From 5768f07dda1abc33872270e0c524321cf1bee024 Mon Sep 17 00:00:00 2001 From: Dongsheng Song Date: Mon, 14 May 2007 10:18:16 +0800 Subject: [PATCH] [TortoiseSVN] Update Simplified Chinese DOC translation to TortoiseSVN.pot@9390, msgmerge only --- tortoisesvn/doc/po/TortoiseSVN.pot | 1856 ++++++++++++++-------------- tortoisesvn/doc/po/TortoiseSVN_zh_CN.po | 1993 ++++++++++++++++--------------- 2 files changed, 1945 insertions(+), 1904 deletions(-) diff --git a/tortoisesvn/doc/po/TortoiseSVN.pot b/tortoisesvn/doc/po/TortoiseSVN.pot index d127e4e..4ab1287 100644 --- a/tortoisesvn/doc/po/TortoiseSVN.pot +++ b/tortoisesvn/doc/po/TortoiseSVN.pot @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2007-05-05 22:50 +0000\n" +"POT-Creation-Date: 2007-05-12 21:53 +0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -794,7 +794,7 @@ msgstr "" msgid "Revisions" msgstr "" -#: source/TortoiseSVN_en.xml:1221(primary) source/TortoiseSVN_en.xml:8171(primary) +#: source/TortoiseSVN_en.xml:1221(primary) source/TortoiseSVN_en.xml:8198(primary) msgid "revision" msgstr "" @@ -1053,7 +1053,7 @@ msgstr "" 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. \nLoadModule dav_svn_module modules/mod_dav_svn.so\nLoadModule authz_svn_module modules/mod_authz_svn.so\n" msgstr "" -#: source/TortoiseSVN_en.xml:1681(title) source/TortoiseSVN_en.xml:9963(term) +#: source/TortoiseSVN_en.xml:1681(title) source/TortoiseSVN_en.xml:10005(term) msgid "Configuration" msgstr "" @@ -1878,7 +1878,7 @@ msgstr "" msgid "right drag" msgstr "" -#: source/TortoiseSVN_en.xml:3319(primary) source/TortoiseSVN_en.xml:6839(primary) source/TortoiseSVN_en.xml:7970(primary) +#: source/TortoiseSVN_en.xml:3319(primary) source/TortoiseSVN_en.xml:6866(primary) source/TortoiseSVN_en.xml:7997(primary) msgid "copy" msgstr "" @@ -1986,7 +1986,7 @@ msgstr "" msgid "import" msgstr "" -#: source/TortoiseSVN_en.xml:3465(primary) source/TortoiseSVN_en.xml:12421(glossterm) +#: source/TortoiseSVN_en.xml:3465(primary) source/TortoiseSVN_en.xml:12463(glossterm) msgid "Repository" msgstr "" @@ -2069,7 +2069,7 @@ msgstr "" msgid "You can also use the repository browser to create new folders directly in the repository." msgstr "" -#: source/TortoiseSVN_en.xml:3605(title) source/TortoiseSVN_en.xml:12082(title) source/TortoiseSVN_en.xml:12321(glossterm) +#: source/TortoiseSVN_en.xml:3605(title) source/TortoiseSVN_en.xml:12124(title) source/TortoiseSVN_en.xml:12363(glossterm) msgid "Import" msgstr "" @@ -2189,11 +2189,11 @@ msgstr "" 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: \nsounds http://sounds.red-bean.com/repos\nquick_graphs http://graphics.red-bean.com/repos/fast%20graphics\nskins/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 "" -#: source/TortoiseSVN_en.xml:3816(para) source/TortoiseSVN_en.xml:10907(para) +#: source/TortoiseSVN_en.xml:3816(para) source/TortoiseSVN_en.xml:10949(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:3821(para) source/TortoiseSVN_en.xml:10912(para) +#: source/TortoiseSVN_en.xml:3821(para) source/TortoiseSVN_en.xml:10954(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 "" @@ -2485,7 +2485,7 @@ msgstr "" msgid "Update Your Working Copy With Changes From Others" msgstr "" -#: source/TortoiseSVN_en.xml:4291(primary) source/TortoiseSVN_en.xml:10652(primary) +#: source/TortoiseSVN_en.xml:4291(primary) source/TortoiseSVN_en.xml:10694(primary) msgid "update" msgstr "" @@ -2729,7 +2729,7 @@ msgstr "" msgid "modifications" msgstr "" -#: source/TortoiseSVN_en.xml:4748(title) source/TortoiseSVN_en.xml:11846(title) +#: source/TortoiseSVN_en.xml:4748(title) source/TortoiseSVN_en.xml:11888(title) msgid "Check for Modifications" msgstr "" @@ -3009,7 +3009,7 @@ msgstr "" 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:5262(para) source/TortoiseSVN_en.xml:8004(para) +#: source/TortoiseSVN_en.xml:5262(para) source/TortoiseSVN_en.xml:8031(para) msgid "Open the selected file, either with the default viewer for that file type, or with a program you choose." msgstr "" @@ -3797,7 +3797,7 @@ msgstr "" 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 "" -#: source/TortoiseSVN_en.xml:6494(para) source/TortoiseSVN_en.xml:7686(para) +#: source/TortoiseSVN_en.xml:6494(para) source/TortoiseSVN_en.xml:7713(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 "" @@ -3809,7 +3809,7 @@ msgstr "" 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 "" -#: source/TortoiseSVN_en.xml:6513(title) source/TortoiseSVN_en.xml:11951(title) source/TortoiseSVN_en.xml:12214(glossterm) +#: source/TortoiseSVN_en.xml:6513(title) source/TortoiseSVN_en.xml:11993(title) source/TortoiseSVN_en.xml:12256(glossterm) msgid "Cleanup" msgstr "" @@ -3950,18 +3950,26 @@ msgid "tsvn:logtemplate is used with projects which have rule msgstr "" #: source/TortoiseSVN_en.xml:6741(para) +msgid "Subversion allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their subversion config file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files." +msgstr "" + +#: source/TortoiseSVN_en.xml:6750(para) +msgid "If there is a conflict between the local autoprops and tsvn:autoprops, the project settings take precedence because they are specific to that project." +msgstr "" + +#: source/TortoiseSVN_en.xml:6757(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 "" -#: source/TortoiseSVN_en.xml:6752(para) +#: source/TortoiseSVN_en.xml:6768(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 "" -#: source/TortoiseSVN_en.xml:6766(para) +#: source/TortoiseSVN_en.xml:6782(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 "" -#: source/TortoiseSVN_en.xml:6774(para) +#: source/TortoiseSVN_en.xml:6790(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 "" @@ -3969,3629 +3977,3641 @@ msgstr "" msgid "TortoiseSVN has a few special properties of its own, and these begin with tsvn:. " msgstr "" -#: source/TortoiseSVN_en.xml:6790(para) source/TortoiseSVN_en.xml:8683(para) +#: source/TortoiseSVN_en.xml:6806(para) source/TortoiseSVN_en.xml:8710(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 "" -#: source/TortoiseSVN_en.xml:6797(title) +#: source/TortoiseSVN_en.xml:6813(title) msgid "Set the tsvn: properties on folders" msgstr "" -#: source/TortoiseSVN_en.xml:6798(para) +#: source/TortoiseSVN_en.xml:6814(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 "" -#: source/TortoiseSVN_en.xml:6812(para) source/TortoiseSVN_en.xml:8705(para) source/TortoiseSVN_en.xml:8807(para) +#: source/TortoiseSVN_en.xml:6828(para) source/TortoiseSVN_en.xml:8732(para) source/TortoiseSVN_en.xml:8834(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 "" -#: source/TortoiseSVN_en.xml:6819(para) +#: source/TortoiseSVN_en.xml:6835(para) msgid "TortoiseSVN can integrate with some bugtracking tools. This uses properties, which start with bugtraq:. Read for further information." msgstr "" -#: source/TortoiseSVN_en.xml:6824(para) +#: source/TortoiseSVN_en.xml:6840(para) msgid "It can also integrate with some web-based repository browsers. Read for further information." msgstr "" -#: source/TortoiseSVN_en.xml:6831(title) +#: source/TortoiseSVN_en.xml:6845(para) +msgid "Although the tsvn:xxx properties are extremely useful, they only work with TortoiseSVN, and some will only work in newer versions of TortoiseSVN. If people working on your project use a variety of Subversion clients, or possibly have old versions of TortoiseSVN, you may want to use repository hooks to enforce project policies. tsvn: properties can only help to implement a policy, they cannot enforce it." +msgstr "" + +#: source/TortoiseSVN_en.xml:6858(title) msgid "Branching / Tagging" msgstr "" -#: source/TortoiseSVN_en.xml:6833(primary) +#: source/TortoiseSVN_en.xml:6860(primary) msgid "branch" msgstr "" -#: source/TortoiseSVN_en.xml:6836(primary) +#: source/TortoiseSVN_en.xml:6863(primary) msgid "tag" msgstr "" -#: source/TortoiseSVN_en.xml:6842(para) +#: source/TortoiseSVN_en.xml:6869(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:6852(para) +#: source/TortoiseSVN_en.xml:6879(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:6858(para) +#: source/TortoiseSVN_en.xml:6885(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 "" -#: source/TortoiseSVN_en.xml:6868(title) +#: source/TortoiseSVN_en.xml:6895(title) msgid "Creating a Branch or Tag" msgstr "" -#: source/TortoiseSVN_en.xml:6873(title) +#: source/TortoiseSVN_en.xml:6900(title) msgid "The Branch/Tag Dialog" msgstr "" -#: source/TortoiseSVN_en.xml:6869(para) +#: source/TortoiseSVN_en.xml:6896(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 "" -#: source/TortoiseSVN_en.xml:6883(para) +#: source/TortoiseSVN_en.xml:6910(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 "" -#: source/TortoiseSVN_en.xml:6904(term) source/TortoiseSVN_en.xml:11997(listitem) +#: source/TortoiseSVN_en.xml:6931(term) source/TortoiseSVN_en.xml:12039(listitem) msgid "HEAD revision in the repository" msgstr "" -#: source/TortoiseSVN_en.xml:6906(para) +#: source/TortoiseSVN_en.xml:6933(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:6915(term) +#: source/TortoiseSVN_en.xml:6942(term) msgid "Specific revision in the repository" msgstr "" -#: source/TortoiseSVN_en.xml:6917(para) +#: source/TortoiseSVN_en.xml:6944(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:6930(term) source/TortoiseSVN_en.xml:11999(listitem) +#: source/TortoiseSVN_en.xml:6957(term) source/TortoiseSVN_en.xml:12041(listitem) msgid "Working copy" msgstr "" -#: source/TortoiseSVN_en.xml:6932(para) +#: source/TortoiseSVN_en.xml:6959(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:6899(para) +#: source/TortoiseSVN_en.xml:6926(para) msgid "Now you have to select the source of the copy. Here you have three options: " msgstr "" -#: source/TortoiseSVN_en.xml:6945(para) +#: source/TortoiseSVN_en.xml:6972(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:6953(para) +#: source/TortoiseSVN_en.xml:6980(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:6958(para) +#: source/TortoiseSVN_en.xml:6985(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:6966(title) +#: source/TortoiseSVN_en.xml:6993(title) msgid "To Checkout or to Switch..." msgstr "" -#: source/TortoiseSVN_en.xml:6969(primary) +#: source/TortoiseSVN_en.xml:6996(primary) msgid "switch" msgstr "" -#: source/TortoiseSVN_en.xml:6971(para) +#: source/TortoiseSVN_en.xml:6998(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 "" -#: source/TortoiseSVN_en.xml:6987(para) +#: source/TortoiseSVN_en.xml:7014(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 "" -#: source/TortoiseSVN_en.xml:6999(para) +#: source/TortoiseSVN_en.xml:7026(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 "" -#: source/TortoiseSVN_en.xml:7009(para) +#: source/TortoiseSVN_en.xml:7036(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 "" -#: source/TortoiseSVN_en.xml:7017(para) +#: source/TortoiseSVN_en.xml:7044(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:7028(title) +#: source/TortoiseSVN_en.xml:7055(title) msgid "The Switch Dialog" msgstr "" -#: source/TortoiseSVN_en.xml:6982(para) +#: source/TortoiseSVN_en.xml:7009(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:7037(para) +#: source/TortoiseSVN_en.xml:7064(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 "" -#: source/TortoiseSVN_en.xml:7053(para) +#: source/TortoiseSVN_en.xml:7080(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 "" -#: source/TortoiseSVN_en.xml:7063(para) +#: source/TortoiseSVN_en.xml:7090(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:7032(para) +#: source/TortoiseSVN_en.xml:7059(para) msgid "Although Subversion itself makes no distinction between tags and branches, the way they are typically used differs a bit. " msgstr "" -#: source/TortoiseSVN_en.xml:7076(title) +#: source/TortoiseSVN_en.xml:7103(title) msgid "Merging" msgstr "" -#: source/TortoiseSVN_en.xml:7079(primary) +#: source/TortoiseSVN_en.xml:7106(primary) msgid "merge" msgstr "" -#: source/TortoiseSVN_en.xml:7081(para) +#: source/TortoiseSVN_en.xml:7108(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:7086(para) +#: source/TortoiseSVN_en.xml:7113(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 "" -#: source/TortoiseSVN_en.xml:7096(para) +#: source/TortoiseSVN_en.xml:7123(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 "" -#: source/TortoiseSVN_en.xml:7109(para) +#: source/TortoiseSVN_en.xml:7136(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:7116(para) +#: source/TortoiseSVN_en.xml:7143(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:7121(title) +#: source/TortoiseSVN_en.xml:7148(title) msgid "Merging a Range of Revisions" msgstr "" -#: source/TortoiseSVN_en.xml:7122(para) +#: source/TortoiseSVN_en.xml:7149(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:7129(title) +#: source/TortoiseSVN_en.xml:7156(title) msgid "The Merge Dialog" msgstr "" -#: source/TortoiseSVN_en.xml:7142(para) +#: source/TortoiseSVN_en.xml:7169(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 "" -#: source/TortoiseSVN_en.xml:7155(para) +#: source/TortoiseSVN_en.xml:7182(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 "" -#: source/TortoiseSVN_en.xml:7163(para) +#: source/TortoiseSVN_en.xml:7190(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: \nRev Comments\n39. Working on MyBranch\n38. Working on trunk\n37. Working on MyBranch\n36. Create branch MyBranch\n35. Working on trunk\n34. 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 "" -#: source/TortoiseSVN_en.xml:7191(para) +#: source/TortoiseSVN_en.xml:7218(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 "" -#: source/TortoiseSVN_en.xml:7204(para) +#: source/TortoiseSVN_en.xml:7231(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 "" -#: source/TortoiseSVN_en.xml:7212(para) +#: source/TortoiseSVN_en.xml:7239(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 "" -#: source/TortoiseSVN_en.xml:7225(para) +#: source/TortoiseSVN_en.xml:7252(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:7233(para) +#: source/TortoiseSVN_en.xml:7260(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:7241(para) source/TortoiseSVN_en.xml:7345(para) source/TortoiseSVN_en.xml:10791(para) +#: source/TortoiseSVN_en.xml:7268(para) source/TortoiseSVN_en.xml:7372(para) source/TortoiseSVN_en.xml:10833(para) msgid "Click OK to complete the merge." msgstr "" -#: source/TortoiseSVN_en.xml:7127(para) +#: source/TortoiseSVN_en.xml:7154(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 "" -#: source/TortoiseSVN_en.xml:7250(para) +#: source/TortoiseSVN_en.xml:7277(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 "" -#: source/TortoiseSVN_en.xml:7263(para) +#: source/TortoiseSVN_en.xml:7290(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:7270(para) +#: source/TortoiseSVN_en.xml:7297(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 "" -#: source/TortoiseSVN_en.xml:7280(title) +#: source/TortoiseSVN_en.xml:7307(title) msgid "Merging Two Different Trees" msgstr "" -#: source/TortoiseSVN_en.xml:7281(para) +#: source/TortoiseSVN_en.xml:7308(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 "" -#: source/TortoiseSVN_en.xml:7302(para) +#: source/TortoiseSVN_en.xml:7329(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 "" -#: source/TortoiseSVN_en.xml:7313(para) +#: source/TortoiseSVN_en.xml:7340(para) msgid "Because you are comparing two different trees, make sure the Use \"From:\" URL checkbox is not checked." msgstr "" -#: source/TortoiseSVN_en.xml:7320(para) +#: source/TortoiseSVN_en.xml:7347(para) msgid "In the To: field enter the full folder url of the feature branch." msgstr "" -#: source/TortoiseSVN_en.xml:7326(para) +#: source/TortoiseSVN_en.xml:7353(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 "" -#: source/TortoiseSVN_en.xml:7336(para) +#: source/TortoiseSVN_en.xml:7363(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:7291(para) +#: source/TortoiseSVN_en.xml:7318(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 "" -#: source/TortoiseSVN_en.xml:7351(para) +#: source/TortoiseSVN_en.xml:7378(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:7359(title) +#: source/TortoiseSVN_en.xml:7386(title) msgid "Previewing Merge Results" msgstr "" -#: source/TortoiseSVN_en.xml:7360(para) +#: source/TortoiseSVN_en.xml:7387(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:7365(para) +#: source/TortoiseSVN_en.xml:7392(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:7372(para) +#: source/TortoiseSVN_en.xml:7399(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:7381(para) +#: source/TortoiseSVN_en.xml:7408(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:7389(title) +#: source/TortoiseSVN_en.xml:7416(title) msgid "Ignoring Ancestry" msgstr "" -#: source/TortoiseSVN_en.xml:7390(para) +#: source/TortoiseSVN_en.xml:7417(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 "" -#: source/TortoiseSVN_en.xml:7410(title) +#: source/TortoiseSVN_en.xml:7437(title) msgid "Locking" msgstr "" -#: source/TortoiseSVN_en.xml:7412(primary) +#: source/TortoiseSVN_en.xml:7439(primary) msgid "locking" msgstr "" -#: source/TortoiseSVN_en.xml:7422(para) +#: source/TortoiseSVN_en.xml:7449(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:7430(para) +#: source/TortoiseSVN_en.xml:7457(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 "" -#: source/TortoiseSVN_en.xml:7414(para) +#: source/TortoiseSVN_en.xml:7441(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 "" -#: source/TortoiseSVN_en.xml:7438(para) +#: source/TortoiseSVN_en.xml:7465(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 "" -#: source/TortoiseSVN_en.xml:7445(title) +#: source/TortoiseSVN_en.xml:7472(title) msgid "How Locking Works in Subversion" msgstr "" -#: source/TortoiseSVN_en.xml:7446(para) +#: source/TortoiseSVN_en.xml:7473(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:7452(para) +#: source/TortoiseSVN_en.xml:7479(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:7459(para) +#: source/TortoiseSVN_en.xml:7486(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 "" -#: source/TortoiseSVN_en.xml:7475(para) +#: source/TortoiseSVN_en.xml:7502(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:7481(para) +#: source/TortoiseSVN_en.xml:7508(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 "" -#: source/TortoiseSVN_en.xml:7491(para) +#: source/TortoiseSVN_en.xml:7518(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:7500(title) +#: source/TortoiseSVN_en.xml:7527(title) msgid "Getting a Lock" msgstr "" -#: source/TortoiseSVN_en.xml:7509(title) +#: source/TortoiseSVN_en.xml:7536(title) msgid "The Locking Dialog" msgstr "" -#: source/TortoiseSVN_en.xml:7501(para) +#: source/TortoiseSVN_en.xml:7528(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 "" -#: source/TortoiseSVN_en.xml:7521(para) +#: source/TortoiseSVN_en.xml:7548(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 "" -#: source/TortoiseSVN_en.xml:7535(title) +#: source/TortoiseSVN_en.xml:7562(title) msgid "Releasing a Lock" msgstr "" -#: source/TortoiseSVN_en.xml:7536(para) +#: source/TortoiseSVN_en.xml:7563(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:7547(para) +#: source/TortoiseSVN_en.xml:7574(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 "" -#: source/TortoiseSVN_en.xml:7560(title) +#: source/TortoiseSVN_en.xml:7587(title) msgid "Checking Lock Status" msgstr "" -#: source/TortoiseSVN_en.xml:7563(title) +#: source/TortoiseSVN_en.xml:7590(title) msgid "The Check for Modifications Dialog" msgstr "" -#: source/TortoiseSVN_en.xml:7561(para) +#: source/TortoiseSVN_en.xml:7588(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 "" -#: source/TortoiseSVN_en.xml:7576(para) +#: source/TortoiseSVN_en.xml:7603(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:7581(title) +#: source/TortoiseSVN_en.xml:7608(title) msgid "Avoid Breaking and Stealing Locks" msgstr "" -#: source/TortoiseSVN_en.xml:7582(para) +#: source/TortoiseSVN_en.xml:7609(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 "" -#: source/TortoiseSVN_en.xml:7594(title) +#: source/TortoiseSVN_en.xml:7621(title) msgid "Making Non-locked Files Read-Only" msgstr "" -#: source/TortoiseSVN_en.xml:7595(para) +#: source/TortoiseSVN_en.xml:7622(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 "" -#: source/TortoiseSVN_en.xml:7605(para) +#: source/TortoiseSVN_en.xml:7632(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 "" -#: source/TortoiseSVN_en.xml:7613(title) +#: source/TortoiseSVN_en.xml:7640(title) msgid "The Locking Hook Scripts" msgstr "" -#: source/TortoiseSVN_en.xml:7614(para) +#: source/TortoiseSVN_en.xml:7641(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 "" -#: source/TortoiseSVN_en.xml:7620(para) +#: source/TortoiseSVN_en.xml:7647(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 "" -#: source/TortoiseSVN_en.xml:7628(para) +#: source/TortoiseSVN_en.xml:7655(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 "" -#: source/TortoiseSVN_en.xml:7634(para) +#: source/TortoiseSVN_en.xml:7661(para) msgid "Read to find out more." msgstr "" -#: source/TortoiseSVN_en.xml:7640(title) +#: source/TortoiseSVN_en.xml:7667(title) msgid "Creating and Applying Patches" msgstr "" -#: source/TortoiseSVN_en.xml:7642(primary) +#: source/TortoiseSVN_en.xml:7669(primary) msgid "patch" msgstr "" -#: source/TortoiseSVN_en.xml:7646(para) +#: source/TortoiseSVN_en.xml:7673(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:7657(para) +#: source/TortoiseSVN_en.xml:7684(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:7662(title) +#: source/TortoiseSVN_en.xml:7689(title) msgid "Creating a Patch File" msgstr "" -#: source/TortoiseSVN_en.xml:7663(para) +#: source/TortoiseSVN_en.xml:7690(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 "" -#: source/TortoiseSVN_en.xml:7677(title) +#: source/TortoiseSVN_en.xml:7704(title) msgid "The Create Patch dialog" msgstr "" -#: source/TortoiseSVN_en.xml:7680(para) +#: source/TortoiseSVN_en.xml:7707(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:7691(para) +#: source/TortoiseSVN_en.xml:7718(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:7697(para) +#: source/TortoiseSVN_en.xml:7724(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 "" -#: source/TortoiseSVN_en.xml:7704(para) +#: source/TortoiseSVN_en.xml:7731(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:7713(title) +#: source/TortoiseSVN_en.xml:7740(title) msgid "Applying a Patch File" 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." +#: source/TortoiseSVN_en.xml:7741(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 doc/source/ 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 "" -#: source/TortoiseSVN_en.xml:7728(para) +#: source/TortoiseSVN_en.xml:7755(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) +#: source/TortoiseSVN_en.xml:7762(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 "" -#: source/TortoiseSVN_en.xml:7749(para) +#: source/TortoiseSVN_en.xml:7776(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 "" -#: source/TortoiseSVN_en.xml:7759(para) +#: source/TortoiseSVN_en.xml:7786(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:7764(para) +#: source/TortoiseSVN_en.xml:7791(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 "" -#: source/TortoiseSVN_en.xml:7771(para) +#: source/TortoiseSVN_en.xml:7798(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:7779(title) +#: source/TortoiseSVN_en.xml:7806(title) msgid "Who Changed Which Line?" msgstr "" -#: source/TortoiseSVN_en.xml:7781(primary) +#: source/TortoiseSVN_en.xml:7808(primary) msgid "blame" msgstr "" -#: source/TortoiseSVN_en.xml:7784(primary) +#: source/TortoiseSVN_en.xml:7811(primary) msgid "annotate" msgstr "" -#: source/TortoiseSVN_en.xml:7787(primary) +#: source/TortoiseSVN_en.xml:7814(primary) msgid "praise" msgstr "" -#: source/TortoiseSVN_en.xml:7790(para) +#: source/TortoiseSVN_en.xml:7817(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 "" -#: source/TortoiseSVN_en.xml:7800(para) +#: source/TortoiseSVN_en.xml:7827(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:7805(title) +#: source/TortoiseSVN_en.xml:7832(title) msgid "Blame for Files" msgstr "" -#: source/TortoiseSVN_en.xml:7808(title) +#: source/TortoiseSVN_en.xml:7835(title) msgid "The Annotate / Blame Dialog" msgstr "" -#: source/TortoiseSVN_en.xml:7806(para) +#: source/TortoiseSVN_en.xml:7833(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 "" -#: source/TortoiseSVN_en.xml:7815(para) +#: source/TortoiseSVN_en.xml:7842(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 "" -#: source/TortoiseSVN_en.xml:7821(para) +#: source/TortoiseSVN_en.xml:7848(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 "" -#: source/TortoiseSVN_en.xml:7831(title) +#: source/TortoiseSVN_en.xml:7858(title) msgid "TortoiseBlame" msgstr "" -#: source/TortoiseSVN_en.xml:7829(para) +#: source/TortoiseSVN_en.xml:7856(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 "" -#: source/TortoiseSVN_en.xml:7842(para) +#: source/TortoiseSVN_en.xml:7869(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:7849(para) +#: source/TortoiseSVN_en.xml:7876(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:7855(para) +#: source/TortoiseSVN_en.xml:7882(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:7865(para) +#: source/TortoiseSVN_en.xml:7892(para) msgid "You can also jump to a specific line number using EditGo To Line...." msgstr "" -#: source/TortoiseSVN_en.xml:7872(para) +#: source/TortoiseSVN_en.xml:7899(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:7894(para) +#: source/TortoiseSVN_en.xml:7921(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:7901(title) source/TortoiseSVN_en.xml:7926(term) +#: source/TortoiseSVN_en.xml:7928(title) source/TortoiseSVN_en.xml:7953(term) msgid "Blame Differences" msgstr "" -#: source/TortoiseSVN_en.xml:7902(para) +#: source/TortoiseSVN_en.xml:7929(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:7912(term) +#: source/TortoiseSVN_en.xml:7939(term) msgid "Blame Revisions" msgstr "" -#: source/TortoiseSVN_en.xml:7914(para) +#: source/TortoiseSVN_en.xml:7941(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:7928(para) +#: source/TortoiseSVN_en.xml:7955(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:7942(term) +#: source/TortoiseSVN_en.xml:7969(term) msgid "Compare and Blame with Working BASE" msgstr "" -#: source/TortoiseSVN_en.xml:7944(para) +#: source/TortoiseSVN_en.xml:7971(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:7908(para) +#: source/TortoiseSVN_en.xml:7935(para) msgid "The revision log dialog includes several options which allow you to do this. " msgstr "" -#: source/TortoiseSVN_en.xml:7962(title) source/TortoiseSVN_en.xml:7980(title) +#: source/TortoiseSVN_en.xml:7989(title) source/TortoiseSVN_en.xml:8007(title) msgid "The Repository Browser" msgstr "" -#: source/TortoiseSVN_en.xml:7964(primary) +#: source/TortoiseSVN_en.xml:7991(primary) msgid "repobrowser" msgstr "" -#: source/TortoiseSVN_en.xml:7967(primary) +#: source/TortoiseSVN_en.xml:7994(primary) msgid "server-side actions" msgstr "" -#: source/TortoiseSVN_en.xml:7973(para) +#: source/TortoiseSVN_en.xml:8000(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:7986(para) +#: source/TortoiseSVN_en.xml:8013(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:7995(para) +#: source/TortoiseSVN_en.xml:8022(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:8010(para) +#: source/TortoiseSVN_en.xml:8037(para) msgid "Save an unversioned copy of the file to your hard drive." msgstr "" -#: source/TortoiseSVN_en.xml:8015(para) +#: source/TortoiseSVN_en.xml:8042(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:8021(para) +#: source/TortoiseSVN_en.xml:8048(para) msgid "Blame the file, to see who changed which line and when." msgstr "" -#: source/TortoiseSVN_en.xml:8026(para) +#: source/TortoiseSVN_en.xml:8053(para) msgid "Delete or rename the file." msgstr "" -#: source/TortoiseSVN_en.xml:8031(para) +#: source/TortoiseSVN_en.xml:8058(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) +#: source/TortoiseSVN_en.xml:8064(para) msgid "View the file's properties (you cannot edit properties directly in the repository)." msgstr "" -#: source/TortoiseSVN_en.xml:8000(para) +#: source/TortoiseSVN_en.xml:8027(para) msgid "The context menu for a file allows you to: " msgstr "" -#: source/TortoiseSVN_en.xml:8048(para) +#: source/TortoiseSVN_en.xml:8075(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:8054(para) +#: source/TortoiseSVN_en.xml:8081(para) msgid "Export the folder to a local unversioned copy on your hard drive." msgstr "" -#: source/TortoiseSVN_en.xml:8059(para) +#: source/TortoiseSVN_en.xml:8086(para) msgid "Checkout the folder to produce a local working copy on your hard drive." msgstr "" -#: source/TortoiseSVN_en.xml:8064(para) +#: source/TortoiseSVN_en.xml:8091(para) msgid "Create a new folder in the repository." msgstr "" -#: source/TortoiseSVN_en.xml:8069(para) +#: source/TortoiseSVN_en.xml:8096(para) msgid "Add files or folders directly to the repository." msgstr "" -#: source/TortoiseSVN_en.xml:8074(para) +#: source/TortoiseSVN_en.xml:8101(para) msgid "Delete or rename the folder." msgstr "" -#: source/TortoiseSVN_en.xml:8079(para) +#: source/TortoiseSVN_en.xml:8106(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:8085(para) +#: source/TortoiseSVN_en.xml:8112(para) msgid "View the folder's properties (you cannot edit properties directly in the repository)." msgstr "" -#: source/TortoiseSVN_en.xml:8091(para) +#: source/TortoiseSVN_en.xml:8118(para) msgid "Mark the folder for comparison. A marked folder is shown in bold." msgstr "" -#: source/TortoiseSVN_en.xml:8096(para) +#: source/TortoiseSVN_en.xml:8123(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:8044(para) +#: source/TortoiseSVN_en.xml:8071(para) msgid "The context menu for a folder allows you to: " msgstr "" -#: source/TortoiseSVN_en.xml:8105(para) +#: source/TortoiseSVN_en.xml:8132(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:8110(para) +#: source/TortoiseSVN_en.xml:8137(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:8114(para) +#: source/TortoiseSVN_en.xml:8141(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:8123(para) +#: source/TortoiseSVN_en.xml:8150(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:8130(para) +#: source/TortoiseSVN_en.xml:8157(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:8136(para) +#: source/TortoiseSVN_en.xml:8163(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:8142(para) +#: source/TortoiseSVN_en.xml:8169(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:8149(para) +#: source/TortoiseSVN_en.xml:8176(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:8154(para) +#: source/TortoiseSVN_en.xml:8181(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 "" -#: source/TortoiseSVN_en.xml:8169(title) +#: source/TortoiseSVN_en.xml:8196(title) msgid "Revision Graphs" msgstr "" -#: source/TortoiseSVN_en.xml:8174(primary) +#: source/TortoiseSVN_en.xml:8201(primary) msgid "graph" msgstr "" -#: source/TortoiseSVN_en.xml:8178(title) +#: source/TortoiseSVN_en.xml:8205(title) msgid "A Revision Graph" msgstr "" -#: source/TortoiseSVN_en.xml:8176(para) +#: source/TortoiseSVN_en.xml:8203(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 "" -#: source/TortoiseSVN_en.xml:8189(para) +#: source/TortoiseSVN_en.xml:8216(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:8195(para) +#: source/TortoiseSVN_en.xml:8222(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 "" -#: source/TortoiseSVN_en.xml:8208(term) +#: source/TortoiseSVN_en.xml:8235(term) msgid "Added file/folder" msgstr "" -#: source/TortoiseSVN_en.xml:8210(para) +#: source/TortoiseSVN_en.xml:8237(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:8217(term) +#: source/TortoiseSVN_en.xml:8244(term) msgid "Deleted file/folder" msgstr "" -#: source/TortoiseSVN_en.xml:8219(para) +#: source/TortoiseSVN_en.xml:8246(para) msgid "Deleted items eg. a branch which is no longer required, are shown using an octagon (rectangle with corners cut off)." msgstr "" -#: source/TortoiseSVN_en.xml:8226(term) +#: source/TortoiseSVN_en.xml:8253(term) msgid "Branch tip revision" msgstr "" -#: source/TortoiseSVN_en.xml:8228(para) +#: source/TortoiseSVN_en.xml:8255(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:8237(term) +#: source/TortoiseSVN_en.xml:8264(term) msgid "Normal file/folder" msgstr "" -#: source/TortoiseSVN_en.xml:8239(para) +#: source/TortoiseSVN_en.xml:8266(para) msgid "All other items are shown using a plain rectangle." msgstr "" -#: source/TortoiseSVN_en.xml:8204(para) +#: source/TortoiseSVN_en.xml:8231(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:8251(para) +#: source/TortoiseSVN_en.xml:8278(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:8258(para) +#: source/TortoiseSVN_en.xml:8285(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:8267(para) +#: source/TortoiseSVN_en.xml:8294(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:8273(para) +#: source/TortoiseSVN_en.xml:8300(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:8277(para) +#: source/TortoiseSVN_en.xml:8304(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 "" -#: source/TortoiseSVN_en.xml:8284(para) +#: source/TortoiseSVN_en.xml:8311(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:8295(para) +#: source/TortoiseSVN_en.xml:8322(para) msgid "If you right click on a revision you can use Context MenuShow Log to view the history." msgstr "" -#: source/TortoiseSVN_en.xml:8304(para) +#: source/TortoiseSVN_en.xml:8331(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 "" -#: source/TortoiseSVN_en.xml:8313(title) +#: source/TortoiseSVN_en.xml:8340(title) msgid "Exporting a Subversion Working Copy" msgstr "" -#: source/TortoiseSVN_en.xml:8315(primary) +#: source/TortoiseSVN_en.xml:8342(primary) msgid "export" msgstr "" -#: source/TortoiseSVN_en.xml:8317(para) +#: source/TortoiseSVN_en.xml:8344(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 "" -#: source/TortoiseSVN_en.xml:8332(title) +#: source/TortoiseSVN_en.xml:8359(title) msgid "The Export-from-URL Dialog" msgstr "" -#: source/TortoiseSVN_en.xml:8330(para) +#: source/TortoiseSVN_en.xml:8357(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 "" -#: source/TortoiseSVN_en.xml:8342(para) +#: source/TortoiseSVN_en.xml:8369(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 "" -#: source/TortoiseSVN_en.xml:8352(para) +#: source/TortoiseSVN_en.xml:8379(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 "" -#: source/TortoiseSVN_en.xml:8362(para) +#: source/TortoiseSVN_en.xml:8389(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 "" -#: source/TortoiseSVN_en.xml:8376(para) +#: source/TortoiseSVN_en.xml:8403(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 "" -#: source/TortoiseSVN_en.xml:8385(title) +#: source/TortoiseSVN_en.xml:8412(title) msgid "Relocating a working copy" msgstr "" -#: source/TortoiseSVN_en.xml:8387(primary) +#: source/TortoiseSVN_en.xml:8414(primary) msgid "relocate" msgstr "" -#: source/TortoiseSVN_en.xml:8392(title) +#: source/TortoiseSVN_en.xml:8419(title) msgid "The Relocate Dialog" msgstr "" -#: source/TortoiseSVN_en.xml:8390(para) +#: source/TortoiseSVN_en.xml:8417(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 "" -#: source/TortoiseSVN_en.xml:8416(para) +#: source/TortoiseSVN_en.xml:8443(para) msgid "The IP address of the server has changed." msgstr "" -#: source/TortoiseSVN_en.xml:8419(para) +#: source/TortoiseSVN_en.xml:8446(para) msgid "The protocol has changed (e.g. http:// to https://)." msgstr "" -#: source/TortoiseSVN_en.xml:8422(para) +#: source/TortoiseSVN_en.xml:8449(para) msgid "The repository root path in the server setup has changed." msgstr "" -#: source/TortoiseSVN_en.xml:8410(para) +#: source/TortoiseSVN_en.xml:8437(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:8433(para) +#: source/TortoiseSVN_en.xml:8460(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:8439(para) +#: source/TortoiseSVN_en.xml:8466(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 "" -#: source/TortoiseSVN_en.xml:8429(para) +#: source/TortoiseSVN_en.xml:8456(para) msgid "It does not apply if: " msgstr "" -#: source/TortoiseSVN_en.xml:8451(para) +#: source/TortoiseSVN_en.xml:8478(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:8460(title) +#: source/TortoiseSVN_en.xml:8487(title) msgid "Integration with Bugtracking Systems / Issue trackers" msgstr "" -#: source/TortoiseSVN_en.xml:8462(primary) +#: source/TortoiseSVN_en.xml:8489(primary) msgid "bugtracking" msgstr "" -#: source/TortoiseSVN_en.xml:8465(primary) +#: source/TortoiseSVN_en.xml:8492(primary) msgid "bugtracker" msgstr "" -#: source/TortoiseSVN_en.xml:8468(primary) +#: source/TortoiseSVN_en.xml:8495(primary) msgid "issuetracker" msgstr "" -#: source/TortoiseSVN_en.xml:8470(para) +#: source/TortoiseSVN_en.xml:8497(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 "" -#: source/TortoiseSVN_en.xml:8483(para) +#: source/TortoiseSVN_en.xml:8510(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 "" -#: source/TortoiseSVN_en.xml:8489(para) +#: source/TortoiseSVN_en.xml:8516(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 "" -#: source/TortoiseSVN_en.xml:8496(para) +#: source/TortoiseSVN_en.xml:8523(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 "" -#: source/TortoiseSVN_en.xml:8479(para) +#: source/TortoiseSVN_en.xml:8506(para) msgid "TortoiseSVN can help the user in two ways: " msgstr "" -#: source/TortoiseSVN_en.xml:8504(para) +#: source/TortoiseSVN_en.xml:8531(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 "" -#: source/TortoiseSVN_en.xml:8516(term) +#: source/TortoiseSVN_en.xml:8543(term) msgid "bugtraq:url" msgstr "" -#: source/TortoiseSVN_en.xml:8518(para) +#: source/TortoiseSVN_en.xml:8545(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 "" -#: source/TortoiseSVN_en.xml:8536(term) +#: source/TortoiseSVN_en.xml:8563(term) msgid "bugtraq:warnifnoissue" msgstr "" -#: source/TortoiseSVN_en.xml:8538(para) +#: source/TortoiseSVN_en.xml:8565(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 "" -#: source/TortoiseSVN_en.xml:8510(para) +#: source/TortoiseSVN_en.xml:8537(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 "" -#: source/TortoiseSVN_en.xml:8557(term) +#: source/TortoiseSVN_en.xml:8584(term) msgid "bugtraq:message" msgstr "" -#: source/TortoiseSVN_en.xml:8559(para) +#: source/TortoiseSVN_en.xml:8586(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 "" -#: source/TortoiseSVN_en.xml:8580(term) +#: source/TortoiseSVN_en.xml:8607(term) msgid "bugtraq:append" msgstr "" -#: source/TortoiseSVN_en.xml:8582(para) +#: source/TortoiseSVN_en.xml:8609(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 "" -#: source/TortoiseSVN_en.xml:8595(term) +#: source/TortoiseSVN_en.xml:8622(term) msgid "bugtraq:label" msgstr "" -#: source/TortoiseSVN_en.xml:8597(para) +#: source/TortoiseSVN_en.xml:8624(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 "" -#: source/TortoiseSVN_en.xml:8609(term) +#: source/TortoiseSVN_en.xml:8636(term) msgid "bugtraq:number" msgstr "" -#: source/TortoiseSVN_en.xml:8611(para) +#: source/TortoiseSVN_en.xml:8638(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 "" -#: source/TortoiseSVN_en.xml:8551(para) +#: source/TortoiseSVN_en.xml:8578(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 "" -#: source/TortoiseSVN_en.xml:8633(term) +#: source/TortoiseSVN_en.xml:8660(term) msgid "bugtraq:logregex" msgstr "" -#: source/TortoiseSVN_en.xml:8635(para) +#: source/TortoiseSVN_en.xml:8662(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:8642(para) +#: source/TortoiseSVN_en.xml:8669(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 "" -#: source/TortoiseSVN_en.xml:8647(para) +#: source/TortoiseSVN_en.xml:8674(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 "" -#: source/TortoiseSVN_en.xml:8655(para) +#: source/TortoiseSVN_en.xml:8682(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 "" -#: source/TortoiseSVN_en.xml:8661(para) +#: source/TortoiseSVN_en.xml:8688(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 "" -#: source/TortoiseSVN_en.xml:8624(para) +#: source/TortoiseSVN_en.xml:8651(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 "" -#: source/TortoiseSVN_en.xml:8672(para) +#: source/TortoiseSVN_en.xml:8699(para) msgid "If both the bugtraq:message and bugtraq:logregex properties are set, logregex takes precedence." msgstr "" -#: source/TortoiseSVN_en.xml:8677(para) +#: source/TortoiseSVN_en.xml:8704(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 "" -#: source/TortoiseSVN_en.xml:8690(title) source/TortoiseSVN_en.xml:8792(title) +#: source/TortoiseSVN_en.xml:8717(title) source/TortoiseSVN_en.xml:8819(title) msgid "Set the Properties on Folders" msgstr "" -#: source/TortoiseSVN_en.xml:8691(para) source/TortoiseSVN_en.xml:8793(para) +#: source/TortoiseSVN_en.xml:8718(para) source/TortoiseSVN_en.xml:8820(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 "" -#: source/TortoiseSVN_en.xml:8712(para) +#: source/TortoiseSVN_en.xml:8739(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 "" -#: source/TortoiseSVN_en.xml:8721(title) +#: source/TortoiseSVN_en.xml:8748(title) msgid "Integration with Web-based Repository Viewers" msgstr "" -#: source/TortoiseSVN_en.xml:8723(primary) +#: source/TortoiseSVN_en.xml:8750(primary) msgid "webview" msgstr "" -#: source/TortoiseSVN_en.xml:8726(primary) +#: source/TortoiseSVN_en.xml:8753(primary) msgid "repoviewer" msgstr "" -#: source/TortoiseSVN_en.xml:8728(para) +#: source/TortoiseSVN_en.xml:8755(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 "" -#: source/TortoiseSVN_en.xml:8740(para) +#: source/TortoiseSVN_en.xml:8767(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 "" -#: source/TortoiseSVN_en.xml:8748(term) +#: source/TortoiseSVN_en.xml:8775(term) msgid "webviewer:revision" msgstr "" -#: source/TortoiseSVN_en.xml:8750(para) +#: source/TortoiseSVN_en.xml:8777(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 "" -#: source/TortoiseSVN_en.xml:8767(term) +#: source/TortoiseSVN_en.xml:8794(term) msgid "webviewer:pathrevision" msgstr "" -#: source/TortoiseSVN_en.xml:8769(para) +#: source/TortoiseSVN_en.xml:8796(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:8816(title) +#: source/TortoiseSVN_en.xml:8843(title) msgid "TortoiseSVN's Settings" msgstr "" -#: source/TortoiseSVN_en.xml:8818(primary) +#: source/TortoiseSVN_en.xml:8845(primary) msgid "settings" msgstr "" -#: source/TortoiseSVN_en.xml:8820(para) +#: source/TortoiseSVN_en.xml:8847(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:8829(title) +#: source/TortoiseSVN_en.xml:8856(title) msgid "General Settings" msgstr "" -#: source/TortoiseSVN_en.xml:8831(primary) +#: source/TortoiseSVN_en.xml:8858(primary) msgid "sounds" msgstr "" -#: source/TortoiseSVN_en.xml:8835(title) +#: source/TortoiseSVN_en.xml:8862(title) msgid "The Settings Dialog, General Page" msgstr "" -#: source/TortoiseSVN_en.xml:8833(para) +#: source/TortoiseSVN_en.xml:8860(para) msgid " This dialog allows you to specify your preferred language, and the Subversion-specific settings." msgstr "" -#: source/TortoiseSVN_en.xml:8843(term) +#: source/TortoiseSVN_en.xml:8870(term) msgid "Language" msgstr "" -#: source/TortoiseSVN_en.xml:8845(para) +#: source/TortoiseSVN_en.xml:8872(para) msgid "Selects your user interface language. What else did you expect?" msgstr "" -#: source/TortoiseSVN_en.xml:8852(term) +#: source/TortoiseSVN_en.xml:8879(term) msgid "Automatically check for newer versions every week" msgstr "" -#: source/TortoiseSVN_en.xml:8854(para) +#: source/TortoiseSVN_en.xml:8881(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 "" -#: source/TortoiseSVN_en.xml:8865(term) +#: source/TortoiseSVN_en.xml:8892(term) msgid "System sounds" msgstr "" -#: source/TortoiseSVN_en.xml:8871(para) +#: source/TortoiseSVN_en.xml:8898(para) msgid "Error" msgstr "" -#: source/TortoiseSVN_en.xml:8876(para) +#: source/TortoiseSVN_en.xml:8903(para) msgid "Notice" msgstr "" -#: source/TortoiseSVN_en.xml:8881(para) +#: source/TortoiseSVN_en.xml:8908(para) msgid "Warning" msgstr "" -#: source/TortoiseSVN_en.xml:8867(para) +#: source/TortoiseSVN_en.xml:8894(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 "" -#: source/TortoiseSVN_en.xml:8893(term) +#: source/TortoiseSVN_en.xml:8920(term) msgid "Global ignore pattern" msgstr "" -#: source/TortoiseSVN_en.xml:8896(primary) +#: source/TortoiseSVN_en.xml:8923(primary) msgid "exclude pattern" msgstr "" -#: source/TortoiseSVN_en.xml:8899(primary) +#: source/TortoiseSVN_en.xml:8926(primary) msgid "global ignore" msgstr "" -#: source/TortoiseSVN_en.xml:8901(para) +#: source/TortoiseSVN_en.xml:8928(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 "" -#: source/TortoiseSVN_en.xml:8915(para) +#: source/TortoiseSVN_en.xml:8942(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 "" -#: source/TortoiseSVN_en.xml:8921(para) +#: source/TortoiseSVN_en.xml:8948(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 "" -#: source/TortoiseSVN_en.xml:8929(para) +#: source/TortoiseSVN_en.xml:8956(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 "" -#: source/TortoiseSVN_en.xml:8941(term) +#: source/TortoiseSVN_en.xml:8968(term) msgid "Set filedates to the \"last commit time\"" msgstr "" -#: source/TortoiseSVN_en.xml:8943(para) +#: source/TortoiseSVN_en.xml:8970(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 "" -#: source/TortoiseSVN_en.xml:8957(term) +#: source/TortoiseSVN_en.xml:8984(term) msgid "Subversion configuration file" msgstr "" -#: source/TortoiseSVN_en.xml:8959(para) +#: source/TortoiseSVN_en.xml:8986(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 "" -#: source/TortoiseSVN_en.xml:8984(term) +#: source/TortoiseSVN_en.xml:9011(term) msgid "Use \"_svn\" instead of \".svn\" directories" msgstr "" -#: source/TortoiseSVN_en.xml:8986(para) +#: source/TortoiseSVN_en.xml:9013(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 "" -#: source/TortoiseSVN_en.xml:8993(para) +#: source/TortoiseSVN_en.xml:9020(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 "" -#: source/TortoiseSVN_en.xml:8998(para) +#: source/TortoiseSVN_en.xml:9025(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 "" -#: source/TortoiseSVN_en.xml:9009(title) +#: source/TortoiseSVN_en.xml:9036(title) msgid "Look and Feel Settings" msgstr "" -#: source/TortoiseSVN_en.xml:9013(title) source/TortoiseSVN_en.xml:9094(title) +#: source/TortoiseSVN_en.xml:9040(title) source/TortoiseSVN_en.xml:9121(title) msgid "The Settings Dialog, Look and Feel Page" msgstr "" -#: source/TortoiseSVN_en.xml:9011(para) +#: source/TortoiseSVN_en.xml:9038(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 "" -#: source/TortoiseSVN_en.xml:9021(para) +#: source/TortoiseSVN_en.xml:9048(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 "" -#: source/TortoiseSVN_en.xml:9031(para) +#: source/TortoiseSVN_en.xml:9058(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 "" -#: source/TortoiseSVN_en.xml:9053(term) +#: source/TortoiseSVN_en.xml:9080(term) msgid "Unchecked (default)" msgstr "" -#: source/TortoiseSVN_en.xml:9055(para) +#: source/TortoiseSVN_en.xml:9082(para) msgid "In this state the menu items are all drawn by TortoiseSVN. No accelerator keys are shown." msgstr "" -#: source/TortoiseSVN_en.xml:9062(term) +#: source/TortoiseSVN_en.xml:9089(term) msgid "Checked" msgstr "" -#: source/TortoiseSVN_en.xml:9064(para) +#: source/TortoiseSVN_en.xml:9091(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 "" -#: source/TortoiseSVN_en.xml:9075(term) +#: source/TortoiseSVN_en.xml:9102(term) msgid "Indeterminate" msgstr "" -#: source/TortoiseSVN_en.xml:9077(para) +#: source/TortoiseSVN_en.xml:9104(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:9048(para) +#: source/TortoiseSVN_en.xml:9075(para) msgid "The option Enable accelerators on the top level menu has three states: " msgstr "" -#: source/TortoiseSVN_en.xml:9084(para) +#: source/TortoiseSVN_en.xml:9111(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 "" -#: source/TortoiseSVN_en.xml:9090(title) +#: source/TortoiseSVN_en.xml:9117(title) msgid "Icon Overlay Settings" msgstr "" -#: source/TortoiseSVN_en.xml:9092(para) +#: source/TortoiseSVN_en.xml:9119(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 "" -#: source/TortoiseSVN_en.xml:9102(para) +#: source/TortoiseSVN_en.xml:9129(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 "" -#: source/TortoiseSVN_en.xml:9107(para) +#: source/TortoiseSVN_en.xml:9134(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 "" -#: source/TortoiseSVN_en.xml:9121(term) +#: source/TortoiseSVN_en.xml:9148(term) msgid "Default" msgstr "" -#: source/TortoiseSVN_en.xml:9123(para) +#: source/TortoiseSVN_en.xml:9150(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 "" -#: source/TortoiseSVN_en.xml:9134(para) +#: source/TortoiseSVN_en.xml:9161(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 "" -#: source/TortoiseSVN_en.xml:9142(para) +#: source/TortoiseSVN_en.xml:9169(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 "" -#: source/TortoiseSVN_en.xml:9150(term) +#: source/TortoiseSVN_en.xml:9177(term) msgid "Shell" msgstr "" -#: source/TortoiseSVN_en.xml:9152(para) +#: source/TortoiseSVN_en.xml:9179(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 "" -#: source/TortoiseSVN_en.xml:9158(para) +#: source/TortoiseSVN_en.xml:9185(para) msgid "Advantage: needs only very little memory (around 1 MB of RAM) and can show the status in realtime." msgstr "" -#: source/TortoiseSVN_en.xml:9162(para) +#: source/TortoiseSVN_en.xml:9189(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 "" -#: source/TortoiseSVN_en.xml:9172(term) +#: source/TortoiseSVN_en.xml:9199(term) msgid "None" msgstr "" -#: source/TortoiseSVN_en.xml:9174(para) +#: source/TortoiseSVN_en.xml:9201(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 "" -#: source/TortoiseSVN_en.xml:9181(para) +#: source/TortoiseSVN_en.xml:9208(para) msgid "Advantage: uses absolutely no additional memory and does not slow down the Explorer at all while browsing." msgstr "" -#: source/TortoiseSVN_en.xml:9185(para) +#: source/TortoiseSVN_en.xml:9212(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:9113(para) +#: source/TortoiseSVN_en.xml:9140(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 "" -#: source/TortoiseSVN_en.xml:9194(para) +#: source/TortoiseSVN_en.xml:9221(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:9199(para) +#: source/TortoiseSVN_en.xml:9226(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 "" -#: source/TortoiseSVN_en.xml:9207(para) +#: source/TortoiseSVN_en.xml:9234(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 "" -#: source/TortoiseSVN_en.xml:9212(para) +#: source/TortoiseSVN_en.xml:9239(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 "" -#: source/TortoiseSVN_en.xml:9219(para) +#: source/TortoiseSVN_en.xml:9246(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:9224(para) +#: source/TortoiseSVN_en.xml:9251(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 "" -#: source/TortoiseSVN_en.xml:9231(title) +#: source/TortoiseSVN_en.xml:9258(title) msgid "Icon Set Selection" msgstr "" -#: source/TortoiseSVN_en.xml:9235(title) +#: source/TortoiseSVN_en.xml:9262(title) msgid "The Settings Dialog, Icon Set Page" msgstr "" -#: source/TortoiseSVN_en.xml:9233(para) +#: source/TortoiseSVN_en.xml:9260(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:9244(title) +#: source/TortoiseSVN_en.xml:9271(title) msgid "TortoiseSVN Dialog Settings 1" msgstr "" -#: source/TortoiseSVN_en.xml:9248(title) +#: source/TortoiseSVN_en.xml:9275(title) msgid "The Settings Dialog, Dialogs 1 Page" msgstr "" -#: source/TortoiseSVN_en.xml:9246(para) +#: source/TortoiseSVN_en.xml:9273(para) msgid " This dialog allows you to configure some of TortoiseSVN's dialogs the way you like them." msgstr "" -#: source/TortoiseSVN_en.xml:9256(term) +#: source/TortoiseSVN_en.xml:9283(term) msgid "Default number of log messages" msgstr "" -#: source/TortoiseSVN_en.xml:9258(para) +#: source/TortoiseSVN_en.xml:9285(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 "" -#: source/TortoiseSVN_en.xml:9272(term) +#: source/TortoiseSVN_en.xml:9299(term) msgid "Font for log messages" msgstr "" -#: source/TortoiseSVN_en.xml:9274(para) +#: source/TortoiseSVN_en.xml:9301(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:9283(term) +#: source/TortoiseSVN_en.xml:9310(term) msgid "Short date / time format in log messages" msgstr "" -#: source/TortoiseSVN_en.xml:9285(para) +#: source/TortoiseSVN_en.xml:9312(para) msgid "If the standard long messages use up too much space on your screen use the short format." msgstr "" -#: source/TortoiseSVN_en.xml:9292(term) +#: source/TortoiseSVN_en.xml:9319(term) msgid "Progress Dialog" msgstr "" -#: source/TortoiseSVN_en.xml:9294(para) +#: source/TortoiseSVN_en.xml:9321(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 "" -#: source/TortoiseSVN_en.xml:9305(para) +#: source/TortoiseSVN_en.xml:9332(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:9313(para) +#: source/TortoiseSVN_en.xml:9340(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:9321(para) +#: source/TortoiseSVN_en.xml:9348(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:9328(para) +#: source/TortoiseSVN_en.xml:9355(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 "" -#: source/TortoiseSVN_en.xml:9340(term) +#: source/TortoiseSVN_en.xml:9367(term) msgid "Use URL of WC as the default \"From:\" URL" msgstr "" -#: source/TortoiseSVN_en.xml:9342(para) +#: source/TortoiseSVN_en.xml:9369(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 "" -#: source/TortoiseSVN_en.xml:9354(term) +#: source/TortoiseSVN_en.xml:9381(term) msgid "Default checkout path" msgstr "" -#: source/TortoiseSVN_en.xml:9356(para) +#: source/TortoiseSVN_en.xml:9383(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:9365(term) +#: source/TortoiseSVN_en.xml:9392(term) msgid "Default checkout URL" msgstr "" -#: source/TortoiseSVN_en.xml:9367(para) +#: source/TortoiseSVN_en.xml:9394(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 "" -#: source/TortoiseSVN_en.xml:9378(title) +#: source/TortoiseSVN_en.xml:9405(title) msgid "TortoiseSVN Dialog Settings 2" msgstr "" -#: source/TortoiseSVN_en.xml:9382(title) +#: source/TortoiseSVN_en.xml:9409(title) msgid "The Settings Dialog, Dialogs 2 Page" msgstr "" -#: source/TortoiseSVN_en.xml:9388(term) +#: source/TortoiseSVN_en.xml:9415(term) msgid "Recurse into unversioned folders" msgstr "" -#: source/TortoiseSVN_en.xml:9390(para) +#: source/TortoiseSVN_en.xml:9417(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:9404(term) +#: source/TortoiseSVN_en.xml:9431(term) msgid "Use autocompletion of filepaths and keywords" msgstr "" -#: source/TortoiseSVN_en.xml:9406(para) +#: source/TortoiseSVN_en.xml:9433(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:9416(term) +#: source/TortoiseSVN_en.xml:9443(term) msgid "Timeout in seconds to stop the autocompletion parsing" msgstr "" -#: source/TortoiseSVN_en.xml:9418(para) +#: source/TortoiseSVN_en.xml:9445(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:9427(term) +#: source/TortoiseSVN_en.xml:9454(term) msgid "Only use spellchecker when tsvn:projectlanguage is set" msgstr "" -#: source/TortoiseSVN_en.xml:9429(para) +#: source/TortoiseSVN_en.xml:9456(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:9437(term) +#: source/TortoiseSVN_en.xml:9464(term) msgid "Max. items to keep in the log message history" msgstr "" -#: source/TortoiseSVN_en.xml:9439(para) +#: source/TortoiseSVN_en.xml:9466(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 "" -#: source/TortoiseSVN_en.xml:9448(term) +#: source/TortoiseSVN_en.xml:9475(term) msgid "Re-open commit dialog after a commit failed" msgstr "" -#: source/TortoiseSVN_en.xml:9450(para) +#: source/TortoiseSVN_en.xml:9477(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 "" -#: source/TortoiseSVN_en.xml:9461(term) +#: source/TortoiseSVN_en.xml:9488(term) msgid "Contact the repository on startup" msgstr "" -#: source/TortoiseSVN_en.xml:9463(para) +#: source/TortoiseSVN_en.xml:9490(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:9473(term) -msgid "Sort items numerically" +#: source/TortoiseSVN_en.xml:9500(term) +msgid "Show Lock dialog before locking files" +msgstr "" + +#: source/TortoiseSVN_en.xml:9502(para) +msgid "When you select one or more files and then use TortoiseSVNLock to take out a lock on those files, on some projects it is customary to write a lock message explaining why you have locked the files. If you do not use lock messages, you can uncheck this box to skip that dialog and lock the files immediately." 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." +#: source/TortoiseSVN_en.xml:9514(para) +msgid "If you use the lock command on a folder, you are always presented with the lock dialog as that also gives you the option to select files for locking." +msgstr "" + +#: source/TortoiseSVN_en.xml:9519(para) +msgid "If your project is using the tsvn:lockmsgminsize property, you will see the lock dialog regardless of this setting because the project requires lock messages." msgstr "" -#: source/TortoiseSVN_en.xml:9487(title) +#: source/TortoiseSVN_en.xml:9529(title) msgid "TortoiseSVN Colour Settings" msgstr "" -#: source/TortoiseSVN_en.xml:9491(title) +#: source/TortoiseSVN_en.xml:9533(title) msgid "The Settings Dialog, Colours Page" msgstr "" -#: source/TortoiseSVN_en.xml:9489(para) +#: source/TortoiseSVN_en.xml:9531(para) msgid " This dialog allows you to configure the text colours used in TortoiseSVN's dialogs the way you like them." msgstr "" -#: source/TortoiseSVN_en.xml:9499(term) +#: source/TortoiseSVN_en.xml:9541(term) msgid "Possible or real conflict / obstructed" msgstr "" -#: source/TortoiseSVN_en.xml:9501(para) +#: source/TortoiseSVN_en.xml:9543(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:9506(para) +#: source/TortoiseSVN_en.xml:9548(para) msgid "This colour is also used for error messages in the progress dialogs." msgstr "" -#: source/TortoiseSVN_en.xml:9512(term) +#: source/TortoiseSVN_en.xml:9554(term) msgid "Added files" msgstr "" -#: source/TortoiseSVN_en.xml:9514(para) +#: source/TortoiseSVN_en.xml:9556(para) msgid "Items added to the repository." msgstr "" -#: source/TortoiseSVN_en.xml:9520(term) +#: source/TortoiseSVN_en.xml:9562(term) msgid "Missing / deleted / replaced" msgstr "" -#: source/TortoiseSVN_en.xml:9522(para) +#: source/TortoiseSVN_en.xml:9564(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:9530(term) +#: source/TortoiseSVN_en.xml:9572(term) msgid "Merged" msgstr "" -#: source/TortoiseSVN_en.xml:9532(para) +#: source/TortoiseSVN_en.xml:9574(para) msgid "Changes from the repository successfully merged into the WC without creating any conflicts." msgstr "" -#: source/TortoiseSVN_en.xml:9539(term) +#: source/TortoiseSVN_en.xml:9581(term) msgid "Modified / copied" msgstr "" -#: source/TortoiseSVN_en.xml:9541(para) +#: source/TortoiseSVN_en.xml:9583(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:9549(term) +#: source/TortoiseSVN_en.xml:9591(term) msgid "Deleted node" msgstr "" -#: source/TortoiseSVN_en.xml:9551(para) +#: source/TortoiseSVN_en.xml:9593(para) msgid "An item which has been deleted from the repository." msgstr "" -#: source/TortoiseSVN_en.xml:9557(term) +#: source/TortoiseSVN_en.xml:9599(term) msgid "Added node" msgstr "" -#: source/TortoiseSVN_en.xml:9559(para) +#: source/TortoiseSVN_en.xml:9601(para) msgid "An item which has been added to the repository, by an add, copy or move operation." msgstr "" -#: source/TortoiseSVN_en.xml:9566(term) +#: source/TortoiseSVN_en.xml:9608(term) msgid "Renamed node" msgstr "" -#: source/TortoiseSVN_en.xml:9568(para) +#: source/TortoiseSVN_en.xml:9610(para) msgid "An item which has been renamed within the repository." msgstr "" -#: source/TortoiseSVN_en.xml:9574(term) +#: source/TortoiseSVN_en.xml:9616(term) msgid "Replaced node" msgstr "" -#: source/TortoiseSVN_en.xml:9576(para) +#: source/TortoiseSVN_en.xml:9618(para) msgid "The original item has been deleted and a new item with the same name replaces it." msgstr "" -#: source/TortoiseSVN_en.xml:9587(title) +#: source/TortoiseSVN_en.xml:9629(title) msgid "Network Settings" msgstr "" -#: source/TortoiseSVN_en.xml:9589(primary) +#: source/TortoiseSVN_en.xml:9631(primary) msgid "proxy server" msgstr "" -#: source/TortoiseSVN_en.xml:9593(title) +#: source/TortoiseSVN_en.xml:9635(title) msgid "The Settings Dialog, Network Page" msgstr "" -#: source/TortoiseSVN_en.xml:9591(para) +#: source/TortoiseSVN_en.xml:9633(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:9599(para) +#: source/TortoiseSVN_en.xml:9641(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 "" -#: source/TortoiseSVN_en.xml:9609(para) +#: source/TortoiseSVN_en.xml:9651(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 "" -#: source/TortoiseSVN_en.xml:9617(para) +#: source/TortoiseSVN_en.xml:9659(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 "" -#: source/TortoiseSVN_en.xml:9628(title) +#: source/TortoiseSVN_en.xml:9670(title) msgid "External Program Settings" msgstr "" -#: source/TortoiseSVN_en.xml:9631(title) +#: source/TortoiseSVN_en.xml:9673(title) msgid "The Settings Dialog, Diff Viewer Page" msgstr "" -#: source/TortoiseSVN_en.xml:9629(para) +#: source/TortoiseSVN_en.xml:9671(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 "" -#: source/TortoiseSVN_en.xml:9639(para) +#: source/TortoiseSVN_en.xml:9681(para) msgid "Read for a list of some of the external diff/merge programs that people are using with TortoiseSVN." msgstr "" -#: source/TortoiseSVN_en.xml:9644(title) +#: source/TortoiseSVN_en.xml:9686(title) msgid "Diff Viewer" msgstr "" -#: source/TortoiseSVN_en.xml:9657(term) source/TortoiseSVN_en.xml:9748(term) +#: source/TortoiseSVN_en.xml:9699(term) source/TortoiseSVN_en.xml:9790(term) msgid "%base" msgstr "" -#: source/TortoiseSVN_en.xml:9659(para) +#: source/TortoiseSVN_en.xml:9701(para) msgid "The original file without your changes" msgstr "" -#: source/TortoiseSVN_en.xml:9665(term) source/TortoiseSVN_en.xml:9757(term) +#: source/TortoiseSVN_en.xml:9707(term) source/TortoiseSVN_en.xml:9799(term) msgid "%bname" msgstr "" -#: source/TortoiseSVN_en.xml:9667(para) source/TortoiseSVN_en.xml:9759(para) +#: source/TortoiseSVN_en.xml:9709(para) source/TortoiseSVN_en.xml:9801(para) msgid "The window title for the base file" msgstr "" -#: source/TortoiseSVN_en.xml:9673(term) source/TortoiseSVN_en.xml:9765(term) +#: source/TortoiseSVN_en.xml:9715(term) source/TortoiseSVN_en.xml:9807(term) msgid "%mine" msgstr "" -#: source/TortoiseSVN_en.xml:9675(para) +#: source/TortoiseSVN_en.xml:9717(para) msgid "Your own file, with your changes" msgstr "" -#: source/TortoiseSVN_en.xml:9681(term) source/TortoiseSVN_en.xml:9773(term) +#: source/TortoiseSVN_en.xml:9723(term) source/TortoiseSVN_en.xml:9815(term) msgid "%yname" msgstr "" -#: source/TortoiseSVN_en.xml:9683(para) source/TortoiseSVN_en.xml:9775(para) +#: source/TortoiseSVN_en.xml:9725(para) source/TortoiseSVN_en.xml:9817(para) msgid "The window title for your file" msgstr "" -#: source/TortoiseSVN_en.xml:9646(para) +#: source/TortoiseSVN_en.xml:9688(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 "" -#: source/TortoiseSVN_en.xml:9690(para) +#: source/TortoiseSVN_en.xml:9732(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 "" -#: source/TortoiseSVN_en.xml:9700(para) +#: source/TortoiseSVN_en.xml:9742(para) msgid "For example, with ExamDiff Pro: \nC:\\Path-To\\ExamDiff.exe %base %mine\n or with KDiff3: \nC:\\Path-To\\kdiff3.exe %base %mine --L1 %bname --L2 %yname\n or with WinMerge: \nC:\\Path-To\\WinMerge.exe -e -ub -dl %bname -dr %yname %base %mine\n or with Araxis: \nC:\\Path-To\\compare.exe /max /wait /title1:%bname /title2:%yname\n %base %mine\n" msgstr "" -#: source/TortoiseSVN_en.xml:9719(para) +#: source/TortoiseSVN_en.xml:9761(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 "" -#: source/TortoiseSVN_en.xml:9733(para) +#: source/TortoiseSVN_en.xml:9775(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:9740(title) +#: source/TortoiseSVN_en.xml:9782(title) msgid "Merge Tool" msgstr "" -#: source/TortoiseSVN_en.xml:9750(para) +#: source/TortoiseSVN_en.xml:9792(para) msgid "the original file without your or the others changes" msgstr "" -#: source/TortoiseSVN_en.xml:9767(para) +#: source/TortoiseSVN_en.xml:9809(para) msgid "your own file, with your changes" msgstr "" -#: source/TortoiseSVN_en.xml:9781(term) +#: source/TortoiseSVN_en.xml:9823(term) msgid "%theirs" msgstr "" -#: source/TortoiseSVN_en.xml:9783(para) +#: source/TortoiseSVN_en.xml:9825(para) msgid "the file as it is in the repository" msgstr "" -#: source/TortoiseSVN_en.xml:9789(term) +#: source/TortoiseSVN_en.xml:9831(term) msgid "%tname" msgstr "" -#: source/TortoiseSVN_en.xml:9791(para) +#: source/TortoiseSVN_en.xml:9833(para) msgid "The window title for the file in the repository" msgstr "" -#: source/TortoiseSVN_en.xml:9797(term) +#: source/TortoiseSVN_en.xml:9839(term) msgid "%merged" msgstr "" -#: source/TortoiseSVN_en.xml:9799(para) +#: source/TortoiseSVN_en.xml:9841(para) msgid "the conflicted file, the result of the merge operation" msgstr "" -#: source/TortoiseSVN_en.xml:9806(term) +#: source/TortoiseSVN_en.xml:9848(term) msgid "%mname" msgstr "" -#: source/TortoiseSVN_en.xml:9808(para) +#: source/TortoiseSVN_en.xml:9850(para) msgid "The window title for the merged file" msgstr "" -#: source/TortoiseSVN_en.xml:9742(para) +#: source/TortoiseSVN_en.xml:9784(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:9815(para) +#: source/TortoiseSVN_en.xml:9857(para) msgid "For example, with Perforce Merge: \nC:\\Path-To\\P4Merge.exe %base %theirs %mine %merged\n or with KDiff3: \nC:\\Path-To\\kdiff3.exe %base %mine %theirs -o %merged\n --L1 %bname --L2 %yname --L3 %tname\n or with Araxis: \nC:\\Path-To\\compare.exe /max /wait /3 /title1:%tname /title2:%bname\n /title3:%yname %theirs %base %mine %merged /a2\n" msgstr "" -#: source/TortoiseSVN_en.xml:9833(title) +#: source/TortoiseSVN_en.xml:9875(title) msgid "Diff/Merge Advanced Settings" msgstr "" -#: source/TortoiseSVN_en.xml:9837(title) +#: source/TortoiseSVN_en.xml:9879(title) msgid "The Settings Dialog, Diff/Merge Advanced Dialog" msgstr "" -#: source/TortoiseSVN_en.xml:9835(para) +#: source/TortoiseSVN_en.xml:9877(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 "" -#: source/TortoiseSVN_en.xml:9846(para) +#: source/TortoiseSVN_en.xml:9888(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 "" -#: source/TortoiseSVN_en.xml:9858(title) +#: source/TortoiseSVN_en.xml:9900(title) msgid "Unified Diff Viewer" msgstr "" -#: source/TortoiseSVN_en.xml:9860(para) +#: source/TortoiseSVN_en.xml:9902(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 "" -#: source/TortoiseSVN_en.xml:9869(para) +#: source/TortoiseSVN_en.xml:9911(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 "" -#: source/TortoiseSVN_en.xml:9885(title) +#: source/TortoiseSVN_en.xml:9927(title) msgid "Saved Data Settings" msgstr "" -#: source/TortoiseSVN_en.xml:9888(title) +#: source/TortoiseSVN_en.xml:9930(title) msgid "The Settings Dialog, Saved Data Page" msgstr "" -#: source/TortoiseSVN_en.xml:9886(para) +#: source/TortoiseSVN_en.xml:9928(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 "" -#: source/TortoiseSVN_en.xml:9897(term) +#: source/TortoiseSVN_en.xml:9939(term) msgid "URL history" msgstr "" -#: source/TortoiseSVN_en.xml:9899(para) +#: source/TortoiseSVN_en.xml:9941(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 "" -#: source/TortoiseSVN_en.xml:9906(para) +#: source/TortoiseSVN_en.xml:9948(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 "" -#: source/TortoiseSVN_en.xml:9915(term) +#: source/TortoiseSVN_en.xml:9957(term) msgid "Log messages" msgstr "" -#: source/TortoiseSVN_en.xml:9917(para) +#: source/TortoiseSVN_en.xml:9959(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 "" -#: source/TortoiseSVN_en.xml:9925(term) +#: source/TortoiseSVN_en.xml:9967(term) msgid "Dialog sizes and positions" msgstr "" -#: source/TortoiseSVN_en.xml:9927(para) +#: source/TortoiseSVN_en.xml:9969(para) msgid "Many dialogs remember the size and screen position that you last used." msgstr "" -#: source/TortoiseSVN_en.xml:9934(term) +#: source/TortoiseSVN_en.xml:9976(term) msgid "Authentication data" msgstr "" -#: source/TortoiseSVN_en.xml:9936(para) +#: source/TortoiseSVN_en.xml:9978(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 "" -#: source/TortoiseSVN_en.xml:9943(para) +#: source/TortoiseSVN_en.xml:9985(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:9953(title) +#: source/TortoiseSVN_en.xml:9995(title) msgid "Registry Settings" msgstr "" -#: source/TortoiseSVN_en.xml:9955(primary) +#: source/TortoiseSVN_en.xml:9997(primary) msgid "registry" msgstr "" -#: source/TortoiseSVN_en.xml:9957(para) +#: source/TortoiseSVN_en.xml:9999(para) msgid "A few infrequently used settings are available only by editing the registry directly." msgstr "" -#: source/TortoiseSVN_en.xml:9965(para) +#: source/TortoiseSVN_en.xml:10007(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 "" -#: source/TortoiseSVN_en.xml:9974(term) +#: source/TortoiseSVN_en.xml:10016(term) msgid "Cache Tray Icon" msgstr "" -#: source/TortoiseSVN_en.xml:9976(para) +#: source/TortoiseSVN_en.xml:10018(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 "" -#: source/TortoiseSVN_en.xml:9988(title) +#: source/TortoiseSVN_en.xml:10030(title) msgid "Subversion Working Folders" msgstr "" -#: source/TortoiseSVN_en.xml:9990(primary) +#: source/TortoiseSVN_en.xml:10032(primary) msgid ".svn folder" msgstr "" -#: source/TortoiseSVN_en.xml:9993(primary) +#: source/TortoiseSVN_en.xml:10035(primary) msgid "_svn folder" msgstr "" -#: source/TortoiseSVN_en.xml:9995(para) +#: source/TortoiseSVN_en.xml:10037(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 "" -#: source/TortoiseSVN_en.xml:10001(para) +#: source/TortoiseSVN_en.xml:10043(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 "" -#: source/TortoiseSVN_en.xml:10011(para) +#: source/TortoiseSVN_en.xml:10053(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 "" -#: source/TortoiseSVN_en.xml:10022(title) +#: source/TortoiseSVN_en.xml:10064(title) msgid "Client Side Hook Scripts" msgstr "" -#: source/TortoiseSVN_en.xml:10024(primary) +#: source/TortoiseSVN_en.xml:10066(primary) msgid "client hooks" msgstr "" -#: source/TortoiseSVN_en.xml:10027(primary) +#: source/TortoiseSVN_en.xml:10069(primary) msgid "hook scripts" msgstr "" -#: source/TortoiseSVN_en.xml:10031(title) +#: source/TortoiseSVN_en.xml:10073(title) msgid "The Settings Dialog, Hook Scripts Page" msgstr "" -#: source/TortoiseSVN_en.xml:10029(para) +#: source/TortoiseSVN_en.xml:10071(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 "" -#: source/TortoiseSVN_en.xml:10039(para) +#: source/TortoiseSVN_en.xml:10081(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 "" -#: source/TortoiseSVN_en.xml:10044(para) +#: source/TortoiseSVN_en.xml:10086(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:10052(title) +#: source/TortoiseSVN_en.xml:10094(title) msgid "The Settings Dialog, Configure Hook Scripts" msgstr "" -#: source/TortoiseSVN_en.xml:10050(para) +#: source/TortoiseSVN_en.xml:10092(para) msgid " To add a new hook script, simply click Add and fill in the details." msgstr "" -#: source/TortoiseSVN_en.xml:10062(term) source/TortoiseSVN_en.xml:10130(term) +#: source/TortoiseSVN_en.xml:10104(term) source/TortoiseSVN_en.xml:10172(term) msgid "Start-commit" msgstr "" -#: source/TortoiseSVN_en.xml:10064(para) +#: source/TortoiseSVN_en.xml:10106(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:10072(term) source/TortoiseSVN_en.xml:10138(term) +#: source/TortoiseSVN_en.xml:10114(term) source/TortoiseSVN_en.xml:10180(term) msgid "Pre-commit" msgstr "" -#: source/TortoiseSVN_en.xml:10074(para) +#: source/TortoiseSVN_en.xml:10116(para) msgid "Called after the user clicks OK in the commit dialog, and before the actual commit begins." msgstr "" -#: source/TortoiseSVN_en.xml:10081(term) source/TortoiseSVN_en.xml:10147(term) +#: source/TortoiseSVN_en.xml:10123(term) source/TortoiseSVN_en.xml:10189(term) msgid "Post-commit" msgstr "" -#: source/TortoiseSVN_en.xml:10083(para) +#: source/TortoiseSVN_en.xml:10125(para) msgid "Called after the commit finishes (whether successful or not)." msgstr "" -#: source/TortoiseSVN_en.xml:10089(term) source/TortoiseSVN_en.xml:10157(term) +#: source/TortoiseSVN_en.xml:10131(term) source/TortoiseSVN_en.xml:10199(term) msgid "Start-update" msgstr "" -#: source/TortoiseSVN_en.xml:10091(para) +#: source/TortoiseSVN_en.xml:10133(para) msgid "Called before the update-to-revision dialog is shown." msgstr "" -#: source/TortoiseSVN_en.xml:10097(term) source/TortoiseSVN_en.xml:10165(term) +#: source/TortoiseSVN_en.xml:10139(term) source/TortoiseSVN_en.xml:10207(term) msgid "Pre-update" msgstr "" -#: source/TortoiseSVN_en.xml:10099(para) +#: source/TortoiseSVN_en.xml:10141(para) msgid "Called before the actual Subversion update begins." msgstr "" -#: source/TortoiseSVN_en.xml:10105(term) source/TortoiseSVN_en.xml:10173(term) +#: source/TortoiseSVN_en.xml:10147(term) source/TortoiseSVN_en.xml:10215(term) msgid "Post-update" msgstr "" -#: source/TortoiseSVN_en.xml:10107(para) +#: source/TortoiseSVN_en.xml:10149(para) msgid "Called after the update finishes (whether successful or not)." msgstr "" -#: source/TortoiseSVN_en.xml:10058(para) +#: source/TortoiseSVN_en.xml:10100(para) msgid "There are currently six types of hook script available " msgstr "" -#: source/TortoiseSVN_en.xml:10114(para) +#: source/TortoiseSVN_en.xml:10156(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 "" -#: source/TortoiseSVN_en.xml:10119(para) +#: source/TortoiseSVN_en.xml:10161(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 "" -#: 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) +#: source/TortoiseSVN_en.xml:10175(literal) source/TortoiseSVN_en.xml:10183(literal) source/TortoiseSVN_en.xml:10202(literal) source/TortoiseSVN_en.xml:10210(literal) source/TortoiseSVN_en.xml:10218(literal) source/TortoiseSVN_en.xml:10230(term) msgid "%PATHS%" msgstr "" -#: source/TortoiseSVN_en.xml:10142(literal) source/TortoiseSVN_en.xml:10150(literal) source/TortoiseSVN_en.xml:10200(term) +#: source/TortoiseSVN_en.xml:10184(literal) source/TortoiseSVN_en.xml:10192(literal) source/TortoiseSVN_en.xml:10242(term) msgid "%SELECTEDPATHS%" msgstr "" -#: source/TortoiseSVN_en.xml:10151(literal) source/TortoiseSVN_en.xml:10177(literal) source/TortoiseSVN_en.xml:10210(term) +#: source/TortoiseSVN_en.xml:10193(literal) source/TortoiseSVN_en.xml:10219(literal) source/TortoiseSVN_en.xml:10252(term) msgid "%REVISION%" msgstr "" -#: source/TortoiseSVN_en.xml:10152(literal) source/TortoiseSVN_en.xml:10178(literal) source/TortoiseSVN_en.xml:10218(term) +#: source/TortoiseSVN_en.xml:10194(literal) source/TortoiseSVN_en.xml:10220(literal) source/TortoiseSVN_en.xml:10260(term) msgid "%ERROR%" msgstr "" -#: source/TortoiseSVN_en.xml:10125(para) +#: source/TortoiseSVN_en.xml:10167(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 "" -#: source/TortoiseSVN_en.xml:10190(para) +#: source/TortoiseSVN_en.xml:10232(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:10202(para) +#: source/TortoiseSVN_en.xml:10244(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:10212(para) +#: source/TortoiseSVN_en.xml:10254(para) msgid "The repository revision after a commit completes." msgstr "" -#: source/TortoiseSVN_en.xml:10220(para) +#: source/TortoiseSVN_en.xml:10262(para) msgid "Empty if the operation was successful, or the error message if the operation was unsuccessful." msgstr "" -#: source/TortoiseSVN_en.xml:10184(para) +#: source/TortoiseSVN_en.xml:10226(para) msgid "The meaning of each of these variables is described here: " msgstr "" -#: source/TortoiseSVN_en.xml:10228(para) +#: source/TortoiseSVN_en.xml:10270(para) msgid "If you want the Subversion operation to hold off until the hook has completed, check Wait for the script to finish." msgstr "" -#: source/TortoiseSVN_en.xml:10232(para) +#: source/TortoiseSVN_en.xml:10274(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:10240(title) +#: source/TortoiseSVN_en.xml:10282(title) msgid "Final Step" msgstr "" -#: source/TortoiseSVN_en.xml:10246(title) +#: source/TortoiseSVN_en.xml:10288(title) msgid "Wishlist" msgstr "" -#: source/TortoiseSVN_en.xml:10247(para) +#: source/TortoiseSVN_en.xml:10289(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 "" -#: source/TortoiseSVN_en.xml:10253(para) +#: source/TortoiseSVN_en.xml:10295(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 "" -#: source/TortoiseSVN_en.xml:10267(title) +#: source/TortoiseSVN_en.xml:10309(title) msgid "The SubWCRev Program" msgstr "" -#: source/TortoiseSVN_en.xml:10269(primary) +#: source/TortoiseSVN_en.xml:10311(primary) msgid "version extraction" msgstr "" -#: source/TortoiseSVN_en.xml:10272(para) +#: source/TortoiseSVN_en.xml:10314(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 "" -#: source/TortoiseSVN_en.xml:10286(title) +#: source/TortoiseSVN_en.xml:10328(title) msgid "The SubWCRev Command Line" msgstr "" -#: source/TortoiseSVN_en.xml:10287(para) +#: source/TortoiseSVN_en.xml:10329(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 "" -#: source/TortoiseSVN_en.xml:10295(para) +#: source/TortoiseSVN_en.xml:10337(para) msgid "SubWCRev.exe is called from the command line or a script, and is controlled using the command line parameters. \nSubWCRev WorkingCopyPath [SrcVersionFile DstVersionFile] [-nmdfe]\n" msgstr "" -#: source/TortoiseSVN_en.xml:10302(para) +#: source/TortoiseSVN_en.xml:10344(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 "" -#: source/TortoiseSVN_en.xml:10308(para) +#: source/TortoiseSVN_en.xml:10350(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 "" -#: source/TortoiseSVN_en.xml:10324(title) source/TortoiseSVN_en.xml:10393(title) +#: source/TortoiseSVN_en.xml:10366(title) source/TortoiseSVN_en.xml:10435(title) msgid "List of available command line switches" msgstr "" -#: source/TortoiseSVN_en.xml:10330(entry) source/TortoiseSVN_en.xml:12009(title) source/TortoiseSVN_en.xml:12497(glossterm) +#: source/TortoiseSVN_en.xml:10372(entry) source/TortoiseSVN_en.xml:12051(title) source/TortoiseSVN_en.xml:12539(glossterm) msgid "Switch" msgstr "" -#: source/TortoiseSVN_en.xml:10331(entry) source/TortoiseSVN_en.xml:10400(entry) source/TortoiseSVN_en.xml:11331(entry) +#: source/TortoiseSVN_en.xml:10373(entry) source/TortoiseSVN_en.xml:10442(entry) source/TortoiseSVN_en.xml:11373(entry) msgid "Description" msgstr "" -#: source/TortoiseSVN_en.xml:10336(entry) +#: source/TortoiseSVN_en.xml:10378(entry) msgid "-n" msgstr "" -#: source/TortoiseSVN_en.xml:10337(entry) +#: source/TortoiseSVN_en.xml:10379(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 "" -#: source/TortoiseSVN_en.xml:10345(entry) +#: source/TortoiseSVN_en.xml:10387(entry) msgid "-m" msgstr "" -#: source/TortoiseSVN_en.xml:10346(entry) +#: source/TortoiseSVN_en.xml:10388(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 "" -#: source/TortoiseSVN_en.xml:10354(entry) +#: source/TortoiseSVN_en.xml:10396(entry) msgid "-d" msgstr "" -#: source/TortoiseSVN_en.xml:10355(entry) +#: source/TortoiseSVN_en.xml:10397(entry) msgid "If this switch is given, SubWCRev will exit with ERRORLEVEL 9 if the destination file already exists." msgstr "" -#: source/TortoiseSVN_en.xml:10362(entry) +#: source/TortoiseSVN_en.xml:10404(entry) msgid "-f" msgstr "" -#: source/TortoiseSVN_en.xml:10363(entry) +#: source/TortoiseSVN_en.xml:10405(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 "" -#: source/TortoiseSVN_en.xml:10371(entry) +#: source/TortoiseSVN_en.xml:10413(entry) msgid "-e" msgstr "" -#: source/TortoiseSVN_en.xml:10372(entry) +#: source/TortoiseSVN_en.xml:10414(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 "" -#: source/TortoiseSVN_en.xml:10317(para) +#: source/TortoiseSVN_en.xml:10359(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 "" -#: source/TortoiseSVN_en.xml:10388(title) +#: source/TortoiseSVN_en.xml:10430(title) msgid "Keyword Substitution" msgstr "" -#: source/TortoiseSVN_en.xml:10399(entry) +#: source/TortoiseSVN_en.xml:10441(entry) msgid "Keyword" msgstr "" -#: source/TortoiseSVN_en.xml:10405(entry) +#: source/TortoiseSVN_en.xml:10447(entry) msgid "$WCREV$" msgstr "" -#: source/TortoiseSVN_en.xml:10406(entry) +#: source/TortoiseSVN_en.xml:10448(entry) msgid "Replaced with the highest commit revision in the working copy." msgstr "" -#: source/TortoiseSVN_en.xml:10412(entry) +#: source/TortoiseSVN_en.xml:10454(entry) msgid "$WCDATE$" msgstr "" -#: source/TortoiseSVN_en.xml:10417(literal) +#: source/TortoiseSVN_en.xml:10459(literal) msgid "yyyy-mm-dd hh:mm:ss" msgstr "" -#: source/TortoiseSVN_en.xml:10413(entry) +#: source/TortoiseSVN_en.xml:10455(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:10421(entry) +#: source/TortoiseSVN_en.xml:10463(entry) msgid "$WCNOW$" msgstr "" -#: source/TortoiseSVN_en.xml:10422(entry) +#: source/TortoiseSVN_en.xml:10464(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:10429(entry) +#: source/TortoiseSVN_en.xml:10471(entry) msgid "$WCRANGE$" msgstr "" -#: source/TortoiseSVN_en.xml:10430(entry) +#: source/TortoiseSVN_en.xml:10472(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 "" -#: source/TortoiseSVN_en.xml:10441(entry) +#: source/TortoiseSVN_en.xml:10483(entry) msgid "$WCMIXED?TText:FText$" msgstr "" -#: source/TortoiseSVN_en.xml:10442(entry) +#: source/TortoiseSVN_en.xml:10484(entry) msgid "Replaced with TText if there are mixed update revisions, or FText if not." msgstr "" -#: source/TortoiseSVN_en.xml:10448(entry) +#: source/TortoiseSVN_en.xml:10490(entry) msgid "$WCMODS?TText:FText$" msgstr "" -#: source/TortoiseSVN_en.xml:10449(entry) +#: source/TortoiseSVN_en.xml:10491(entry) msgid "Replaced with TText if there are local modifications, or FText if not." msgstr "" -#: source/TortoiseSVN_en.xml:10455(entry) +#: source/TortoiseSVN_en.xml:10497(entry) msgid "$WCURL$" msgstr "" -#: source/TortoiseSVN_en.xml:10456(entry) +#: source/TortoiseSVN_en.xml:10498(entry) msgid "Replaced with the repository URL of the working copy path passed to SubWCRev." msgstr "" -#: source/TortoiseSVN_en.xml:10389(para) +#: source/TortoiseSVN_en.xml:10431(para) msgid "If a source and destination files are supplied, SubWCRev copies source to destination, performing keyword substitution as follows: " msgstr "" -#: source/TortoiseSVN_en.xml:10470(title) +#: source/TortoiseSVN_en.xml:10512(title) msgid "Keyword Example" msgstr "" -#: source/TortoiseSVN_en.xml:10471(para) +#: source/TortoiseSVN_en.xml:10513(para) msgid "The example below shows how keywords in a template file are substituted in the output file." msgstr "" -#: source/TortoiseSVN_en.xml:10475(screen) +#: source/TortoiseSVN_en.xml:10517(screen) #, no-wrap msgid "\n// Test file for SubWCRev\n\nchar *Revision = \"$WCREV$\";\nchar *Modified = \"$WCMODS?Modified:Not modified$\";\nchar *Date = \"$WCDATE$\";\nchar *RevRange = \"$WCRANGE$\";\nchar *Mixed = \"$WCMIXED?Mixed revision WC:Not mixed$\";\nchar *URL = \"$WCURL$\";\n\n#if $WCMODS?1:0$\n#error Source is modified\n#endif\n\n// EndOfFile\n" msgstr "" -#: source/TortoiseSVN_en.xml:10491(para) +#: source/TortoiseSVN_en.xml:10533(para) msgid "After running SubWCRev.exe, the output file looks like this:" msgstr "" -#: source/TortoiseSVN_en.xml:10494(screen) +#: source/TortoiseSVN_en.xml:10536(screen) #, no-wrap msgid "\n// Test file for SubWCRev\n\nchar *Revision = \"3701\";\nchar *Modified = \"Modified\";\nchar *Date = \"2005/06/15 11:15:12\";\nchar *RevRange = \"3699:3701\";\nchar *Mixed = \"Mixed revision WC\";\nchar *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 "" -#: source/TortoiseSVN_en.xml:10517(title) +#: source/TortoiseSVN_en.xml:10559(title) msgid "Frequently Asked Questions (FAQ)" msgstr "" -#: source/TortoiseSVN_en.xml:10519(para) +#: source/TortoiseSVN_en.xml:10561(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 "" -#: source/TortoiseSVN_en.xml:10531(para) +#: source/TortoiseSVN_en.xml:10573(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 "" -#: source/TortoiseSVN_en.xml:10541(para) +#: source/TortoiseSVN_en.xml:10583(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:10552(title) +#: source/TortoiseSVN_en.xml:10594(title) msgid "How Do I..." msgstr "" -#: source/TortoiseSVN_en.xml:10554(para) +#: source/TortoiseSVN_en.xml:10596(para) msgid "This appendix contains solutions to problems/questions you might have when using TortoiseSVN." msgstr "" -#: source/TortoiseSVN_en.xml:10560(title) +#: source/TortoiseSVN_en.xml:10602(title) msgid "Move/copy a lot of files at once" msgstr "" -#: source/TortoiseSVN_en.xml:10562(primary) +#: source/TortoiseSVN_en.xml:10604(primary) msgid "moving" msgstr "" -#: source/TortoiseSVN_en.xml:10564(para) +#: source/TortoiseSVN_en.xml:10606(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 "" -#: source/TortoiseSVN_en.xml:10573(para) +#: source/TortoiseSVN_en.xml:10615(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 "" -#: source/TortoiseSVN_en.xml:10596(title) +#: source/TortoiseSVN_en.xml:10638(title) msgid "Force users to enter a log message" msgstr "" -#: source/TortoiseSVN_en.xml:10598(primary) +#: source/TortoiseSVN_en.xml:10640(primary) msgid "log message" msgstr "" -#: source/TortoiseSVN_en.xml:10600(para) +#: source/TortoiseSVN_en.xml:10642(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 "" -#: source/TortoiseSVN_en.xml:10606(title) +#: source/TortoiseSVN_en.xml:10648(title) msgid "Hook-script on the server" msgstr "" -#: source/TortoiseSVN_en.xml:10607(para) +#: source/TortoiseSVN_en.xml:10649(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 "" -#: source/TortoiseSVN_en.xml:10612(para) +#: source/TortoiseSVN_en.xml:10654(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 "" -#: source/TortoiseSVN_en.xml:10622(para) +#: source/TortoiseSVN_en.xml:10664(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 "" -#: source/TortoiseSVN_en.xml:10633(title) +#: source/TortoiseSVN_en.xml:10675(title) msgid "Project properties" msgstr "" -#: source/TortoiseSVN_en.xml:10634(para) +#: source/TortoiseSVN_en.xml:10676(para) msgid "TortoiseSVN uses properties to control some of its features. One of those properties is the tsvn:logminsize property." msgstr "" -#: source/TortoiseSVN_en.xml:10638(para) +#: source/TortoiseSVN_en.xml:10680(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 "" -#: source/TortoiseSVN_en.xml:10643(para) +#: source/TortoiseSVN_en.xml:10685(para) msgid "For detailed information on those project properties, please refer to " msgstr "" -#: source/TortoiseSVN_en.xml:10650(title) +#: source/TortoiseSVN_en.xml:10692(title) msgid "Update selected files from the repository" msgstr "" -#: source/TortoiseSVN_en.xml:10654(para) +#: source/TortoiseSVN_en.xml:10696(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 "" -#: source/TortoiseSVN_en.xml:10664(para) +#: source/TortoiseSVN_en.xml:10706(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 "" -#: source/TortoiseSVN_en.xml:10676(title) +#: source/TortoiseSVN_en.xml:10718(title) msgid "Roll back revisions in the repository" msgstr "" -#: source/TortoiseSVN_en.xml:10678(primary) +#: source/TortoiseSVN_en.xml:10720(primary) msgid "rollback" msgstr "" -#: source/TortoiseSVN_en.xml:10681(title) +#: source/TortoiseSVN_en.xml:10723(title) msgid "Use the revision log dialog" msgstr "" -#: source/TortoiseSVN_en.xml:10682(para) +#: source/TortoiseSVN_en.xml:10724(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:10691(para) +#: source/TortoiseSVN_en.xml:10733(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:10698(para) +#: source/TortoiseSVN_en.xml:10740(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 "" -#: source/TortoiseSVN_en.xml:10711(para) +#: source/TortoiseSVN_en.xml:10753(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 "" -#: source/TortoiseSVN_en.xml:10726(para) +#: source/TortoiseSVN_en.xml:10768(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:10739(para) source/TortoiseSVN_en.xml:10796(para) +#: source/TortoiseSVN_en.xml:10781(para) source/TortoiseSVN_en.xml:10838(para) msgid "You have reverted the changes within your working copy. Check the results, then commit the changes." msgstr "" -#: source/TortoiseSVN_en.xml:10745(title) +#: source/TortoiseSVN_en.xml:10787(title) msgid "Use the merge dialog" msgstr "" -#: source/TortoiseSVN_en.xml:10746(para) +#: source/TortoiseSVN_en.xml:10788(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:10753(para) +#: source/TortoiseSVN_en.xml:10795(para) msgid "In your working copy select TortoiseSVNMerge." msgstr "" -#: source/TortoiseSVN_en.xml:10762(para) +#: source/TortoiseSVN_en.xml:10804(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 "" -#: source/TortoiseSVN_en.xml:10770(para) +#: source/TortoiseSVN_en.xml:10812(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:10778(para) +#: source/TortoiseSVN_en.xml:10820(para) msgid "make sure the Use \"From:\" URL checkbox is checked." msgstr "" -#: source/TortoiseSVN_en.xml:10784(para) +#: source/TortoiseSVN_en.xml:10826(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:10802(title) +#: source/TortoiseSVN_en.xml:10844(title) msgid "Use svndumpfilter" msgstr "" -#: source/TortoiseSVN_en.xml:10803(para) +#: source/TortoiseSVN_en.xml:10845(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 "" -#: source/TortoiseSVN_en.xml:10814(para) +#: source/TortoiseSVN_en.xml:10856(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 "" -#: source/TortoiseSVN_en.xml:10825(title) +#: source/TortoiseSVN_en.xml:10867(title) msgid "Compare two revisions of a file" msgstr "" -#: source/TortoiseSVN_en.xml:10827(primary) +#: source/TortoiseSVN_en.xml:10869(primary) msgid "compare files" msgstr "" -#: source/TortoiseSVN_en.xml:10829(para) +#: source/TortoiseSVN_en.xml:10871(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 "" -#: source/TortoiseSVN_en.xml:10843(para) +#: source/TortoiseSVN_en.xml:10885(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:10853(para) +#: source/TortoiseSVN_en.xml:10895(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 "" -#: source/TortoiseSVN_en.xml:10876(title) +#: source/TortoiseSVN_en.xml:10918(title) msgid "Include a common sub-project" msgstr "" -#: source/TortoiseSVN_en.xml:10878(primary) +#: source/TortoiseSVN_en.xml:10920(primary) msgid "common projects" msgstr "" -#: source/TortoiseSVN_en.xml:10880(para) +#: source/TortoiseSVN_en.xml:10922(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) +#: source/TortoiseSVN_en.xml:10932(title) msgid "Use svn:externals" msgstr "" -#: source/TortoiseSVN_en.xml:10891(para) +#: source/TortoiseSVN_en.xml:10933(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 "" -#: source/TortoiseSVN_en.xml:10899(para) +#: source/TortoiseSVN_en.xml:10941(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 "" -#: source/TortoiseSVN_en.xml:10920(title) +#: source/TortoiseSVN_en.xml:10962(title) msgid "Use a nested working copy" msgstr "" -#: source/TortoiseSVN_en.xml:10921(para) +#: source/TortoiseSVN_en.xml:10963(para) msgid "Create a new folder within your project to contain the common code, but do not add it to Subversion" msgstr "" -#: source/TortoiseSVN_en.xml:10925(para) +#: source/TortoiseSVN_en.xml:10967(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 "" -#: source/TortoiseSVN_en.xml:10935(para) +#: source/TortoiseSVN_en.xml:10977(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:10942(title) +#: source/TortoiseSVN_en.xml:10984(title) msgid "Use a relative location" msgstr "" -#: source/TortoiseSVN_en.xml:10943(para) +#: source/TortoiseSVN_en.xml:10985(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: \nC:\\Projects\\Proj1\nC:\\Projects\\Proj2\nC:\\Projects\\Proj3\nC:\\Projects\\Common\n and refer to the common code using a relative path, eg. ..\\..\\Common\\DSPcore." msgstr "" -#: source/TortoiseSVN_en.xml:10958(para) +#: source/TortoiseSVN_en.xml:11000(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 \nSUBST 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 "" -#: source/TortoiseSVN_en.xml:10976(para) +#: source/TortoiseSVN_en.xml:11018(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 "" -#: source/TortoiseSVN_en.xml:10986(title) +#: source/TortoiseSVN_en.xml:11028(title) msgid "Create a shortcut to a repository" msgstr "" -#: source/TortoiseSVN_en.xml:10988(primary) +#: source/TortoiseSVN_en.xml:11030(primary) msgid "shortcut" msgstr "" -#: source/TortoiseSVN_en.xml:10990(para) +#: source/TortoiseSVN_en.xml:11032(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: \nTortoiseProc.exe /command:repobrowser /path:\"url/to/repository\"\n Of course you need to include the real repository URL." msgstr "" -#: source/TortoiseSVN_en.xml:11002(title) +#: source/TortoiseSVN_en.xml:11044(title) msgid "Ignore files which are already versioned" msgstr "" -#: source/TortoiseSVN_en.xml:11004(primary) +#: source/TortoiseSVN_en.xml:11046(primary) msgid "unversion" msgstr "" -#: source/TortoiseSVN_en.xml:11006(para) +#: source/TortoiseSVN_en.xml:11048(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 "" -#: source/TortoiseSVN_en.xml:11013(para) +#: source/TortoiseSVN_en.xml:11055(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 "" -#: source/TortoiseSVN_en.xml:11028(para) +#: source/TortoiseSVN_en.xml:11070(para) msgid "Move the file to somewhere safe, not inside your working copy." msgstr "" -#: source/TortoiseSVN_en.xml:11034(para) +#: source/TortoiseSVN_en.xml:11076(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 "" -#: source/TortoiseSVN_en.xml:11045(para) +#: source/TortoiseSVN_en.xml:11087(para) msgid "Move the file back to its original location." msgstr "" -#: source/TortoiseSVN_en.xml:11050(para) +#: source/TortoiseSVN_en.xml:11092(para) msgid "Add the file to the ignore list so you don't get into the same trouble again." msgstr "" -#: source/TortoiseSVN_en.xml:11023(para) +#: source/TortoiseSVN_en.xml:11065(para) msgid "If the files are already in the repository, you have to do a little more work. " msgstr "" -#: source/TortoiseSVN_en.xml:11062(para) +#: source/TortoiseSVN_en.xml:11104(para) msgid "TortoiseSVNExport the folder to somewhere safe, not inside your working copy." msgstr "" -#: source/TortoiseSVN_en.xml:11072(para) +#: source/TortoiseSVN_en.xml:11114(para) msgid "TortoiseSVNDelete the folder from your working copy." msgstr "" -#: source/TortoiseSVN_en.xml:11081(para) +#: source/TortoiseSVN_en.xml:11123(para) msgid "TortoiseSVNCommit the deleted folder to remove it from the repository." msgstr "" -#: source/TortoiseSVN_en.xml:11090(para) +#: source/TortoiseSVN_en.xml:11132(para) msgid "Move the exported folder back to its original location in your working copy." msgstr "" -#: source/TortoiseSVN_en.xml:11096(para) +#: source/TortoiseSVN_en.xml:11138(para) msgid "Add the folder to the ignore list so you don't get into the same trouble again." msgstr "" -#: source/TortoiseSVN_en.xml:11057(para) +#: source/TortoiseSVN_en.xml:11099(para) msgid "If you need to remove a whole folder/hierarchy from version control, the procedure is different again. " msgstr "" -#: source/TortoiseSVN_en.xml:11106(title) +#: source/TortoiseSVN_en.xml:11148(title) msgid "Administrators" msgstr "" -#: source/TortoiseSVN_en.xml:11108(para) +#: source/TortoiseSVN_en.xml:11150(para) msgid "This appendix contains solutions to problems/questions you might have when you are responsible for deploying TortoiseSVN to multiple client computers." msgstr "" -#: source/TortoiseSVN_en.xml:11115(title) +#: source/TortoiseSVN_en.xml:11157(title) msgid "Deploy TortoiseSVN via group policies" msgstr "" -#: source/TortoiseSVN_en.xml:11117(primary) +#: source/TortoiseSVN_en.xml:11159(primary) msgid "group policies" msgstr "" -#: source/TortoiseSVN_en.xml:11120(primary) source/TortoiseSVN_en.xml:12305(glossterm) +#: source/TortoiseSVN_en.xml:11162(primary) source/TortoiseSVN_en.xml:12347(glossterm) msgid "GPO" msgstr "" -#: source/TortoiseSVN_en.xml:11122(para) +#: source/TortoiseSVN_en.xml:11164(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 "" -#: source/TortoiseSVN_en.xml:11127(para) +#: source/TortoiseSVN_en.xml:11169(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 "" -#: source/TortoiseSVN_en.xml:11134(para) +#: source/TortoiseSVN_en.xml:11176(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 "" -#: source/TortoiseSVN_en.xml:11146(title) +#: source/TortoiseSVN_en.xml:11188(title) msgid "Redirect the upgrade check" msgstr "" -#: source/TortoiseSVN_en.xml:11148(primary) +#: source/TortoiseSVN_en.xml:11190(primary) msgid "upgrade check" msgstr "" -#: source/TortoiseSVN_en.xml:11150(para) +#: source/TortoiseSVN_en.xml:11192(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 "" -#: source/TortoiseSVN_en.xml:11156(title) +#: source/TortoiseSVN_en.xml:11198(title) msgid "The upgrade dialog" msgstr "" -#: source/TortoiseSVN_en.xml:11159(para) +#: source/TortoiseSVN_en.xml:11201(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:11165(para) +#: source/TortoiseSVN_en.xml:11207(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: \n1.4.1.6000\nA new version of TortoiseSVN is available for you to download!\nhttp://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 "" -#: source/TortoiseSVN_en.xml:11190(title) +#: source/TortoiseSVN_en.xml:11232(title) msgid "Setting the SVN_ASP_DOT_NET_HACK environment variable" msgstr "" -#: source/TortoiseSVN_en.xml:11192(primary) +#: source/TortoiseSVN_en.xml:11234(primary) msgid "SVN_ASP_DOT_NET_HACK" msgstr "" -#: source/TortoiseSVN_en.xml:11194(para) +#: source/TortoiseSVN_en.xml:11236(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 "" -#: source/TortoiseSVN_en.xml:11201(para) +#: source/TortoiseSVN_en.xml:11243(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: \nmsiexec /i TortoiseSVN-1.4.0.msi ASPDOTNETHACK=TRUE\n" msgstr "" -#: source/TortoiseSVN_en.xml:11212(title) +#: source/TortoiseSVN_en.xml:11254(title) msgid "Automating TortoiseSVN" msgstr "" -#: source/TortoiseSVN_en.xml:11214(para) +#: source/TortoiseSVN_en.xml:11256(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:11220(para) +#: source/TortoiseSVN_en.xml:11262(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 "" -#: source/TortoiseSVN_en.xml:11232(title) source/TortoiseSVN_en.xml:11701(title) +#: source/TortoiseSVN_en.xml:11274(title) source/TortoiseSVN_en.xml:11743(title) msgid "TortoiseSVN Commands" msgstr "" -#: source/TortoiseSVN_en.xml:11234(primary) +#: source/TortoiseSVN_en.xml:11276(primary) msgid "automation" msgstr "" -#: source/TortoiseSVN_en.xml:11237(primary) +#: source/TortoiseSVN_en.xml:11279(primary) msgid "command line" msgstr "" -#: source/TortoiseSVN_en.xml:11239(para) +#: source/TortoiseSVN_en.xml:11281(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 "" -#: source/TortoiseSVN_en.xml:11248(para) +#: source/TortoiseSVN_en.xml:11290(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:11253(para) +#: source/TortoiseSVN_en.xml:11295(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 "" -#: source/TortoiseSVN_en.xml:11259(para) +#: source/TortoiseSVN_en.xml:11301(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 "" -#: source/TortoiseSVN_en.xml:11267(para) +#: source/TortoiseSVN_en.xml:11309(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:11278(para) +#: source/TortoiseSVN_en.xml:11320(para) msgid " don't close the dialog automatically" msgstr "" -#: source/TortoiseSVN_en.xml:11283(para) +#: source/TortoiseSVN_en.xml:11325(para) msgid " auto close if no errors" msgstr "" -#: source/TortoiseSVN_en.xml:11288(para) +#: source/TortoiseSVN_en.xml:11330(para) msgid " auto close if no errors and conflicts" msgstr "" -#: source/TortoiseSVN_en.xml:11293(para) +#: source/TortoiseSVN_en.xml:11335(para) msgid " auto close if no errors, conflicts and merges" msgstr "" -#: source/TortoiseSVN_en.xml:11298(para) +#: source/TortoiseSVN_en.xml:11340(para) msgid " auto close if no errors, conflicts and merges for local operations" msgstr "" -#: source/TortoiseSVN_en.xml:11272(para) +#: source/TortoiseSVN_en.xml:11314(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:11305(para) +#: source/TortoiseSVN_en.xml:11347(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 "" -#: source/TortoiseSVN_en.xml:11324(title) +#: source/TortoiseSVN_en.xml:11366(title) msgid "List of available commands and options" msgstr "" -#: source/TortoiseSVN_en.xml:11330(entry) +#: source/TortoiseSVN_en.xml:11372(entry) msgid "Command" msgstr "" -#: source/TortoiseSVN_en.xml:11337(entry) +#: source/TortoiseSVN_en.xml:11379(entry) msgid "Shows the About-dialog. This is also shown if no command is given." msgstr "" -#: source/TortoiseSVN_en.xml:11348(option) +#: source/TortoiseSVN_en.xml:11390(option) msgid "/startrev:xxx" msgstr "" -#: source/TortoiseSVN_en.xml:11349(option) +#: source/TortoiseSVN_en.xml:11391(option) msgid "/endrev:xxx" msgstr "" -#: source/TortoiseSVN_en.xml:11350(option) +#: source/TortoiseSVN_en.xml:11392(option) msgid "/strict" msgstr "" -#: source/TortoiseSVN_en.xml:11344(entry) +#: source/TortoiseSVN_en.xml:11386(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: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) +#: source/TortoiseSVN_en.xml:11398(option) source/TortoiseSVN_en.xml:11413(option) source/TortoiseSVN_en.xml:11441(option) source/TortoiseSVN_en.xml:11449(option) source/TortoiseSVN_en.xml:11457(option) source/TortoiseSVN_en.xml:11464(option) source/TortoiseSVN_en.xml:11473(option) source/TortoiseSVN_en.xml:11486(option) source/TortoiseSVN_en.xml:11487(option) source/TortoiseSVN_en.xml:11489(option) source/TortoiseSVN_en.xml:11508(option) source/TortoiseSVN_en.xml:11521(option) source/TortoiseSVN_en.xml:11528(option) source/TortoiseSVN_en.xml:11538(option) source/TortoiseSVN_en.xml:11544(option) source/TortoiseSVN_en.xml:11552(option) source/TortoiseSVN_en.xml:11558(option) source/TortoiseSVN_en.xml:11580(option) source/TortoiseSVN_en.xml:11580(option) source/TortoiseSVN_en.xml:11591(option) source/TortoiseSVN_en.xml:11600(option) source/TortoiseSVN_en.xml:11615(option) source/TortoiseSVN_en.xml:11625(option) source/TortoiseSVN_en.xml:11632(option) source/TortoiseSVN_en.xml:11641(option) source/TortoiseSVN_en.xml:11648(option) source/TortoiseSVN_en.xml:11665(option) msgid "/path" msgstr "" -#: source/TortoiseSVN_en.xml:11357(option) +#: source/TortoiseSVN_en.xml:11399(option) msgid "/url" msgstr "" -#: source/TortoiseSVN_en.xml:11355(entry) +#: source/TortoiseSVN_en.xml:11397(entry) msgid "Opens the checkout dialog. The specifies the target directory and the specifies the URL to checkout from." msgstr "" -#: source/TortoiseSVN_en.xml:11363(entry) +#: source/TortoiseSVN_en.xml:11405(entry) msgid "Opens the import dialog. The path specifies the directory with the data to import." msgstr "" -#: source/TortoiseSVN_en.xml:11372(option) +#: source/TortoiseSVN_en.xml:11414(option) msgid "/rev" msgstr "" -#: source/TortoiseSVN_en.xml:11375(option) +#: source/TortoiseSVN_en.xml:11417(option) msgid "/rev:1234" msgstr "" -#: source/TortoiseSVN_en.xml:11376(option) +#: source/TortoiseSVN_en.xml:11418(option) msgid "/nonrecursive" msgstr "" -#: source/TortoiseSVN_en.xml:11377(option) +#: source/TortoiseSVN_en.xml:11419(option) msgid "/ignoreexternals" msgstr "" -#: source/TortoiseSVN_en.xml:11370(entry) +#: source/TortoiseSVN_en.xml:11412(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 "" -#: source/TortoiseSVN_en.xml:11388(option) +#: source/TortoiseSVN_en.xml:11430(option) msgid "path" msgstr "" -#: source/TortoiseSVN_en.xml:11392(option) +#: source/TortoiseSVN_en.xml:11434(option) msgid "/bugid:\"the bug id here\"" msgstr "" -#: source/TortoiseSVN_en.xml:11382(entry) +#: source/TortoiseSVN_en.xml:11424(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 "" -#: source/TortoiseSVN_en.xml:11398(entry) +#: source/TortoiseSVN_en.xml:11440(entry) msgid "Adds the files in to version control." msgstr "" -#: source/TortoiseSVN_en.xml:11405(entry) +#: source/TortoiseSVN_en.xml:11447(entry) msgid "Reverts local modifications of a working copy. The tells which items to revert." msgstr "" -#: source/TortoiseSVN_en.xml:11413(entry) +#: source/TortoiseSVN_en.xml:11455(entry) msgid "Cleans up interrupted or aborted operations and unlocks the working copy in ." msgstr "" -#: source/TortoiseSVN_en.xml:11423(option) source/TortoiseSVN_en.xml:11489(option) source/TortoiseSVN_en.xml:11616(option) +#: source/TortoiseSVN_en.xml:11465(option) source/TortoiseSVN_en.xml:11531(option) source/TortoiseSVN_en.xml:11658(option) msgid "/noquestion" msgstr "" -#: source/TortoiseSVN_en.xml:11420(entry) +#: source/TortoiseSVN_en.xml:11462(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:11430(entry) +#: source/TortoiseSVN_en.xml:11472(entry) msgid "Creates a repository in " msgstr "" -#: source/TortoiseSVN_en.xml:11436(entry) +#: source/TortoiseSVN_en.xml:11478(entry) msgid "Opens the switch dialog. The path specifies the target directory." msgstr "" -#: source/TortoiseSVN_en.xml:11443(entry) +#: source/TortoiseSVN_en.xml:11485(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 "" -#: source/TortoiseSVN_en.xml:11456(option) +#: source/TortoiseSVN_en.xml:11498(option) msgid "/mergefrom:xxx" msgstr "" -#: source/TortoiseSVN_en.xml:11457(option) +#: source/TortoiseSVN_en.xml:11499(option) msgid "/mergeto:xxx" msgstr "" -#: source/TortoiseSVN_en.xml:11458(option) +#: source/TortoiseSVN_en.xml:11500(option) msgid "/fromurl:URL" msgstr "" -#: source/TortoiseSVN_en.xml:11452(entry) +#: source/TortoiseSVN_en.xml:11494(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:11464(entry) +#: source/TortoiseSVN_en.xml:11506(entry) msgid "Brings up the branch/tag dialog. The is the working copy to branch/tag from." msgstr "" -#: source/TortoiseSVN_en.xml:11472(entry) +#: source/TortoiseSVN_en.xml:11514(entry) msgid "Opens the settings dialog." msgstr "" -#: source/TortoiseSVN_en.xml:11478(entry) +#: source/TortoiseSVN_en.xml:11520(entry) msgid "Removes the file(s) in from version control." msgstr "" -#: source/TortoiseSVN_en.xml:11485(entry) +#: source/TortoiseSVN_en.xml:11527(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:11498(option) source/TortoiseSVN_en.xml:11500(option) +#: source/TortoiseSVN_en.xml:11540(option) source/TortoiseSVN_en.xml:11542(option) msgid "/path2" msgstr "" -#: source/TortoiseSVN_en.xml:11494(entry) +#: source/TortoiseSVN_en.xml:11536(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 "" -#: source/TortoiseSVN_en.xml:11507(entry) +#: source/TortoiseSVN_en.xml:11549(entry) msgid "Starts the conflicteditor specified in the TortoiseSVN settings with the correct files for the conflicted file in ." msgstr "" -#: source/TortoiseSVN_en.xml:11515(entry) +#: source/TortoiseSVN_en.xml:11557(entry) msgid "Opens the relocate dialog. The specifies the working copy path to relocate." msgstr "" -#: source/TortoiseSVN_en.xml:11522(entry) +#: source/TortoiseSVN_en.xml:11564(entry) msgid "Opens the help file." msgstr "" -#: source/TortoiseSVN_en.xml:11528(entry) +#: source/TortoiseSVN_en.xml:11570(entry) msgid "Opens the check-for-modifications dialog. The path specifies the working copy directory." msgstr "" -#: source/TortoiseSVN_en.xml:11540(option) source/TortoiseSVN_en.xml:11542(option) +#: source/TortoiseSVN_en.xml:11582(option) source/TortoiseSVN_en.xml:11584(option) msgid "/rev:xxx" msgstr "" -#: source/TortoiseSVN_en.xml:11535(entry) +#: source/TortoiseSVN_en.xml:11577(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 "" -#: source/TortoiseSVN_en.xml:11548(entry) +#: source/TortoiseSVN_en.xml:11590(entry) msgid "Adds all targets in to the ignore list, i.e. adds the svn:ignore property to those files." msgstr "" -#: source/TortoiseSVN_en.xml:11559(option) +#: source/TortoiseSVN_en.xml:11601(option) msgid "startrev" msgstr "" -#: source/TortoiseSVN_en.xml:11560(option) +#: source/TortoiseSVN_en.xml:11602(option) msgid "endrev" msgstr "" -#: source/TortoiseSVN_en.xml:11564(option) +#: source/TortoiseSVN_en.xml:11606(option) msgid "/line:nnn" msgstr "" -#: source/TortoiseSVN_en.xml:11556(entry) +#: source/TortoiseSVN_en.xml:11598(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 "" -#: source/TortoiseSVN_en.xml:11574(option) +#: source/TortoiseSVN_en.xml:11616(option) msgid "/savepath:path" msgstr "" -#: source/TortoiseSVN_en.xml:11575(option) +#: source/TortoiseSVN_en.xml:11617(option) msgid "/revision:xxx" msgstr "" -#: source/TortoiseSVN_en.xml:11571(entry) +#: source/TortoiseSVN_en.xml:11613(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 "" -#: source/TortoiseSVN_en.xml:11581(entry) +#: source/TortoiseSVN_en.xml:11623(entry) msgid "Creates a patch file for the path given in ." msgstr "" -#: source/TortoiseSVN_en.xml:11588(entry) +#: source/TortoiseSVN_en.xml:11630(entry) msgid "Shows the revision graph for the path given in ." msgstr "" -#: source/TortoiseSVN_en.xml:11595(entry) +#: source/TortoiseSVN_en.xml:11637(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:11604(entry) +#: source/TortoiseSVN_en.xml:11646(entry) msgid "Unlocks a file or all files in a directory.. " msgstr "" -#: source/TortoiseSVN_en.xml:11611(entry) +#: source/TortoiseSVN_en.xml:11653(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 "" -#: source/TortoiseSVN_en.xml:11621(entry) +#: source/TortoiseSVN_en.xml:11663(entry) msgid "Shows the properties dialog for the path given in ." msgstr "" -#: source/TortoiseSVN_en.xml:11630(para) +#: source/TortoiseSVN_en.xml:11672(para) msgid "Examples (which should be entered on one line): \nTortoiseProc.exe /command:commit /path:\"c:\\svn_wc\\file1.txt*c:\\svn_wc\\file2.txt\"\n /logmsg:\"test log message\" /closeonend\n\nTortoiseProc.exe /command:update /path:\"c:\\svn_wc\\\" /closeonend\n\nTortoiseProc.exe /command:log /path:\"c:\\svn_wc\\file1.txt\"\n /startrev:50 /endrev:60 /closeonend\n" msgstr "" -#: source/TortoiseSVN_en.xml:11645(title) +#: source/TortoiseSVN_en.xml:11687(title) msgid "Command Line Interface Cross Reference" msgstr "" -#: source/TortoiseSVN_en.xml:11647(primary) +#: source/TortoiseSVN_en.xml:11689(primary) msgid "command line client" msgstr "" -#: source/TortoiseSVN_en.xml:11650(primary) +#: source/TortoiseSVN_en.xml:11692(primary) msgid "CLI" msgstr "" -#: source/TortoiseSVN_en.xml:11653(para) +#: source/TortoiseSVN_en.xml:11695(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 "" -#: source/TortoiseSVN_en.xml:11662(para) +#: source/TortoiseSVN_en.xml:11704(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 "" -#: source/TortoiseSVN_en.xml:11668(para) +#: source/TortoiseSVN_en.xml:11710(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 "" -#: source/TortoiseSVN_en.xml:11676(title) +#: source/TortoiseSVN_en.xml:11718(title) msgid "Conventions and Basic Rules" msgstr "" -#: source/TortoiseSVN_en.xml:11677(para) +#: source/TortoiseSVN_en.xml:11719(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 "" -#: source/TortoiseSVN_en.xml:11687(para) +#: source/TortoiseSVN_en.xml:11729(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 "" -#: source/TortoiseSVN_en.xml:11694(para) +#: source/TortoiseSVN_en.xml:11736(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 "" -#: source/TortoiseSVN_en.xml:11703(title) source/TortoiseSVN_en.xml:12205(glossterm) +#: source/TortoiseSVN_en.xml:11745(title) source/TortoiseSVN_en.xml:12247(glossterm) msgid "Checkout" msgstr "" -#: source/TortoiseSVN_en.xml:11704(screen) +#: source/TortoiseSVN_en.xml:11746(screen) #, no-wrap msgid "\nsvn checkout [-N] [--ignore-externals] [-r rev] URL PATH\n" msgstr "" -#: source/TortoiseSVN_en.xml:11707(para) +#: source/TortoiseSVN_en.xml:11749(para) msgid "If Only checkout the top folder is checked, use the -N switch." msgstr "" -#: source/TortoiseSVN_en.xml:11711(para) source/TortoiseSVN_en.xml:11754(para) +#: source/TortoiseSVN_en.xml:11753(para) source/TortoiseSVN_en.xml:11796(para) msgid "If Omit externals is checked, use the --ignore-externals switch." msgstr "" -#: source/TortoiseSVN_en.xml:11715(para) +#: source/TortoiseSVN_en.xml:11757(para) msgid "If you are checking out a specific revision, specify that after the URL using -r switch." msgstr "" -#: source/TortoiseSVN_en.xml:11721(title) source/TortoiseSVN_en.xml:12511(glossterm) +#: source/TortoiseSVN_en.xml:11763(title) source/TortoiseSVN_en.xml:12553(glossterm) msgid "Update" msgstr "" -#: source/TortoiseSVN_en.xml:11722(screen) +#: source/TortoiseSVN_en.xml:11764(screen) #, no-wrap msgid "\nsvn info URL_of_WC\nsvn update [-r rev] PATH\n" msgstr "" -#: source/TortoiseSVN_en.xml:11726(para) +#: source/TortoiseSVN_en.xml:11768(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 "" -#: source/TortoiseSVN_en.xml:11733(para) +#: source/TortoiseSVN_en.xml:11775(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 "" -#: source/TortoiseSVN_en.xml:11738(para) +#: source/TortoiseSVN_en.xml:11780(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:11745(title) +#: source/TortoiseSVN_en.xml:11787(title) msgid "Update to Revision" msgstr "" -#: source/TortoiseSVN_en.xml:11746(screen) +#: source/TortoiseSVN_en.xml:11788(screen) #, no-wrap msgid "\nsvn info URL_of_WC\nsvn update [-r rev] [-N] [--ignore-externals] PATH\n" msgstr "" -#: source/TortoiseSVN_en.xml:11750(para) +#: source/TortoiseSVN_en.xml:11792(para) msgid "If Only update the top folder is checked, use the -N switch." msgstr "" -#: source/TortoiseSVN_en.xml:11760(title) source/TortoiseSVN_en.xml:12231(glossterm) +#: source/TortoiseSVN_en.xml:11802(title) source/TortoiseSVN_en.xml:12273(glossterm) msgid "Commit" msgstr "" -#: source/TortoiseSVN_en.xml:11761(para) +#: source/TortoiseSVN_en.xml:11803(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 "" -#: source/TortoiseSVN_en.xml:11768(screen) source/TortoiseSVN_en.xml:11930(screen) source/TortoiseSVN_en.xml:11958(screen) +#: source/TortoiseSVN_en.xml:11810(screen) source/TortoiseSVN_en.xml:11972(screen) source/TortoiseSVN_en.xml:12000(screen) #, no-wrap msgid "\nsvn status -v PATH\n" msgstr "" -#: source/TortoiseSVN_en.xml:11771(para) source/TortoiseSVN_en.xml:11859(para) +#: source/TortoiseSVN_en.xml:11813(para) source/TortoiseSVN_en.xml:11901(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 "" -#: source/TortoiseSVN_en.xml:11779(para) +#: source/TortoiseSVN_en.xml:11821(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:11783(screen) source/TortoiseSVN_en.xml:12073(screen) +#: source/TortoiseSVN_en.xml:11825(screen) source/TortoiseSVN_en.xml:12115(screen) #, no-wrap msgid "\nsvn add PATH...\n" msgstr "" -#: source/TortoiseSVN_en.xml:11786(para) +#: source/TortoiseSVN_en.xml:11828(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 "" -#: source/TortoiseSVN_en.xml:11794(screen) +#: source/TortoiseSVN_en.xml:11836(screen) #, no-wrap msgid "\nsvn commit -m \"LogMessage\" [-N] [--no-unlock] PATH...\n" msgstr "" -#: source/TortoiseSVN_en.xml:11797(para) source/TortoiseSVN_en.xml:12003(para) source/TortoiseSVN_en.xml:12086(para) +#: source/TortoiseSVN_en.xml:11839(para) source/TortoiseSVN_en.xml:12045(para) source/TortoiseSVN_en.xml:12128(para) msgid "LogMessage here represents the contents of the log message edit box. This can be empty." msgstr "" -#: source/TortoiseSVN_en.xml:11801(para) +#: source/TortoiseSVN_en.xml:11843(para) msgid "If Keep locks is checked, use the --no-unlock switch." msgstr "" -#: source/TortoiseSVN_en.xml:11807(title) source/TortoiseSVN_en.xml:12277(glossterm) +#: source/TortoiseSVN_en.xml:11849(title) source/TortoiseSVN_en.xml:12319(glossterm) msgid "Diff" msgstr "" -#: source/TortoiseSVN_en.xml:11808(screen) +#: source/TortoiseSVN_en.xml:11850(screen) #, no-wrap msgid "\nsvn diff PATH\n" msgstr "" -#: source/TortoiseSVN_en.xml:11811(para) +#: source/TortoiseSVN_en.xml:11853(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 "" -#: source/TortoiseSVN_en.xml:11820(para) +#: source/TortoiseSVN_en.xml:11862(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 "" -#: source/TortoiseSVN_en.xml:11828(title) +#: source/TortoiseSVN_en.xml:11870(title) msgid "Show Log" msgstr "" -#: source/TortoiseSVN_en.xml:11829(screen) +#: source/TortoiseSVN_en.xml:11871(screen) #, no-wrap msgid "\nsvn log -v -r 0:N --limit 100 [--stop-on-copy] PATH\n or\nsvn log -v -r M:N [--stop-on-copy] PATH\n" msgstr "" -#: source/TortoiseSVN_en.xml:11834(para) +#: source/TortoiseSVN_en.xml:11876(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 "" -#: source/TortoiseSVN_en.xml:11840(para) +#: source/TortoiseSVN_en.xml:11882(para) msgid "If Stop on copy/rename is checked, use the --stop-on-copy switch." msgstr "" -#: source/TortoiseSVN_en.xml:11847(screen) +#: source/TortoiseSVN_en.xml:11889(screen) #, no-wrap msgid "\nsvn status -v PATH\n or\nsvn status -u -v PATH\n" msgstr "" -#: source/TortoiseSVN_en.xml:11852(para) +#: source/TortoiseSVN_en.xml:11894(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 "" -#: source/TortoiseSVN_en.xml:11869(title) +#: source/TortoiseSVN_en.xml:11911(title) msgid "Revision Graph" msgstr "" -#: source/TortoiseSVN_en.xml:11870(para) +#: source/TortoiseSVN_en.xml:11912(para) msgid "The revision graph is a feature of TortoiseSVN only. There's no equivalent in the command line client." msgstr "" -#: source/TortoiseSVN_en.xml:11874(para) +#: source/TortoiseSVN_en.xml:11916(para) msgid "What TortoiseSVN does is an \nsvn info URL_of_WC\nsvn log -v URL\n where URL is the repository root and then analyzes the data returned." msgstr "" -#: source/TortoiseSVN_en.xml:11885(title) +#: source/TortoiseSVN_en.xml:11927(title) msgid "Repo Browser" msgstr "" -#: source/TortoiseSVN_en.xml:11886(screen) +#: source/TortoiseSVN_en.xml:11928(screen) #, no-wrap msgid "\nsvn info URL_of_WC\nsvn list [-r rev] -v URL\n" msgstr "" -#: source/TortoiseSVN_en.xml:11890(para) +#: source/TortoiseSVN_en.xml:11932(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 "" -#: source/TortoiseSVN_en.xml:11897(para) +#: source/TortoiseSVN_en.xml:11939(para) msgid "The svn list call will list the contents of a directory, given a URL and revision." msgstr "" -#: source/TortoiseSVN_en.xml:11903(title) +#: source/TortoiseSVN_en.xml:11945(title) msgid "Edit Conflicts" msgstr "" -#: source/TortoiseSVN_en.xml:11904(para) +#: source/TortoiseSVN_en.xml:11946(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 "" -#: source/TortoiseSVN_en.xml:11911(title) +#: source/TortoiseSVN_en.xml:11953(title) msgid "Resolved" msgstr "" -#: source/TortoiseSVN_en.xml:11912(screen) +#: source/TortoiseSVN_en.xml:11954(screen) #, no-wrap msgid "\nsvn resolved PATH\n" msgstr "" -#: source/TortoiseSVN_en.xml:11917(title) +#: source/TortoiseSVN_en.xml:11959(title) msgid "Rename" msgstr "" -#: source/TortoiseSVN_en.xml:11918(screen) +#: source/TortoiseSVN_en.xml:11960(screen) #, no-wrap msgid "\nsvn rename CURR_PATH NEW_PATH\n" msgstr "" -#: source/TortoiseSVN_en.xml:11923(title) source/TortoiseSVN_en.xml:12265(glossterm) +#: source/TortoiseSVN_en.xml:11965(title) source/TortoiseSVN_en.xml:12307(glossterm) msgid "Delete" msgstr "" -#: source/TortoiseSVN_en.xml:11924(screen) +#: source/TortoiseSVN_en.xml:11966(screen) #, no-wrap msgid "\nsvn delete PATH\n" msgstr "" -#: source/TortoiseSVN_en.xml:11929(title) source/TortoiseSVN_en.xml:12444(glossterm) +#: source/TortoiseSVN_en.xml:11971(title) source/TortoiseSVN_en.xml:12486(glossterm) msgid "Revert" msgstr "" -#: source/TortoiseSVN_en.xml:11933(para) +#: source/TortoiseSVN_en.xml:11975(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:11939(para) +#: source/TortoiseSVN_en.xml:11981(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 "" -#: source/TortoiseSVN_en.xml:11946(screen) +#: source/TortoiseSVN_en.xml:11988(screen) #, no-wrap msgid "\nsvn revert [-R] PATH...\n" msgstr "" -#: source/TortoiseSVN_en.xml:11952(screen) +#: source/TortoiseSVN_en.xml:11994(screen) #, no-wrap msgid "\nsvn cleanup PATH\n" msgstr "" -#: source/TortoiseSVN_en.xml:11957(title) +#: source/TortoiseSVN_en.xml:11999(title) msgid "Get Lock" msgstr "" -#: source/TortoiseSVN_en.xml:11961(para) +#: source/TortoiseSVN_en.xml:12003(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:11966(screen) +#: source/TortoiseSVN_en.xml:12008(screen) #, no-wrap msgid "\nsvn lock -m \"LockMessage\" [--force] PATH...\n" msgstr "" -#: source/TortoiseSVN_en.xml:11969(para) +#: source/TortoiseSVN_en.xml:12011(para) msgid "LockMessage here represents the contents of the lock message edit box. This can be empty." msgstr "" -#: source/TortoiseSVN_en.xml:11973(para) +#: source/TortoiseSVN_en.xml:12015(para) msgid "If Steal the locks is checked, use the --force switch." msgstr "" -#: source/TortoiseSVN_en.xml:11979(title) +#: source/TortoiseSVN_en.xml:12021(title) msgid "Release Lock" msgstr "" -#: source/TortoiseSVN_en.xml:11980(screen) +#: source/TortoiseSVN_en.xml:12022(screen) #, no-wrap msgid "\nsvn unlock PATH\n" msgstr "" -#: source/TortoiseSVN_en.xml:11985(title) +#: source/TortoiseSVN_en.xml:12027(title) msgid "Branch/Tag" msgstr "" -#: source/TortoiseSVN_en.xml:11986(screen) +#: source/TortoiseSVN_en.xml:12028(screen) #, no-wrap msgid "\nsvn copy -m \"LogMessage\" URL URL\n or\nsvn copy -m \"LogMessage\" URL@rev URL@rev\n or\nsvn copy -m \"LogMessage\" PATH URL\n" msgstr "" -#: source/TortoiseSVN_en.xml:11998(listitem) +#: source/TortoiseSVN_en.xml:12040(listitem) msgid "Specific revision in repository" msgstr "" -#: source/TortoiseSVN_en.xml:11993(para) +#: source/TortoiseSVN_en.xml:12035(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:12010(screen) +#: source/TortoiseSVN_en.xml:12052(screen) #, no-wrap msgid "\nsvn info URL_of_WC\nsvn switch [-r rev] URL PATH\n" msgstr "" -#: source/TortoiseSVN_en.xml:12016(title) source/TortoiseSVN_en.xml:12358(glossterm) +#: source/TortoiseSVN_en.xml:12058(title) source/TortoiseSVN_en.xml:12400(glossterm) msgid "Merge" msgstr "" -#: source/TortoiseSVN_en.xml:12017(screen) +#: source/TortoiseSVN_en.xml:12059(screen) #, no-wrap msgid "\nsvn merge [--dry-run] --force From_URL@revN To_URL@revM PATH\n" msgstr "" -#: source/TortoiseSVN_en.xml:12020(para) +#: source/TortoiseSVN_en.xml:12062(para) msgid "The Dry run performs the same merge with the --dry-run switch." msgstr "" -#: source/TortoiseSVN_en.xml:12024(screen) +#: source/TortoiseSVN_en.xml:12066(screen) #, no-wrap msgid "\nsvn diff From_URL@revN To_URL@revM\n" msgstr "" -#: source/TortoiseSVN_en.xml:12027(para) +#: source/TortoiseSVN_en.xml:12069(para) msgid "The Unified diff shows the diff operation which will be used to do the merge." msgstr "" -#: source/TortoiseSVN_en.xml:12033(title) source/TortoiseSVN_en.xml:12286(glossterm) +#: source/TortoiseSVN_en.xml:12075(title) source/TortoiseSVN_en.xml:12328(glossterm) msgid "Export" msgstr "" -#: source/TortoiseSVN_en.xml:12034(screen) +#: source/TortoiseSVN_en.xml:12076(screen) #, no-wrap msgid "\nsvn export [-r rev] [--ignore-externals] URL Export_PATH\n" msgstr "" -#: source/TortoiseSVN_en.xml:12037(para) +#: source/TortoiseSVN_en.xml:12079(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:12041(para) +#: source/TortoiseSVN_en.xml:12083(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 "" -#: source/TortoiseSVN_en.xml:12046(para) +#: source/TortoiseSVN_en.xml:12088(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 "" -#: source/TortoiseSVN_en.xml:12051(para) +#: source/TortoiseSVN_en.xml:12093(para) msgid "In both cases, if Omit externals is checked, use the --ignore-externals switch." msgstr "" -#: source/TortoiseSVN_en.xml:12058(title) source/TortoiseSVN_en.xml:12404(glossterm) +#: source/TortoiseSVN_en.xml:12100(title) source/TortoiseSVN_en.xml:12446(glossterm) msgid "Relocate" msgstr "" -#: source/TortoiseSVN_en.xml:12059(screen) +#: source/TortoiseSVN_en.xml:12101(screen) #, no-wrap msgid "\nsvn switch --relocate From_URL To_URL\n" msgstr "" -#: source/TortoiseSVN_en.xml:12064(title) +#: source/TortoiseSVN_en.xml:12106(title) msgid "Create Repository Here" msgstr "" -#: source/TortoiseSVN_en.xml:12065(screen) +#: source/TortoiseSVN_en.xml:12107(screen) #, no-wrap msgid "\nsvnadmin create --fs-type fsfs PATH\n or\nsvnadmin create --fs-type bdb PATH\n" msgstr "" -#: source/TortoiseSVN_en.xml:12072(title) source/TortoiseSVN_en.xml:12148(glossterm) +#: source/TortoiseSVN_en.xml:12114(title) source/TortoiseSVN_en.xml:12190(glossterm) msgid "Add" msgstr "" -#: source/TortoiseSVN_en.xml:12076(para) +#: source/TortoiseSVN_en.xml:12118(para) msgid "If you selected a folder, TortoiseSVN first scans it recursively for items which can be added." msgstr "" -#: source/TortoiseSVN_en.xml:12083(screen) +#: source/TortoiseSVN_en.xml:12125(screen) #, no-wrap msgid "\nsvn import -m LogMessage PATH URL\n" msgstr "" -#: source/TortoiseSVN_en.xml:12092(title) source/TortoiseSVN_en.xml:12169(glossterm) +#: source/TortoiseSVN_en.xml:12134(title) source/TortoiseSVN_en.xml:12211(glossterm) msgid "Blame" msgstr "" -#: source/TortoiseSVN_en.xml:12093(screen) +#: source/TortoiseSVN_en.xml:12135(screen) #, no-wrap msgid "\nsvn blame -r N:M -v PATH\nsvn log -r N:M PATH\n" msgstr "" -#: source/TortoiseSVN_en.xml:12097(para) +#: source/TortoiseSVN_en.xml:12139(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 "" -#: source/TortoiseSVN_en.xml:12105(title) +#: source/TortoiseSVN_en.xml:12147(title) msgid "Add to Ignore List" msgstr "" -#: source/TortoiseSVN_en.xml:12106(screen) +#: source/TortoiseSVN_en.xml:12148(screen) #, no-wrap msgid "\nsvn propget svn:ignore PATH > tempfile\n{edit new ignore item into tempfile}\nsvn propset svn:ignore -F tempfile PATH\n" msgstr "" -#: source/TortoiseSVN_en.xml:12111(para) +#: source/TortoiseSVN_en.xml:12153(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 "" -#: source/TortoiseSVN_en.xml:12118(title) +#: source/TortoiseSVN_en.xml:12160(title) msgid "Create Patch" msgstr "" -#: source/TortoiseSVN_en.xml:12119(screen) +#: source/TortoiseSVN_en.xml:12161(screen) #, no-wrap msgid "\nsvn diff PATH > patchfile\n" msgstr "" -#: source/TortoiseSVN_en.xml:12122(para) +#: source/TortoiseSVN_en.xml:12164(para) msgid "TortoiseSVN creates a patchfile in unified diff format by comparing the working copy with its BASE version." msgstr "" -#: source/TortoiseSVN_en.xml:12128(title) +#: source/TortoiseSVN_en.xml:12170(title) msgid "Apply Patch" msgstr "" -#: source/TortoiseSVN_en.xml:12129(para) +#: source/TortoiseSVN_en.xml:12171(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 "" -#: source/TortoiseSVN_en.xml:12146(title) +#: source/TortoiseSVN_en.xml:12188(title) msgid "Glossary" msgstr "" -#: source/TortoiseSVN_en.xml:12150(para) +#: source/TortoiseSVN_en.xml:12192(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 "" -#: source/TortoiseSVN_en.xml:12158(glossterm) +#: source/TortoiseSVN_en.xml:12200(glossterm) msgid "BASE revision" msgstr "" -#: source/TortoiseSVN_en.xml:12160(para) +#: source/TortoiseSVN_en.xml:12202(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/TortoiseSVN_en.xml:12171(para) +#: source/TortoiseSVN_en.xml:12213(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 "" -#: source/TortoiseSVN_en.xml:12181(glossterm) +#: source/TortoiseSVN_en.xml:12223(glossterm) msgid "BDB" msgstr "" -#: source/TortoiseSVN_en.xml:12183(para) +#: source/TortoiseSVN_en.xml:12225(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 "" -#: source/TortoiseSVN_en.xml:12190(glossterm) +#: source/TortoiseSVN_en.xml:12232(glossterm) msgid "Branch" msgstr "" -#: source/TortoiseSVN_en.xml:12192(para) +#: source/TortoiseSVN_en.xml:12234(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 "" -#: source/TortoiseSVN_en.xml:12207(para) +#: source/TortoiseSVN_en.xml:12249(para) msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." msgstr "" -#: source/TortoiseSVN_en.xml:12216(para) +#: source/TortoiseSVN_en.xml:12258(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 "" -#: source/TortoiseSVN_en.xml:12233(para) +#: source/TortoiseSVN_en.xml:12275(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 "" -#: source/TortoiseSVN_en.xml:12241(glossterm) +#: source/TortoiseSVN_en.xml:12283(glossterm) msgid "Conflict" msgstr "" -#: source/TortoiseSVN_en.xml:12243(para) +#: source/TortoiseSVN_en.xml:12285(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 "" -#: source/TortoiseSVN_en.xml:12253(glossterm) +#: source/TortoiseSVN_en.xml:12295(glossterm) msgid "Copy" msgstr "" -#: source/TortoiseSVN_en.xml:12255(para) +#: source/TortoiseSVN_en.xml:12297(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 "" -#: source/TortoiseSVN_en.xml:12267(para) +#: source/TortoiseSVN_en.xml:12309(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:12279(para) +#: source/TortoiseSVN_en.xml:12321(para) msgid "Shorthand for Show Differences. Very useful when you want to see exactly what changes have been made." msgstr "" -#: source/TortoiseSVN_en.xml:12288(para) +#: source/TortoiseSVN_en.xml:12330(para) msgid "This command produces a copy of a versioned folder, just like a working copy, but without the local .svn folders." msgstr "" -#: source/TortoiseSVN_en.xml:12296(glossterm) +#: source/TortoiseSVN_en.xml:12338(glossterm) msgid "FSFS" msgstr "" -#: source/TortoiseSVN_en.xml:12298(para) +#: source/TortoiseSVN_en.xml:12340(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 "" -#: source/TortoiseSVN_en.xml:12307(para) +#: source/TortoiseSVN_en.xml:12349(para) msgid "Group policy object" msgstr "" -#: source/TortoiseSVN_en.xml:12313(glossterm) +#: source/TortoiseSVN_en.xml:12355(glossterm) msgid "HEAD revision" msgstr "" -#: source/TortoiseSVN_en.xml:12315(para) +#: source/TortoiseSVN_en.xml:12357(para) msgid "The latest revision of a file or folder in the repository." msgstr "" -#: source/TortoiseSVN_en.xml:12323(para) +#: source/TortoiseSVN_en.xml:12365(para) msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." msgstr "" -#: source/TortoiseSVN_en.xml:12330(glossterm) +#: source/TortoiseSVN_en.xml:12372(glossterm) msgid "Lock" msgstr "" -#: source/TortoiseSVN_en.xml:12332(para) +#: source/TortoiseSVN_en.xml:12374(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:12340(glossterm) +#: source/TortoiseSVN_en.xml:12382(glossterm) msgid "Log" msgstr "" -#: source/TortoiseSVN_en.xml:12342(para) +#: source/TortoiseSVN_en.xml:12384(para) msgid "Show the revision history of a file or folder. Also known as History." msgstr "" -#: source/TortoiseSVN_en.xml:12349(glossterm) +#: source/TortoiseSVN_en.xml:12391(glossterm) msgid "History" msgstr "" -#: source/TortoiseSVN_en.xml:12351(para) +#: source/TortoiseSVN_en.xml:12393(para) msgid "Show the revision history of a file or folder. Also known as Log." msgstr "" -#: source/TortoiseSVN_en.xml:12360(para) +#: source/TortoiseSVN_en.xml:12402(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:12366(para) +#: source/TortoiseSVN_en.xml:12408(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 "" -#: source/TortoiseSVN_en.xml:12374(glossterm) +#: source/TortoiseSVN_en.xml:12416(glossterm) msgid "Patch" msgstr "" -#: source/TortoiseSVN_en.xml:12376(para) +#: source/TortoiseSVN_en.xml:12418(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 "" -#: source/TortoiseSVN_en.xml:12389(glossterm) +#: source/TortoiseSVN_en.xml:12431(glossterm) msgid "Property" msgstr "" -#: source/TortoiseSVN_en.xml:12391(para) +#: source/TortoiseSVN_en.xml:12433(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 "" -#: source/TortoiseSVN_en.xml:12406(para) +#: source/TortoiseSVN_en.xml:12448(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/TortoiseSVN_en.xml:12412(para) +#: source/TortoiseSVN_en.xml:12454(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/TortoiseSVN_en.xml:12423(para) +#: source/TortoiseSVN_en.xml:12465(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:12432(glossterm) +#: source/TortoiseSVN_en.xml:12474(glossterm) msgid "Resolve" msgstr "" -#: source/TortoiseSVN_en.xml:12434(para) +#: source/TortoiseSVN_en.xml:12476(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 "" -#: source/TortoiseSVN_en.xml:12446(para) +#: source/TortoiseSVN_en.xml:12488(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 "" -#: source/TortoiseSVN_en.xml:12455(glossterm) +#: source/TortoiseSVN_en.xml:12497(glossterm) msgid "Revision" msgstr "" -#: source/TortoiseSVN_en.xml:12457(para) +#: source/TortoiseSVN_en.xml:12499(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 "" -#: source/TortoiseSVN_en.xml:12464(para) +#: source/TortoiseSVN_en.xml:12506(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:12471(glossterm) +#: source/TortoiseSVN_en.xml:12513(glossterm) msgid "Revision Property (revprop)" msgstr "" -#: source/TortoiseSVN_en.xml:12473(para) +#: source/TortoiseSVN_en.xml:12515(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 "" -#: source/TortoiseSVN_en.xml:12485(glossterm) +#: source/TortoiseSVN_en.xml:12527(glossterm) msgid "SVN" msgstr "" -#: source/TortoiseSVN_en.xml:12487(para) +#: source/TortoiseSVN_en.xml:12529(para) msgid "A frequently-used abbreviation for Subversion." msgstr "" -#: source/TortoiseSVN_en.xml:12490(para) +#: source/TortoiseSVN_en.xml:12532(para) msgid "The name of the Subversion custom protocol used by the svnserve repository server." msgstr "" -#: source/TortoiseSVN_en.xml:12499(para) +#: source/TortoiseSVN_en.xml:12541(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/TortoiseSVN_en.xml:12513(para) +#: source/TortoiseSVN_en.xml:12555(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:12521(glossterm) +#: source/TortoiseSVN_en.xml:12563(glossterm) msgid "Working Copy" msgstr "" -#: source/TortoiseSVN_en.xml:12523(para) +#: source/TortoiseSVN_en.xml:12565(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 "" diff --git a/tortoisesvn/doc/po/TortoiseSVN_zh_CN.po b/tortoisesvn/doc/po/TortoiseSVN_zh_CN.po index 1c178f6..afd0c6d 100644 --- a/tortoisesvn/doc/po/TortoiseSVN_zh_CN.po +++ b/tortoisesvn/doc/po/TortoiseSVN_zh_CN.po @@ -27,7 +27,7 @@ msgid "" msgstr "" "Project-Id-Version: TortoiseSVN Documentation\n" -"POT-Creation-Date: 2007-05-05 22:50 +0000\n" +"POT-Creation-Date: 2007-05-12 21:53 +0000\n" "PO-Revision-Date: 2007-05-09 13:36+0800\n" "Last-Translator: Dongsheng Song \n" "Language-Team: TortoiseSVN translation team \n" @@ -839,7 +839,7 @@ msgid "Revisions" msgstr "修订版本" #: source/TortoiseSVN_en.xml:1221(primary) -#: source/TortoiseSVN_en.xml:8171(primary) +#: source/TortoiseSVN_en.xml:8198(primary) msgid "revision" msgstr "修订版本" @@ -1138,7 +1138,7 @@ msgstr "" "LoadModule authz_svn_module modules/mod_authz_svn.so\n" "" -#: source/TortoiseSVN_en.xml:1681(title) source/TortoiseSVN_en.xml:9963(term) +#: source/TortoiseSVN_en.xml:1681(title) source/TortoiseSVN_en.xml:10005(term) msgid "Configuration" msgstr "配置" @@ -2524,8 +2524,8 @@ msgid "right drag" msgstr "右键拖动" #: source/TortoiseSVN_en.xml:3319(primary) -#: source/TortoiseSVN_en.xml:6839(primary) -#: source/TortoiseSVN_en.xml:7970(primary) +#: source/TortoiseSVN_en.xml:6866(primary) +#: source/TortoiseSVN_en.xml:7997(primary) msgid "copy" msgstr "复制" @@ -2634,7 +2634,7 @@ msgid "import" msgstr "导入" #: source/TortoiseSVN_en.xml:3465(primary) -#: source/TortoiseSVN_en.xml:12421(glossterm) +#: source/TortoiseSVN_en.xml:12463(glossterm) msgid "Repository" msgstr "版本库" @@ -2772,8 +2772,8 @@ msgid "You can also use the repository browser to create new folders directly in msgstr "你还可以使用版本库浏览器直接在版本库中创建文件夹。" #: source/TortoiseSVN_en.xml:3605(title) -#: source/TortoiseSVN_en.xml:12082(title) -#: source/TortoiseSVN_en.xml:12321(glossterm) +#: source/TortoiseSVN_en.xml:12124(title) +#: source/TortoiseSVN_en.xml:12363(glossterm) msgid "Import" msgstr "导入" @@ -2903,11 +2903,11 @@ msgstr "" "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:3816(para) source/TortoiseSVN_en.xml:10907(para) +#: source/TortoiseSVN_en.xml:3816(para) source/TortoiseSVN_en.xml:10949(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:3821(para) source/TortoiseSVN_en.xml:10912(para) +#: source/TortoiseSVN_en.xml:3821(para) source/TortoiseSVN_en.xml:10954(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 "如果外部工程位于不同的版本库，当你向主项目提交你的修改时，你对外部工程做的修改会被通报，但是你必须单独的提交这些外部项目的修改。" @@ -3204,7 +3204,7 @@ msgid "Update Your Working Copy With Changes From Others" msgstr "用来自别人的修改更新你的工作副本" #: source/TortoiseSVN_en.xml:4291(primary) -#: source/TortoiseSVN_en.xml:10652(primary) +#: source/TortoiseSVN_en.xml:10694(primary) msgid "update" msgstr "更新" @@ -3464,7 +3464,7 @@ msgid "modifications" msgstr "修改" #: source/TortoiseSVN_en.xml:4748(title) -#: source/TortoiseSVN_en.xml:11846(title) +#: source/TortoiseSVN_en.xml:11888(title) msgid "Check for Modifications" msgstr "检查所作的修改" @@ -3744,7 +3744,7 @@ msgstr "显示选中版本中的选中文件的差异。这个操作只对显示 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:5262(para) source/TortoiseSVN_en.xml:8004(para) +#: source/TortoiseSVN_en.xml:5262(para) source/TortoiseSVN_en.xml:8031(para) msgid "Open the selected file, either with the default viewer for that file type, or with a program you choose." msgstr "用默认查看器或你指定的程序打开选中文件的选中版本。" @@ -4533,7 +4533,7 @@ msgstr "恢复对话框" 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:6494(para) source/TortoiseSVN_en.xml:7686(para) +#: source/TortoiseSVN_en.xml:6494(para) source/TortoiseSVN_en.xml:7713(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 "在这一对话框中，纵列和在 检查修改对话框中的纵列同样是可以定制的。更多细节请阅读 " @@ -4546,8 +4546,8 @@ msgid "Revert will only undo msgstr "Revert仅能撤消你本地的变更。他不能撤消已经提交的的变更。如果你想撤消所有的包括已经提交到一个特定版本的变更，请阅读 获得更多信息。" #: source/TortoiseSVN_en.xml:6513(title) -#: source/TortoiseSVN_en.xml:11951(title) -#: source/TortoiseSVN_en.xml:12214(glossterm) +#: source/TortoiseSVN_en.xml:11993(title) +#: source/TortoiseSVN_en.xml:12256(glossterm) msgid "Cleanup" msgstr "清理" @@ -4688,18 +4688,26 @@ msgid "tsvn:logtemplate is used with projects which have rule msgstr "tsvn:logtemplate在需要定义日志消息格式化规则的工程中使用。在你开始提交时，这个属性的多行消息会被插入日志消息编辑框。你可以编辑它以便包含需要的信息。注意: 如果你使用了tsvn:logminsize属性，请确认这个长度大于模版的长度，不然就会失去其保护作用。" #: source/TortoiseSVN_en.xml:6741(para) +msgid "Subversion allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their subversion config file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files." +msgstr "" + +#: source/TortoiseSVN_en.xml:6750(para) +msgid "If there is a conflict between the local autoprops and tsvn:autoprops, the project settings take precedence because they are specific to that project." +msgstr "" + +#: source/TortoiseSVN_en.xml:6757(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:6752(para) +#: source/TortoiseSVN_en.xml:6768(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:6766(para) +#: source/TortoiseSVN_en.xml:6782(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:6774(para) +#: source/TortoiseSVN_en.xml:6790(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创建自定义属性列表。对目录应用这些属性，当你编辑其任何子项属性时，你自定义的属性将会在预定义属性名称列表中出现。" @@ -4707,68 +4715,72 @@ msgstr "当你想增加新属性时，你可以从组合框的下拉列表选取 msgid "TortoiseSVN has a few special properties of its own, and these begin with tsvn:. " msgstr "TortoiseSVN 有自己专用的几个属性，它们都有tsvn:前缀。" -#: source/TortoiseSVN_en.xml:6790(para) source/TortoiseSVN_en.xml:8683(para) +#: source/TortoiseSVN_en.xml:6806(para) source/TortoiseSVN_en.xml:8710(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:6797(title) +#: source/TortoiseSVN_en.xml:6813(title) msgid "Set the tsvn: properties on folders" msgstr "设置文件夹的 tsvn: 属性" -#: source/TortoiseSVN_en.xml:6798(para) +#: source/TortoiseSVN_en.xml:6814(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:6812(para) source/TortoiseSVN_en.xml:8705(para) -#: source/TortoiseSVN_en.xml:8807(para) +#: source/TortoiseSVN_en.xml:6828(para) source/TortoiseSVN_en.xml:8732(para) +#: source/TortoiseSVN_en.xml:8834(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:6819(para) +#: source/TortoiseSVN_en.xml:6835(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:6824(para) +#: source/TortoiseSVN_en.xml:6840(para) msgid "It can also integrate with some web-based repository browsers. Read for further information." msgstr "它也与一些基于WEB的版本库浏览器集成。阅读以获得更多信息。" -#: source/TortoiseSVN_en.xml:6831(title) +#: source/TortoiseSVN_en.xml:6845(para) +msgid "Although the tsvn:xxx properties are extremely useful, they only work with TortoiseSVN, and some will only work in newer versions of TortoiseSVN. If people working on your project use a variety of Subversion clients, or possibly have old versions of TortoiseSVN, you may want to use repository hooks to enforce project policies. tsvn: properties can only help to implement a policy, they cannot enforce it." +msgstr "" + +#: source/TortoiseSVN_en.xml:6858(title) msgid "Branching / Tagging" msgstr "分支/标记" -#: source/TortoiseSVN_en.xml:6833(primary) +#: source/TortoiseSVN_en.xml:6860(primary) msgid "branch" msgstr "分支" -#: source/TortoiseSVN_en.xml:6836(primary) +#: source/TortoiseSVN_en.xml:6863(primary) msgid "tag" msgstr "标记" -#: source/TortoiseSVN_en.xml:6842(para) +#: source/TortoiseSVN_en.xml:6869(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:6852(para) +#: source/TortoiseSVN_en.xml:6879(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:6858(para) +#: source/TortoiseSVN_en.xml:6885(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:6868(title) +#: source/TortoiseSVN_en.xml:6895(title) msgid "Creating a Branch or Tag" msgstr "创建一个分支或标记" -#: source/TortoiseSVN_en.xml:6873(title) +#: source/TortoiseSVN_en.xml:6900(title) msgid "The Branch/Tag Dialog" msgstr "分支/标记对话框" -#: source/TortoiseSVN_en.xml:6869(para) +#: source/TortoiseSVN_en.xml:6896(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:6883(para) +#: source/TortoiseSVN_en.xml:6910(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" @@ -4782,149 +4794,149 @@ msgstr "" " http://svn.collab.net/repos/ProjectName/tags/Release_1.10\n" "如果你忘记了你上一次使用的命名约定，可以用鼠标右键打开版本库浏览器来察看已经存在的版本库结构。" -#: source/TortoiseSVN_en.xml:6904(term) -#: source/TortoiseSVN_en.xml:11997(listitem) +#: source/TortoiseSVN_en.xml:6931(term) +#: source/TortoiseSVN_en.xml:12039(listitem) msgid "HEAD revision in the repository" msgstr "版本库中的最新版本" -#: source/TortoiseSVN_en.xml:6906(para) +#: source/TortoiseSVN_en.xml:6933(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:6915(term) +#: source/TortoiseSVN_en.xml:6942(term) msgid "Specific revision in the repository" msgstr "在版本库中指定具体的版本" -#: source/TortoiseSVN_en.xml:6917(para) +#: source/TortoiseSVN_en.xml:6944(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:6930(term) -#: source/TortoiseSVN_en.xml:11999(listitem) +#: source/TortoiseSVN_en.xml:6957(term) +#: source/TortoiseSVN_en.xml:12041(listitem) msgid "Working copy" msgstr "工作副本" -#: source/TortoiseSVN_en.xml:6932(para) +#: source/TortoiseSVN_en.xml:6959(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:6899(para) +#: source/TortoiseSVN_en.xml:6926(para) msgid "Now you have to select the source of the copy. Here you have three options: " msgstr "现在你必须选择要复制的源位置。在这里你有三个设置选项: " -#: source/TortoiseSVN_en.xml:6945(para) +#: source/TortoiseSVN_en.xml:6972(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:6953(para) +#: source/TortoiseSVN_en.xml:6980(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:6958(para) +#: source/TortoiseSVN_en.xml:6985(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:6966(title) +#: source/TortoiseSVN_en.xml:6993(title) msgid "To Checkout or to Switch..." msgstr "检出或者切换" -#: source/TortoiseSVN_en.xml:6969(primary) +#: source/TortoiseSVN_en.xml:6996(primary) msgid "switch" msgstr "切换" -#: source/TortoiseSVN_en.xml:6971(para) +#: source/TortoiseSVN_en.xml:6998(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:6987(para) +#: source/TortoiseSVN_en.xml:7014(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:6999(para) +#: source/TortoiseSVN_en.xml:7026(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:7009(para) +#: source/TortoiseSVN_en.xml:7036(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:7017(para) +#: source/TortoiseSVN_en.xml:7044(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:7028(title) +#: source/TortoiseSVN_en.xml:7055(title) msgid "The Switch Dialog" msgstr "切换对话框" -#: source/TortoiseSVN_en.xml:6982(para) +#: source/TortoiseSVN_en.xml:7009(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:7037(para) +#: source/TortoiseSVN_en.xml:7064(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:7053(para) +#: source/TortoiseSVN_en.xml:7080(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:7063(para) +#: source/TortoiseSVN_en.xml:7090(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:7032(para) +#: source/TortoiseSVN_en.xml:7059(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:7076(title) +#: source/TortoiseSVN_en.xml:7103(title) msgid "Merging" msgstr "正在合并" -#: source/TortoiseSVN_en.xml:7079(primary) +#: source/TortoiseSVN_en.xml:7106(primary) msgid "merge" msgstr "合并" -#: source/TortoiseSVN_en.xml:7081(para) +#: source/TortoiseSVN_en.xml:7108(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:7086(para) +#: source/TortoiseSVN_en.xml:7113(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:7096(para) +#: source/TortoiseSVN_en.xml:7123(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:7109(para) +#: source/TortoiseSVN_en.xml:7136(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:7116(para) +#: source/TortoiseSVN_en.xml:7143(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:7121(title) +#: source/TortoiseSVN_en.xml:7148(title) msgid "Merging a Range of Revisions" msgstr "合并指定版本范围" -#: source/TortoiseSVN_en.xml:7122(para) +#: source/TortoiseSVN_en.xml:7149(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:7129(title) +#: source/TortoiseSVN_en.xml:7156(title) msgid "The Merge Dialog" msgstr "合并对话框" -#: source/TortoiseSVN_en.xml:7142(para) +#: source/TortoiseSVN_en.xml:7169(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:7155(para) +#: source/TortoiseSVN_en.xml:7182(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:7163(para) +#: source/TortoiseSVN_en.xml:7190(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" @@ -4948,1532 +4960,1541 @@ msgstr "" " ...\n" "如果你要将 MyBranch 的修改合并到 trunk，应该选择36作为开始版本，而不是象你想的是37。如果你选择37作为开始点，那么差异引擎将会比较结束点与版本37比较，这就丢失了版本37做的修改。如果这听起来很复杂，不要担心，在TortoiseSVN中有更简单的方法 ..." -#: source/TortoiseSVN_en.xml:7191(para) +#: source/TortoiseSVN_en.xml:7218(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:7204(para) +#: source/TortoiseSVN_en.xml:7231(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:7212(para) +#: source/TortoiseSVN_en.xml:7239(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:7225(para) +#: source/TortoiseSVN_en.xml:7252(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:7233(para) +#: source/TortoiseSVN_en.xml:7260(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:7241(para) source/TortoiseSVN_en.xml:7345(para) -#: source/TortoiseSVN_en.xml:10791(para) +#: source/TortoiseSVN_en.xml:7268(para) source/TortoiseSVN_en.xml:7372(para) +#: source/TortoiseSVN_en.xml:10833(para) msgid "Click OK to complete the merge." msgstr "点击合并按钮完成合并。" -#: source/TortoiseSVN_en.xml:7127(para) +#: source/TortoiseSVN_en.xml:7154(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:7250(para) +#: source/TortoiseSVN_en.xml:7277(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:7263(para) +#: source/TortoiseSVN_en.xml:7290(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:7270(para) +#: source/TortoiseSVN_en.xml:7297(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:7280(title) +#: source/TortoiseSVN_en.xml:7307(title) msgid "Merging Two Different Trees" msgstr "合并两个不同的目录树" -#: source/TortoiseSVN_en.xml:7281(para) +#: source/TortoiseSVN_en.xml:7308(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:7302(para) +#: source/TortoiseSVN_en.xml:7329(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:7313(para) +#: source/TortoiseSVN_en.xml:7340(para) msgid "Because you are comparing two different trees, make sure the Use \"From:\" URL checkbox is not checked." msgstr "因为你在比较两个不同的树，确认没有选择使用 \"开始:\" 路径检查框。" -#: source/TortoiseSVN_en.xml:7320(para) +#: source/TortoiseSVN_en.xml:7347(para) msgid "In the To: field enter the full folder url of the feature branch." msgstr "在结束:域输入关注的分支中文件夹的全路径。" -#: source/TortoiseSVN_en.xml:7326(para) +#: source/TortoiseSVN_en.xml:7353(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:7336(para) +#: source/TortoiseSVN_en.xml:7363(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:7291(para) +#: source/TortoiseSVN_en.xml:7318(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:7351(para) +#: source/TortoiseSVN_en.xml:7378(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:7359(title) +#: source/TortoiseSVN_en.xml:7386(title) msgid "Previewing Merge Results" msgstr "预览合并结果" -#: source/TortoiseSVN_en.xml:7360(para) +#: source/TortoiseSVN_en.xml:7387(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:7365(para) +#: source/TortoiseSVN_en.xml:7392(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:7372(para) +#: source/TortoiseSVN_en.xml:7399(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:7381(para) +#: source/TortoiseSVN_en.xml:7408(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:7389(title) +#: source/TortoiseSVN_en.xml:7416(title) msgid "Ignoring Ancestry" msgstr "忽略祖先" -#: source/TortoiseSVN_en.xml:7390(para) +#: source/TortoiseSVN_en.xml:7417(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:7410(title) +#: source/TortoiseSVN_en.xml:7437(title) msgid "Locking" msgstr "锁" -#: source/TortoiseSVN_en.xml:7412(primary) +#: source/TortoiseSVN_en.xml:7439(primary) msgid "locking" msgstr "加锁" -#: source/TortoiseSVN_en.xml:7422(para) +#: source/TortoiseSVN_en.xml:7449(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:7430(para) +#: source/TortoiseSVN_en.xml:7457(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:7414(para) +#: source/TortoiseSVN_en.xml:7441(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:7438(para) +#: source/TortoiseSVN_en.xml:7465(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:7445(title) +#: source/TortoiseSVN_en.xml:7472(title) msgid "How Locking Works in Subversion" msgstr "锁定在Subverion中是如何工作的" -#: source/TortoiseSVN_en.xml:7446(para) +#: source/TortoiseSVN_en.xml:7473(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:7452(para) +#: source/TortoiseSVN_en.xml:7479(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:7459(para) +#: source/TortoiseSVN_en.xml:7486(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:7475(para) +#: source/TortoiseSVN_en.xml:7502(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:7481(para) +#: source/TortoiseSVN_en.xml:7508(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:7491(para) +#: source/TortoiseSVN_en.xml:7518(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:7500(title) +#: source/TortoiseSVN_en.xml:7527(title) msgid "Getting a Lock" msgstr "取得锁定" -#: source/TortoiseSVN_en.xml:7509(title) +#: source/TortoiseSVN_en.xml:7536(title) msgid "The Locking Dialog" msgstr "锁定对话框" -#: source/TortoiseSVN_en.xml:7501(para) +#: source/TortoiseSVN_en.xml:7528(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:7521(para) +#: source/TortoiseSVN_en.xml:7548(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:7535(title) +#: source/TortoiseSVN_en.xml:7562(title) msgid "Releasing a Lock" msgstr "释放锁定" -#: source/TortoiseSVN_en.xml:7536(para) +#: source/TortoiseSVN_en.xml:7563(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:7547(para) +#: source/TortoiseSVN_en.xml:7574(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:7560(title) +#: source/TortoiseSVN_en.xml:7587(title) msgid "Checking Lock Status" msgstr "检查锁定状态" -#: source/TortoiseSVN_en.xml:7563(title) +#: source/TortoiseSVN_en.xml:7590(title) msgid "The Check for Modifications Dialog" msgstr "检查修改对话框" -#: source/TortoiseSVN_en.xml:7561(para) +#: source/TortoiseSVN_en.xml:7588(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:7576(para) +#: source/TortoiseSVN_en.xml:7603(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:7581(title) +#: source/TortoiseSVN_en.xml:7608(title) msgid "Avoid Breaking and Stealing Locks" msgstr "避免破坏和窃取锁定" -#: source/TortoiseSVN_en.xml:7582(para) +#: source/TortoiseSVN_en.xml:7609(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:7594(title) +#: source/TortoiseSVN_en.xml:7621(title) msgid "Making Non-locked Files Read-Only" msgstr "让非锁定的文件变成只读" -#: source/TortoiseSVN_en.xml:7595(para) +#: source/TortoiseSVN_en.xml:7622(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:7605(para) +#: source/TortoiseSVN_en.xml:7632(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:7613(title) +#: source/TortoiseSVN_en.xml:7640(title) msgid "The Locking Hook Scripts" msgstr "锁定钩子脚本" -#: source/TortoiseSVN_en.xml:7614(para) +#: source/TortoiseSVN_en.xml:7641(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:7620(para) +#: source/TortoiseSVN_en.xml:7647(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:7628(para) +#: source/TortoiseSVN_en.xml:7655(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:7634(para) +#: source/TortoiseSVN_en.xml:7661(para) msgid "Read to find out more." msgstr "更多内容请参考 " -#: source/TortoiseSVN_en.xml:7640(title) +#: source/TortoiseSVN_en.xml:7667(title) msgid "Creating and Applying Patches" msgstr "创建并应用补丁" -#: source/TortoiseSVN_en.xml:7642(primary) +#: source/TortoiseSVN_en.xml:7669(primary) msgid "patch" msgstr "补丁" -#: source/TortoiseSVN_en.xml:7646(para) +#: source/TortoiseSVN_en.xml:7673(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:7657(para) +#: source/TortoiseSVN_en.xml:7684(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:7662(title) +#: source/TortoiseSVN_en.xml:7689(title) msgid "Creating a Patch File" msgstr "创建一个补丁文件" -#: source/TortoiseSVN_en.xml:7663(para) +#: source/TortoiseSVN_en.xml:7690(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:7677(title) +#: source/TortoiseSVN_en.xml:7704(title) msgid "The Create Patch dialog" msgstr "创建补丁的对话框" -#: source/TortoiseSVN_en.xml:7680(para) +#: source/TortoiseSVN_en.xml:7707(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:7691(para) +#: source/TortoiseSVN_en.xml:7718(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:7697(para) +#: source/TortoiseSVN_en.xml:7724(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:7704(para) +#: source/TortoiseSVN_en.xml:7731(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:7713(title) +#: source/TortoiseSVN_en.xml:7740(title) msgid "Applying a Patch File" 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." +#: source/TortoiseSVN_en.xml:7741(para) +#, fuzzy +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 doc/source/ 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:7728(para) +#: source/TortoiseSVN_en.xml:7755(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) +#: source/TortoiseSVN_en.xml:7762(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:7749(para) +#: source/TortoiseSVN_en.xml:7776(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:7759(para) +#: source/TortoiseSVN_en.xml:7786(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:7764(para) +#: source/TortoiseSVN_en.xml:7791(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:7771(para) +#: source/TortoiseSVN_en.xml:7798(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:7779(title) +#: source/TortoiseSVN_en.xml:7806(title) msgid "Who Changed Which Line?" msgstr "谁修改了哪一行？" -#: source/TortoiseSVN_en.xml:7781(primary) +#: source/TortoiseSVN_en.xml:7808(primary) msgid "blame" msgstr "追溯" -#: source/TortoiseSVN_en.xml:7784(primary) +#: source/TortoiseSVN_en.xml:7811(primary) msgid "annotate" msgstr "评注" -#: source/TortoiseSVN_en.xml:7787(primary) +#: source/TortoiseSVN_en.xml:7814(primary) msgid "praise" msgstr "称赞" -#: source/TortoiseSVN_en.xml:7790(para) +#: source/TortoiseSVN_en.xml:7817(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:7800(para) +#: source/TortoiseSVN_en.xml:7827(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:7805(title) +#: source/TortoiseSVN_en.xml:7832(title) msgid "Blame for Files" msgstr "追溯文件" -#: source/TortoiseSVN_en.xml:7808(title) +#: source/TortoiseSVN_en.xml:7835(title) msgid "The Annotate / Blame Dialog" msgstr "评注/追溯对话框" -#: source/TortoiseSVN_en.xml:7806(para) +#: source/TortoiseSVN_en.xml:7833(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:7815(para) +#: source/TortoiseSVN_en.xml:7842(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:7821(para) +#: source/TortoiseSVN_en.xml:7848(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:7831(title) +#: source/TortoiseSVN_en.xml:7858(title) msgid "TortoiseBlame" msgstr "TortoiseBlame" -#: source/TortoiseSVN_en.xml:7829(para) +#: source/TortoiseSVN_en.xml:7856(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:7842(para) +#: source/TortoiseSVN_en.xml:7869(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:7849(para) +#: source/TortoiseSVN_en.xml:7876(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:7855(para) +#: source/TortoiseSVN_en.xml:7882(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:7865(para) +#: source/TortoiseSVN_en.xml:7892(para) msgid "You can also jump to a specific line number using EditGo To Line...." msgstr "你也可以使用 编辑转到行 ... 来跳到指定行。" -#: source/TortoiseSVN_en.xml:7872(para) +#: source/TortoiseSVN_en.xml:7899(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:7894(para) +#: source/TortoiseSVN_en.xml:7921(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:7901(title) source/TortoiseSVN_en.xml:7926(term) +#: source/TortoiseSVN_en.xml:7928(title) source/TortoiseSVN_en.xml:7953(term) msgid "Blame Differences" msgstr "追溯不同点" -#: source/TortoiseSVN_en.xml:7902(para) +#: source/TortoiseSVN_en.xml:7929(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:7912(term) +#: source/TortoiseSVN_en.xml:7939(term) msgid "Blame Revisions" msgstr "追溯版本" -#: source/TortoiseSVN_en.xml:7914(para) +#: source/TortoiseSVN_en.xml:7941(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:7928(para) +#: source/TortoiseSVN_en.xml:7955(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:7942(term) +#: source/TortoiseSVN_en.xml:7969(term) msgid "Compare and Blame with Working BASE" msgstr "与工作副本比较并追溯" -#: source/TortoiseSVN_en.xml:7944(para) +#: source/TortoiseSVN_en.xml:7971(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:7908(para) +#: source/TortoiseSVN_en.xml:7935(para) msgid "The revision log dialog includes several options which allow you to do this. " msgstr "在版本日志对话框里包含了以下几个选项支持你做这样的操作。" -#: source/TortoiseSVN_en.xml:7962(title) source/TortoiseSVN_en.xml:7980(title) +#: source/TortoiseSVN_en.xml:7989(title) source/TortoiseSVN_en.xml:8007(title) msgid "The Repository Browser" msgstr "版本库浏览器" -#: source/TortoiseSVN_en.xml:7964(primary) +#: source/TortoiseSVN_en.xml:7991(primary) msgid "repobrowser" msgstr "版本库浏览器" -#: source/TortoiseSVN_en.xml:7967(primary) +#: source/TortoiseSVN_en.xml:7994(primary) msgid "server-side actions" msgstr "服务器端动作" -#: source/TortoiseSVN_en.xml:7973(para) +#: source/TortoiseSVN_en.xml:8000(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:7986(para) +#: source/TortoiseSVN_en.xml:8013(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:7995(para) +#: source/TortoiseSVN_en.xml:8022(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:8010(para) +#: source/TortoiseSVN_en.xml:8037(para) msgid "Save an unversioned copy of the file to your hard drive." msgstr "在你的硬盘上保存此文件的一个未版本控制的副本。" -#: source/TortoiseSVN_en.xml:8015(para) +#: source/TortoiseSVN_en.xml:8042(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:8021(para) +#: source/TortoiseSVN_en.xml:8048(para) msgid "Blame the file, to see who changed which line and when." msgstr "追溯这个文件，查看是谁在何时修改哪些行。" -#: source/TortoiseSVN_en.xml:8026(para) +#: source/TortoiseSVN_en.xml:8053(para) msgid "Delete or rename the file." msgstr "删除或改名文件。" -#: source/TortoiseSVN_en.xml:8031(para) +#: source/TortoiseSVN_en.xml:8058(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) +#: source/TortoiseSVN_en.xml:8064(para) msgid "View the file's properties (you cannot edit properties directly in the repository)." msgstr "查看文件的属性(你不能直接在版本库编辑属性)。" -#: source/TortoiseSVN_en.xml:8000(para) +#: source/TortoiseSVN_en.xml:8027(para) msgid "The context menu for a file allows you to: " msgstr "" -#: source/TortoiseSVN_en.xml:8048(para) +#: source/TortoiseSVN_en.xml:8075(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:8054(para) +#: source/TortoiseSVN_en.xml:8081(para) msgid "Export the folder to a local unversioned copy on your hard drive." msgstr "" -#: source/TortoiseSVN_en.xml:8059(para) +#: source/TortoiseSVN_en.xml:8086(para) msgid "Checkout the folder to produce a local working copy on your hard drive." msgstr "" -#: source/TortoiseSVN_en.xml:8064(para) +#: source/TortoiseSVN_en.xml:8091(para) msgid "Create a new folder in the repository." msgstr "在版本库创建新目录。" -#: source/TortoiseSVN_en.xml:8069(para) +#: source/TortoiseSVN_en.xml:8096(para) msgid "Add files or folders directly to the repository." msgstr "直接向版本库增加文件或目录。" -#: source/TortoiseSVN_en.xml:8074(para) +#: source/TortoiseSVN_en.xml:8101(para) msgid "Delete or rename the folder." msgstr "删除或改名文件夹。" -#: source/TortoiseSVN_en.xml:8079(para) +#: source/TortoiseSVN_en.xml:8106(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:8085(para) +#: source/TortoiseSVN_en.xml:8112(para) msgid "View the folder's properties (you cannot edit properties directly in the repository)." msgstr "查看文件夹的属性(你不能直接在版本库编辑属性)。" -#: source/TortoiseSVN_en.xml:8091(para) +#: source/TortoiseSVN_en.xml:8118(para) msgid "Mark the folder for comparison. A marked folder is shown in bold." msgstr "" -#: source/TortoiseSVN_en.xml:8096(para) +#: source/TortoiseSVN_en.xml:8123(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:8044(para) +#: source/TortoiseSVN_en.xml:8071(para) msgid "The context menu for a folder allows you to: " msgstr "" -#: source/TortoiseSVN_en.xml:8105(para) +#: source/TortoiseSVN_en.xml:8132(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:8110(para) +#: source/TortoiseSVN_en.xml:8137(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:8114(para) +#: source/TortoiseSVN_en.xml:8141(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:8123(para) +#: source/TortoiseSVN_en.xml:8150(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:8130(para) +#: source/TortoiseSVN_en.xml:8157(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:8136(para) +#: source/TortoiseSVN_en.xml:8163(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:8142(para) +#: source/TortoiseSVN_en.xml:8169(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:8149(para) +#: source/TortoiseSVN_en.xml:8176(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:8154(para) +#: source/TortoiseSVN_en.xml:8181(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:8169(title) +#: source/TortoiseSVN_en.xml:8196(title) msgid "Revision Graphs" msgstr "版本分支图" -#: source/TortoiseSVN_en.xml:8174(primary) +#: source/TortoiseSVN_en.xml:8201(primary) msgid "graph" msgstr "分支" -#: source/TortoiseSVN_en.xml:8178(title) +#: source/TortoiseSVN_en.xml:8205(title) msgid "A Revision Graph" msgstr "一个版本分支" -#: source/TortoiseSVN_en.xml:8176(para) +#: source/TortoiseSVN_en.xml:8203(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:8189(para) +#: source/TortoiseSVN_en.xml:8216(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:8195(para) +#: source/TortoiseSVN_en.xml:8222(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:8208(term) +#: source/TortoiseSVN_en.xml:8235(term) msgid "Added file/folder" msgstr "增加文件/文件夹" -#: source/TortoiseSVN_en.xml:8210(para) +#: source/TortoiseSVN_en.xml:8237(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:8217(term) +#: source/TortoiseSVN_en.xml:8244(term) msgid "Deleted file/folder" msgstr "已删除文件/文件夹" -#: source/TortoiseSVN_en.xml:8219(para) +#: source/TortoiseSVN_en.xml:8246(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:8226(term) +#: source/TortoiseSVN_en.xml:8253(term) msgid "Branch tip revision" msgstr "分支最新版本" -#: source/TortoiseSVN_en.xml:8228(para) +#: source/TortoiseSVN_en.xml:8255(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:8237(term) +#: source/TortoiseSVN_en.xml:8264(term) msgid "Normal file/folder" msgstr "一般的文件/文件夹" -#: source/TortoiseSVN_en.xml:8239(para) +#: source/TortoiseSVN_en.xml:8266(para) msgid "All other items are shown using a plain rectangle." msgstr "其他一般的文件用plain rectangle标示。" -#: source/TortoiseSVN_en.xml:8204(para) +#: source/TortoiseSVN_en.xml:8231(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:8251(para) +#: source/TortoiseSVN_en.xml:8278(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:8258(para) +#: source/TortoiseSVN_en.xml:8285(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:8267(para) +#: source/TortoiseSVN_en.xml:8294(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:8273(para) +#: source/TortoiseSVN_en.xml:8300(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:8277(para) +#: source/TortoiseSVN_en.xml:8304(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:8284(para) +#: source/TortoiseSVN_en.xml:8311(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:8295(para) +#: source/TortoiseSVN_en.xml:8322(para) msgid "If you right click on a revision you can use Context MenuShow Log to view the history." msgstr "如果右击一个版本你可以使用右键菜单显示日志 来查看它的历史。" -#: source/TortoiseSVN_en.xml:8304(para) +#: source/TortoiseSVN_en.xml:8331(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:8313(title) +#: source/TortoiseSVN_en.xml:8340(title) msgid "Exporting a Subversion Working Copy" msgstr "导出一个Subversion工作副本" -#: source/TortoiseSVN_en.xml:8315(primary) +#: source/TortoiseSVN_en.xml:8342(primary) msgid "export" msgstr "导出" -#: source/TortoiseSVN_en.xml:8317(para) +#: source/TortoiseSVN_en.xml:8344(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:8332(title) +#: source/TortoiseSVN_en.xml:8359(title) msgid "The Export-from-URL Dialog" msgstr "从 URL 导出对话框" -#: source/TortoiseSVN_en.xml:8330(para) +#: source/TortoiseSVN_en.xml:8357(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:8342(para) +#: source/TortoiseSVN_en.xml:8369(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:8352(para) +#: source/TortoiseSVN_en.xml:8379(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:8362(para) +#: source/TortoiseSVN_en.xml:8389(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:8376(para) +#: source/TortoiseSVN_en.xml:8403(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:8385(title) +#: source/TortoiseSVN_en.xml:8412(title) msgid "Relocating a working copy" msgstr "重新定位工作副本" -#: source/TortoiseSVN_en.xml:8387(primary) +#: source/TortoiseSVN_en.xml:8414(primary) msgid "relocate" msgstr "重新定位" -#: source/TortoiseSVN_en.xml:8392(title) +#: source/TortoiseSVN_en.xml:8419(title) msgid "The Relocate Dialog" msgstr "重定位对话框" -#: source/TortoiseSVN_en.xml:8390(para) +#: source/TortoiseSVN_en.xml:8417(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:8416(para) +#: source/TortoiseSVN_en.xml:8443(para) msgid "The IP address of the server has changed." msgstr "服务器的IP地址已更改。" -#: source/TortoiseSVN_en.xml:8419(para) +#: source/TortoiseSVN_en.xml:8446(para) msgid "The protocol has changed (e.g. http:// to https://)." msgstr "协议已更改(比如从http://改为 https://)。" -#: source/TortoiseSVN_en.xml:8422(para) +#: source/TortoiseSVN_en.xml:8449(para) msgid "The repository root path in the server setup has changed." msgstr "版本库在服务器的路径已更改。" -#: source/TortoiseSVN_en.xml:8410(para) +#: source/TortoiseSVN_en.xml:8437(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:8433(para) +#: source/TortoiseSVN_en.xml:8460(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:8439(para) +#: source/TortoiseSVN_en.xml:8466(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:8429(para) +#: source/TortoiseSVN_en.xml:8456(para) msgid "It does not apply if: " msgstr "以下情况不支持: " -#: source/TortoiseSVN_en.xml:8451(para) +#: source/TortoiseSVN_en.xml:8478(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:8460(title) +#: source/TortoiseSVN_en.xml:8487(title) msgid "Integration with Bugtracking Systems / Issue trackers" msgstr "与 BUG 跟踪系统/问题跟踪集成" -#: source/TortoiseSVN_en.xml:8462(primary) +#: source/TortoiseSVN_en.xml:8489(primary) msgid "bugtracking" msgstr "BUG 跟踪" -#: source/TortoiseSVN_en.xml:8465(primary) +#: source/TortoiseSVN_en.xml:8492(primary) msgid "bugtracker" msgstr "BUG 跟踪者" -#: source/TortoiseSVN_en.xml:8468(primary) +#: source/TortoiseSVN_en.xml:8495(primary) msgid "issuetracker" msgstr "问题跟踪者" -#: source/TortoiseSVN_en.xml:8470(para) +#: source/TortoiseSVN_en.xml:8497(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:8483(para) +#: source/TortoiseSVN_en.xml:8510(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:8489(para) +#: source/TortoiseSVN_en.xml:8516(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:8496(para) +#: source/TortoiseSVN_en.xml:8523(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:8479(para) +#: source/TortoiseSVN_en.xml:8506(para) msgid "TortoiseSVN can help the user in two ways: " msgstr "TortoiseSVN可以在两个方面帮助用户: " -#: source/TortoiseSVN_en.xml:8504(para) +#: source/TortoiseSVN_en.xml:8531(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:8516(term) +#: source/TortoiseSVN_en.xml:8543(term) msgid "bugtraq:url" msgstr "bugtraq:url" -#: source/TortoiseSVN_en.xml:8518(para) +#: source/TortoiseSVN_en.xml:8545(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:8536(term) +#: source/TortoiseSVN_en.xml:8563(term) msgid "bugtraq:warnifnoissue" msgstr "bugtraq:warnifnoissue" -#: source/TortoiseSVN_en.xml:8538(para) +#: source/TortoiseSVN_en.xml:8565(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:8510(para) +#: source/TortoiseSVN_en.xml:8537(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:8557(term) +#: source/TortoiseSVN_en.xml:8584(term) msgid "bugtraq:message" msgstr "bugtraq:message" -#: source/TortoiseSVN_en.xml:8559(para) +#: source/TortoiseSVN_en.xml:8586(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:8580(term) +#: source/TortoiseSVN_en.xml:8607(term) msgid "bugtraq:append" msgstr "bugtraq:append" -#: source/TortoiseSVN_en.xml:8582(para) +#: source/TortoiseSVN_en.xml:8609(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:8595(term) +#: source/TortoiseSVN_en.xml:8622(term) msgid "bugtraq:label" msgstr "bugtraq:label" -#: source/TortoiseSVN_en.xml:8597(para) +#: source/TortoiseSVN_en.xml:8624(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:8609(term) +#: source/TortoiseSVN_en.xml:8636(term) msgid "bugtraq:number" msgstr "bugtraq:number" -#: source/TortoiseSVN_en.xml:8611(para) +#: source/TortoiseSVN_en.xml:8638(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:8551(para) +#: source/TortoiseSVN_en.xml:8578(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:8633(term) +#: source/TortoiseSVN_en.xml:8660(term) msgid "bugtraq:logregex" msgstr "bugtraq:logregex" -#: source/TortoiseSVN_en.xml:8635(para) +#: source/TortoiseSVN_en.xml:8662(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:8642(para) +#: source/TortoiseSVN_en.xml:8669(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:8647(para) +#: source/TortoiseSVN_en.xml:8674(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:8655(para) +#: source/TortoiseSVN_en.xml:8682(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:8661(para) +#: source/TortoiseSVN_en.xml:8688(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:8624(para) +#: source/TortoiseSVN_en.xml:8651(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:8672(para) +#: source/TortoiseSVN_en.xml:8699(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:8677(para) +#: source/TortoiseSVN_en.xml:8704(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:8690(title) source/TortoiseSVN_en.xml:8792(title) +#: source/TortoiseSVN_en.xml:8717(title) source/TortoiseSVN_en.xml:8819(title) msgid "Set the Properties on Folders" msgstr "设置文件夹的属性" -#: source/TortoiseSVN_en.xml:8691(para) source/TortoiseSVN_en.xml:8793(para) +#: source/TortoiseSVN_en.xml:8718(para) source/TortoiseSVN_en.xml:8820(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:8712(para) +#: source/TortoiseSVN_en.xml:8739(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:8721(title) +#: source/TortoiseSVN_en.xml:8748(title) msgid "Integration with Web-based Repository Viewers" msgstr "与基于 WEB 的版本库浏览器集成" -#: source/TortoiseSVN_en.xml:8723(primary) +#: source/TortoiseSVN_en.xml:8750(primary) msgid "webview" msgstr "webview" -#: source/TortoiseSVN_en.xml:8726(primary) +#: source/TortoiseSVN_en.xml:8753(primary) msgid "repoviewer" msgstr "版本库浏览器" -#: source/TortoiseSVN_en.xml:8728(para) +#: source/TortoiseSVN_en.xml:8755(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:8740(para) +#: source/TortoiseSVN_en.xml:8767(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:8748(term) +#: source/TortoiseSVN_en.xml:8775(term) msgid "webviewer:revision" msgstr "webviewer:revision" -#: source/TortoiseSVN_en.xml:8750(para) +#: source/TortoiseSVN_en.xml:8777(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:8767(term) +#: source/TortoiseSVN_en.xml:8794(term) msgid "webviewer:pathrevision" msgstr "webviewer:pathrevision" -#: source/TortoiseSVN_en.xml:8769(para) +#: source/TortoiseSVN_en.xml:8796(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:8816(title) +#: source/TortoiseSVN_en.xml:8843(title) msgid "TortoiseSVN's Settings" msgstr "TortoiseSVN的设置" -#: source/TortoiseSVN_en.xml:8818(primary) +#: source/TortoiseSVN_en.xml:8845(primary) msgid "settings" msgstr "设置" -#: source/TortoiseSVN_en.xml:8820(para) +#: source/TortoiseSVN_en.xml:8847(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:8829(title) +#: source/TortoiseSVN_en.xml:8856(title) msgid "General Settings" msgstr "常规设置" -#: source/TortoiseSVN_en.xml:8831(primary) +#: source/TortoiseSVN_en.xml:8858(primary) msgid "sounds" msgstr "声音" -#: source/TortoiseSVN_en.xml:8835(title) +#: source/TortoiseSVN_en.xml:8862(title) msgid "The Settings Dialog, General Page" msgstr "设置对话框，常规设置页面" -#: source/TortoiseSVN_en.xml:8833(para) +#: source/TortoiseSVN_en.xml:8860(para) msgid " This dialog allows you to specify your preferred language, and the Subversion-specific settings." msgstr " 这个对话框允许你指定自己喜欢的语言，同时也可做那些与Subversion相关的特殊设置。" -#: source/TortoiseSVN_en.xml:8843(term) +#: source/TortoiseSVN_en.xml:8870(term) msgid "Language" msgstr "语言" -#: source/TortoiseSVN_en.xml:8845(para) +#: source/TortoiseSVN_en.xml:8872(para) msgid "Selects your user interface language. What else did you expect?" msgstr "选择你TSVN的用户界面语言。不然你还期望从这里得到啥别的？" -#: source/TortoiseSVN_en.xml:8852(term) +#: source/TortoiseSVN_en.xml:8879(term) msgid "Automatically check for newer versions every week" msgstr "每周自动检查新版本" -#: source/TortoiseSVN_en.xml:8854(para) +#: source/TortoiseSVN_en.xml:8881(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:8865(term) +#: source/TortoiseSVN_en.xml:8892(term) msgid "System sounds" msgstr "系统声音" -#: source/TortoiseSVN_en.xml:8871(para) +#: source/TortoiseSVN_en.xml:8898(para) msgid "Error" msgstr "错误" -#: source/TortoiseSVN_en.xml:8876(para) +#: source/TortoiseSVN_en.xml:8903(para) msgid "Notice" msgstr "提示" -#: source/TortoiseSVN_en.xml:8881(para) +#: source/TortoiseSVN_en.xml:8908(para) msgid "Warning" msgstr "警告" -#: source/TortoiseSVN_en.xml:8867(para) +#: source/TortoiseSVN_en.xml:8894(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:8893(term) +#: source/TortoiseSVN_en.xml:8920(term) msgid "Global ignore pattern" msgstr "全局忽略样式" -#: source/TortoiseSVN_en.xml:8896(primary) +#: source/TortoiseSVN_en.xml:8923(primary) msgid "exclude pattern" msgstr "排斥样式" -#: source/TortoiseSVN_en.xml:8899(primary) +#: source/TortoiseSVN_en.xml:8926(primary) msgid "global ignore" msgstr "全局忽略" -#: source/TortoiseSVN_en.xml:8901(para) +#: source/TortoiseSVN_en.xml:8928(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:8915(para) +#: source/TortoiseSVN_en.xml:8942(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:8921(para) +#: source/TortoiseSVN_en.xml:8948(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:8929(para) +#: source/TortoiseSVN_en.xml:8956(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:8941(term) +#: source/TortoiseSVN_en.xml:8968(term) msgid "Set filedates to the \"last commit time\"" msgstr "将文件日期设置为“最后提交时间”" -#: source/TortoiseSVN_en.xml:8943(para) +#: source/TortoiseSVN_en.xml:8970(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:8957(term) +#: source/TortoiseSVN_en.xml:8984(term) msgid "Subversion configuration file" msgstr "Subversion配置文件" -#: source/TortoiseSVN_en.xml:8959(para) +#: source/TortoiseSVN_en.xml:8986(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:8984(term) +#: source/TortoiseSVN_en.xml:9011(term) msgid "Use \"_svn\" instead of \".svn\" directories" msgstr "使用“_svn”目录替代“.svn”目录" -#: source/TortoiseSVN_en.xml:8986(para) +#: source/TortoiseSVN_en.xml:9013(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:8993(para) +#: source/TortoiseSVN_en.xml:9020(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:8998(para) +#: source/TortoiseSVN_en.xml:9025(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:9009(title) +#: source/TortoiseSVN_en.xml:9036(title) msgid "Look and Feel Settings" msgstr "外观与样式设置" -#: source/TortoiseSVN_en.xml:9013(title) source/TortoiseSVN_en.xml:9094(title) +#: source/TortoiseSVN_en.xml:9040(title) source/TortoiseSVN_en.xml:9121(title) msgid "The Settings Dialog, Look and Feel Page" msgstr "设置对话框，外观与样式页面" -#: source/TortoiseSVN_en.xml:9011(para) +#: source/TortoiseSVN_en.xml:9038(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:9021(para) +#: source/TortoiseSVN_en.xml:9048(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:9031(para) +#: source/TortoiseSVN_en.xml:9058(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:9053(term) +#: source/TortoiseSVN_en.xml:9080(term) msgid "Unchecked (default)" msgstr "未勾选(默认)" -#: source/TortoiseSVN_en.xml:9055(para) +#: source/TortoiseSVN_en.xml:9082(para) msgid "In this state the menu items are all drawn by TortoiseSVN. No accelerator keys are shown." msgstr "这种状态下，菜单项全部是由TSVN画出的，不会显示任何快捷键。" -#: source/TortoiseSVN_en.xml:9062(term) +#: source/TortoiseSVN_en.xml:9089(term) msgid "Checked" msgstr "已勾选" -#: source/TortoiseSVN_en.xml:9064(para) +#: source/TortoiseSVN_en.xml:9091(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:9075(term) +#: source/TortoiseSVN_en.xml:9102(term) msgid "Indeterminate" msgstr "半勾选(灰色)" -#: source/TortoiseSVN_en.xml:9077(para) +#: source/TortoiseSVN_en.xml:9104(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:9048(para) +#: source/TortoiseSVN_en.xml:9075(para) msgid "The option Enable accelerators on the top level menu has three states: " msgstr "选项 使用顶级菜单的快捷键 有三种状态: " -#: source/TortoiseSVN_en.xml:9084(para) +#: source/TortoiseSVN_en.xml:9111(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:9090(title) +#: source/TortoiseSVN_en.xml:9117(title) msgid "Icon Overlay Settings" msgstr "图标叠加设置" -#: source/TortoiseSVN_en.xml:9092(para) +#: source/TortoiseSVN_en.xml:9119(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:9102(para) +#: source/TortoiseSVN_en.xml:9129(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:9107(para) +#: source/TortoiseSVN_en.xml:9134(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:9121(term) +#: source/TortoiseSVN_en.xml:9148(term) msgid "Default" msgstr "默认" -#: source/TortoiseSVN_en.xml:9123(para) +#: source/TortoiseSVN_en.xml:9150(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:9134(para) +#: source/TortoiseSVN_en.xml:9161(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:9142(para) +#: source/TortoiseSVN_en.xml:9169(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:9150(term) +#: source/TortoiseSVN_en.xml:9177(term) msgid "Shell" msgstr "Windows外壳" -#: source/TortoiseSVN_en.xml:9152(para) +#: source/TortoiseSVN_en.xml:9179(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:9158(para) +#: source/TortoiseSVN_en.xml:9185(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:9162(para) +#: source/TortoiseSVN_en.xml:9189(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:9172(term) +#: source/TortoiseSVN_en.xml:9199(term) msgid "None" msgstr "无" -#: source/TortoiseSVN_en.xml:9174(para) +#: source/TortoiseSVN_en.xml:9201(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:9181(para) +#: source/TortoiseSVN_en.xml:9208(para) msgid "Advantage: uses absolutely no additional memory and does not slow down the Explorer at all while browsing." msgstr "优点: 绝对不会占用任何额外的内存，也完全不会减慢浏览器的浏览速度。" -#: source/TortoiseSVN_en.xml:9185(para) +#: source/TortoiseSVN_en.xml:9212(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:9113(para) +#: source/TortoiseSVN_en.xml:9140(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:9194(para) +#: source/TortoiseSVN_en.xml:9221(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:9199(para) +#: source/TortoiseSVN_en.xml:9226(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:9207(para) +#: source/TortoiseSVN_en.xml:9234(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:9212(para) +#: source/TortoiseSVN_en.xml:9239(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:9219(para) +#: source/TortoiseSVN_en.xml:9246(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:9224(para) +#: source/TortoiseSVN_en.xml:9251(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:9231(title) +#: source/TortoiseSVN_en.xml:9258(title) msgid "Icon Set Selection" msgstr "图标集选择" -#: source/TortoiseSVN_en.xml:9235(title) +#: source/TortoiseSVN_en.xml:9262(title) msgid "The Settings Dialog, Icon Set Page" msgstr "设置对话框，图标集页面" -#: source/TortoiseSVN_en.xml:9233(para) +#: source/TortoiseSVN_en.xml:9260(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:9244(title) +#: source/TortoiseSVN_en.xml:9271(title) msgid "TortoiseSVN Dialog Settings 1" msgstr "TSVN对话框设置一" -#: source/TortoiseSVN_en.xml:9248(title) +#: source/TortoiseSVN_en.xml:9275(title) msgid "The Settings Dialog, Dialogs 1 Page" msgstr "设置对话框，对话框一页面" -#: source/TortoiseSVN_en.xml:9246(para) +#: source/TortoiseSVN_en.xml:9273(para) msgid " This dialog allows you to configure some of TortoiseSVN's dialogs the way you like them." msgstr " 此对话框允许你按照喜欢的方式去配置一些TSVN的对话框。" -#: source/TortoiseSVN_en.xml:9256(term) +#: source/TortoiseSVN_en.xml:9283(term) msgid "Default number of log messages" msgstr "默认的日志信息数" -#: source/TortoiseSVN_en.xml:9258(para) +#: source/TortoiseSVN_en.xml:9285(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:9272(term) +#: source/TortoiseSVN_en.xml:9299(term) msgid "Font for log messages" msgstr "日志信息字体" -#: source/TortoiseSVN_en.xml:9274(para) +#: source/TortoiseSVN_en.xml:9301(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:9283(term) +#: source/TortoiseSVN_en.xml:9310(term) msgid "Short date / time format in log messages" msgstr "日志信息使用短日期/时间格式" -#: source/TortoiseSVN_en.xml:9285(para) +#: source/TortoiseSVN_en.xml:9312(para) msgid "If the standard long messages use up too much space on your screen use the short format." msgstr "如果标准长度的日期/时间信息占在用了过多的屏幕空间，可以使用短格式。" -#: source/TortoiseSVN_en.xml:9292(term) +#: source/TortoiseSVN_en.xml:9319(term) msgid "Progress Dialog" msgstr "进程对话框" -#: source/TortoiseSVN_en.xml:9294(para) +#: source/TortoiseSVN_en.xml:9321(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:9305(para) +#: source/TortoiseSVN_en.xml:9332(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:9313(para) +#: source/TortoiseSVN_en.xml:9340(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:9321(para) +#: source/TortoiseSVN_en.xml:9348(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:9328(para) +#: source/TortoiseSVN_en.xml:9355(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:9340(term) +#: source/TortoiseSVN_en.xml:9367(term) msgid "Use URL of WC as the default \"From:\" URL" msgstr "使用工作副本的URL作为默认的来源URL" -#: source/TortoiseSVN_en.xml:9342(para) +#: source/TortoiseSVN_en.xml:9369(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:9354(term) +#: source/TortoiseSVN_en.xml:9381(term) msgid "Default checkout path" msgstr "缺省检出路径" -#: source/TortoiseSVN_en.xml:9356(para) +#: source/TortoiseSVN_en.xml:9383(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:9365(term) +#: source/TortoiseSVN_en.xml:9392(term) msgid "Default checkout URL" msgstr "缺省检出URL" -#: source/TortoiseSVN_en.xml:9367(para) +#: source/TortoiseSVN_en.xml:9394(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:9378(title) +#: source/TortoiseSVN_en.xml:9405(title) msgid "TortoiseSVN Dialog Settings 2" msgstr "TSVN对话框设置二" -#: source/TortoiseSVN_en.xml:9382(title) +#: source/TortoiseSVN_en.xml:9409(title) msgid "The Settings Dialog, Dialogs 2 Page" msgstr "设置对话框，对话框二页面" -#: source/TortoiseSVN_en.xml:9388(term) +#: source/TortoiseSVN_en.xml:9415(term) msgid "Recurse into unversioned folders" msgstr "递归处理未进行版本控制的文件夹" -#: source/TortoiseSVN_en.xml:9390(para) +#: source/TortoiseSVN_en.xml:9417(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:9404(term) +#: source/TortoiseSVN_en.xml:9431(term) msgid "Use autocompletion of filepaths and keywords" msgstr "自动完成文件路径和关键词" -#: source/TortoiseSVN_en.xml:9406(para) +#: source/TortoiseSVN_en.xml:9433(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:9416(term) +#: source/TortoiseSVN_en.xml:9443(term) msgid "Timeout in seconds to stop the autocompletion parsing" msgstr "对自动完成进行多长时间的分析(秒)" -#: source/TortoiseSVN_en.xml:9418(para) +#: source/TortoiseSVN_en.xml:9445(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:9427(term) +#: source/TortoiseSVN_en.xml:9454(term) msgid "Only use spellchecker when tsvn:projectlanguage is set" msgstr "仅在保留了 tsvn:projectlanguage 时才进行拼写检查" -#: source/TortoiseSVN_en.xml:9429(para) +#: source/TortoiseSVN_en.xml:9456(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:9437(term) +#: source/TortoiseSVN_en.xml:9464(term) msgid "Max. items to keep in the log message history" msgstr "日志中保留的最大条目数量" -#: source/TortoiseSVN_en.xml:9439(para) +#: source/TortoiseSVN_en.xml:9466(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:9448(term) +#: source/TortoiseSVN_en.xml:9475(term) msgid "Re-open commit dialog after a commit failed" msgstr "如果提交失败，自动重新打开提交对话框" -#: source/TortoiseSVN_en.xml:9450(para) +#: source/TortoiseSVN_en.xml:9477(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:9461(term) +#: source/TortoiseSVN_en.xml:9488(term) msgid "Contact the repository on startup" msgstr "启动时连接版本库" -#: source/TortoiseSVN_en.xml:9463(para) +#: source/TortoiseSVN_en.xml:9490(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:9473(term) -msgid "Sort items numerically" -msgstr "按数字顺序排序" +#: source/TortoiseSVN_en.xml:9500(term) +msgid "Show Lock dialog before locking files" +msgstr "" + +#: source/TortoiseSVN_en.xml:9502(para) +msgid "When you select one or more files and then use TortoiseSVNLock to take out a lock on those files, on some projects it is customary to write a lock message explaining why you have locked the files. If you do not use lock messages, you can uncheck this box to skip that dialog and lock the files immediately." +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:9514(para) +msgid "If you use the lock command on a folder, you are always presented with the lock dialog as that also gives you the option to select files for locking." +msgstr "" + +#: source/TortoiseSVN_en.xml:9519(para) +msgid "If your project is using the tsvn:lockmsgminsize property, you will see the lock dialog regardless of this setting because the project requires lock messages." +msgstr "" -#: source/TortoiseSVN_en.xml:9487(title) +#: source/TortoiseSVN_en.xml:9529(title) msgid "TortoiseSVN Colour Settings" msgstr "TortoiseSVN 颜色设置" -#: source/TortoiseSVN_en.xml:9491(title) +#: source/TortoiseSVN_en.xml:9533(title) msgid "The Settings Dialog, Colours Page" msgstr "设置对话框，颜色页面" -#: source/TortoiseSVN_en.xml:9489(para) +#: source/TortoiseSVN_en.xml:9531(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:9499(term) +#: source/TortoiseSVN_en.xml:9541(term) msgid "Possible or real conflict / obstructed" msgstr "可能或确实有冲突/有问题" -#: source/TortoiseSVN_en.xml:9501(para) +#: source/TortoiseSVN_en.xml:9543(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:9506(para) +#: source/TortoiseSVN_en.xml:9548(para) msgid "This colour is also used for error messages in the progress dialogs." msgstr "此颜色同样被用在进程对话框的错误信息中。" -#: source/TortoiseSVN_en.xml:9512(term) +#: source/TortoiseSVN_en.xml:9554(term) msgid "Added files" msgstr "添加文件" -#: source/TortoiseSVN_en.xml:9514(para) +#: source/TortoiseSVN_en.xml:9556(para) msgid "Items added to the repository." msgstr "向版本库添加的条目。" -#: source/TortoiseSVN_en.xml:9520(term) +#: source/TortoiseSVN_en.xml:9562(term) msgid "Missing / deleted / replaced" msgstr "丢失/已删除/已替换" -#: source/TortoiseSVN_en.xml:9522(para) +#: source/TortoiseSVN_en.xml:9564(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:9530(term) +#: source/TortoiseSVN_en.xml:9572(term) msgid "Merged" msgstr "合并" -#: source/TortoiseSVN_en.xml:9532(para) +#: source/TortoiseSVN_en.xml:9574(para) msgid "Changes from the repository successfully merged into the WC without creating any conflicts." msgstr "从版本库所做的更改被成功地合并到工作副本，并无任何冲突产生。" -#: source/TortoiseSVN_en.xml:9539(term) +#: source/TortoiseSVN_en.xml:9581(term) msgid "Modified / copied" msgstr "已修改/已复制" -#: source/TortoiseSVN_en.xml:9541(para) +#: source/TortoiseSVN_en.xml:9583(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:9549(term) +#: source/TortoiseSVN_en.xml:9591(term) msgid "Deleted node" msgstr "删除的节点" -#: source/TortoiseSVN_en.xml:9551(para) +#: source/TortoiseSVN_en.xml:9593(para) msgid "An item which has been deleted from the repository." msgstr "一个已经从版本库中删除了的条目。" -#: source/TortoiseSVN_en.xml:9557(term) +#: source/TortoiseSVN_en.xml:9599(term) msgid "Added node" msgstr "添加的节点" -#: source/TortoiseSVN_en.xml:9559(para) +#: source/TortoiseSVN_en.xml:9601(para) msgid "An item which has been added to the repository, by an add, copy or move operation." msgstr "一个通过添加、复制或移动操作，已经被添加到版本库的条目。" -#: source/TortoiseSVN_en.xml:9566(term) +#: source/TortoiseSVN_en.xml:9608(term) msgid "Renamed node" msgstr "重命名的节点" -#: source/TortoiseSVN_en.xml:9568(para) +#: source/TortoiseSVN_en.xml:9610(para) msgid "An item which has been renamed within the repository." msgstr "一个在版本库中已经被重命名的条目。" -#: source/TortoiseSVN_en.xml:9574(term) +#: source/TortoiseSVN_en.xml:9616(term) msgid "Replaced node" msgstr "替换的节点" -#: source/TortoiseSVN_en.xml:9576(para) +#: source/TortoiseSVN_en.xml:9618(para) msgid "The original item has been deleted and a new item with the same name replaces it." msgstr "该原始条目已经被删除，且有同名条目替换了的条目。" -#: source/TortoiseSVN_en.xml:9587(title) +#: source/TortoiseSVN_en.xml:9629(title) msgid "Network Settings" msgstr "网络设置" -#: source/TortoiseSVN_en.xml:9589(primary) +#: source/TortoiseSVN_en.xml:9631(primary) msgid "proxy server" msgstr "代理服务器" -#: source/TortoiseSVN_en.xml:9593(title) +#: source/TortoiseSVN_en.xml:9635(title) msgid "The Settings Dialog, Network Page" msgstr "设置对话框，网络设置页面" -#: source/TortoiseSVN_en.xml:9591(para) +#: source/TortoiseSVN_en.xml:9633(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:9599(para) +#: source/TortoiseSVN_en.xml:9641(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:9609(para) +#: source/TortoiseSVN_en.xml:9651(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:9617(para) +#: source/TortoiseSVN_en.xml:9659(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:9628(title) +#: source/TortoiseSVN_en.xml:9670(title) msgid "External Program Settings" msgstr "外部程序设置" -#: source/TortoiseSVN_en.xml:9631(title) +#: source/TortoiseSVN_en.xml:9673(title) msgid "The Settings Dialog, Diff Viewer Page" msgstr "设置对话框，差异查看页面" -#: source/TortoiseSVN_en.xml:9629(para) +#: source/TortoiseSVN_en.xml:9671(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:9639(para) +#: source/TortoiseSVN_en.xml:9681(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:9644(title) +#: source/TortoiseSVN_en.xml:9686(title) msgid "Diff Viewer" msgstr "差异查看器" -#: source/TortoiseSVN_en.xml:9657(term) source/TortoiseSVN_en.xml:9748(term) +#: source/TortoiseSVN_en.xml:9699(term) source/TortoiseSVN_en.xml:9790(term) msgid "%base" msgstr "%base" -#: source/TortoiseSVN_en.xml:9659(para) +#: source/TortoiseSVN_en.xml:9701(para) msgid "The original file without your changes" msgstr "没更改的原始文件" -#: source/TortoiseSVN_en.xml:9665(term) source/TortoiseSVN_en.xml:9757(term) +#: source/TortoiseSVN_en.xml:9707(term) source/TortoiseSVN_en.xml:9799(term) msgid "%bname" msgstr "%bname" -#: source/TortoiseSVN_en.xml:9667(para) source/TortoiseSVN_en.xml:9759(para) +#: source/TortoiseSVN_en.xml:9709(para) source/TortoiseSVN_en.xml:9801(para) msgid "The window title for the base file" msgstr "原始文件的窗口标题" -#: source/TortoiseSVN_en.xml:9673(term) source/TortoiseSVN_en.xml:9765(term) +#: source/TortoiseSVN_en.xml:9715(term) source/TortoiseSVN_en.xml:9807(term) msgid "%mine" msgstr "%mine" -#: source/TortoiseSVN_en.xml:9675(para) +#: source/TortoiseSVN_en.xml:9717(para) msgid "Your own file, with your changes" msgstr "你更改过的新文件" -#: source/TortoiseSVN_en.xml:9681(term) source/TortoiseSVN_en.xml:9773(term) +#: source/TortoiseSVN_en.xml:9723(term) source/TortoiseSVN_en.xml:9815(term) msgid "%yname" msgstr "%yname" -#: source/TortoiseSVN_en.xml:9683(para) source/TortoiseSVN_en.xml:9775(para) +#: source/TortoiseSVN_en.xml:9725(para) source/TortoiseSVN_en.xml:9817(para) msgid "The window title for your file" msgstr "你新文件的窗口标题" -#: source/TortoiseSVN_en.xml:9646(para) +#: source/TortoiseSVN_en.xml:9688(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:9690(para) +#: source/TortoiseSVN_en.xml:9732(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:9700(para) +#: source/TortoiseSVN_en.xml:9742(para) msgid "" "For example, with ExamDiff Pro: \n" "C:\\Path-To\\ExamDiff.exe %base %mine\n" @@ -6497,63 +6518,63 @@ msgstr "" " %base %mine\n" "" -#: source/TortoiseSVN_en.xml:9719(para) +#: source/TortoiseSVN_en.xml:9761(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:9733(para) +#: source/TortoiseSVN_en.xml:9775(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:9740(title) +#: source/TortoiseSVN_en.xml:9782(title) msgid "Merge Tool" msgstr "合并工具" -#: source/TortoiseSVN_en.xml:9750(para) +#: source/TortoiseSVN_en.xml:9792(para) msgid "the original file without your or the others changes" msgstr "没有被你或他人更改的原始文件" -#: source/TortoiseSVN_en.xml:9767(para) +#: source/TortoiseSVN_en.xml:9809(para) msgid "your own file, with your changes" msgstr "你更改过的新文件" -#: source/TortoiseSVN_en.xml:9781(term) +#: source/TortoiseSVN_en.xml:9823(term) msgid "%theirs" msgstr "%theirs" -#: source/TortoiseSVN_en.xml:9783(para) +#: source/TortoiseSVN_en.xml:9825(para) msgid "the file as it is in the repository" msgstr "档案库中存放的文件" -#: source/TortoiseSVN_en.xml:9789(term) +#: source/TortoiseSVN_en.xml:9831(term) msgid "%tname" msgstr "%tname" -#: source/TortoiseSVN_en.xml:9791(para) +#: source/TortoiseSVN_en.xml:9833(para) msgid "The window title for the file in the repository" msgstr "档案库中文件的窗口标题" -#: source/TortoiseSVN_en.xml:9797(term) +#: source/TortoiseSVN_en.xml:9839(term) msgid "%merged" msgstr "%merged" -#: source/TortoiseSVN_en.xml:9799(para) +#: source/TortoiseSVN_en.xml:9841(para) msgid "the conflicted file, the result of the merge operation" msgstr "发生冲突的文件，同时将被合并后的文件替换" -#: source/TortoiseSVN_en.xml:9806(term) +#: source/TortoiseSVN_en.xml:9848(term) msgid "%mname" msgstr "%mname" -#: source/TortoiseSVN_en.xml:9808(para) +#: source/TortoiseSVN_en.xml:9850(para) msgid "The window title for the merged file" msgstr "合并文件的窗口标题" -#: source/TortoiseSVN_en.xml:9742(para) +#: source/TortoiseSVN_en.xml:9784(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:9815(para) +#: source/TortoiseSVN_en.xml:9857(para) msgid "" "For example, with Perforce Merge: \n" "C:\\Path-To\\P4Merge.exe %base %theirs %mine %merged\n" @@ -6575,326 +6596,326 @@ msgstr "" " /title3:%yname %theirs %base %mine %merged /a2\n" "" -#: source/TortoiseSVN_en.xml:9833(title) +#: source/TortoiseSVN_en.xml:9875(title) msgid "Diff/Merge Advanced Settings" msgstr "差异查看/合并工具的高级设置" -#: source/TortoiseSVN_en.xml:9837(title) +#: source/TortoiseSVN_en.xml:9879(title) msgid "The Settings Dialog, Diff/Merge Advanced Dialog" msgstr "高级差异比较设置/高级合并设置的对话框" -#: source/TortoiseSVN_en.xml:9835(para) +#: source/TortoiseSVN_en.xml:9877(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:9846(para) +#: source/TortoiseSVN_en.xml:9888(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:9858(title) +#: source/TortoiseSVN_en.xml:9900(title) msgid "Unified Diff Viewer" msgstr "统一的差异查看器" -#: source/TortoiseSVN_en.xml:9860(para) +#: source/TortoiseSVN_en.xml:9902(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:9869(para) +#: source/TortoiseSVN_en.xml:9911(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:9885(title) +#: source/TortoiseSVN_en.xml:9927(title) msgid "Saved Data Settings" msgstr "已保存数据的设置" -#: source/TortoiseSVN_en.xml:9888(title) +#: source/TortoiseSVN_en.xml:9930(title) msgid "The Settings Dialog, Saved Data Page" msgstr "设置对话框，已保存数据设置页面" -#: source/TortoiseSVN_en.xml:9886(para) +#: source/TortoiseSVN_en.xml:9928(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:9897(term) +#: source/TortoiseSVN_en.xml:9939(term) msgid "URL history" msgstr "URL历史记录" -#: source/TortoiseSVN_en.xml:9899(para) +#: source/TortoiseSVN_en.xml:9941(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:9906(para) +#: source/TortoiseSVN_en.xml:9948(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:9915(term) +#: source/TortoiseSVN_en.xml:9957(term) msgid "Log messages" msgstr "日志信息" -#: source/TortoiseSVN_en.xml:9917(para) +#: source/TortoiseSVN_en.xml:9959(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:9925(term) +#: source/TortoiseSVN_en.xml:9967(term) msgid "Dialog sizes and positions" msgstr "窗口大小及位置" -#: source/TortoiseSVN_en.xml:9927(para) +#: source/TortoiseSVN_en.xml:9969(para) msgid "Many dialogs remember the size and screen position that you last used." msgstr "许多对话框都可以记录你最后一次使用时的窗口大小和位置。" -#: source/TortoiseSVN_en.xml:9934(term) +#: source/TortoiseSVN_en.xml:9976(term) msgid "Authentication data" msgstr "认证数据" -#: source/TortoiseSVN_en.xml:9936(para) +#: source/TortoiseSVN_en.xml:9978(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:9943(para) +#: source/TortoiseSVN_en.xml:9985(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:9953(title) +#: source/TortoiseSVN_en.xml:9995(title) msgid "Registry Settings" msgstr "注册表设置" -#: source/TortoiseSVN_en.xml:9955(primary) +#: source/TortoiseSVN_en.xml:9997(primary) msgid "registry" msgstr "注册表" -#: source/TortoiseSVN_en.xml:9957(para) +#: source/TortoiseSVN_en.xml:9999(para) msgid "A few infrequently used settings are available only by editing the registry directly." msgstr "一些极不常用的设置只有通过直接修改注册表的方式才能生效。" -#: source/TortoiseSVN_en.xml:9965(para) +#: source/TortoiseSVN_en.xml:10007(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:9974(term) +#: source/TortoiseSVN_en.xml:10016(term) msgid "Cache Tray Icon" msgstr "缓存托盘图标" -#: source/TortoiseSVN_en.xml:9976(para) +#: source/TortoiseSVN_en.xml:10018(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:9988(title) +#: source/TortoiseSVN_en.xml:10030(title) msgid "Subversion Working Folders" msgstr "Subversion 的工作文件夹" -#: source/TortoiseSVN_en.xml:9990(primary) +#: source/TortoiseSVN_en.xml:10032(primary) msgid ".svn folder" msgstr "名为 .svn 的文件夹" -#: source/TortoiseSVN_en.xml:9993(primary) +#: source/TortoiseSVN_en.xml:10035(primary) msgid "_svn folder" msgstr "名为 _svn 的文件夹" -#: source/TortoiseSVN_en.xml:9995(para) +#: source/TortoiseSVN_en.xml:10037(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:10001(para) +#: source/TortoiseSVN_en.xml:10043(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:10011(para) +#: source/TortoiseSVN_en.xml:10053(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:10022(title) +#: source/TortoiseSVN_en.xml:10064(title) msgid "Client Side Hook Scripts" msgstr "客户端钩子脚本" -#: source/TortoiseSVN_en.xml:10024(primary) +#: source/TortoiseSVN_en.xml:10066(primary) msgid "client hooks" msgstr "客户端钩子" -#: source/TortoiseSVN_en.xml:10027(primary) +#: source/TortoiseSVN_en.xml:10069(primary) msgid "hook scripts" msgstr "钩子脚本" -#: source/TortoiseSVN_en.xml:10031(title) +#: source/TortoiseSVN_en.xml:10073(title) msgid "The Settings Dialog, Hook Scripts Page" msgstr "设置对话框，钩子脚本页" -#: source/TortoiseSVN_en.xml:10029(para) +#: source/TortoiseSVN_en.xml:10071(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:10039(para) +#: source/TortoiseSVN_en.xml:10081(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:10044(para) +#: source/TortoiseSVN_en.xml:10086(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:10052(title) +#: source/TortoiseSVN_en.xml:10094(title) msgid "The Settings Dialog, Configure Hook Scripts" msgstr "设置对话框，配置钩子脚本页面" -#: source/TortoiseSVN_en.xml:10050(para) +#: source/TortoiseSVN_en.xml:10092(para) msgid " To add a new hook script, simply click Add and fill in the details." msgstr " 要增加钩子脚本，直接点击 增加 ，然后输入脚本即可。" -#: source/TortoiseSVN_en.xml:10062(term) source/TortoiseSVN_en.xml:10130(term) +#: source/TortoiseSVN_en.xml:10104(term) source/TortoiseSVN_en.xml:10172(term) msgid "Start-commit" msgstr "开始提交" -#: source/TortoiseSVN_en.xml:10064(para) +#: source/TortoiseSVN_en.xml:10106(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:10072(term) source/TortoiseSVN_en.xml:10138(term) +#: source/TortoiseSVN_en.xml:10114(term) source/TortoiseSVN_en.xml:10180(term) msgid "Pre-commit" msgstr "提交之前" -#: source/TortoiseSVN_en.xml:10074(para) +#: source/TortoiseSVN_en.xml:10116(para) msgid "Called after the user clicks OK in the commit dialog, and before the actual commit begins." msgstr "在提交对话框点击确认之后，实际提交之前调用。" -#: source/TortoiseSVN_en.xml:10081(term) source/TortoiseSVN_en.xml:10147(term) +#: source/TortoiseSVN_en.xml:10123(term) source/TortoiseSVN_en.xml:10189(term) msgid "Post-commit" msgstr "提交之后" -#: source/TortoiseSVN_en.xml:10083(para) +#: source/TortoiseSVN_en.xml:10125(para) msgid "Called after the commit finishes (whether successful or not)." msgstr "在提交结束后调用(无论成功或失败)" -#: source/TortoiseSVN_en.xml:10089(term) source/TortoiseSVN_en.xml:10157(term) +#: source/TortoiseSVN_en.xml:10131(term) source/TortoiseSVN_en.xml:10199(term) msgid "Start-update" msgstr "开始更新" -#: source/TortoiseSVN_en.xml:10091(para) +#: source/TortoiseSVN_en.xml:10133(para) msgid "Called before the update-to-revision dialog is shown." msgstr "在更新到版本对话框显示之前调用" -#: source/TortoiseSVN_en.xml:10097(term) source/TortoiseSVN_en.xml:10165(term) +#: source/TortoiseSVN_en.xml:10139(term) source/TortoiseSVN_en.xml:10207(term) msgid "Pre-update" msgstr "更新之前" -#: source/TortoiseSVN_en.xml:10099(para) +#: source/TortoiseSVN_en.xml:10141(para) msgid "Called before the actual Subversion update begins." msgstr "在 Subversion 更新实际开始之前调用" -#: source/TortoiseSVN_en.xml:10105(term) source/TortoiseSVN_en.xml:10173(term) +#: source/TortoiseSVN_en.xml:10147(term) source/TortoiseSVN_en.xml:10215(term) msgid "Post-update" msgstr "更新之后" -#: source/TortoiseSVN_en.xml:10107(para) +#: source/TortoiseSVN_en.xml:10149(para) msgid "Called after the update finishes (whether successful or not)." msgstr "在更新之后调用(无论成功或失败)" -#: source/TortoiseSVN_en.xml:10058(para) +#: source/TortoiseSVN_en.xml:10100(para) msgid "There are currently six types of hook script available " msgstr "现在有六种钩子脚本类型可用 " -#: source/TortoiseSVN_en.xml:10114(para) +#: source/TortoiseSVN_en.xml:10156(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:10119(para) +#: source/TortoiseSVN_en.xml:10161(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: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) +#: source/TortoiseSVN_en.xml:10175(literal) +#: source/TortoiseSVN_en.xml:10183(literal) +#: source/TortoiseSVN_en.xml:10202(literal) +#: source/TortoiseSVN_en.xml:10210(literal) +#: source/TortoiseSVN_en.xml:10218(literal) +#: source/TortoiseSVN_en.xml:10230(term) msgid "%PATHS%" msgstr "%PATHS%" -#: source/TortoiseSVN_en.xml:10142(literal) -#: source/TortoiseSVN_en.xml:10150(literal) -#: source/TortoiseSVN_en.xml:10200(term) +#: source/TortoiseSVN_en.xml:10184(literal) +#: source/TortoiseSVN_en.xml:10192(literal) +#: source/TortoiseSVN_en.xml:10242(term) msgid "%SELECTEDPATHS%" msgstr "%SELECTEDPATHS%" -#: source/TortoiseSVN_en.xml:10151(literal) -#: source/TortoiseSVN_en.xml:10177(literal) -#: source/TortoiseSVN_en.xml:10210(term) +#: source/TortoiseSVN_en.xml:10193(literal) +#: source/TortoiseSVN_en.xml:10219(literal) +#: source/TortoiseSVN_en.xml:10252(term) msgid "%REVISION%" msgstr "%REVISION%" -#: source/TortoiseSVN_en.xml:10152(literal) -#: source/TortoiseSVN_en.xml:10178(literal) -#: source/TortoiseSVN_en.xml:10218(term) +#: source/TortoiseSVN_en.xml:10194(literal) +#: source/TortoiseSVN_en.xml:10220(literal) +#: source/TortoiseSVN_en.xml:10260(term) msgid "%ERROR%" msgstr "%ERROR%" -#: source/TortoiseSVN_en.xml:10125(para) +#: source/TortoiseSVN_en.xml:10167(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:10190(para) +#: source/TortoiseSVN_en.xml:10232(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:10202(para) +#: source/TortoiseSVN_en.xml:10244(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:10212(para) +#: source/TortoiseSVN_en.xml:10254(para) msgid "The repository revision after a commit completes." msgstr "在提交完成后的版本库的版本" -#: source/TortoiseSVN_en.xml:10220(para) +#: source/TortoiseSVN_en.xml:10262(para) msgid "Empty if the operation was successful, or the error message if the operation was unsuccessful." msgstr "如果操作成功，它是空的，否则操作失败时就显示错误信息。" -#: source/TortoiseSVN_en.xml:10184(para) +#: source/TortoiseSVN_en.xml:10226(para) msgid "The meaning of each of these variables is described here: " msgstr "每个变量的含义如下: " -#: source/TortoiseSVN_en.xml:10228(para) +#: source/TortoiseSVN_en.xml:10270(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:10232(para) +#: source/TortoiseSVN_en.xml:10274(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:10240(title) +#: source/TortoiseSVN_en.xml:10282(title) msgid "Final Step" msgstr "最后步骤" -#: source/TortoiseSVN_en.xml:10246(title) +#: source/TortoiseSVN_en.xml:10288(title) msgid "Wishlist" msgstr "愿望表" -#: source/TortoiseSVN_en.xml:10247(para) +#: source/TortoiseSVN_en.xml:10289(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:10253(para) +#: source/TortoiseSVN_en.xml:10295(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:10267(title) +#: source/TortoiseSVN_en.xml:10309(title) msgid "The SubWCRev Program" msgstr "SubWCRev 程序" -#: source/TortoiseSVN_en.xml:10269(primary) +#: source/TortoiseSVN_en.xml:10311(primary) msgid "version extraction" msgstr "版本抽取" -#: source/TortoiseSVN_en.xml:10272(para) +#: source/TortoiseSVN_en.xml:10314(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:10286(title) +#: source/TortoiseSVN_en.xml:10328(title) msgid "The SubWCRev Command Line" msgstr "SubWCRev 命令行" -#: source/TortoiseSVN_en.xml:10287(para) +#: source/TortoiseSVN_en.xml:10329(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:10295(para) +#: source/TortoiseSVN_en.xml:10337(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" @@ -6904,156 +6925,156 @@ msgstr "" "SubWCRev WorkingCopyPath [SrcVersionFile DstVersionFile] [-nmdfe]\n" "" -#: source/TortoiseSVN_en.xml:10302(para) +#: source/TortoiseSVN_en.xml:10344(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:10308(para) +#: source/TortoiseSVN_en.xml:10350(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:10324(title) -#: source/TortoiseSVN_en.xml:10393(title) +#: source/TortoiseSVN_en.xml:10366(title) +#: source/TortoiseSVN_en.xml:10435(title) msgid "List of available command line switches" msgstr "列出可用的命令行开关" -#: source/TortoiseSVN_en.xml:10330(entry) -#: source/TortoiseSVN_en.xml:12009(title) -#: source/TortoiseSVN_en.xml:12497(glossterm) +#: source/TortoiseSVN_en.xml:10372(entry) +#: source/TortoiseSVN_en.xml:12051(title) +#: source/TortoiseSVN_en.xml:12539(glossterm) msgid "Switch" msgstr "切换" -#: source/TortoiseSVN_en.xml:10331(entry) -#: source/TortoiseSVN_en.xml:10400(entry) -#: source/TortoiseSVN_en.xml:11331(entry) +#: source/TortoiseSVN_en.xml:10373(entry) +#: source/TortoiseSVN_en.xml:10442(entry) +#: source/TortoiseSVN_en.xml:11373(entry) msgid "Description" msgstr "描述" -#: source/TortoiseSVN_en.xml:10336(entry) +#: source/TortoiseSVN_en.xml:10378(entry) msgid "-n" msgstr "-n" -#: source/TortoiseSVN_en.xml:10337(entry) +#: source/TortoiseSVN_en.xml:10379(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:10345(entry) +#: source/TortoiseSVN_en.xml:10387(entry) msgid "-m" msgstr "-m" -#: source/TortoiseSVN_en.xml:10346(entry) +#: source/TortoiseSVN_en.xml:10388(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:10354(entry) +#: source/TortoiseSVN_en.xml:10396(entry) msgid "-d" msgstr "-d" -#: source/TortoiseSVN_en.xml:10355(entry) +#: source/TortoiseSVN_en.xml:10397(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:10362(entry) +#: source/TortoiseSVN_en.xml:10404(entry) msgid "-f" msgstr "-f" -#: source/TortoiseSVN_en.xml:10363(entry) +#: source/TortoiseSVN_en.xml:10405(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:10371(entry) +#: source/TortoiseSVN_en.xml:10413(entry) msgid "-e" msgstr "-e" -#: source/TortoiseSVN_en.xml:10372(entry) +#: source/TortoiseSVN_en.xml:10414(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:10317(para) +#: source/TortoiseSVN_en.xml:10359(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:10388(title) +#: source/TortoiseSVN_en.xml:10430(title) msgid "Keyword Substitution" msgstr "关键字替换" -#: source/TortoiseSVN_en.xml:10399(entry) +#: source/TortoiseSVN_en.xml:10441(entry) msgid "Keyword" msgstr "关键字" -#: source/TortoiseSVN_en.xml:10405(entry) +#: source/TortoiseSVN_en.xml:10447(entry) msgid "$WCREV$" msgstr "$WCREV$" -#: source/TortoiseSVN_en.xml:10406(entry) +#: source/TortoiseSVN_en.xml:10448(entry) msgid "Replaced with the highest commit revision in the working copy." msgstr "用工作副本中最高的提交版本来替换" -#: source/TortoiseSVN_en.xml:10412(entry) +#: source/TortoiseSVN_en.xml:10454(entry) msgid "$WCDATE$" msgstr "$WCDATE$" -#: source/TortoiseSVN_en.xml:10417(literal) +#: source/TortoiseSVN_en.xml:10459(literal) msgid "yyyy-mm-dd hh:mm:ss" msgstr "yyyy-mm-dd hh:mm:ss" -#: source/TortoiseSVN_en.xml:10413(entry) +#: source/TortoiseSVN_en.xml:10455(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:10421(entry) +#: source/TortoiseSVN_en.xml:10463(entry) msgid "$WCNOW$" msgstr "$WCNOW$" -#: source/TortoiseSVN_en.xml:10422(entry) +#: source/TortoiseSVN_en.xml:10464(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:10429(entry) +#: source/TortoiseSVN_en.xml:10471(entry) msgid "$WCRANGE$" msgstr "$WCRANGE$" -#: source/TortoiseSVN_en.xml:10430(entry) +#: source/TortoiseSVN_en.xml:10472(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:10441(entry) +#: source/TortoiseSVN_en.xml:10483(entry) msgid "$WCMIXED?TText:FText$" msgstr "$WCMIXED?TText:FText$" -#: source/TortoiseSVN_en.xml:10442(entry) +#: source/TortoiseSVN_en.xml:10484(entry) msgid "Replaced with TText if there are mixed update revisions, or FText if not." msgstr "当有混合版本时用TText 替换，否则用FText替换。" -#: source/TortoiseSVN_en.xml:10448(entry) +#: source/TortoiseSVN_en.xml:10490(entry) msgid "$WCMODS?TText:FText$" msgstr "$WCMODS?TText:FText$" -#: source/TortoiseSVN_en.xml:10449(entry) +#: source/TortoiseSVN_en.xml:10491(entry) msgid "Replaced with TText if there are local modifications, or FText if not." msgstr "若本地存在修改，就用正确提示文本 TText 替换，否则用失败提示文本 FText 替换。" -#: source/TortoiseSVN_en.xml:10455(entry) +#: source/TortoiseSVN_en.xml:10497(entry) msgid "$WCURL$" msgstr "$WCURL$" -#: source/TortoiseSVN_en.xml:10456(entry) +#: source/TortoiseSVN_en.xml:10498(entry) msgid "Replaced with the repository URL of the working copy path passed to SubWCRev." msgstr "用传递给SubWCRev的工作目录的版本库地址替换。" -#: source/TortoiseSVN_en.xml:10389(para) +#: source/TortoiseSVN_en.xml:10431(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:10470(title) +#: source/TortoiseSVN_en.xml:10512(title) msgid "Keyword Example" msgstr "关键字例子" -#: source/TortoiseSVN_en.xml:10471(para) +#: source/TortoiseSVN_en.xml:10513(para) msgid "The example below shows how keywords in a template file are substituted in the output file." msgstr "下面的例子显示了模版文件中的关键字是如何在输出文件中被替换的。" -#: source/TortoiseSVN_en.xml:10475(screen) +#: source/TortoiseSVN_en.xml:10517(screen) #, no-wrap msgid "" "\n" @@ -7088,11 +7109,11 @@ msgstr "" "\n" "// EndOfFile\n" -#: source/TortoiseSVN_en.xml:10491(para) +#: source/TortoiseSVN_en.xml:10533(para) msgid "After running SubWCRev.exe, the output file looks like this:" msgstr "SubWCRev.exe运行完之后，输出文件类似: " -#: source/TortoiseSVN_en.xml:10494(screen) +#: source/TortoiseSVN_en.xml:10536(screen) #, no-wrap msgid "" "\n" @@ -7127,243 +7148,243 @@ msgstr "" "\n" "// EndOfFile\n" -#: source/TortoiseSVN_en.xml:10517(title) +#: source/TortoiseSVN_en.xml:10559(title) msgid "Frequently Asked Questions (FAQ)" msgstr "常见问题(FAQ)" -#: source/TortoiseSVN_en.xml:10519(para) +#: source/TortoiseSVN_en.xml:10561(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:10531(para) +#: source/TortoiseSVN_en.xml:10573(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:10541(para) +#: source/TortoiseSVN_en.xml:10583(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:10552(title) +#: source/TortoiseSVN_en.xml:10594(title) msgid "How Do I..." msgstr "如何实现 …" -#: source/TortoiseSVN_en.xml:10554(para) +#: source/TortoiseSVN_en.xml:10596(para) msgid "This appendix contains solutions to problems/questions you might have when using TortoiseSVN." msgstr "这个附录包括了 TortoiseSVN 使用中可能碰到的一些困难或疑问的解决方法。" -#: source/TortoiseSVN_en.xml:10560(title) +#: source/TortoiseSVN_en.xml:10602(title) msgid "Move/copy a lot of files at once" msgstr "一次移动或复制多个文件" -#: source/TortoiseSVN_en.xml:10562(primary) +#: source/TortoiseSVN_en.xml:10604(primary) msgid "moving" msgstr "移动" -#: source/TortoiseSVN_en.xml:10564(para) +#: source/TortoiseSVN_en.xml:10606(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:10573(para) +#: source/TortoiseSVN_en.xml:10615(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:10596(title) +#: source/TortoiseSVN_en.xml:10638(title) msgid "Force users to enter a log message" msgstr "强制用户写日志" -#: source/TortoiseSVN_en.xml:10598(primary) +#: source/TortoiseSVN_en.xml:10640(primary) msgid "log message" msgstr "日志信息" -#: source/TortoiseSVN_en.xml:10600(para) +#: source/TortoiseSVN_en.xml:10642(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:10606(title) +#: source/TortoiseSVN_en.xml:10648(title) msgid "Hook-script on the server" msgstr "服务器端的钩子脚本(Hook-script)" -#: source/TortoiseSVN_en.xml:10607(para) +#: source/TortoiseSVN_en.xml:10649(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:10612(para) +#: source/TortoiseSVN_en.xml:10654(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:10622(para) +#: source/TortoiseSVN_en.xml:10664(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:10633(title) +#: source/TortoiseSVN_en.xml:10675(title) msgid "Project properties" msgstr "工程(Project)属性" -#: source/TortoiseSVN_en.xml:10634(para) +#: source/TortoiseSVN_en.xml:10676(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:10638(para) +#: source/TortoiseSVN_en.xml:10680(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:10643(para) +#: source/TortoiseSVN_en.xml:10685(para) msgid "For detailed information on those project properties, please refer to " msgstr "关于工程属性的具体信息，请参照 " -#: source/TortoiseSVN_en.xml:10650(title) +#: source/TortoiseSVN_en.xml:10692(title) msgid "Update selected files from the repository" msgstr "从版本库里更新选定的文件到本地" -#: source/TortoiseSVN_en.xml:10654(para) +#: source/TortoiseSVN_en.xml:10696(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:10664(para) +#: source/TortoiseSVN_en.xml:10706(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:10676(title) +#: source/TortoiseSVN_en.xml:10718(title) msgid "Roll back revisions in the repository" msgstr "回滚版本库里的版本" -#: source/TortoiseSVN_en.xml:10678(primary) +#: source/TortoiseSVN_en.xml:10720(primary) msgid "rollback" msgstr "回滚" -#: source/TortoiseSVN_en.xml:10681(title) +#: source/TortoiseSVN_en.xml:10723(title) msgid "Use the revision log dialog" msgstr "使用版本日志对话框" -#: source/TortoiseSVN_en.xml:10682(para) +#: source/TortoiseSVN_en.xml:10724(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:10691(para) +#: source/TortoiseSVN_en.xml:10733(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:10698(para) +#: source/TortoiseSVN_en.xml:10740(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:10711(para) +#: source/TortoiseSVN_en.xml:10753(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:10726(para) +#: source/TortoiseSVN_en.xml:10768(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:10739(para) source/TortoiseSVN_en.xml:10796(para) +#: source/TortoiseSVN_en.xml:10781(para) source/TortoiseSVN_en.xml:10838(para) msgid "You have reverted the changes within your working copy. Check the results, then commit the changes." msgstr "工作副本已经恢复到了变更以前的状态。检查恢复后的结果，然后提交变更。" -#: source/TortoiseSVN_en.xml:10745(title) +#: source/TortoiseSVN_en.xml:10787(title) msgid "Use the merge dialog" msgstr "使用合并对话框" -#: source/TortoiseSVN_en.xml:10746(para) +#: source/TortoiseSVN_en.xml:10788(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:10753(para) +#: source/TortoiseSVN_en.xml:10795(para) msgid "In your working copy select TortoiseSVNMerge." msgstr "在工作副本上选择TortoiseSVN合并。" -#: source/TortoiseSVN_en.xml:10762(para) +#: source/TortoiseSVN_en.xml:10804(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:10770(para) +#: source/TortoiseSVN_en.xml:10812(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:10778(para) +#: source/TortoiseSVN_en.xml:10820(para) msgid "make sure the Use \"From:\" URL checkbox is checked." msgstr "确认使用“起始: ”的 URL检查框处于被选中的状态。" -#: source/TortoiseSVN_en.xml:10784(para) +#: source/TortoiseSVN_en.xml:10826(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:10802(title) +#: source/TortoiseSVN_en.xml:10844(title) msgid "Use svndumpfilter" msgstr "使用 svndumpfilter" -#: source/TortoiseSVN_en.xml:10803(para) +#: source/TortoiseSVN_en.xml:10845(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:10814(para) +#: source/TortoiseSVN_en.xml:10856(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:10825(title) +#: source/TortoiseSVN_en.xml:10867(title) msgid "Compare two revisions of a file" msgstr "比较一个文件的两个版本" -#: source/TortoiseSVN_en.xml:10827(primary) +#: source/TortoiseSVN_en.xml:10869(primary) msgid "compare files" msgstr "比较文件" -#: source/TortoiseSVN_en.xml:10829(para) +#: source/TortoiseSVN_en.xml:10871(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:10843(para) +#: source/TortoiseSVN_en.xml:10885(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:10853(para) +#: source/TortoiseSVN_en.xml:10895(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:10876(title) +#: source/TortoiseSVN_en.xml:10918(title) msgid "Include a common sub-project" msgstr "包含一个普通的子项目" -#: source/TortoiseSVN_en.xml:10878(primary) +#: source/TortoiseSVN_en.xml:10920(primary) msgid "common projects" msgstr "普通项目" -#: source/TortoiseSVN_en.xml:10880(para) +#: source/TortoiseSVN_en.xml:10922(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) +#: source/TortoiseSVN_en.xml:10932(title) msgid "Use svn:externals" msgstr "使用 svn:externals" -#: source/TortoiseSVN_en.xml:10891(para) +#: source/TortoiseSVN_en.xml:10933(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) +#: source/TortoiseSVN_en.xml:10941(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:10920(title) +#: source/TortoiseSVN_en.xml:10962(title) msgid "Use a nested working copy" msgstr "使用嵌套工作副本" -#: source/TortoiseSVN_en.xml:10921(para) +#: source/TortoiseSVN_en.xml:10963(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:10925(para) +#: source/TortoiseSVN_en.xml:10967(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:10935(para) +#: source/TortoiseSVN_en.xml:10977(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:10942(title) +#: source/TortoiseSVN_en.xml:10984(title) msgid "Use a relative location" msgstr "使用相对位置" -#: source/TortoiseSVN_en.xml:10943(para) +#: source/TortoiseSVN_en.xml:10985(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" @@ -7379,7 +7400,7 @@ msgstr "" "C:\\Projects\\Common\n" "然后使用相对路径例如..\\..\\Common\\DSPcore引用通用代码。" -#: source/TortoiseSVN_en.xml:10958(para) +#: source/TortoiseSVN_en.xml:11000(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" @@ -7393,19 +7414,19 @@ msgstr "" "#include \"X:\\superio\\superio.h\"\n" "" -#: source/TortoiseSVN_en.xml:10976(para) +#: source/TortoiseSVN_en.xml:11018(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:10986(title) +#: source/TortoiseSVN_en.xml:11028(title) msgid "Create a shortcut to a repository" msgstr "创建到版本库的快捷方式" -#: source/TortoiseSVN_en.xml:10988(primary) +#: source/TortoiseSVN_en.xml:11030(primary) msgid "shortcut" msgstr "快捷方式" -#: source/TortoiseSVN_en.xml:10990(para) +#: source/TortoiseSVN_en.xml:11032(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" @@ -7415,120 +7436,120 @@ msgstr "" "TortoiseProc.exe /command:repobrowser /path:\"url/to/repository\"\n" " 当然你需要包含真实的版本库 URL。" -#: source/TortoiseSVN_en.xml:11002(title) +#: source/TortoiseSVN_en.xml:11044(title) msgid "Ignore files which are already versioned" msgstr "忽略已经版本控制的文件" -#: source/TortoiseSVN_en.xml:11004(primary) +#: source/TortoiseSVN_en.xml:11046(primary) msgid "unversion" msgstr "没有版本控制" -#: source/TortoiseSVN_en.xml:11006(para) +#: source/TortoiseSVN_en.xml:11048(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:11013(para) +#: source/TortoiseSVN_en.xml:11055(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:11028(para) +#: source/TortoiseSVN_en.xml:11070(para) msgid "Move the file to somewhere safe, not inside your working copy." msgstr "把文件移动到其它安全的位置，不在你的工作副本的目录内。" -#: source/TortoiseSVN_en.xml:11034(para) +#: source/TortoiseSVN_en.xml:11076(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:11045(para) +#: source/TortoiseSVN_en.xml:11087(para) msgid "Move the file back to its original location." msgstr "将文件移到原始位置" -#: source/TortoiseSVN_en.xml:11050(para) +#: source/TortoiseSVN_en.xml:11092(para) msgid "Add the file to the ignore list so you don't get into the same trouble again." msgstr "将文件添加到忽略文件，所以你不必再为此烦心。" -#: source/TortoiseSVN_en.xml:11023(para) +#: source/TortoiseSVN_en.xml:11065(para) msgid "If the files are already in the repository, you have to do a little more work. " msgstr "如果文件已经存在于版本库，你需要做更多的工作。" -#: source/TortoiseSVN_en.xml:11062(para) +#: source/TortoiseSVN_en.xml:11104(para) msgid "TortoiseSVNExport the folder to somewhere safe, not inside your working copy." msgstr "TortoiseSVN导出文件夹到某个安全的地方而不是你的工作副本。" -#: source/TortoiseSVN_en.xml:11072(para) +#: source/TortoiseSVN_en.xml:11114(para) msgid "TortoiseSVNDelete the folder from your working copy." msgstr "TortoiseSVN删除，从你的工作副本中删除该文件夹。" -#: source/TortoiseSVN_en.xml:11081(para) +#: source/TortoiseSVN_en.xml:11123(para) msgid "TortoiseSVNCommit the deleted folder to remove it from the repository." msgstr "TortoiseSVN提交对文件夹的删除操作，将它从版本库中移除。" -#: source/TortoiseSVN_en.xml:11090(para) +#: source/TortoiseSVN_en.xml:11132(para) msgid "Move the exported folder back to its original location in your working copy." msgstr "将导出的文件复制回工作副本原来的位置。" -#: source/TortoiseSVN_en.xml:11096(para) +#: source/TortoiseSVN_en.xml:11138(para) msgid "Add the folder to the ignore list so you don't get into the same trouble again." msgstr "将文件添加到忽略文件，所以你不必再为此烦心。" -#: source/TortoiseSVN_en.xml:11057(para) +#: source/TortoiseSVN_en.xml:11099(para) msgid "If you need to remove a whole folder/hierarchy from version control, the procedure is different again. " msgstr "如果你需要将整个目录从版本控制中删除，过程会有一点区别。" -#: source/TortoiseSVN_en.xml:11106(title) +#: source/TortoiseSVN_en.xml:11148(title) msgid "Administrators" msgstr "管理员" -#: source/TortoiseSVN_en.xml:11108(para) +#: source/TortoiseSVN_en.xml:11150(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:11115(title) +#: source/TortoiseSVN_en.xml:11157(title) msgid "Deploy TortoiseSVN via group policies" msgstr "通过组策略部署 TortoiseSVN" -#: source/TortoiseSVN_en.xml:11117(primary) +#: source/TortoiseSVN_en.xml:11159(primary) msgid "group policies" msgstr "组策略" -#: source/TortoiseSVN_en.xml:11120(primary) -#: source/TortoiseSVN_en.xml:12305(glossterm) +#: source/TortoiseSVN_en.xml:11162(primary) +#: source/TortoiseSVN_en.xml:12347(glossterm) msgid "GPO" msgstr "GPO" -#: source/TortoiseSVN_en.xml:11122(para) +#: source/TortoiseSVN_en.xml:11164(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:11127(para) +#: source/TortoiseSVN_en.xml:11169(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:11134(para) +#: source/TortoiseSVN_en.xml:11176(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:11146(title) +#: source/TortoiseSVN_en.xml:11188(title) msgid "Redirect the upgrade check" msgstr "重定向升级检查" -#: source/TortoiseSVN_en.xml:11148(primary) +#: source/TortoiseSVN_en.xml:11190(primary) msgid "upgrade check" msgstr "升级检查" -#: source/TortoiseSVN_en.xml:11150(para) +#: source/TortoiseSVN_en.xml:11192(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:11156(title) +#: source/TortoiseSVN_en.xml:11198(title) msgid "The upgrade dialog" msgstr "升级对话框" -#: source/TortoiseSVN_en.xml:11159(para) +#: source/TortoiseSVN_en.xml:11201(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:11165(para) +#: source/TortoiseSVN_en.xml:11207(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" @@ -7542,19 +7563,19 @@ msgstr "" "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:11190(title) +#: source/TortoiseSVN_en.xml:11232(title) msgid "Setting the SVN_ASP_DOT_NET_HACK environment variable" msgstr "设置 SVN_ASP_DOT_NET_HACK 环境变量" -#: source/TortoiseSVN_en.xml:11192(primary) +#: source/TortoiseSVN_en.xml:11234(primary) msgid "SVN_ASP_DOT_NET_HACK" msgstr "SVN_ASP_DOT_NET_HACK" -#: source/TortoiseSVN_en.xml:11194(para) +#: source/TortoiseSVN_en.xml:11236(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:11201(para) +#: source/TortoiseSVN_en.xml:11243(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" @@ -7564,337 +7585,337 @@ msgstr "" "msiexec /i TortoiseSVN-1.4.0.msi ASPDOTNETHACK=TRUE\n" "" -#: source/TortoiseSVN_en.xml:11212(title) +#: source/TortoiseSVN_en.xml:11254(title) msgid "Automating TortoiseSVN" msgstr "TortoiseSVN 操作" -#: source/TortoiseSVN_en.xml:11214(para) +#: source/TortoiseSVN_en.xml:11256(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:11220(para) +#: source/TortoiseSVN_en.xml:11262(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:11232(title) -#: source/TortoiseSVN_en.xml:11701(title) +#: source/TortoiseSVN_en.xml:11274(title) +#: source/TortoiseSVN_en.xml:11743(title) msgid "TortoiseSVN Commands" msgstr "TortoiseSVN 命令" -#: source/TortoiseSVN_en.xml:11234(primary) +#: source/TortoiseSVN_en.xml:11276(primary) msgid "automation" msgstr "自动化" -#: source/TortoiseSVN_en.xml:11237(primary) +#: source/TortoiseSVN_en.xml:11279(primary) msgid "command line" msgstr "命令行" -#: source/TortoiseSVN_en.xml:11239(para) +#: source/TortoiseSVN_en.xml:11281(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:11248(para) +#: source/TortoiseSVN_en.xml:11290(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:11253(para) +#: source/TortoiseSVN_en.xml:11295(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:11259(para) +#: source/TortoiseSVN_en.xml:11301(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:11267(para) +#: source/TortoiseSVN_en.xml:11309(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:11278(para) +#: source/TortoiseSVN_en.xml:11320(para) msgid " don't close the dialog automatically" msgstr " 不自动关闭对话框" -#: source/TortoiseSVN_en.xml:11283(para) +#: source/TortoiseSVN_en.xml:11325(para) msgid " auto close if no errors" msgstr " 如果没发生错误则自动关闭对话框" -#: source/TortoiseSVN_en.xml:11288(para) +#: source/TortoiseSVN_en.xml:11330(para) msgid " auto close if no errors and conflicts" msgstr " 如果没发生错误和冲突则自动关闭对话框" -#: source/TortoiseSVN_en.xml:11293(para) +#: source/TortoiseSVN_en.xml:11335(para) msgid " auto close if no errors, conflicts and merges" msgstr "如果没有错误、冲突和合并，会自动关闭" -#: source/TortoiseSVN_en.xml:11298(para) +#: source/TortoiseSVN_en.xml:11340(para) msgid " auto close if no errors, conflicts and merges for local operations" msgstr "如果没有错误、冲突和合并，会自动关闭" -#: source/TortoiseSVN_en.xml:11272(para) +#: source/TortoiseSVN_en.xml:11314(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:11305(para) +#: source/TortoiseSVN_en.xml:11347(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:11324(title) +#: source/TortoiseSVN_en.xml:11366(title) msgid "List of available commands and options" msgstr "有效命令及选项列表" -#: source/TortoiseSVN_en.xml:11330(entry) +#: source/TortoiseSVN_en.xml:11372(entry) msgid "Command" msgstr "命令" -#: source/TortoiseSVN_en.xml:11337(entry) +#: source/TortoiseSVN_en.xml:11379(entry) msgid "Shows the About-dialog. This is also shown if no command is given." msgstr "显示关于对话框。如果没有给命令也会显示。" -#: source/TortoiseSVN_en.xml:11348(option) +#: source/TortoiseSVN_en.xml:11390(option) msgid "/startrev:xxx" msgstr "/startrev:xxx" -#: source/TortoiseSVN_en.xml:11349(option) +#: source/TortoiseSVN_en.xml:11391(option) msgid "/endrev:xxx" msgstr "/endrev:xxx" -#: source/TortoiseSVN_en.xml:11350(option) +#: source/TortoiseSVN_en.xml:11392(option) msgid "/strict" msgstr "/strict" -#: source/TortoiseSVN_en.xml:11344(entry) +#: source/TortoiseSVN_en.xml:11386(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:11398(option) +#: source/TortoiseSVN_en.xml:11413(option) +#: source/TortoiseSVN_en.xml:11441(option) +#: source/TortoiseSVN_en.xml:11449(option) +#: source/TortoiseSVN_en.xml:11457(option) +#: source/TortoiseSVN_en.xml:11464(option) +#: source/TortoiseSVN_en.xml:11473(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:11487(option) +#: source/TortoiseSVN_en.xml:11489(option) +#: source/TortoiseSVN_en.xml:11508(option) +#: source/TortoiseSVN_en.xml:11521(option) +#: source/TortoiseSVN_en.xml:11528(option) #: source/TortoiseSVN_en.xml:11538(option) -#: source/TortoiseSVN_en.xml:11549(option) +#: source/TortoiseSVN_en.xml:11544(option) +#: source/TortoiseSVN_en.xml:11552(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) +#: source/TortoiseSVN_en.xml:11580(option) +#: source/TortoiseSVN_en.xml:11591(option) +#: source/TortoiseSVN_en.xml:11600(option) +#: source/TortoiseSVN_en.xml:11615(option) +#: source/TortoiseSVN_en.xml:11625(option) +#: source/TortoiseSVN_en.xml:11632(option) +#: source/TortoiseSVN_en.xml:11641(option) +#: source/TortoiseSVN_en.xml:11648(option) +#: source/TortoiseSVN_en.xml:11665(option) msgid "/path" msgstr "/path" -#: source/TortoiseSVN_en.xml:11357(option) +#: source/TortoiseSVN_en.xml:11399(option) msgid "/url" msgstr "/url" -#: source/TortoiseSVN_en.xml:11355(entry) +#: source/TortoiseSVN_en.xml:11397(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:11363(entry) +#: source/TortoiseSVN_en.xml:11405(entry) msgid "Opens the import dialog. The path specifies the directory with the data to import." msgstr "打开导入对话框，路径制定了数据导入路径。" -#: source/TortoiseSVN_en.xml:11372(option) +#: source/TortoiseSVN_en.xml:11414(option) msgid "/rev" msgstr "/rev" -#: source/TortoiseSVN_en.xml:11375(option) +#: source/TortoiseSVN_en.xml:11417(option) msgid "/rev:1234" msgstr "/rev:1234" -#: source/TortoiseSVN_en.xml:11376(option) +#: source/TortoiseSVN_en.xml:11418(option) msgid "/nonrecursive" msgstr "/nonrecursive" -#: source/TortoiseSVN_en.xml:11377(option) +#: source/TortoiseSVN_en.xml:11419(option) msgid "/ignoreexternals" msgstr "/ignoreexternals" -#: source/TortoiseSVN_en.xml:11370(entry) +#: source/TortoiseSVN_en.xml:11412(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:11388(option) +#: source/TortoiseSVN_en.xml:11430(option) msgid "path" msgstr "path" -#: source/TortoiseSVN_en.xml:11392(option) +#: source/TortoiseSVN_en.xml:11434(option) msgid "/bugid:\"the bug id here\"" msgstr "/bugid:\"the bug id here\"" -#: source/TortoiseSVN_en.xml:11382(entry) +#: source/TortoiseSVN_en.xml:11424(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:11398(entry) +#: source/TortoiseSVN_en.xml:11440(entry) msgid "Adds the files in to version control." msgstr "将的文件添加到版本控制 。" -#: source/TortoiseSVN_en.xml:11405(entry) +#: source/TortoiseSVN_en.xml:11447(entry) msgid "Reverts local modifications of a working copy. The tells which items to revert." msgstr "恢复工作副本的本地修改，说明恢复哪些条目。" -#: source/TortoiseSVN_en.xml:11413(entry) +#: source/TortoiseSVN_en.xml:11455(entry) msgid "Cleans up interrupted or aborted operations and unlocks the working copy in ." msgstr "清理中断和终止的操作，将工作副本的解锁。" -#: source/TortoiseSVN_en.xml:11423(option) -#: source/TortoiseSVN_en.xml:11489(option) -#: source/TortoiseSVN_en.xml:11616(option) +#: source/TortoiseSVN_en.xml:11465(option) +#: source/TortoiseSVN_en.xml:11531(option) +#: source/TortoiseSVN_en.xml:11658(option) msgid "/noquestion" msgstr "/noquestion" -#: source/TortoiseSVN_en.xml:11420(entry) +#: source/TortoiseSVN_en.xml:11462(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:11430(entry) +#: source/TortoiseSVN_en.xml:11472(entry) msgid "Creates a repository in " msgstr "在创建一个版本库。" -#: source/TortoiseSVN_en.xml:11436(entry) +#: source/TortoiseSVN_en.xml:11478(entry) msgid "Opens the switch dialog. The path specifies the target directory." msgstr "打开选项对话框。路径参数指定目标目录。" -#: source/TortoiseSVN_en.xml:11443(entry) +#: source/TortoiseSVN_en.xml:11485(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:11456(option) +#: source/TortoiseSVN_en.xml:11498(option) msgid "/mergefrom:xxx" msgstr "/mergefrom:xxx" -#: source/TortoiseSVN_en.xml:11457(option) +#: source/TortoiseSVN_en.xml:11499(option) msgid "/mergeto:xxx" msgstr "/mergeto:xxx" -#: source/TortoiseSVN_en.xml:11458(option) +#: source/TortoiseSVN_en.xml:11500(option) msgid "/fromurl:URL" msgstr "/fromurl:URL" -#: source/TortoiseSVN_en.xml:11452(entry) +#: source/TortoiseSVN_en.xml:11494(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:11464(entry) +#: source/TortoiseSVN_en.xml:11506(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:11472(entry) +#: source/TortoiseSVN_en.xml:11514(entry) msgid "Opens the settings dialog." msgstr "打开设置对话框。" -#: source/TortoiseSVN_en.xml:11478(entry) +#: source/TortoiseSVN_en.xml:11520(entry) msgid "Removes the file(s) in from version control." msgstr "从版本控制里移除中的文件。" -#: source/TortoiseSVN_en.xml:11485(entry) +#: source/TortoiseSVN_en.xml:11527(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:11498(option) -#: source/TortoiseSVN_en.xml:11500(option) +#: source/TortoiseSVN_en.xml:11540(option) +#: source/TortoiseSVN_en.xml:11542(option) msgid "/path2" msgstr "/path2" -#: source/TortoiseSVN_en.xml:11494(entry) +#: source/TortoiseSVN_en.xml:11536(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:11507(entry) +#: source/TortoiseSVN_en.xml:11549(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:11515(entry) +#: source/TortoiseSVN_en.xml:11557(entry) msgid "Opens the relocate dialog. The specifies the working copy path to relocate." msgstr "打开重定位对话框，指定了重定位的工作副本路径。" -#: source/TortoiseSVN_en.xml:11522(entry) +#: source/TortoiseSVN_en.xml:11564(entry) msgid "Opens the help file." msgstr "打开帮助文件" -#: source/TortoiseSVN_en.xml:11528(entry) +#: source/TortoiseSVN_en.xml:11570(entry) msgid "Opens the check-for-modifications dialog. The path specifies the working copy directory." msgstr "打开为修改检出对话框，路经指定了工作副本目录。" -#: source/TortoiseSVN_en.xml:11540(option) -#: source/TortoiseSVN_en.xml:11542(option) +#: source/TortoiseSVN_en.xml:11582(option) +#: source/TortoiseSVN_en.xml:11584(option) msgid "/rev:xxx" msgstr "/rev:xxx" -#: source/TortoiseSVN_en.xml:11535(entry) +#: source/TortoiseSVN_en.xml:11577(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:11548(entry) +#: source/TortoiseSVN_en.xml:11590(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:11559(option) +#: source/TortoiseSVN_en.xml:11601(option) msgid "startrev" msgstr "startrev" -#: source/TortoiseSVN_en.xml:11560(option) +#: source/TortoiseSVN_en.xml:11602(option) msgid "endrev" msgstr "endrev" -#: source/TortoiseSVN_en.xml:11564(option) +#: source/TortoiseSVN_en.xml:11606(option) msgid "/line:nnn" msgstr "/line:nnn" -#: source/TortoiseSVN_en.xml:11556(entry) +#: source/TortoiseSVN_en.xml:11598(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:11574(option) +#: source/TortoiseSVN_en.xml:11616(option) msgid "/savepath:path" msgstr "/savepath:path" -#: source/TortoiseSVN_en.xml:11575(option) +#: source/TortoiseSVN_en.xml:11617(option) msgid "/revision:xxx" msgstr "/revision:xxx" -#: source/TortoiseSVN_en.xml:11571(entry) +#: source/TortoiseSVN_en.xml:11613(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:11581(entry) +#: source/TortoiseSVN_en.xml:11623(entry) msgid "Creates a patch file for the path given in ." msgstr "创建下的补丁文件。" -#: source/TortoiseSVN_en.xml:11588(entry) +#: source/TortoiseSVN_en.xml:11630(entry) msgid "Shows the revision graph for the path given in ." msgstr "显示目录下的版本变化图。" -#: source/TortoiseSVN_en.xml:11595(entry) +#: source/TortoiseSVN_en.xml:11637(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:11604(entry) +#: source/TortoiseSVN_en.xml:11646(entry) msgid "Unlocks a file or all files in a directory.. " msgstr "解锁一个文件或一个目录内的所有文件... " -#: source/TortoiseSVN_en.xml:11611(entry) +#: source/TortoiseSVN_en.xml:11653(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:11621(entry) +#: source/TortoiseSVN_en.xml:11663(entry) msgid "Shows the properties dialog for the path given in ." msgstr "显示 给出的路径之属性对话框。" -#: source/TortoiseSVN_en.xml:11630(para) +#: source/TortoiseSVN_en.xml:11672(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" @@ -7916,52 +7937,52 @@ msgstr "" " /startrev:50 /endrev:60 /closeonend\n" "" -#: source/TortoiseSVN_en.xml:11645(title) +#: source/TortoiseSVN_en.xml:11687(title) msgid "Command Line Interface Cross Reference" msgstr "命令行交叉索引" -#: source/TortoiseSVN_en.xml:11647(primary) +#: source/TortoiseSVN_en.xml:11689(primary) msgid "command line client" msgstr "命令行客户端" -#: source/TortoiseSVN_en.xml:11650(primary) +#: source/TortoiseSVN_en.xml:11692(primary) msgid "CLI" msgstr "CLI" -#: source/TortoiseSVN_en.xml:11653(para) +#: source/TortoiseSVN_en.xml:11695(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) +#: source/TortoiseSVN_en.xml:11704(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) +#: source/TortoiseSVN_en.xml:11710(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:11676(title) +#: source/TortoiseSVN_en.xml:11718(title) msgid "Conventions and Basic Rules" msgstr "约定和基本规则" -#: source/TortoiseSVN_en.xml:11677(para) +#: source/TortoiseSVN_en.xml:11719(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:11687(para) +#: source/TortoiseSVN_en.xml:11729(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:11694(para) +#: source/TortoiseSVN_en.xml:11736(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:11703(title) -#: source/TortoiseSVN_en.xml:12205(glossterm) +#: source/TortoiseSVN_en.xml:11745(title) +#: source/TortoiseSVN_en.xml:12247(glossterm) msgid "Checkout" msgstr "检出" -#: source/TortoiseSVN_en.xml:11704(screen) +#: source/TortoiseSVN_en.xml:11746(screen) #, no-wrap msgid "" "\n" @@ -7970,24 +7991,24 @@ msgstr "" "\n" "svn checkout [-N] [--ignore-externals] [-r rev] URL PATH\n" -#: source/TortoiseSVN_en.xml:11707(para) +#: source/TortoiseSVN_en.xml:11749(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) +#: source/TortoiseSVN_en.xml:11753(para) source/TortoiseSVN_en.xml:11796(para) msgid "If Omit externals is checked, use the --ignore-externals switch." msgstr "如果希望忽略外部被选中，使用--ignore-externals选型。" -#: source/TortoiseSVN_en.xml:11715(para) +#: source/TortoiseSVN_en.xml:11757(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) +#: source/TortoiseSVN_en.xml:11763(title) +#: source/TortoiseSVN_en.xml:12553(glossterm) msgid "Update" msgstr "更新" -#: source/TortoiseSVN_en.xml:11722(screen) +#: source/TortoiseSVN_en.xml:11764(screen) #, no-wrap msgid "" "\n" @@ -7998,23 +8019,23 @@ msgstr "" "svn info URL_of_WC\n" "svn update [-r rev] PATH\n" -#: source/TortoiseSVN_en.xml:11726(para) +#: source/TortoiseSVN_en.xml:11768(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) +#: source/TortoiseSVN_en.xml:11775(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) +#: source/TortoiseSVN_en.xml:11780(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:11745(title) +#: source/TortoiseSVN_en.xml:11787(title) msgid "Update to Revision" msgstr "更新到版本" -#: source/TortoiseSVN_en.xml:11746(screen) +#: source/TortoiseSVN_en.xml:11788(screen) #, no-wrap msgid "" "\n" @@ -8025,22 +8046,22 @@ msgstr "" "svn info URL_of_WC\n" "svn update [-r rev] [-N] [--ignore-externals] PATH\n" -#: source/TortoiseSVN_en.xml:11750(para) +#: source/TortoiseSVN_en.xml:11792(para) msgid "If Only update the top folder is checked, use the -N switch." msgstr "如果希望只更新顶级目录，使用-N选项。" -#: source/TortoiseSVN_en.xml:11760(title) -#: source/TortoiseSVN_en.xml:12231(glossterm) +#: source/TortoiseSVN_en.xml:11802(title) +#: source/TortoiseSVN_en.xml:12273(glossterm) msgid "Commit" msgstr "提交" -#: source/TortoiseSVN_en.xml:11761(para) +#: source/TortoiseSVN_en.xml:11803(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:11768(screen) -#: source/TortoiseSVN_en.xml:11930(screen) -#: source/TortoiseSVN_en.xml:11958(screen) +#: source/TortoiseSVN_en.xml:11810(screen) +#: source/TortoiseSVN_en.xml:11972(screen) +#: source/TortoiseSVN_en.xml:12000(screen) #, no-wrap msgid "" "\n" @@ -8049,16 +8070,16 @@ msgstr "" "\n" "svn status -v PATH\n" -#: source/TortoiseSVN_en.xml:11771(para) source/TortoiseSVN_en.xml:11859(para) +#: source/TortoiseSVN_en.xml:11813(para) source/TortoiseSVN_en.xml:11901(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:11779(para) +#: source/TortoiseSVN_en.xml:11821(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:11783(screen) -#: source/TortoiseSVN_en.xml:12073(screen) +#: source/TortoiseSVN_en.xml:11825(screen) +#: source/TortoiseSVN_en.xml:12115(screen) #, no-wrap msgid "" "\n" @@ -8067,11 +8088,11 @@ msgstr "" "\n" "svn add PATH...\n" -#: source/TortoiseSVN_en.xml:11786(para) +#: source/TortoiseSVN_en.xml:11828(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:11794(screen) +#: source/TortoiseSVN_en.xml:11836(screen) #, no-wrap msgid "" "\n" @@ -8080,21 +8101,21 @@ 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) +#: source/TortoiseSVN_en.xml:11839(para) source/TortoiseSVN_en.xml:12045(para) +#: source/TortoiseSVN_en.xml:12128(para) msgid "LogMessage here represents the contents of the log message edit box. This can be empty." msgstr "日志消息是日志编辑框的内容。它可以为空。" -#: source/TortoiseSVN_en.xml:11801(para) +#: source/TortoiseSVN_en.xml:11843(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) +#: source/TortoiseSVN_en.xml:11849(title) +#: source/TortoiseSVN_en.xml:12319(glossterm) msgid "Diff" msgstr "差异" -#: source/TortoiseSVN_en.xml:11808(screen) +#: source/TortoiseSVN_en.xml:11850(screen) #, no-wrap msgid "" "\n" @@ -8103,19 +8124,19 @@ msgstr "" "\n" "svn diff PATH\n" -#: source/TortoiseSVN_en.xml:11811(para) +#: source/TortoiseSVN_en.xml:11853(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) +#: source/TortoiseSVN_en.xml:11862(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) +#: source/TortoiseSVN_en.xml:11870(title) msgid "Show Log" msgstr "显示日志" -#: source/TortoiseSVN_en.xml:11829(screen) +#: source/TortoiseSVN_en.xml:11871(screen) #, no-wrap msgid "" "\n" @@ -8128,15 +8149,15 @@ msgstr "" " 或者\n" "svn log -v -r M:N [--stop-on-copy] PATH\n" -#: source/TortoiseSVN_en.xml:11834(para) +#: source/TortoiseSVN_en.xml:11876(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:11840(para) +#: source/TortoiseSVN_en.xml:11882(para) msgid "If Stop on copy/rename is checked, use the --stop-on-copy switch." msgstr "如果选择了停止于复制/改名，就使用--stop-on-copy开关。" -#: source/TortoiseSVN_en.xml:11847(screen) +#: source/TortoiseSVN_en.xml:11889(screen) #, no-wrap msgid "" "\n" @@ -8149,19 +8170,19 @@ msgstr "" " 或者\n" "svn status -u -v PATH\n" -#: source/TortoiseSVN_en.xml:11852(para) +#: source/TortoiseSVN_en.xml:11894(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) +#: source/TortoiseSVN_en.xml:11911(title) msgid "Revision Graph" msgstr "版本图" -#: source/TortoiseSVN_en.xml:11870(para) +#: source/TortoiseSVN_en.xml:11912(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) +#: source/TortoiseSVN_en.xml:11916(para) msgid "" "What TortoiseSVN does is an \n" "svn info URL_of_WC\n" @@ -8173,11 +8194,11 @@ msgstr "" "svn log -v URL\n" "其中URL是版本库的 根，返回分析数据。" -#: source/TortoiseSVN_en.xml:11885(title) +#: source/TortoiseSVN_en.xml:11927(title) msgid "Repo Browser" msgstr "版本库浏览器" -#: source/TortoiseSVN_en.xml:11886(screen) +#: source/TortoiseSVN_en.xml:11928(screen) #, no-wrap msgid "" "\n" @@ -8188,27 +8209,27 @@ msgstr "" "svn info URL_of_WC\n" "svn list [-r rev] -v URL\n" -#: source/TortoiseSVN_en.xml:11890(para) +#: source/TortoiseSVN_en.xml:11932(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) +#: source/TortoiseSVN_en.xml:11939(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) +#: source/TortoiseSVN_en.xml:11945(title) msgid "Edit Conflicts" msgstr "编辑冲突" -#: source/TortoiseSVN_en.xml:11904(para) +#: source/TortoiseSVN_en.xml:11946(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) +#: source/TortoiseSVN_en.xml:11953(title) msgid "Resolved" msgstr "已解决" -#: source/TortoiseSVN_en.xml:11912(screen) +#: source/TortoiseSVN_en.xml:11954(screen) #, no-wrap msgid "" "\n" @@ -8217,11 +8238,11 @@ msgstr "" "\n" "svn resolved PATH\n" -#: source/TortoiseSVN_en.xml:11917(title) +#: source/TortoiseSVN_en.xml:11959(title) msgid "Rename" msgstr "改名" -#: source/TortoiseSVN_en.xml:11918(screen) +#: source/TortoiseSVN_en.xml:11960(screen) #, no-wrap msgid "" "\n" @@ -8230,12 +8251,12 @@ msgstr "" "\n" "svn rename CURR_PATH NEW_PATH\n" -#: source/TortoiseSVN_en.xml:11923(title) -#: source/TortoiseSVN_en.xml:12265(glossterm) +#: source/TortoiseSVN_en.xml:11965(title) +#: source/TortoiseSVN_en.xml:12307(glossterm) msgid "Delete" msgstr "删除" -#: source/TortoiseSVN_en.xml:11924(screen) +#: source/TortoiseSVN_en.xml:11966(screen) #, no-wrap msgid "" "\n" @@ -8244,20 +8265,20 @@ msgstr "" "\n" "svn delete PATH\n" -#: source/TortoiseSVN_en.xml:11929(title) -#: source/TortoiseSVN_en.xml:12444(glossterm) +#: source/TortoiseSVN_en.xml:11971(title) +#: source/TortoiseSVN_en.xml:12486(glossterm) msgid "Revert" msgstr "恢复" -#: source/TortoiseSVN_en.xml:11933(para) +#: source/TortoiseSVN_en.xml:11975(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:11939(para) +#: source/TortoiseSVN_en.xml:11981(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:11946(screen) +#: source/TortoiseSVN_en.xml:11988(screen) #, no-wrap msgid "" "\n" @@ -8266,7 +8287,7 @@ msgstr "" "\n" "svn revert [-R] PATH...\n" -#: source/TortoiseSVN_en.xml:11952(screen) +#: source/TortoiseSVN_en.xml:11994(screen) #, no-wrap msgid "" "\n" @@ -8275,15 +8296,15 @@ msgstr "" "\n" "svn cleanup PATH\n" -#: source/TortoiseSVN_en.xml:11957(title) +#: source/TortoiseSVN_en.xml:11999(title) msgid "Get Lock" msgstr "获得锁" -#: source/TortoiseSVN_en.xml:11961(para) +#: source/TortoiseSVN_en.xml:12003(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:11966(screen) +#: source/TortoiseSVN_en.xml:12008(screen) #, no-wrap msgid "" "\n" @@ -8292,19 +8313,19 @@ msgstr "" "\n" "svn lock -m \"LockMessage\" [--force] PATH...\n" -#: source/TortoiseSVN_en.xml:11969(para) +#: source/TortoiseSVN_en.xml:12011(para) msgid "LockMessage here represents the contents of the lock message edit box. This can be empty." msgstr "加锁信息是加锁编辑框的内容。它可以为空。\"" -#: source/TortoiseSVN_en.xml:11973(para) +#: source/TortoiseSVN_en.xml:12015(para) msgid "If Steal the locks is checked, use the --force switch." msgstr "如果选择了强制锁定 ，就使用--force开关。" -#: source/TortoiseSVN_en.xml:11979(title) +#: source/TortoiseSVN_en.xml:12021(title) msgid "Release Lock" msgstr "释放锁" -#: source/TortoiseSVN_en.xml:11980(screen) +#: source/TortoiseSVN_en.xml:12022(screen) #, no-wrap msgid "" "\n" @@ -8313,11 +8334,11 @@ msgstr "" "\n" "svn unlock PATH\n" -#: source/TortoiseSVN_en.xml:11985(title) +#: source/TortoiseSVN_en.xml:12027(title) msgid "Branch/Tag" msgstr "分支/标记" -#: source/TortoiseSVN_en.xml:11986(screen) +#: source/TortoiseSVN_en.xml:12028(screen) #, no-wrap msgid "" "\n" @@ -8334,15 +8355,15 @@ msgstr "" " 或\n" "svn copy -m \"LogMessage\" PATH URL\n" -#: source/TortoiseSVN_en.xml:11998(listitem) +#: source/TortoiseSVN_en.xml:12040(listitem) msgid "Specific revision in repository" msgstr "指定版本库中的版本" -#: source/TortoiseSVN_en.xml:11993(para) +#: source/TortoiseSVN_en.xml:12035(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:12010(screen) +#: source/TortoiseSVN_en.xml:12052(screen) #, no-wrap msgid "" "\n" @@ -8353,12 +8374,12 @@ msgstr "" "svn info URL_of_WC\n" "svn switch [-r rev] URL PATH\n" -#: source/TortoiseSVN_en.xml:12016(title) -#: source/TortoiseSVN_en.xml:12358(glossterm) +#: source/TortoiseSVN_en.xml:12058(title) +#: source/TortoiseSVN_en.xml:12400(glossterm) msgid "Merge" msgstr "合并" -#: source/TortoiseSVN_en.xml:12017(screen) +#: source/TortoiseSVN_en.xml:12059(screen) #, no-wrap msgid "" "\n" @@ -8367,11 +8388,11 @@ msgstr "" "\n" "svn merge [--dry-run] --force From_URL@revN To_URL@revM PATH\n" -#: source/TortoiseSVN_en.xml:12020(para) +#: source/TortoiseSVN_en.xml:12062(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) +#: source/TortoiseSVN_en.xml:12066(screen) #, no-wrap msgid "" "\n" @@ -8380,16 +8401,16 @@ msgstr "" "\n" "svn diff From_URL@revN To_URL@revM\n" -#: source/TortoiseSVN_en.xml:12027(para) +#: source/TortoiseSVN_en.xml:12069(para) msgid "The Unified diff shows the diff operation which will be used to do the merge." msgstr "Unified diff显示了用来合并的区别操作。" -#: source/TortoiseSVN_en.xml:12033(title) -#: source/TortoiseSVN_en.xml:12286(glossterm) +#: source/TortoiseSVN_en.xml:12075(title) +#: source/TortoiseSVN_en.xml:12328(glossterm) msgid "Export" msgstr "输出" -#: source/TortoiseSVN_en.xml:12034(screen) +#: source/TortoiseSVN_en.xml:12076(screen) #, no-wrap msgid "" "\n" @@ -8398,28 +8419,28 @@ msgstr "" "\n" "svn export [-r rev] [--ignore-externals] URL Export_PATH\n" -#: source/TortoiseSVN_en.xml:12037(para) +#: source/TortoiseSVN_en.xml:12079(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:12041(para) +#: source/TortoiseSVN_en.xml:12083(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:12046(para) +#: source/TortoiseSVN_en.xml:12088(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:12051(para) +#: source/TortoiseSVN_en.xml:12093(para) msgid "In both cases, if Omit externals is checked, use the --ignore-externals switch." msgstr "在两种情况下，如果Omit externals被选中，就相当于使用了--ignore-externals选项。" -#: source/TortoiseSVN_en.xml:12058(title) -#: source/TortoiseSVN_en.xml:12404(glossterm) +#: source/TortoiseSVN_en.xml:12100(title) +#: source/TortoiseSVN_en.xml:12446(glossterm) msgid "Relocate" msgstr "重新定位" -#: source/TortoiseSVN_en.xml:12059(screen) +#: source/TortoiseSVN_en.xml:12101(screen) #, no-wrap msgid "" "\n" @@ -8428,11 +8449,11 @@ msgstr "" "\n" "svn switch --relocate From_URL To_URL\n" -#: source/TortoiseSVN_en.xml:12064(title) +#: source/TortoiseSVN_en.xml:12106(title) msgid "Create Repository Here" msgstr "在当前位置创建版本库" -#: source/TortoiseSVN_en.xml:12065(screen) +#: source/TortoiseSVN_en.xml:12107(screen) #, no-wrap msgid "" "\n" @@ -8445,16 +8466,16 @@ msgstr "" " 或\n" "svnadmin create --fs-type bdb PATH\n" -#: source/TortoiseSVN_en.xml:12072(title) -#: source/TortoiseSVN_en.xml:12148(glossterm) +#: source/TortoiseSVN_en.xml:12114(title) +#: source/TortoiseSVN_en.xml:12190(glossterm) msgid "Add" msgstr "添加" -#: source/TortoiseSVN_en.xml:12076(para) +#: source/TortoiseSVN_en.xml:12118(para) msgid "If you selected a folder, TortoiseSVN first scans it recursively for items which can be added." msgstr "如果选择了一个文件夹，TortoiseSVN会首先会递归的访问可以添加的条目。" -#: source/TortoiseSVN_en.xml:12083(screen) +#: source/TortoiseSVN_en.xml:12125(screen) #, no-wrap msgid "" "\n" @@ -8463,12 +8484,12 @@ msgstr "" "\n" "svn import -m LogMessage PATH URL\n" -#: source/TortoiseSVN_en.xml:12092(title) -#: source/TortoiseSVN_en.xml:12169(glossterm) +#: source/TortoiseSVN_en.xml:12134(title) +#: source/TortoiseSVN_en.xml:12211(glossterm) msgid "Blame" msgstr "追溯" -#: source/TortoiseSVN_en.xml:12093(screen) +#: source/TortoiseSVN_en.xml:12135(screen) #, no-wrap msgid "" "\n" @@ -8479,15 +8500,15 @@ msgstr "" "svn blame -r N:M -v PATH\n" "svn log -r N:M PATH\n" -#: source/TortoiseSVN_en.xml:12097(para) +#: source/TortoiseSVN_en.xml:12139(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:12105(title) +#: source/TortoiseSVN_en.xml:12147(title) msgid "Add to Ignore List" msgstr "加入忽略列表" -#: source/TortoiseSVN_en.xml:12106(screen) +#: source/TortoiseSVN_en.xml:12148(screen) #, no-wrap msgid "" "\n" @@ -8500,15 +8521,15 @@ msgstr "" "{编辑新的忽略内容到tempfile文件中}\n" "svn propset svn:ignore -F tempfile PATH\n" -#: source/TortoiseSVN_en.xml:12111(para) +#: source/TortoiseSVN_en.xml:12153(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:12118(title) +#: source/TortoiseSVN_en.xml:12160(title) msgid "Create Patch" msgstr "创建补丁" -#: source/TortoiseSVN_en.xml:12119(screen) +#: source/TortoiseSVN_en.xml:12161(screen) #, no-wrap msgid "" "\n" @@ -8517,235 +8538,235 @@ msgstr "" "\n" "svn diff PATH > patchfile\n" -#: source/TortoiseSVN_en.xml:12122(para) +#: source/TortoiseSVN_en.xml:12164(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:12128(title) +#: source/TortoiseSVN_en.xml:12170(title) msgid "Apply Patch" msgstr "应用补丁(Apply Patch)" -#: source/TortoiseSVN_en.xml:12129(para) +#: source/TortoiseSVN_en.xml:12171(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:12146(title) +#: source/TortoiseSVN_en.xml:12188(title) msgid "Glossary" msgstr "术语表" -#: source/TortoiseSVN_en.xml:12150(para) +#: source/TortoiseSVN_en.xml:12192(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:12158(glossterm) +#: source/TortoiseSVN_en.xml:12200(glossterm) msgid "BASE revision" msgstr "基础版本(BASE revision)" -#: source/TortoiseSVN_en.xml:12160(para) +#: source/TortoiseSVN_en.xml:12202(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:12171(para) +#: source/TortoiseSVN_en.xml:12213(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:12181(glossterm) +#: source/TortoiseSVN_en.xml:12223(glossterm) msgid "BDB" msgstr "BDB" -#: source/TortoiseSVN_en.xml:12183(para) +#: source/TortoiseSVN_en.xml:12225(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:12190(glossterm) +#: source/TortoiseSVN_en.xml:12232(glossterm) msgid "Branch" msgstr "分支" -#: source/TortoiseSVN_en.xml:12192(para) +#: source/TortoiseSVN_en.xml:12234(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:12207(para) +#: source/TortoiseSVN_en.xml:12249(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:12216(para) +#: source/TortoiseSVN_en.xml:12258(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:12233(para) +#: source/TortoiseSVN_en.xml:12275(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:12241(glossterm) +#: source/TortoiseSVN_en.xml:12283(glossterm) msgid "Conflict" msgstr "冲突" -#: source/TortoiseSVN_en.xml:12243(para) +#: source/TortoiseSVN_en.xml:12285(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:12253(glossterm) +#: source/TortoiseSVN_en.xml:12295(glossterm) msgid "Copy" msgstr "复制" -#: source/TortoiseSVN_en.xml:12255(para) +#: source/TortoiseSVN_en.xml:12297(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:12267(para) +#: source/TortoiseSVN_en.xml:12309(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:12279(para) +#: source/TortoiseSVN_en.xml:12321(para) msgid "Shorthand for Show Differences. Very useful when you want to see exactly what changes have been made." msgstr "显示区别的快捷方式，当你希望查看你所做修改的时候非常有用。" -#: source/TortoiseSVN_en.xml:12288(para) +#: source/TortoiseSVN_en.xml:12330(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:12296(glossterm) +#: source/TortoiseSVN_en.xml:12338(glossterm) msgid "FSFS" msgstr "FSFS" -#: source/TortoiseSVN_en.xml:12298(para) +#: source/TortoiseSVN_en.xml:12340(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:12307(para) +#: source/TortoiseSVN_en.xml:12349(para) msgid "Group policy object" msgstr "组策略对象" -#: source/TortoiseSVN_en.xml:12313(glossterm) +#: source/TortoiseSVN_en.xml:12355(glossterm) msgid "HEAD revision" msgstr "最新版本(HEAD revision)" -#: source/TortoiseSVN_en.xml:12315(para) +#: source/TortoiseSVN_en.xml:12357(para) msgid "The latest revision of a file or folder in the repository." msgstr "版本库里文件或目录的最新版本。" -#: source/TortoiseSVN_en.xml:12323(para) +#: source/TortoiseSVN_en.xml:12365(para) msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." msgstr "在一个修订里将整个目录导入到版本库的Subversion命令。" -#: source/TortoiseSVN_en.xml:12330(glossterm) +#: source/TortoiseSVN_en.xml:12372(glossterm) msgid "Lock" msgstr "锁" -#: source/TortoiseSVN_en.xml:12332(para) +#: source/TortoiseSVN_en.xml:12374(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:12340(glossterm) +#: source/TortoiseSVN_en.xml:12382(glossterm) msgid "Log" msgstr "日志" -#: source/TortoiseSVN_en.xml:12342(para) +#: source/TortoiseSVN_en.xml:12384(para) msgid "Show the revision history of a file or folder. Also known as History." msgstr "显示一个文件或是文件夹的版本历史。也就是历史。" -#: source/TortoiseSVN_en.xml:12349(glossterm) +#: source/TortoiseSVN_en.xml:12391(glossterm) msgid "History" msgstr "历史" -#: source/TortoiseSVN_en.xml:12351(para) +#: source/TortoiseSVN_en.xml:12393(para) msgid "Show the revision history of a file or folder. Also known as Log." msgstr "显示文件或目录的历史修订，也被称为Log。" -#: source/TortoiseSVN_en.xml:12360(para) +#: source/TortoiseSVN_en.xml:12402(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:12366(para) +#: source/TortoiseSVN_en.xml:12408(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:12374(glossterm) +#: source/TortoiseSVN_en.xml:12416(glossterm) msgid "Patch" msgstr "补丁" -#: source/TortoiseSVN_en.xml:12376(para) +#: source/TortoiseSVN_en.xml:12418(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:12389(glossterm) +#: source/TortoiseSVN_en.xml:12431(glossterm) msgid "Property" msgstr "属性" -#: source/TortoiseSVN_en.xml:12391(para) +#: source/TortoiseSVN_en.xml:12433(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:12406(para) +#: source/TortoiseSVN_en.xml:12448(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:12412(para) +#: source/TortoiseSVN_en.xml:12454(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:12423(para) +#: source/TortoiseSVN_en.xml:12465(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:12432(glossterm) +#: source/TortoiseSVN_en.xml:12474(glossterm) msgid "Resolve" msgstr "解决" -#: source/TortoiseSVN_en.xml:12434(para) +#: source/TortoiseSVN_en.xml:12476(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:12446(para) +#: source/TortoiseSVN_en.xml:12488(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:12455(glossterm) +#: source/TortoiseSVN_en.xml:12497(glossterm) msgid "Revision" msgstr "版本" -#: source/TortoiseSVN_en.xml:12457(para) +#: source/TortoiseSVN_en.xml:12499(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:12464(para) +#: source/TortoiseSVN_en.xml:12506(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:12471(glossterm) +#: source/TortoiseSVN_en.xml:12513(glossterm) msgid "Revision Property (revprop)" msgstr "版本属性(revprop)" -#: source/TortoiseSVN_en.xml:12473(para) +#: source/TortoiseSVN_en.xml:12515(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) +#: source/TortoiseSVN_en.xml:12527(glossterm) msgid "SVN" msgstr "SVN" -#: source/TortoiseSVN_en.xml:12487(para) +#: source/TortoiseSVN_en.xml:12529(para) msgid "A frequently-used abbreviation for Subversion." msgstr "Subversion的常见缩写形式。" -#: source/TortoiseSVN_en.xml:12490(para) +#: source/TortoiseSVN_en.xml:12532(para) msgid "The name of the Subversion custom protocol used by the svnserve repository server." msgstr "Subversion的svnserve版本库服务器使用的自定义协议名称。" -#: source/TortoiseSVN_en.xml:12499(para) +#: source/TortoiseSVN_en.xml:12541(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:12513(para) +#: source/TortoiseSVN_en.xml:12555(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:12521(glossterm) +#: source/TortoiseSVN_en.xml:12563(glossterm) msgid "Working Copy" msgstr "工作副本" -#: source/TortoiseSVN_en.xml:12523(para) +#: source/TortoiseSVN_en.xml:12565(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将修改传递回版本库。" -- 2.11.4.GIT