TSVN poChecker

This tool, to be used before committing your work, should help you locate problems in translation files. Please consider it as work-in-progress, as we are still working on it.

First of all, it will help you find missing accelerators - Luebbe's translation status page shows counts but not strings themselves, so the table below will help you fix these problems.

The analysis also includes some other useful lists, it checks for instance for correct new line styles, untranslated strings and spelling mistakes. As we prefer to err on the side of caution, you may find a lot of false positives. Anyway I hope this will help you improve the quality of your translation.

Oto



For new translators

Please follow this link if you think you may help with translation.
-> TortoiseSVN translation


Precommit checker

You can upload file for check before you make actual commit, so you can fix errors in one commit.

Make sure you are going to check translation against proper branch.

Choose a file to upload:



Revision: 20088 of trunk

Last update: September 05 2010 17:08 CET (GMT+1/GMT+2(DST))
Go to STABLE.

Language GUI check DOC Author(s)
Flag PAR!! ACC! NLS UNT FUZ ESC Note
French fr 5 244 125 4 244/125 5 Olivier Booklage, Philippe Torche, Jean-Christophe Gigogne, Jérémy Badier, Jean-Christophe Mazenc, Christophe Sauveur, Frédéric Bodin, Matthias Goupil, Dany McCarthy, Yves Mittelmann, Vincent Houde

GUI history graph:


history

TSVN doc history graph:


history

TMerge doc history graph:


history

Revision: 20088

PO Check (fr)

Parameter strings test

This test is necessary to pass or you can expect crashing of TSVN - specially true when you use longer type as is in English like %s instead of %d, %ld instead of %d, etc. Also having more parameters lead to crash TSVN. When TSVN not crash, the information is still wrong. For example number instead of text.

PASS

Missing/Unexpected Key Accelerator test

This is accessibility test. Passing this test is recommended. If you are interesting in more details about accelerator key overlapping I may enable such test for your language, but in fact there not too much to do against it. According Luebbe and Stefan there is no problem about it you just have to use accelerator more time to select element and then use enter or space for activate button.

PASS

Differences in new line style

This tests if new line style from pot match localized new line style. This test may have false positives when English text has new line style inconsistence. Using more lines for Native when English use just one is also alowed for most of translation even here reported.

Index Line English Line Native
1 Assuming your repository is located in <filename>c:\\repos\\TestRepo</filename>, and your server is called <filename>localhost</filename>, enter: <screen>\n
svn://localhost/repos/TestRepo\n
</screen> when prompted by the repo browser.
1463 En supposant que votre référentiel est placé dans <filename>c:\\repos\\TestRepo</filename> et votre serveur est appelé <filename>localhost</filename>, entrer : <screen>\n
svn://localhost/repos/TestRepo\n
</screen> quand l'explorateur de référentiel le demande.
2 You can also increase security and save time entering URLs with svnserve by using the --root switch to set the root location and restrict access to a specified directory on the server: <screen>\n
svnserve.exe --daemon --root drive:\\path\\to\\repository\\root\n
</screen> Using the previous test as a guide, svnserve would now run as: <screen>\n
svnserve.exe --daemon --root c:\\repos\n
</screen> And in TortoiseSVN our repo-browser URL is now shortened to: <screen>\n
svn://localhost/TestRepo\n
</screen> Note that the --root switch is also needed if your repository is located on a different partition or drive than the location of svnserve on your server.
1467 Vous pouvez aussi augmenter la sécurité et gagner du temps en entrant l'URL avec svnserve en utilisant le commutateur --root pour indiquer l'emplacement racine et limiter l'accès à un répertoire spécifique sur le serveur : <screen>\n
svnserve.exe --daemon --root disque:\\chemin\\vers\\racine\\référentiel\n
</screen> En utilisant le test précédent comme guide, svnserve fonctionnerait maintenant comme : <screen>\n
svnserve.exe --daemon --root c:\\référentiels\n
</screen> Et dans TortoiseSVN notre URL de l'explorateur de référentiel est maintenant raccourcie en : <screen>\n
svn://localhost/TestRéférentiel\n
</screen> Notez que le commutateur --root est aussi nécessaire si votre référentiel est placé sur une partition ou un disque différent de l'emplacement de svnserve sur votre serveur.
3 To install svnserve as a native windows service, execute the following command all on one line to create a service which is automatically started when windows starts. <screen>\n
sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service\n
--root c:\\repos\" displayname= \"Subversion\" depend= tcpip\n
start= auto\n
</screen> If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: <screen>\n
sc create svnserve binpath= \"\n
\\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n
--service --root c:\\repos\" displayname= \"Subversion\"\n
depend= tcpip start= auto\n
</screen> You can also add a description after creating the service. This will show up in the Windows Services Manager. <screen>\n
sc description svnserve \"Subversion server (svnserve)\"\n
</screen>
1483 Pour installer svnserve comme service Windows, exécutez la commande suivante sur une seule ligne. Le service sera alors créé et lancé à chaque démarrage de Windows. <screen>\n
sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service\n
--root c:\\repos\" displayname= \"Subversion\" depend= tcpip\n
start= auto\n
</screen> Si l'un des chemins d'accès contient des espaces, vous devrez encapsuler ceux ci dans des double cotes, comme suit :<screen>\n
sc create svnserve binpath= \"\n
\\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n
--service --root c:\\repos\" displayname= \"Subversion\"\n
depend= tcpip start= auto\n
</screen> Vous pouvez également ajouter une description après avoir créé le service. Elle sera visible depuis la fenêtre de gestion des services de Windows. <screen>\n
sc description svnserve \"Serveur Subversion (svnserve)\"\n
</screen>
4 Note that if you are authenticating using SSPI, then you don't need the <literal>AuthUserFile</literal> line to define a password file any more. Apache authenticates your username and password against your windows domain instead. You will need to update the users list in your <filename>svnaccessfile</filename> to reference <literal>DOMAIN\\username</literal> as well. 1948 Notez que si vous vous authentifiez en utilisant SSPI, alors vous n'avez plus besoin de la ligne <literal>AuthUserFile</literal> pour définir un fichier de mot de passe. Apache authentifie votre nom d'utilisateur et votre mot de passe avec votre domaine Windows à la place. Vous devrez mettre à jour la liste d'utilisateurs dans votre <filename>svnaccessfile</filename> pour faire aussi référence au <literal>DOMAINE\\n
om d'utilisateur</literal>.
5 To specify a different location of the configuration file, use the parameter <option>/configdir:\"path\\to\\config\\directory\"</option>. This will override the default path, including any registry setting. 10131 Pour spécifier un emplacement différent du fichier de configuration, utilisez le paramètre <option>/configdir:\"chemin\\vers\\répertoire\\de\\conf\"</option>. Cela remplacera le chemin par défaut, y compris tous les paramètres de la base de registre.
Note: Line numbers are as in committed file, it may differ when you update to use newer .pot, also edited multi line messages may shift line position.

Total:5

Not translated strings test

This tests if all strings has been translated. Translated mean that there in native string set. If English and native are same it is not marked as not translated, this just can happen.

Index Line English Line
1 125 When you list the changes to a file or folder, you can click on a revision to see the comments for that commit. You can also see a list of changed files - just double click on a file to see exactly what changed. 155
2 129 The commit dialog lists all the items that will be included in a commit, and each item has a checkbox so you can choose which items you want to include. Unversioned files can also be listed, in case you forgot to add that new file. 159
3 197 TortoiseSVN is an Open Source project developed under the GNU General Public License (GPL). It is free to download and free to use, either personally or commercially, on any number of PCs. 227
4 398 This section is aimed at people who would like to find out what TortoiseSVN is all about and give it a test drive. It explains how to install TortoiseSVN and set up a local repository, and it walks you through the most commonly used operations. 433
5 410 TortoiseSVN runs on Windows XP or higher and is available in both 32-bit and 64-bit flavours. If you are running 64-bit Windows you may want to install both versions. 445
6 434 Language packs are available which translate the TortoiseSVN user interface into many different languages. Please check for more information on how to install these. 469
7 446 Before we get stuck into working with some real files, it is important to get an overview of how subversion works and the terms that are used. 481
8 457 Subversion uses a central database which contains all your version-controlled files with their complete history. This database is referred to as the repository. The repository normally lives on a file server running the Subversion server program, which supplies content to Subversion clients (like TortoiseSVN) on request. If you only back up one thing, back up your repository as it is the definitive master copy of all your data. 492
9 466 This is where you do the real work. Every developer has his own working copy, sometimes known as a sandbox, on his local PC. You can pull down the latest version from the repository, work on it locally without affecting anyone else, then when you are happy with the changes you made commit them back to the repository. 501
10 470 A Subversion working copy does not contain the history of the project, but it does keep a copy of the files as they exist in the repository before you started making changes. This means that it is easy to check exactly what changes you have made. 505
11 479 You also need to know where to find TortoiseSVN because there is not much to see from the Start Menu. This is because TortoiseSVN is a Shell extension, so first of all, start Windows Explorer. Right click on a folder in Explorer and you should see some new entries in the context menu like this: 514
12 487 This section shows you how to try out some of the most commonly used features on a small test repository. Naturally it doesn't explain everything - this is just the Quick Start Guide after all. Once you are up and running you should take the time to read the rest of this user guide, which takes you through things in much more detail. It also explains more about setting up a proper Subversion server. 522
13 495 For a real project you will have a repository set up somewhere safe and a Subversion server to control it. For the purposes of this tutorial we are going to use Subversion's local repository feature which allows direct access to a repository created on your hard drive without needing a server at all. 530
14 499 First create a new empty directory on your PC. It can go anywhere, but in this tutorial we are going to call it C:\\svn_repos. Now right click on the new folder and from the context menu choose TortoiseSVNCreate Repository here.... The repository is then created inside the folder, ready for you to use. 534
15 503 The local repository feature is very useful for test and evaluation but unless you are working as a sole developer on one PC you should always use a proper Subversion server. It is tempting in a small company to avoid the work of setting up a server and just access your repository on a network share. Don't ever do that. You will lose data. Read to find out why this is a bad idea, and how to set up a server. 538
16 516 Now we have a repository, but it is completely empty at the moment. Let's assume I have a set of files in C:\\Projects\\Widget1 that I would like to add. Navigate to the Widget1 folder in Explorer and right click on it. Now select TortoiseSVNImport... which brings up a dialog A Subversion repository is referred to by URL, which allows us to specify a repository anywhere on the Internet. In this case we need to point to our own local repository which has a URL of file:///c:/svn_repos/Widget1 Note that there are 3 slashes after file: and that the forward slashes are used throughout. 551
17 520 The other important feature of this dialog is the Import Message box which allows you to enter a message describing what you are doing. When you come to look through your project history, these commit messages are a valuable guide to what changes have been made and why. In this case we can say something simple like Import the Widget1 project. Click on OK and the folder is added to your repository. 555
18 528 Now that we have a project in our repository, we need to create a working copy to use for day-to-day work. Note that the act of importing a folder does not automatically turn that folder into a working copy. The Subversion term for creating a fresh working copy is Checkout. We are going to checkout the Widget1 folder of our repository into a development folder on the PC called C:\\Projects\\Widget1-Dev. Create that folder, then right click on it and select TortoiseSVNCheckout.... Enter the URL to checkout, in this case file:///c:/svn_repos/Widget1 and click on OK. Our development folder is then populated with files from the repository. 563
19 532 You will notice that the appearance of this folder is different from our original folder. Every file has a green check mark in the bottom left corner. These are TortoiseSVN's status icons which are only present in a working copy. The green state indicates that the file is unchanged from the version in the repository. 567
20 540 Time to get to work. In the Widget1-Dev we start editing files - let's say we make changes to Widget1.c and ReadMe.txt. Notice that the icon overlays on these files have now changed to red, indicating that changes have been made locally. 575
21 552 OK, so we are happy with the changes, let's update the repository. This action is referred to as a Commit of the changes. Right click on the Widget1-Dev folder and select TortoiseSVNCommit. The commit dialog lists the changed files, each with a checkbox. You might want to choose only a subset of those files, but in this case we are going to commit the changes to both files. Enter up a message to describe what the change is all about and click on OK. The progress dialog shows the files being uploaded to the repository and you're done. 588
22 560 As the project develops you will need to add new files - let's say you add some new features in Extras.c and add a reference in the existing Makefile. Right click on the folder and TortoiseSVNAdd. The Add dialog now shows you all unversioned files and you can select which ones you want to add. Another way of adding files would be to right click on the file itself and select TortoiseSVNAdd. 596
23 564 Now when you go to commit the folder, the new file shows up as Added and the existing file as Modified. Note that you can double click on the modified file to check exactly what changes were made. 600
24 576 One of the most useful features of TortoiseSVN is the Log dialog. This shows you a list of all the commits you made to a file or folder, and shows those detailed commit messages that you entered ;-) OK, so I cheated a little here and used a screenshot from the TortoiseSVN repository. 612
25 580 The top pane shows a list of revisions committed along with the start of the commit message. If you select one of these revisions, the middle pane will show the full log message for that revision and the bottom pane will show a list of changed files and folders. 616
26 584 Each of these panes has a context menu which provides you with lots more ways of using the information. In the bottom pane you can double click on a file to see exactly what changes were made in that revision. Read to get the full story. 620
27 592 One feature of all revision control systems is that they let you undo changes that you made previously. As you would expect, TortoiseSVN makes this easy to access. 628
28 596 If you want to get rid of changes that you have not yet committed and reset your file to the way it was before you started editing, TortoiseSVNRevert is your friend. This discards your changes (to the Recycle bin, just in case) and reverts to the committed version you started with. If you want to get rid of just some of the changes, you can use TortoiseMerge to view the differences and selectively revert changed lines. 632
29 604 Moving On ... 641
30 608 This guide has given you a very quick tour of some of TortoiseSVN's most important and useful features, but of course there is far more that we haven't covered. We strongly recommend that you take the time to read the rest of this manual, especially which gives you a lot more detail on day-to-day operations. 645
31 612 We have taken a lot of trouble to make sure that it is both informative and easy to read, but we recognise that there is a lot of it! Take your time and don't be afraid to try things out on a test repository as you go along. The best way to learn is by using it. 649
32 1115 You will also be asked whether you want to create a directory structure within the repository. Find out about layout options in . 1196
33 1119 TortoiseSVN will set a custom folder icon when it creates a repository so you can identify local repositories more easily. If you create a repository using the official command line client this folder icon is not assigned. 1200
34 1208 Because this layout is so commonly used, when you create a new repository using TortoiseSVN, it will also offer to create the directory structure for you. 1298
35 2285 If you want to clear authentication for one realm only then you will have to dig into those directories, find the file which contains the information you want to clear and delete the file. 2966
36 2748 Getting the regex just right can be tricky, so to help you sort out a suitable expression there is a test dialog which allows you to enter an expression and then type in filenames to test it against. Start it from the command prompt using the command TortoiseProc.exe /command:autotexttest 3448
37 3280 There are other cases which are labelled as tree conflicts simply because the conflict involves a folder rather than a file. For example if you add a folder with the same name to both trunk and branch and then try to merge you will get a tree conflict. If you want to keep the folder from the merge target, just mark the conflict as resolved. If you want to use the one in the merge source then you need to SVN delete the one in the target first and run the merge again. If you need anything more complicated then you have to resolve manually. 3995
38 4123 Simple sub-string search works in a manner similar to a search engine. Strings to search for are separated by spaces, and all strings must match. You can use a leading - to specify that a particular sub-string is not found (invert matching for that term), and you can use ! at the start of the expression to invert matching for the entire expression. You can use quote marks to surround a string which must contain spaces, and if you want to search for a literal quotation mark you can use two quotation marks together as a self-escaping sequence. Note that the backslash character is not used as an escape character and has no special significance in simple sub-string searches. Examples will make this easier: \n
Alice Bob -Eve\n
searches for strings containing both Alice and Bob but not Eve \n
!Alice Bob\n
searches for strings which do not contain both Alice and Bob \n
!-Alice -Bob\n
do you remember De Morgan's theorem? NOT(NOT Alice AND NOT Bob) reduces to (Alice OR Bob). \n
\"Alice and Bob\"\n
searches for the literal expression Alice and Bob\n
\"\"\n
searches for a double-quote anywhere in the text \n
\"Alice says \"\"hi\"\" to Bob\"\n
searches for the literal expression Alice says \"hi\" to Bob
4841
39 5230 Because properties are versioned, you cannot edit the properties of previous revisions. If you look at properties from the log dialog, or from a non-HEAD revision in the repository browser, you will see a list of properties and values, but no edit controls. 5964
40 5246 From the folder(s) where you wish to apply these properties, use TortoiseSVNproperties and click on Import.... You will be prompted for a filename to import from, so navigate to the place you saved the export file previously and select it. The properties will be added to the folders non-recursively. 5980
41 5250 If you want to add properties to a tree recursively, follow the steps above, then in the property dialog select each property in turn, click on Edit..., check the Apply property recursively box and click on OK. 5984
42 5254 The Import file format is binary and proprietary to TortoiseSVN. Its only purpose is to transfer properties using Import and Export, so there is no need to edit these files. 5988
43 5282 You can edit the subversion configuration file to enable this feature on your client. The General page of TortoiseSVN's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of subversion's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard subversion feature and works with any subversion client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository. 6017
44 5286 An alternative method is to set the tsvn:autoprops property on folders, as described in the next section. This method only works for TortoiseSVN clients, but it does get propagated to all working copies on update. 6021
45 5290 Whichever method you choose, you should note that auto-props are only applied to files at the time they are added to the repository. Auto-props will never change the properties of files which are already versioned. 6025
46 5294 If you want to be absolutely sure that new files have the correct properties applied, you should set up a repository pre-commit hook to reject commits where the required properties are not set. 6029
47 5342 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 configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for subversion autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension. 6077
48 5374 The property tsvn:logrevregex defines a regular expression which matches references to revisions in a log message. This is used in the log dialog to turn such references into links which when clicked will either scroll to that revision (if the revision is already shown in the log dialog, or if it's available from the log cache) or open a new log dialog showing that revision. 6111
49 5378 The regular expression must match the whole reference, not just the revision number. The revision number is extracted from the matched reference string automatically. 6115
50 5382 If this property is not set, a default regular expression is used to link revision references. 6119
51 5386 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. 6123
52 5432 Fetching properties remotely is a slow operation, so some of the features described above will not work in the repository browser as they do in a working copy. 6173
53 5436 When you add a property using the repo browser, only the standard svn: properties are offered in the pre-defined list. Any other property name must be entered manually. 6177
54 5444 Project properties will not be propagated automatically when a child folder is added using the repo browser. 6185
55 5452 Although TortoiseSVN's project 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. project properties can only help to implement a policy, they cannot enforce it. 6193
56 6065 Choosing Prefer local will select your local changes in every conflict. Likewise, Prefer repository will select the repository changes in every conflict. This sounds easy, but the conflicts often cover more lines than you think they will and you may get unexpected results. 6858
57 6077 It is likely that some of the changes will have merged smoothly, while other local changes conflict with changes already committed to the repository. All changes which can be merged are merged. The Merge Conflict Callback dialog gives you three different ways of handling the lines which are in conflict. 6871
58 6578 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. 7374
59 6666 The graph is normally restricted to showing branch points, but it is often useful to be able to see the respective HEAD revision for each branch too. If you select Show HEAD revisions, each HEAD revision nodes will be shown as an ellipse. Note that HEAD here refers to the last revision committed on that path, not to the HEAD revision of the repository. 7469
60 6674 If you invoked the revision graph from a working copy, you can opt to show the BASE revision on the graph using Show WC revision, which marks the BASE node with a bold outline. 7477
61 6682 If you invoked the revision graph from a working copy, you can opt to show an additional node representing your modified working copy using Show WC modifications. This is an elliptical node with a bold outline in red by default. 7485
62 6694 Each revision graph node represents a revision in the repository where something changed in the tree you are looking at. Different types of node can be distinguished by shape and colour. The shapes are fixed, but colours can be set using TortoiseSVNSettings 7497
63 6702 The default view (grouping off) places the nodes such that their vertical position is in strict revision order, so you have a visual cue for the order in which things were done. Where two nodes are in the same column the order is very obvious. When two nodes are in adjacent columns the offset is much smaller because there is no need to prevent the nodes from overlapping, and as a result the order is a little less obvious. Such optimisations are necessary to keep complex graphs to a reasonable size. Please note that this ordering uses the edge of the node on the older side as a reference, i.e. the bottom edge of the node when the graph is shown with oldest node at the bottom. The reference edge is significant because the node shapes are not all the same height. 7506
64 6714 The default behavior (grouping off) has all rows sorted strictly by revision. As a result, long-living branches with sparse commits occupy a whole column for only a few changes and the graph becomes very broad. 7518
65 6718 This mode groups changes by branch, so that there is no global revision ordering: Consecutive revisions on a branch will be shown in (often) consecutive lines. Sub-branches, however, are arranged in such a way that later branches will be shown in the same column above older branches to keep the graph slim. As a result, a given row may contain changes from different revisions. 7522
66 6734 When a graph is broken into several smaller trees, the trees may appear either in natural revision order, or aligned at the bottom of the window, depending on whether you are using the Group Branches option. Use this option to grow all trees down from the top instead. 7538
67 6742 If the layout of the graph has produced a lot of crossing lines, use this option to clean it up. This may make the layout columns appear in less logical places, for example in a diagonal line rather than a column, and the graph may require a larger area to draw. 7546
68 6750 Long path names can take a lot of space and make the node boxes very large. Use this option to show only the changed part of a path, replacing the common part with dots. E.g. if you create a branch /branches/1.2.x/doc/html from /trunk/doc/html the branch could be shown in compact form as /branches/1.2.x/.. because the last two levels, doc and html, did not change. 7554
69 6758 This does just what you expect and shows every revision where something (in the tree that you are graphing) has changed. For long histories this can produce a truly huge graph. 7562
70 6766 This ensures that the latest revision on every branch is always shown on the graph. 7570
71 6774 When a branch/tag is made, the default behaviour is to show the branch as taken from the last node where a change was made. Strictly speaking this is inaccurate since the branches are often made from the current HEAD rather than a specific revision. So it is possible to show the more correct (but less useful) revision that was used to create the copy. Note that this revision may be younger than the HEAD revision of the source branch. 7578
72 6782 When a project has many tags, showing every tag as a separate node on the graph takes a lot of space and obscures the more interesting development branch structure. At the same time you may need to be able to access the tag content easily so that you can compare revisions. This option hides the nodes for tags and shows them instead in the tooltip for the node that they were copied from. A tag icon on the right side of the source node indicates that tags were made. 7586
73 6790 Hides paths which are no longer present at the HEAD revision of the repository, e.g. deleted branches. 7594
74 6798 Hides branches where no changes were committed to the respective file or sub-folder. This does not necessarily indicate that the branch was not used, just that no changes were made to this part of it. 7602
75 6806 Marks the revision on the graph which corresponds to the update revision of the item you fetched the graph for. If you have just updated, this will be HEAD, but if others have committed changes since your last update your WC may be a few revisions lower down. The node is marked by giving it a bold outline. 7610
76 6814 If your WC contains local changes, this option draws it as a separate elliptical node, linked back to the node that your WC was last updated to. The default outline colour is red. You may need to refresh the graph using F5 to capture recent changes. 7618
77 6822 Sometimes the revision graph contains more revisions than you want to see. This option opens a dialog which allows you to restrict the range of revisions displayed, and to hide particular paths by name. 7626
78 6826 Tree stripes 7630
79 6830 Where the graph contains several trees, it is sometimes useful to use alternating colours on the background to help distinguish between trees. 7634
80 6838 Shows a small picture of the entire graph, with the current view window as a rectangle which you can drag. This allows you to navigate the graph more easily. Note that for very large graphs the overview may become useless due to the extreme zoom factor and will therefore not be shown in such cases. 7642
81 6842 Because a revision graph is often quite complex, there are a number of features which can be used to tailor the view the way you want it. These are available in the View menu and from the toolbar. 7646
82 6850 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. 7654
83 6870 You can also merge changes in the selected revision(s) into a different working copy. A folder selection dialog allows you to choose the working copy to merge into, but after that there is no confirmation dialog, nor any opportunity to try a test merge. It is a good idea to merge into an unmodified working copy so that you can revert the changes if it doesn't work out! This is a useful feature if you want to merge selected revisions from one branch to another. 7675
84 6878 First-time users may be surprised by the fact that the revision graph shows something that does not match the user's mental model. If a revision changes multiple copies or branches of a file or folder, for instance, then there will be multiple nodes for that single revision. It is a good practice to start with the leftmost options in the toolbar and customize the graph step-by-step until it comes close to your mental model. 7683
85 6882 All filter options try lose as little information as possible. That may cause some nodes to change their color, for instance. Whenever the result is unexpected, undo the last filter operation and try to understand what is special about that particular revision or branch. In most cases, the initially expected outcome of the filter operation would either be inaccurate or misleading. 7687
86 6886 If you want to check the server again for newer information, you can simply refresh the view using F5. If you are using the log cache (enabled by default), this will check the repository for newer commits and fetch only the new ones. If the log cache was in offline mode, this will also attempt to go back online. 7691
87 6890 If you are using the log cache and you think the message content or author may have changed, you should use the log dialog to refresh the messages you need. Since the revision graph works from the repository root, we would have to invalidate the entire log cache, and refilling it could take a very long time. 7695
88 6894 Pruning Trees 7699
89 6898 A large tree can be difficult to navigate and sometimes you will want to hide parts of it, or break it down into a forest of smaller trees. If you hover the mouse over the point where a node link enters or leaves the node you will see one or more popup buttons which allow you to do this. 7703
90 6918 Click on the graph background for the main context menu, which offers options to Expand all and Join all. If no branch has been collapsed or split, the context menu will not be shown. 7723
91 6942 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. 7748
92 6970 To export single files with TortoiseSVN, you have to use the repository browser (). Simply drag the file(s) you want to export from the repository browser to where you want them in the explorer, or use the context menu in the repository browser to export the files. 7779
93 6978 If you want to export a copy of your project tree structure but containing only the files which have changed in a particular revision, or between any two revisions, use the compare revisions feature described in . 7787
94 6991 Sometimes you have a working copy which you want to convert back to a normal folder without the .svn directories. What you really need is an export-in-place command, that just removes the control directories rather than generating a new clean directory tree. 7800
95 6995 The answer is surprisingly simple - export the folder to itself! TortoiseSVN detects this special case and asks if you want to make the working copy unversioned. If you answer yes the control directories will be removed and you will have a plain, unversioned directory tree. 7804
96 7031 You may be surprised to find that TortoiseSVN contacts the repository as part of this operation. All it is doing is performing some simple checks to make sure that the new URL really does refer to the same repository as the existing working copy. 7841
97 7124 If it begins with the string ^/ it is assumed to be relative to the repository root. For example, ^/../?do=details&amp;id=%BUGID% will resolve to http://tortoisesvn.net/?do=details&amp;id=%BUGID% if your repository is located on http://tortoisesvn.net/svn/trunk/. 7934
98 7128 A URL beginning with the string / is assumed to be relative to the server's hostname. For example /?do=details&amp;id=%BUGID% will resolve to http://tortoisesvn.net/?do=details&amp;id=%BUGID% if your repository is located anywhere on http://tortoisesvn.net. 7938
99 7172 If two expressions are set, then the first expression is used as a pre-filter to find expressions which contain bug IDs. The second expression then extracts the bare bug IDs from the result of the first regex. This allows you to use a list of bug IDs and natural language expressions if you wish. e.g. you might fix several bugs and include a string something like this: This change resolves issues #23, #24 and #25 7987
100 7180 The first expression picks out issues #23, #24 and #25 from the surrounding log message. The second regex extracts plain decimal numbers from the output of the first regex, so it will return 23, 24 and 25 to use as bug IDs. 7995
101 7184 Breaking the first regex down a little, it must start with the word issue, possibly capitalised. This is optionally followed by an s (more than one issue) and optionally a colon. This is followed by one or more groups each having zero or more leading whitespace, an optional comma or and and more optional space. Finally there is a mandatory # and a mandatory decimal number. 7999
102 7208 And even if you don't need the links, the issue numbers show up as a separate column in the log dialog, making it easier to find the changes which relate to a particular issue. 8026
103 7222 No Issue Tracker Information from Repository Browser 8040
104 7231 For the same reason, project properties will not be propagated automatically when a child folder is added using the repo browser. 8050
105 7243 The previous section deals with adding issue information to the log messages. But what if you need to get information from the issue tracker? The commit dialog has a COM interface which allows integration an external program that can talk to your tracker. Typically you might want to query the tracker to get a list of open issues assigned to you, so that you can pick the issues that are being addressed in this commit. 8063
106 7247 Any such interface is of course highly specific to your issue tracker system, so we cannot provide this part, and describing how to create such a program is beyond the scope of this manual. The interface definition and sample plugins in C# and C++/ATL can be obtained from the contrib folder in the TortoiseSVN repository. ( explains how to access the repository). A summary of the API is also given in Another (working) example plugin in C# is Gurtle which implements the required COM interface to interact with the Google Code issue tracker. 8067
107 7255 For illustration purposes, let's suppose that your system administrator has provided you with an issue tracker plugin which you have installed, and that you have set up some of your working copies to use the plugin in TortoiseSVN's settings dialog. When you open the commit dialog from a working copy to which the plugin has been assigned, you will see a new button at the top of the dialog. In this example you can select one or more open issues. The plugin can then generate specially formatted text which it adds to your log message. 8075
108 7511 Always close dialogs for local operations 8339
109 7515 Local operations like adding files or reverting changes do not need to contact the repository and complete quickly, so the progress dialog is often of little interest. Select this option if you want the progress dialog to close automatically after these operations, unless there are errors. 8343
110 7739 When using filtering in the log dialog, search terms are highlighted in the results using this colour. 8571
111 7975 Any path you specify here is assumed to apply recursively, so none of the child folders will show overlays either. If you want to exclude only the named folder, append ? after the path. 8815
112 7983 Users sometimes ask how these three settings interact. For any given path check the include and exclude lists, seeking upwards through the directory structure until a match is found. When the first match is found, obey that include or exclude rule. If there is a conflict, a single directory spec takes precedence over a recursive spec, then inclusion takes precedence over exclusion. 8823
113 7987 An example will help here: \n
Exclude:\n
C:\n
C:\\develop\\?\n
C:\\develop\\tsvn\\obj\n
C:\\develop\\tsvn\\bin\n
\n
Include:\n
C:\\develop\n
These settings disable icon overlays for the C: drive, except for c:\\develop. All projects below that directory will show overlays, except the c:\\develop folder itself, which is specifically ignored. The high-churn binary folders are also excluded.
8827
114 8003 It is often convenient to use a SUBST drive to access your working copies, e.g. using the command \n
subst T: C:\\TortoiseSVN\\trunk\\doc\n
However this can cause the overlays not to update, as TSVNCache will only receive one notification when a file changes, and that is normally for the original path. This means that your overlays on the subst path may never be updated.
8853
115 8007 An easy way to work around this is to exclude the original path from showing overlays, so that the overlays show up on the subst path instead. 8860
116 8011 Sometimes you will exclude areas that contain working copies, which saves TSVNCache from scanning and monitoring for changes, but you still want a visual indication that such folders are versioned. The Show excluded folders as 'normal' checkbox allows you to do this. With this option, versioned folders in any excluded area (drive type not checked, or specifically excluded) will show up as normal and up-to-date, with a green check mark. This reminds you that you are looking at a working copy, even though the folder overlays may not be correct. Files do not get an overlay at all. Note that the context menus still work, even though the overlays are not shown. 8864
117 8015 As a special exception to this, drives A: and B: are never considered for the Show excluded folders as 'normal' option. This is because Windows is forced to look on the drive, which can result in a delay of several seconds when starting Explorer, even if your PC does have a floppy drive. 8868
118 8031 Enabled Overlay Handlers 8884
119 8039 Because the number of overlays available is severely restricted, you can choose to disable some handlers to ensure that the ones you want will be loaded. Because TortoiseSVN uses the common TortoiseOverlays component which is shared with other Tortoise clients (e.g. TortoiseCVS, TortoiseHG) this setting will affect those clients too. 8893
120 8067 You must specify the full path to the executable. For TortoisePlink.exe this is the standard TortoiseSVN bin directory. Use the Browse button to help locate it. Note that if the path contains spaces, you must enclose it in quotes, e.g. \n
\"C:\\Program Files\\TortoiseSVN\\bin\\TortoisePlink.exe\"\n
8922
121 8075 TortoisePlink does not have any documentation of its own because it is just a minor variant of Plink. Find out about command line parameters from the PuTTY website 8933
122 8083 Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseSVN FAQ listed under Subversion/TortoiseSVN SSH How-To. 8941
123 8233 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+Del. 9142
124 8249 TortoiseSVN caches log messages fetched by the Show Log dialog to save time when you next show the log. If someone else edits a log message and you already have that message cached, you will not see the change until you clear the cache. Log message caching is enabled on the Log Cache tab. 9158
125 8277 TortoiseSVN keeps a log of everything written to its progress dialogs. This can be useful when, for example, you want to check what happened in a recent update command. 9187
126 8281 The log file is limited in length and when it grows too big the oldest content is discarded. By default 4000 lines are kept, but you can customize that number. 9191
127 8301 This dialog allows you to configure the log caching feature of TortoiseSVN, which retains a local copy of log messages and changed paths to avoid time-consuming downloads from the server. Using the log cache can dramatically speed up the log dialog and the revision graph. Another useful feature is that the log messages can still be accessed when offline. 9211
128 8309 Enables log caching whenever log data is requested. If checked, data will be retrieved from the cache when available, and any messages not in the cache will be retrieved from the server and added to the cache. 9219
129 8313 If caching is disabled, data will always be retrieved directly from the server and not stored locally. 9223
130 8321 Occasionally you may have to connect to a server which uses the same URL for all repositories. Older versions of svnbridge would do this. If you need to access such repositories you will have to check this option. If you don't, leave it unchecked to improve performance. 9231
131 8329 Some hosting services give all their repositories the same UUID. You may even have done this yourself by copying a repository folder to create a new one. For all sorts of reasons this is a bad idea - a UUID should be unique. However, the log cache will still work in this situation if you check this box. If you don't need it, leave it unchecked to improve performance. 9239
132 8337 If you are working offline, or if the repository server is down, the log cache can still be used to supply log messages already held in the cache. Of course the cache may not be up-to-date, so there are options to allow you to select whether this feature should be used. 9247
133 8341 When log data is being taken from the cache without contacting the server, the dialog using those message will show the offline state in its title bar. 9251
134 8349 When you invoke the log dialog you will normally want to contact the server to check for any newer log messages. If the timeout set here is non-zero then the server will only be contacted when the timeout has elapsed since the last time contact. This can reduce server round-trips if you open the log dialog frequently and the server is slow, but the data shown may not be completely up-to-date. If you want to use this feature we suggest using a value of 300 (5 minutes) as a compromise. 9259
135 8357 If you browse around a lot of repositories you will accumulate a lot of log caches. If you're not actively using them, the cache will not grow very big, so TortoiseSVN purges them after a set time by default. Use this item to control cache purging. 9267
136 8365 Larger caches are more expensive to reacquire, so TortoiseSVN only purges small caches. Fine tune the threshold with this value. 9275
137 8373 Occasionally something goes wrong with the caching and causes a crash. If this happens the cache is normally deleted automatically to prevent a recurrence of the problem. If you use the less stable nightly build you may opt to keep the cache anyway. 9283
138 8381 On this page you can see a list of the repositories that are cached locally, and the space used for the cache. If you select one of the repositories you can then use the buttons underneath. 9291
139 8389 Click on the Export button to export the entire cache as a set of CSV files. This could be useful if you want to process the log data using an external program, although it is mainly useful to the developers. 9299
140 8393 Click on Delete to remove all cached data for the selected repositories. This does not disable caching for the repository so the next time you request log data, a new cache will be created. 9303
141 8417 The amount of disk space used for the cache. Data is compressed, so disk usage is generally fairly modest. 9327
142 8465 The number of revision ranges which we have not fetched, simply because they haven't been requested. This is a measure of the number of holes in the cache. 9375
143 8505 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. 9416
144 8580 Called before an attempt to contact the repository. Called at most once in five minutes. 9492
145 8640 The repository revision to which the update should be done or after a commit completes. 9553
146 8644 Path to a file containing the error message. If there was no error, the file will be empty. 9557
147 8648 The current working directory with which the script is run. This is set to the common root directory of all affected paths. 9561
148 8656 Note that although we have given these parameters names for convenience, you do not have to refer to those names in the hook settings. All parameters listed for a particular hook are always passed, whether you want them or not ;-) 9569
149 8660 If you want the Subversion operation to hold off until the hook has completed, check Wait for the script to finish. 9573
150 8664 Normally you will want to hide ugly DOS boxes when the script runs, so Hide the script while running is checked by default. 9577
151 8672 A small tool is included in the TortoiseSVN installation folder named ConnectVPN.exe. You can use this tool configured as a pre-connect hook to connect automatically to your VPN before TortoiseSVN tries to connect to a repository. Just pass the name of the VPN connection as the first parameter to the tool. 9586
152 8680 TortoiseSVN can use a COM plugin to query issue trackers when in the commit dialog. The use of such plugins is described in . If your system administrator has provided you with a plugin, which you have already installed and registered, this is the place to specify how it integrates with your working copy. 9594
153 8688 Click on Add... to use the plugin with a particular working copy. Here you can specify the working copy path, choose which plugin to use from a drop down list of all registered issue tracker plugins, and any parameters to pass. The parameters will be specific to the plugin, but might include your user name on the issue tracker so that the plugin can query for issues which are assigned to you. 9602
154 8692 This property specifies the COM UUID of the IBugtraqProvider, for example {91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}. (this example is the UUID of the Gurtle bugtraq provider, which is a provider for the Google Code issue tracker). 9606
155 8696 This is the same as bugtraq:provideruuid, but for the 64-bit version of the IBugtraqProvider. 9610
156 8704 If you want all users to use the same COM plugin for your project, you can specify the plugin also with the properties bugtraq:provideruuid, bugtraq:provideruuid64 and bugtraq:providerparams. Please check the documentation of your IBugtraqProvider plugin to find out what to specify in these two properties. 9618
157 8732 You can select the font used to display the text, and the point size to use. This applies both to the file content, and to the author and revision information shown in the left pane. 9646
158 8780 A few infrequently used settings are available only in the advanced page of the settings dialog. These settings modify the registry directly and you have to know what each of these settings is used for and what it does. Do not modify these settings unless you are sure you need to change them. 9696
159 8788 Set this to true if you want a dialog to pop up for every command showing the command line used to start TortoiseProc.exe 9705
160 8796 This can be useful if you use something other than the windows explorer or if you get problems with the context menu displaying incorrectly. Set this value to false if you don't want TortoiseSVN to show icons for the shell context menu items. Set this value to true to show the icons again. 9714
161 8800 If you don't want TortoiseSVN to show icons for the context menus in its own dialogs, set this value to false. 9718
162 8804 The log dialog shows the revision the working copy path is at in bold. But this requires that the log dialog fetches the status of that path. Since for very big working copies this can take a while, you can set this value to false to deactivate this feature. 9722
163 8808 The status list control which is used in various dialogs (e.g., commit, check-for-modifications, add, revert, ...) uses full row selection (i.e., if you select an entry, the full row is selected, not just the first column). This is fine, but the selected row then also covers the background image on the bottom right, which can look ugly. To disable full row select, set this value to false. 9726
164 8812 The commit and log dialog use styling (e.g. bold, italic) in commit messages (see for details). If you don't want to do this, set the value to false. 9730
165 8816 TortoiseSVN uses accelerators for its explorer context menu entries. Since this can lead to doubled accelerators (e.g. the SVN Commit has the Alt-C accelerator, but so does the Copy entry of explorer). If you don't want or need the accelerators of the TortoiseSVN entries, set this value to false. 9734
166 8820 As with the explorer, TortoiseSVN shows additional commands if the Shift key is pressed while the context menu is opened. To force TortoiseSVN to always show those extended commands, set this value to true. 9738
167 8824 If you don't want the explorer to update the status overlays while another TortoiseSVN command is running (e.g. Update, Commit, ...) then set this value to true. 9742
168 8828 This value contains the URL from which TortoiseSVN tries to download a text file to find out if there are updates available. This might be useful for company admins who don't want their users to update TortoiseSVN until they approve it. 9746
169 8832 The extra columns the TortoiseSVN adds to the details view in Windows Explorer are normally only active in a working copy. If you want those to be accessible everywhere, not just in working copies, set this value to true. Note that the extra columns are only available in XP. Vista and later doesn't support that feature any more. 9750
170 8836 If an update adds a new file from the repository which already exists in the local working copy as an unversioned file, the default action is to keep the local file, showing it as a (possibly) modified version of the new file from the repository. If you would prefer TortoiseSVN to create a conflict in such situations, set this value to false. 9754
171 8840 TortoiseSVN checks whether there's a new version available about once a week. If an updated version is found, the commit dialog shows a link control with that info. If you prefer the old behavior back where a dialog pops up notifying you about the update, set this value to true. 9758
172 8844 TortoiseSVN checks whether there's a new version available about once a week. If you don't want TortoiseSVN to do this check, set this value to false. 9762
173 8848 The auto-completion list shown in the commit message editor displays the names of files listed for commit. To also include these names with extensions removed, set this value to true. 9766
174 8852 When you merge revisions from another branch, and merge tracking information is available, the log messages from the revisions you merge will be collected to make up a commit log message. A pre-defined string is used to separate the individual log messages of the merged revisions. If you prefer, you can set this to a value containing a separator string of your choice. 9770
175 8860 By default, TortoiseSVN always runs an update with externals included. This avoids problems with inconsistent working copies. If you have however a lot of externals set, an update can take quite a while. Set this value to false to run the default update with externals excluded. To update with externals included, either run the Update to revision... dialog or set this value to true again. 9779
176 8864 In most dialogs in TortoiseSVN, you can use Ctrl+Enter to dismiss the dialog as if you clicked on the OK button. If you don't want this, set this value to false. 9783
177 8868 Sometimes multiple users use the same account on the same computer. In such situations it's not really wanted to save the authentication data. Setting this value to false disables the save authentication button in the authentication dialog. 9787
178 9029 Replaced with the commit date/time of the highest commit revision. By default, international format is used: . Alternatively, you can specify a custom format which will be used with , for example: . For a list of available formatting characters, look at the . 9955
179 9097 Replaced with the lock date. Time formatting can be used as described for . 10024
180 9113 Some of these keywords apply to single files rather than to an entire working copy, so it only makes sense to use these when SubWCRev is called to scan a single file. This applies to $WCINSVN$, $WCISLOCKED$, $WCLOCKDATE$, $WCLOCKOWNER$ and $WCLOCKCOMMENT$. 10040
181 9139 A file like this will be included in the build so you would expect it to be versioned. Be sure to version the template file, not the generated file, otherwise each time you regenerate the version file you need to commit the change, which in turn means the version file needs to be updated. 10126
182 9167 This method traverses the working copy gathering the revision information. Naturally you must call this before you can access the information using the remaining methods. The first parameter is the path. The second parameter should be true if you want to include folder revisions. Equivalent to the command line switch. The third parameter should be true if you want to include svn:externals. Equivalent to the command line switch. 10154
183 9224 String representing the date when the lock was created, or an empty string if the item is not locked. 10211
184 9228 String representing the lock owner, or an empty string if the item is not locked. 10215
185 9249 \n
using LibSubWCRev;\n
SubWCRev sub = new SubWCRev();\n
sub.GetWCInfo(\"C:\\\\PathToMyFile\\\\MyFile.cc\", true, true);\n
if (sub.IsSvnItem == true)\n
{\n
MessageBox.Show(\"versioned\");\n
}\n
else\n
{\n
MessageBox.Show(\"not versioned\");\n
}\n
10480
186 9270 To get a tighter integration with issue trackers than by simply using the bugtraq: properties, TortoiseSVN can make use of COM plugins. With such plugins it is possible to fetch information directly from the issue tracker, interact with the user and provide information back to TortoiseSVN about open issues, verify log messages entered by the user and even run actions after a successful commit to e.g, close an issue. 10514
187 9278 You should provide both a 32-bit and 64-bit version of your plugin. Because the x64-Version of TortoiseSVN can not use a 32-bit plugin and vice-versa. 10522
188 9308 \n
HRESULT GetCommitMessage (\n
// Parent window for your provider's UI.\n
[in] HWND hParentWnd,\n
\n
// Parameters for your provider.\n
[in] BSTR parameters,\n
[in] BSTR commonRoot,\n
[in] SAFEARRAY(BSTR) pathList,\n
\n
// The text already present in the commit message.\n
// Your provider should include this text in the new message,\n
// where appropriate.\n
[in] BSTR originalMessage,\n
\n
// The new text for the commit message.\n
// This replaces the original message.\n
[out, retval] BSTR *newMessage\n
);\n
10605
189 9313 This is the main method of the plugin. This method is called from the TortoiseSVN commit dialog when the user clicks on the plugin button. 10629
190 9317 The parameters string is the string the user has to enter in the settings dialog when he configures the plugin. Usually a plugin would use this to find the URL of the issue tracker and/or login information or more. 10633
191 9321 The commonRoot string contains the parent path of all items selected to bring up the commit dialog. Note that this is not the root path of all items which the user has selected in the commit dialog. For the branch/tag dialog, this is the path which is to be copied. 10637
192 9325 The pathList parameter contains an array of paths (as strings) which the user has selected for the commit. 10641
193 9329 The originalMessage parameter contains the text entered in the log message box in the commit dialog. If the user has not yet entered any text, this string will be empty. 10645
194 9333 The newMessage return string is copied into the log message edit box in the commit dialog, replacing whatever is already there. If a plugin does not modify the originalMessage string, it must return the same string again here, otherwise any text the user has entered will be lost. 10649
195 9345 \n
HRESULT GetCommitMessage2 (\n
// Parent window for your provider's UI.\n
[in] HWND hParentWnd,\n
\n
// Parameters for your provider.\n
[in] BSTR parameters,\n
// The common URL of the commit\n
[in] BSTR commonURL,\n
[in] BSTR commonRoot,\n
[in] SAFEARRAY(BSTR) pathList,\n
\n
// The text already present in the commit message.\n
// Your provider should include this text in the new message,\n
// where appropriate.\n
[in] BSTR originalMessage,\n
\n
// You can assign custom revision properties to a commit\n
// by setting the next two params.\n
// note: Both safearrays must be of the same length.\n
// For every property name there must be a property value!\n
\n
// The content of the bugID field (if shown)\n
[in] BSTR bugID,\n
\n
// Modified content of the bugID field\n
[out] BSTR * bugIDOut,\n
\n
// The list of revision property names.\n
[out] SAFEARRAY(BSTR) * revPropNames,\n
\n
// The list of revision property values.\n
[out] SAFEARRAY(BSTR) * revPropValues,\n
\n
// The new text for the commit message.\n
// This replaces the original message\n
[out, retval] BSTR * newMessage\n
);\n
10661
196 9350 This method is called from the TortoiseSVN commit dialog when the user clicks on the plugin button. This method is called instead of GetCommitMessage(). Please refer to the documentation for GetCommitMessage for the parameters that are also used there. 10704
197 9354 The parameter commonURL is the parent URL of all items selected to bring up the commit dialog. This is basically the URL of the commonRoot path. 10708
198 9358 The parameter bugID contains the content of the bug-ID field (if it is shown, configured with the property bugtraq:message). 10712
199 9362 The return parameter bugIDOut is used to fill the bug-ID field when the method returns. 10716
200 9366 The revPropNames and revPropValues return parameters can contain name/value pairs for revision properties that the commit should set. A plugin must make sure that both arrays have the same size on return! Each property name in revPropNames must also have a corresponding value in revPropValues. If no revision properties are to be set, the plugin must return empty arrays. 10720
201 9375 This method is called right before the commit dialog is closed and the commit begins. A plugin can use this method to validate the selected files/folders for the commit and/or the commit message entered by the user. The parameters are the same as for GetCommitMessage2(), with the difference that commonURL is now the common URL of all checked items, and commonRoot the root path of all checked items. 10749
202 9379 For the branch/tag dialog, the commonURL is the source URL of the copy, and commonRoot is set to the target URL of the copy. 10753
203 9383 The return parameter errorMessage must either contain an error message which TortoiseSVN shows to the user or be empty for the commit to start. If an error message is returned, TortoiseSVN shows the error string in a dialog and keeps the commit dialog open so the user can correct whatever is wrong. A plugin should therefore return an error string which informs the user what is wrong and how to correct it. 10757
204 9387 \n
HRESULT OnCommitFinished (\n
// Parent window for any (error) UI that needs to be displayed.\n
[in] HWND hParentWnd,\n
\n
// The common root of all paths that got committed.\n
[in] BSTR commonRoot,\n
\n
// All the paths that got committed.\n
[in] SAFEARRAY(BSTR) pathList,\n
\n
\n
// The text already present in the commit message.\n
[in] BSTR logMessage,\n
\n
// The revision of the commit.\n
[in] ULONG revision,\n
\n
\n
// An error to show to the user if this function\n
// returns something else than S_OK\n
[out, retval] BSTR * error\n
);\n
10761
205 9392 This method is called after a successful commit. A plugin can use this method to e.g., close the selected issue or add information about the commit to the issue. The parameters are the same as for GetCommitMessage2. 10789
206 9401 This method is called from the settings dialog where the user can configure the plugins. If a plugin provides its own configuration dialog with ShowOptionsDialog, it must return TRUE here, otherwise it must return FALSE. 10808
207 9405 \n
HRESULT ShowOptionsDialog(\n
// Parent window for the options dialog\n
[in] HWND hParentWnd,\n
\n
// Parameters for your provider.\n
[in] BSTR parameters,\n
\n
// The parameters string\n
[out, retval] BSTR * newparameters\n
);\n
10812
208 9410 This method is called from the settings dialog when the user clicks on the \"Options\" button that is shown if HasOptions returns TRUE. A plugin can show an options dialog to make it easier for the user to configure the plugin. 10828
209 9414 The parameters string contains the plugin parameters string that is already set/entered. 10832
210 9438 users@tortoisesvn.tigris.org is the one to use if you have questions about using TortoiseSVN. 10860
211 9442 If you want to help out with the development of TortoiseSVN, then you should take part in discussions on dev@tortoisesvn.tigris.org. 10864
212 9446 If you want to help with the translation of the TortoiseSVN user interface or the documentation, send an e-mail to translators@tortoisesvn.tigris.org. 10868
213 9615 In the To Revision field enter the revision number that you want to revert to, namely the one before the first revision to be reverted. 11042
214 9671 vendor projects 11102
215 9691 Of the three methods described, this is the only one which needs no setup on the client side. Once externals are specified in the folder properties, all clients will get populated folders when they update. 11124
216 9759 If the files are already in the repository, they have to be deleted from the repository and added to the ignore list. Fortunately TortoiseSVN has a convenient shortcut for doing this. TortoiseSVNUnversion and add to ignore list will first mark the file/folder for deletion from the repository, keeping the local copy. It also adds this item to the ignore list so that it will not be added back into Subversion again by mistake. Once this is done you just need to commit the parent folder. 11221
217 9775 If you have a working copy which you no longer need, how do you get rid of it cleanly? Easy - just delete it in Windows Explorer! Working copies are private local entities, and they are self-contained. 11237
218 9893 As of version 1.5.0 and later, TortoiseSVN allows you to disable (actually, hide) context menu entries. Since this is a feature which should not be used lightly but only if there is a compelling reason, there is no GUI for this and it has to be done directly in the registry. This can be used to disable certain commands for users who should not use them. But please note that only the context menu entries in the explorer are hidden, and the commands are still available through other means, e.g. the command line or even other dialogs in TortoiseSVN itself! 11375
219 9897 The registry keys which hold the information on which context menus to show are HKEY_CURRENT_USER\\Software\\TortoiseSVN\\ContextMenuEntriesMaskLow and HKEY_CURRENT_USER\\Software\\TortoiseSVN\\ContextMenuEntriesMaskHigh. 11379
220 9901 Each of these registry entries is a DWORD value, with each bit corresponding to a specific menu entry. A set bit means the corresponding menu entry is deactivated. 11383
221 10075 Example: to disable the Relocate the Delete unversioned items and the Settings menu entries, add the values assigned to the entries like this: \n
0x0000000000080000\n
+ 0x0000000080000000\n
+ 0x2000000000000000\n
= 0x2000000080080000\n
The lower DWORD value (0x80080000) must then be stored in HKEY_CURRENT_USER\\Software\\TortoiseSVN\\ContextMenuEntriesMaskLow, the higher DWORD value (0x20000000) in HKEY_CURRENT_USER\\Software\\TortoiseSVN\\ContextMenuEntriesMaskHigh.
11557
222 10123 You can also specify a file which contains a list of paths, separated by newlines. The file must be in UTF-16 format. If you pass such a file, use instead of . To have TortoiseProc delete that file after the command is finished, you can pass the parameter . 11611
223 10338 Cleans up interrupted or aborted operations and unlocks the working copy in . Use to prevent the result dialog from popping up (either telling about the cleanup being finished or showing an error message). 11829
224 10427 Depending on the URLs and revisions to compare, this either shows a unified diff (if the option is set), a dialog with a list of files that have changed or if the URLs point to files starts the diff viewer for those two files. 11919
225 10544 Using special URLs, it is also possible to call TortoiseProc from a web page. 12055
226 10548 TortoiseSVN registers a new protocol tsvncmd: which can be used to create hyperlinks that execute TortoiseSVN commands. The commands and parameters are the same as when automating TortoiseSVN from the command line. 12059
227 10560 with cmd being one of the allowed commands and with parameter being a parameter like path or revision, depending on the command used. 12071
228 10581 The image diff tool has a few command line options which you can use to control how the tool is started. The program is called TortoiseIDiff.exe. 12102
229 10610 If specified, the image diff tool switches to the overlay mode (alpha blend). 12131
230 10614 If specified, the image diff tool fits both images together. 12135
231 10672 The depth combo box items relate to the -depth argument. 12208
232 11018 Every file and folder has a Subversion status value as reported by the Subversion library. In the command line client, these are represented by single letter codes, but in TortoiseSVN they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values. 12700
233 11058 If an item has subversion status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either. 12740
234 11062 An item can only have one Subversion status value. For example a file could be locally modified and it could be marked for deletion at the same time. Subversion returns a single status value - in this case deleted. Those priorities are defined within Subversion itself. 12744
235 11066 When TortoiseSVN displays the status recursively (the default setting), each folder displays an overlay reflecting its own status and the status of all its children. In order to display a single summary overlay, we use the priority order shown above to determine which overlay to use, with the Conflicted overlay taking highest priority. 12748
236 11142 Install Cygwin SSH daemon as described here: http://pigtail.net/LRP/printsrv/cygwin-sshd.html 12843
237 11146 Create a new Windows user account svnuser which we will use to access the repository. Be sure to give this user full access rights to the repository. 12847
238 11158 Grab the tools we need for using SSH on the windows client from this site: http://www.chiark.greenend.org.uk/~sgtatham/putty/ Just go to the download section and get Putty, Plink, Pageant and Puttygen. 12865
239 11166 The next step is to create a key pair for authentication. There are two possible ways to create keys. The first is to create the keys with PuTTYgen on the client, upload the public key to your server and use the private key with PuTTY. The other is to create the key pair with the OpenSSH tool ssh-keygen, download the private key to your client and convert the private key to a PuTTY-style private key. 12873
240 11174 Login to the server as root or svnuser and type: \n
ssh-keygen -b 1024 -t dsa -N passphrase -f keyfile\n
substituting a real pass-phrase (which only you know) and key file. We just created a SSH2 DSA key with 1024 bit key-phrase. If you type \n
ls -l keyfile*\n
you will see two files, keyfile and keyfile.pub. As you might guess, the .pub file is the public key file, the other is the private one.
12881
241 11178 Append the public key to those in the .ssh folder within the svnuser home directory: \n
cat keyfile.pub &gt;&gt; /home/svnuser/.ssh/authorized_keys\n
12890
242 11182 In order to use the private key we generated, we have to convert it to a putty format. This is because the private key file format is not specified by a standards body. After you download the private key file to your client PC, start PuTTYgen and use ConversionsImport key. Browse to your file keyfile which you got from the server the passphrase you used when creating the key. Finally click on Save private key and save the file as keyfile.PPK. 12897
243 11286 The standard installer has support only for English, but you can download separate language packs and spell check dictionaries separately after installation. 13049
244 11310 The documentation has also been translated into several different languages. You can download translated manuals from the support page on our website. 13075
Note: Line numbers are as in committed file, it may differ when you update to use newer .pot, also edited multi line messages may shift line position.

Total:244

Fuzzy mark test

String marked as fuzzy is not in final shape.

Index Line English Line Native
1 - Although most people just download the installer, you also have full read access to the source code of this program. You can browse it on this link http://code.google.com/p/tortoisesvn/source/browse/. The current development line is located under /trunk/, and the released versions are located under /tags/. 231 TortoiseSVN est un projet Open Source. Cela signifie que vous avez un accès total au code source de ce programme. Vous pouvez y accéder avec ce lien http://tortoisesvn.tigris.org/svn/tortoisesvn/. L'utilisateur est guest, et laissez le mot de passe vide. La version la plus récente (sur laquelle nous travaillons actuellement) est dans /trunk/, les versions publiées sont situées dans /tags/.
2 - In 2002, Tim Kemp found that Subversion was a very good version control system, but it lacked a good GUI client. The idea for a Subversion client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS. Tim studied the source code of TortoiseCVS and used it as a base for TortoiseSVN. He then started the project, registered the domain tortoisesvn.org and put the source code online. 248 En 2002, Tim Kemp a constaté que Subversion était un très bon système de contrôle de version, mais il lui manquait un bon client avec une interface graphique. L'idée d'un client Subversion comme une intégration du shell de Windows a été inspirée par le client semblable pour CVS nommé TortoiseCVS.
3 - Around that time, Stefan Küng was looking for a good and free version control system and found Subversion and the source for TortoiseSVN. Since TortoiseSVN was still not ready for use, he joined the project and started programming. He soon rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained. 253 Tim a étudié le code source de TortoiseCVS et l'a utilisé comme base pour TortoiseSVN. Il a alors commencé le projet, a enregistré le domaine tortoisesvn.org et a mis le code source en ligne. Pendant ce temps, Stefan Küng cherchait un bon système de contrôle de version gratuit et a trouvé Subversion et le source de TortoiseSVN. Puisque TortoiseSVN n'était toujours pas prêt à l'emploi il a alors rejoint le projet et a commencé à programmer. Bientôt il a réécrit la plupart du code existant et a commencé à ajouter des commandes et des fonctionnalités, jusqu'au point où rien n'est resté du code original.
4 - As Subversion became more stable it attracted more and more users who also started using TortoiseSVN as their Subversion client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseSVN. He now takes care of the website and manages the many translations. 258 Comme Subversion est devenu plus stable, il a attiré de plus en plus d'utilisateurs qui ont aussi commencé à utiliser TortoiseSVN comme leur client Subversion. La base utilisateur a grandi rapidement (et grandit toujours chaque jour). C'est à ce moment que Lübbe Onken s'est proposé d'aider avec des icônes agréables et un logo pour TortoiseSVN. Et il s'occupe du site Web et gère la traduction.
5 - This book is written for computer-literate folk who want to use Subversion to manage their data, but prefer to use a GUI client rather than a command line client. TortoiseSVN is a windows shell extension and it is assumed that the user is familiar with the windows explorer and how to use it. 343 Ce manuel est écrit pour les gens initiés à l'informatique qui veulent utiliser Subversion pour gérer leurs données, mais qui ne sont pas à l'aise pour utiliser le client en ligne de commande pour ce faire. Puisque TortoiseSVN est une extension du shell Windows, il est sous-entendu que l'utilisateur est familiarisé avec l'explorateur Windows et sait comment l'utiliser.
6 - But what are the changes? Right click on one of the changed files and select TortoiseSVNDiff. TortoiseSVN's file compare tool starts, showing you exactly which lines have changed. 583 Pour fusionner la branche de fonction dans le tronc, vous devez aller sur une copie de travail du tronc. Sélectionnez TortoiseSVNFusionner... du menu contextuel.
7 - If you want to undo the effects of a particular revision, start with the Log dialog and find the offending revision. Select Context MenuRevert changes from this revision and those changes will be undone. 636 Ou si vous voulez faire d'une révision précédente la nouvelle révision HEAD, faites un clic droit sur les révisions sélectionnées, puis sélectionnez Menu contextuelRevenir à cette révision. Cela annulera tous les changements après la révision choisie.
8 - TortoiseSVN does not support file:// access to BDB repositories due to these compatibility issues, although it will of course always support this repository format when accessed via a server through the svn://, http:// or https:// protocols. 1208 Pour des problèmes de compatibilité, les accès aux référentiels BDB de type file:// ne seront plus supportés dans les versions futures de TortoiseSVN, cependant l'accès à ce type de référentiel via un serveur en utilisant les protocoles svn://, http:// ou https:// sera toujours supporté. Pour cette raison, pour les référentiels destinés à être utilisés via le protocole file:// doivent être créés en FSFS.
9 - import this structure into the repository via a right click on the folder that contains this folder structure and selecting TortoiseSVNImport... In the import dialog enter the URL to your repository and click OK. This will import your temp folder into the repository root to create the basic repository layout. 1376 importez cette structure dans le référentiel via un clic droit sur le dossier et choisissez TortoiseSVNImporter... Cela importera votre dossier temporaire dans la racine du référentiel pour créer la disposition de base du référentiel.
10 - You can get those three files directly from our source repository at http://tortoisesvn.googlecode.com/svn/trunk/contrib/svnindex. ( explains how to access the TortoiseSVN source repository). 2235 Vous pouvez récupérer ces trois fichiers depuis notre référentiel : http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/contrib/other/svnindex. ( explique comment accéder au référentiel des sources de TortoiseSVN).
11 - svn.simple contains credentials for basic authentication (username/password). Note that passwords are stored using the WinCrypt API, not in plain text form. 2945 svn.simple contient les accréditations pour l'authentification de base (nom d'utilisateur/mot de passe).
12 - In windows explorer, Right click on the checked out folder, then use TortoiseSVNRepo-Browser to bring up the repository browser. Find the sub-folder you would like to add to your working copy, then use Context menuUpdate item to revision... That menu will only be visible if the selected item does not exist yet in your working copy, but the parent item does exist. 3221 Dans l'explorateur de référentiel, faites un click droit sur le répertoire extrait, puis utilisez TortoiseSVNExplorateur de référentiel pour afficher l'explorateur de référentiel. Trouvez le sous répertoire que vous souhaitez ajouter à votre version de travail, et utilisez Menu contextuelMettre à jour à la révision.... Ce menu ne sera visible que si les éléments sélectionnés n'existent pas dans votre copie de travail, et que l'élément parent y est.
13 - A file conflict occurs when two or more developers have changed the same few lines of a file. As Subversion knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string &lt;&lt;&lt;&lt;&lt;&lt;&lt;. The conflicting area is marked like this: \n
&lt;&lt;&lt;&lt;&lt;&lt;&lt; filename\n
your changes\n
=======\n
code merged from repository\n
&gt;&gt;&gt;&gt;&gt;&gt;&gt; revision\n
Also, for every conflicted file Subversion places three additional files in your directory:
3708 Un conflit de fichier arrive quand 2 développeurs our plus modifient un même fichier. Dans la mesure où Subversion ne sait rien de votre projet, il laisse la résolution des conflits à la charge des développeurs. Dès qu'un conflit est détecté, vous devriez ouvrir le fichier en question, et chercher les lignes commençant par &lt;&lt;&lt;&lt;&lt;&lt;&lt;. La zone en conflit est marquée de cette manière: \n
\t&lt;&lt;&lt;&lt;&lt;&lt;&lt; nom_de_fichier\n
\t\tvos modifications\n
\t=======\n
\t\tcode fusionné depuis le référentiel\n
\t&gt;&gt;&gt;&gt;&gt;&gt;&gt; révision\n
\t
De plus, pour chaque conflit Subversion place trois fichiers dans votre répertoire:
14 - Compare the selected revision with the previous revision. This works in a similar manner to comparing with your working copy. For folders this option will first show the changed files dialog allowing you to select files to compare. 4386 Compare la révision sélectionnée avec la révision précédente. Cette fonctionnalité est similaire à la comparaison avec votre copie de travail.
15 - Show the changed files dialog allowing you to select files. Blame the selected revision, and the previous revision, and compare the results using a visual diff tool. (folders only). 4395 Annoter la révision sélectionnée et la révision précédente et comparer les résultats en utilisant un outil de comparaison. (juste valable pour les répertoires).
16 - Click on the search icon to select which information you want to search in, and to choose regex mode. Normally you will only need a simple sub-string search, but if you need to more flexible search terms, you can use regular expressions. If you hover the mouse over the box, a tooltip will give hints on how to use the regex functions, or the sub-string functions. The filter works by checking whether your filter string matches the log entries, and then only those entries which match the filter string are shown. 4836 Cliquez sur l'icone de recherche pour sélectionner le type d'information que vous souhaitez rechercher, et pour choisir le mode regex. Vous ne devriez avoir besoin que d'une simple recherche de texte, mais si vous souhaitez plus de flexibilité, vous pouvez alors utiliser les expressions regulières. Si vous passez la souris au dessus de la boite, une tooltip vous donnera des informations sur comment utiliser les fonctions d'expressions regulières. Vous pouvez également trouver l'aide en ligne et un tutoriel à cette adresse http://www.regular-expressions.info/. Seuls les commentaires de révision passant le filtre (i.e. qui matchent le filtre) sont affichés.
17 - Describing the use of regular expression searches is beyond the scope of this manual, but you can find online documentation and a tutorial at http://www.regular-expressions.info/. 4858 Si vous êtes peu familiers avec les expressions régulières, jetez un coup d'oeil à la documentation en ligne et au didactitiel à http://www.regular-expressions.info/.
18 - You can also filter the path names in the bottom pane using the Show only affected paths checkbox. Affected paths are those which contain the path used to display the log. If you fetch the log for a folder, that means anything in that folder or below it. For a file it means just that one file. Normally the path list shows any other paths which are affected by the same commit, but in grey. If the box is checked, those paths are hidden. 4867 Vous pouvez aussi filtrer les noms de chemin dans le panneau du bas en utilisant la case à cocher Cacher les chemins changés sans relation. Les chemins liés sont ceux qui contiennent le chemin utilisé pour montrer le journal. Si vous parcourez le journal pour un dossier, cela signifie tout dans ce dossier ou en dessous. Pour un fichier cela signifie juste ce fichier. La case à cocher a trois états : vous pouvez montrer tous les chemins, griser ceux sans relation, ou cacher complètement les chemins sans relation.
19 - Edit properties at HEAD revision 5959 Temps d'attente maximum écoulé avant la mise à jour de la révision de tête (HEAD).
20 - You can configure Subversion and TortoiseSVN to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this. 6012 Vous pouvez configurer Subversion pour définir automatiquement des propriétés sur les fichiers et sur les dossiers lorsqu'ils sont ajoutés au référentiel. Lisez pour plus d'informations.
21 - 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. 6085 Dans la boîte de dialogue Livrer, vous avez une option pour coller la liste des fichiers changés, en incluant le statut de chaque fichier (ajouté, modifié, etc). tsvn:logfilelistenglish définit si le statut de fichier est inséré en anglais ou dans la langue locale. Si la propriété n'est pas définie, la valeur par défaut est true.
22 - 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. 6090 TortoiseSVN peut utiliser des modules de vérification orthographique qui sont aussi utilisés par OpenOffice et Mozilla. Si vous avez ceux-ci installés, cette propriété déterminera quel vérificateur d'orthographe utiliser, c'est-à-dire en quelle langue les commentaire de votre projet devraient être écrits. tsvn:projectlanguage définit le module de langue que le moteur de vérification orthographique devrait utiliser quand vous entrez un commentaire. Vous pouvez trouver les valeurs pour votre langue sur cette page : MSDN : Language Identifiers.
23 - Some tsvn: properties require a true/false value. TortoiseSVN also understands yes as a synonym for true and no as a synonym for false. 6132 Certaines propriétés tsvn: exigent une valeur true/false. TSVN comprend aussi yes comme synonyme de true et no comme synonyme de false.
24 - TortoiseSVN can integrate with some bug tracking tools. This uses project properties that start with bugtraq:. Read for further information. 6137 TortoiseSVN peut s'intégrer à quelques outils de traque de bugs. Cela utilise des propriétés, qui commencent par bugtraq:. Lisez pour plus d'informations.
25 - It can also integrate with some web-based repository browsers, using project properties that start with webviewer:. Read for further information. 6142 Il peut aussi s'intégrer à certains explorateurs de référentiel en ligne. Lisez pour plus d'informations.
26 - These special project 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 sub-folder, then it is sufficient to set the properties on trunk/. If you can't be sure, you should set the properties recursively on each sub-folder. A property setting deeper in the project hierarchy overrides settings on higher levels (closer to trunk/). 6151 Ces propriétés tsvn: doivent être mises sur les dossiers pour que le système fonctionne. Quand vous livrez un fichier ou un dossier, les propriétés sont lues à partir de ce dossier. Si les propriétés ne sont pas trouvées là, TortoiseSVN cherchera vers le haut dans l'arborescence des dossiers pour les trouver jusqu'à ce qu'il arrive à un dossier non versionné, ou jusqu'à ce que la racine de l'arbre (par exemple C:\\) soit trouvée. Si vous pouvez être sûr que chaque utilisateur extraie seulement du trunk/ par exemple et non d'un sous-dossier, il est alors suffisant de mettre les propriétés sur trunk/. Si vous ne pouvez pas être sûr, vous devriez définir les propriétés récursivement sur chaque sous-dossier. Une propriété définit plus profondemment dans la hiérarchie du projet ignore les réglages sur les niveaux supérieurs (plus près de trunk/).
27 - If the external project is in the same repository, any changes you make there will be included in the commit list when you commit your main project. 6257 Si le projet externe est dans le même référentiel, les changements que vous y faites seront inclus dans la liste de livraisons quand vous livrerez votre projet principal.
28 - Now everything is set up, all you have to do is click on the Merge button. If you want to preview the results Test Merge simulates 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 files where conflicts may occur. Because merge tracking makes the merge process a lot more complicated, there is no guaranteed way to find out in advance whether the merge will complete without conflicts, so files marked as conflicted in a test merge may in fact merge without any problem. 6765 A présent que tout est correctement configuré, tout ce que vous avez à faire est de cliquer sur le bouton Fusionner. Si vous voulez avoir un aperçu du résultat, le bouton Tester la fusion fera la fusion mais sans modifier la CdT. La liste des fichiers affectés par la fusion s'affichera, ainsi que les endroits où il y a des conflits.
29 - Normally you will want to look at the conflicts and resolve them yourself. In that case, choose the Edit Conflict which will start up your merge tool. When you are satisfied with the result, click Resolved. 6862 Normalement vous allez vouloir voir les conflits et les résoudre. Dans ce cas, choisissez éditer le conflit qui lancera l'outil de fusion. Lorsque vous êtes satisfait du résultat, cliquez sur Résolu.
30 - 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. 7352 Si vous choisissez deux éléments, vous pouvez voir les différences soit avec des différences unifiées, soit comme une liste des fichiers qui peuvent être comparés visuellement en utilisant l'outil de comparaison par défaut. Cela peut être particulièrement utile pour comparer deux étiquettes pour voir ce qui a changé.
31 - 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. 7361 Si vous choisissez deux éléments, vous pouvez voir les différences soit avec des différences unifiées, soit comme une liste des fichiers qui peuvent être comparés visuellement en utilisant l'outil de comparaison par défaut. Cela peut être particulièrement utile pour comparer deux étiquettes pour voir ce qui a changé.
32 - 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. 7378 Vous pouvez aussi utiliser l'explorateur de référentiel pour les opérations de glisser-déplacer. Si vous glissez un dossier de l'explorateur dans l'explorateur de référentiel, il sera importé dans le référentiel. Notez que si vous glisser plusieurs éléments, ils seront importés dans des livraisons séparées.
33 - 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. 7387 Si vous voulez copier/déplacer un fichier ou un dossier à un autre emplacement et lui donner aussi un nouveau nom en même temps, vous pouvez glisser avec le bouton droit ou glisser avec le bouton droit et Ctrl l'élément au lieu de le glisser. Dans ce cas, une boîte de dialogue renommer s'affiche où vous pouvez saisir un nouveau nom pour le fichier ou le dossier.
34 - 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. 7396 Parfois quand vous essayerez d'ouvrir un chemin, vous obtiendrez un message d'erreur à la place des détails de l'élément. Cela pourrait arriver si vous spécifiez une URL invalide, ou si vous n'avez pas d'autorisation d'accès, ou s'il y a d'autres problèmes serveur. Si vous devez copier ce message pour l'inclure dans un e-mail, faites simplement un clic droit dessus et utilisez Menu contextuelCopier le message d'erreur dans le presse-papiers, ou utilisez simplement CTRL+C.
35 - 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 500,000 revisions you could be waiting for some time. 7425 Pour générer le graphique, TortoiseSVN doit aller chercher tous les commentaires depuis la racine de référentiel. Inutile de dire cela peut prendre plusieurs minutes même avec un référentiel de quelques milliers de révisions, selon la vitesse du serveur, la bande passante du réseau, etc. Si vous essayez cela avec quelque chose comme le projet Apache qui a actuellement plus de 300000 révisions vous pourriez attendre un moment.
36 - The good news is that if you are using log caching, you only have to suffer this delay once. After that, log data is held locally. Log caching is enabled in TortoiseSVN's settings. 7430 La bonne nouvelle est que vous si mettez le journal en cache, vous n'aurez à attendre qu'une fois. Ensuite, ces données seront stockées localement. Ce paramètre est activé dans la page Mise en cache du journal de la fenêtre de configuration de TortoiseSVN.
37 - Items which have been added, or created by copying another file/folder are shown using a rounded rectangle. The default colour is green. Tags and trunks are treated as a special case and use a different shade, depending on the TortoiseSVNSettings 7443 Les éléments qui ont été ajoutés, ou créés en copiant un autre fichier/dossier sont affichés en utilisant un rectangle arrondi.
38 - Deleted items eg. a branch which is no longer required, are shown using an octagon (rectangle with corners cut off). The default colour is red. 7452 Les éléments supprimés, une branche qui n'est plus exigée par exemple, sont montrées en utilisant un octogone (un rectangle avec des coins coupés).
39 - Note that by default the graph only shows the points at which items were added, copied 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. 7501 Le graphique de révision montre plusieurs types de noeud : Notez que par défaut le graphique ne montre que les points auxquels les éléments ont été ajoutés ou supprimés. Afficher chaque révision d'un projet pourrait produire un graphique très grand pour des cas peu communs. Si vous voulez vraiment voir toutes les révisions, il existe une option pour ce faire dans le menu Affichage et sur la barre d'outils.
40 - 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. 7662 Si vous sélectionnez deux révisions (faites un clic gauche avec Ctrl), vous pouvez utiliser le menu contextuel pour afficher les différences entre ces révisions. Vous pouvez vouloir afficher les différences comme aux points de création de branche, mais le plus souvent vous voudrez afficher les différences aux points de fin de branche, c'est-à-dire à la révision HEAD.
41 - 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. 7739 Parfois vous pouvez vouloir une copie de votre arborescence de travail sans ces répertoires .svn, par exemple pour créer un paquet zippé de votre source ou pour l'exporter vers un serveur web. Au lieu de faire une copie puis de supprimer tous ces répertoires .svn manuellement, TortoiseSVN propose la commande TortoiseSVNExporter.... Si vous exécutez cette commande sur votre copie de travail on vous demandera un emplacement pour sauvegarder la copie de travail propre sans les répertoires .svn. Par défaut, seuls les fichiers versionnés sont exportés, mais vous pouvez utilisez la case Exporter aussi les fichiers non versionnés pour inclure tous les autres fichiers non versionnés qui existent dans votre CdT et pas dans le référentiel. Les références externes utilisant svn:externals peuvent être omises au besoin.
42 - 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. 7756 Parfois vous pouvez vouloir une copie de votre arborescence de travail sans ces répertoires .svn, par exemple pour créer un paquet zippé de votre source ou pour l'exporter vers un serveur web. Au lieu de faire une copie puis de supprimer tous ces répertoires .svn manuellement, TortoiseSVN propose la commande TortoiseSVNExporter.... Si vous exécutez cette commande sur votre copie de travail on vous demandera un emplacement pour sauvegarder la copie de travail propre sans les répertoires .svn. Par défaut, seuls les fichiers versionnés sont exportés, mais vous pouvez utilisez la case Exporter aussi les fichiers non versionnés pour inclure tous les autres fichiers non versionnés qui existent dans votre CdT et pas dans le référentiel. Les références externes utilisant svn:externals peuvent être omises au besoin.
43 - 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. 7761 Une autre façon de faire une exportation consiste à glisser avec le bouton droit un dossier de la copie de travail vers un autre emplacement et de choisir Menu contextuelSVN Exporter ici ou Menu contextuelSVN Exporter tout ici. La seconde option inclut aussi bien les fichiers non versionnés.
44 - 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). 7766 Si le répertoire cible contient déjà un répertoire du même nom que celui que vous exportez, un nouveau répertoire sera créé avec un suffixe (n) suffix, par exempleCible (1).
45 - 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. 7836 Si votre référentiel a pour quelque raison que ce soit changé d'emplacement (IP/URL). Peut-être que vous êtes même bloqué et que vous ne pouvez pas livrer et que vous ne voulez pas extraire votre copie de travail à nouveau depuis le nouvel emplacement et déplacer toutes vos données modifiées dans la nouvelle copie de travail, TortoiseSVNRelocaliser est la commande que vous recherchez. Elle fait essentiellement très peu : elle parcourt toutes les fichiers \"entries\" dans les dossiers .svn et change l'URL des entrées avec la nouvelle valeur.
46 - Set this to true, if you want TortoiseSVN to warn you because of an empty issue-number text field. Valid values are true/false. If not defined, false is assumed. 7942 Mettez cela à true, si vous voulez que TortoiseSVN vous avertisse quand le champ du numéro d'incident est vide. Les valeurs valables sont true/false. Si elle n'est pas définie, false est par défaut.
47 - 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: 7947 Il y a deux façons d'intégrer TortoiseSVN avec les traqueurs d'incidents. L'une est basée sur des chaînes simples, l'autre sur les expressions régulières. Les propriétés utilisées par les deux approches sont :
48 - This property activates the bug tracking 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 log message. It must contain %BUGID%, which is replaced with the issue number on commit. This ensures that your commit log contains a reference to the issue number which is always in a consistent format and can be parsed by your bug tracking tool to associate the issue number with a particular commit. As an example you might use Issue : %BUGID%, but this depends on your Tool. 7956 Cette propriété active le système de traque de bugs en mode champ de saisie. Si cette propriété est définie, alors TortoiseSVN vous demandera d'entrer un numéro d'incident quand vous livrez vos changements. Elle est utilisée pour ajouter une ligne à la fin du commentaire. Elle doit contenir %BUGID%, qui est remplacé par le numéro d'incident à la livraison. Cela assure que votre journal de livraison contient une référence au numéro d'incident qui est toujours dans un format cohérent et peut être analysé syntaxiquement par votre outil de traque de bugs pour associer le numéro d'incident à une livraison particulière. Par exemple le projet de TortoiseSVN utilise Issue : %BUGID%, mais cela dépend de votre outil.
49 - This text is shown by TortoiseSVN on the commit dialog to label the edit box where you enter the issue number. 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. 7965 Ce texte est affiché par TortoiseSVN sur la boîte de dialogue de livraison comme label pour la boîte de saisie où vous entrez le numéro d'incident. S'il n'est pas défini, Bug-ID/ N° d'incident sera affiché. Gardez à l'esprit que la fenêtre ne sera pas redimensionnée pour s'adapter à ce label, gardez donc la taille de du label en-dessous de 20-25 caractères.
50 - If set to true only numbers are allowed in the issue-number text field. An exception is the comma, so you can comma separate several numbers. Valid values are true/false. If not defined, true is assumed. 7970 Si elle est définie à true, seuls les nombres sont autorisés dans le champ du numéro d'incident. La virgule est une exception, donc vous pouvez séparer plusieurs numéros par des virgules. Les valeurs valides sont true/false. Si elle n'est pas définie, true est la valeur par défaut.
51 - If only one expression is set, then the bare bug IDs must be matched in the groups of the regex string. Example: [Ii]ssue(?:s)? #?(\\d+) This method is required by a few issue trackers, e.g. trac, but it is harder to construct the regex. We recommend that you only use this method if your issue tracker documentation tells you to. 8003 Si seule une expression est définie, alors l'ID du bug seul doit correspondre aux groupes de la chaîne regex. Exemple : [Ii]ssue(?:s)? #?(\\d+)
52 - If you are unfamiliar with regular expressions, take a look at the introduction at http://en.wikipedia.org/wiki/Regular_expression, and the online documentation and tutorial at http://www.regular-expressions.info/. 8008 Si vous êtes peu familiers avec les expressions régulières, jetez un coup d'oeil à la documentation en ligne et au didactitiel à http://www.regular-expressions.info/.
53 - 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. 8013 Dans l'approche avec les expressions régulières, TortoiseSVN n'affiche pas de champ de saisie séparé, mais marque la partie du commentaire que l'utilisateur entre qui est reconnue par le traqueur d'incidents. Cela se fait pendant que l'utilisateur écrit le commentaire. Cela signifie aussi que l'ID de bug peut être n'importe où à l'intérieur d'un commentaire ! Cette méthode est beaucoup plus souple et c'est celle utilisée par le projet de TortoiseSVN lui-même.
54 - Because the issue tracker integration depends upon accessing subversion properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser unless you started the repo browser from your working copy. If you started the repo browser by entering the URL of the repository you won't see this feature. 8044 Le formattage dépend des propriétés d'accès de subversion, vous ne verrez que le résultat lorsque vous utiliserez une copie de travail exportée. Afficher les propriétés à distance étant une opération lente, vous ne pourrez pas l'effectuer depuis l'explorateur de référentiel.
55 - This issue tracker integration is not restricted to TortoiseSVN; it can be used with any Subversion client. For more information, read the full Issue Tracker Integration Specification in the TortoiseSVN source repository. ( explains how to access the repository). 8054 Cette intégration de tracker d'incidents n'est pas limité à TortoiseSVN ; elle peut être utilisée avec n'importe quel client Subversion. Pour plus d'informations, lisez Issuetracker Integration Specification.
56 - Because the repo viewer integration depends upon accessing subversion properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser unless you started the repo browser from your working copy. If you started the repo browser by entering the URL of the repository you won't see this feature. 8119 Le formattage dépend des propriétés d'accès de subversion, vous ne verrez que le résultat lorsque vous utiliserez une copie de travail exportée. Afficher les propriétés à distance étant une opération lente, vous ne pourrez pas l'effectuer depuis l'explorateur de référentiel.
57 - Check for updates 8160 Vérifier les modifications
58 - TortoiseSVN will contact its download site periodically to see if there is a newer version of the program available. If there is it will show a notification link in the commit dialog. 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. 8165 Si elle est cochée, TortoiseSVN entrera en contact avec son site de téléchargement une fois par semaine pour voir s'il y a une version plus récente du programme disponible. Utilisez Vérifier maintenant si vous voulez une réponse tout de suite. La nouvelle version ne sera pas téléchargée ; vous recevez simplement une boîte de dialogue d'information vous disant que la nouvelle version est disponible.
59 - 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. These patterns should not include any path separators. Note also that there is no way to differentiate between files and directories. Read for more information on the pattern-matching syntax. 8202 Les modèles d'exclusion globaux sont utilisés pour empêcher des fichiers non versionnés d'apparaître dans la boîte de dialogue de livraison par exemple. Les fichiers correspondant aux modèles sont aussi ignorés lors d'un import. Ignorez des fichiers ou des répertoires en saisissant les noms ou les extensions. Les modèles sont séparés par des espaces par exemple */bin */obj *.bak *.~?? *.jar *.[Tt]mp. Les deux premières entrées se réfèrent aux répertoires, les quatre autres aux fichiers. Ces modèles utilisent l'expansion de nom de fichier. Lisez pour plus d'informations.
60 - This option tells TortoiseSVN to set the file dates 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 date stamps 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. 8223 Cette option indique à TortoiseSVN de mettre la date des fichiers à la date de dernière livraison lors d'une extraction ou d'une mise à jour. Autrement TortoiseSVN utilisera la date actuelle. Si vous développez des logiciels, il est généralement mieux d'utiliser la date actuelle parce que les systèmes de compilation regardent normalement les dates pour décider quels fichiers ont besoin d'être compilés. Si vous utilisez \"la date de dernière livraison\" et revenez à une révision de fichier plus vieille, votre projet peut ne pas compiler comme vous vous y attendez.
61 - 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. 8232 Utilisez Éditer pour éditer directement le fichier de configuration de Subversion. Quelques réglages ne peuvent pas être modifiés directement par TortoiseSVN et ont besoin d'être définis ici à la place. Pour plus d'informations concernant le fichier config Subversion, regardez le Manuel Subversion. La section sur Automatic Property Setting a beacoup d'intérêt et c'est ce qui se configure ici. Notez que Subversion peut lire l'information de configuration depuis plusieurs endroits et vous devez savoir lequel à la priorité. Référez-vous à Configuration and the Windows Registry pour en savoir plus.
62 - Limits the number of log messages that TortoiseSVN fetches when you first select TortoiseSVNShow Log Useful for slow server connections. You can always use Show All or Next 100 to get more messages. 8289 Limite le nombre de commentaires que TortoiseSVN va d'abord chercher quand vous choisissez TortoiseSVNVoir le journal Utile avec des connexions serveur lentes. Vous pouvez toujours utiliser Afficher tout ou 100 suivants pour obtenir plus de messages.
63 - Auto-close 8318 auto-props
64 - The auto-completion 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 auto-completion information, you can extend the timeout. 8411 L'analyseur syntaxique d'autocomplétion peut être assez lent s'il y a beaucoup de grands fichiers à vérifier. Ce délai empêche la boîte de dialogue de livraison de se bloquer trop longtemps. Si vous manquez d'informations d'autocomplétion importantes, vous pouvez étendre le délai.
65 - When you type in a log message in the commit dialog, TortoiseSVN stores it for possible re-use later. By default it will keep the last 25 log messages for each repository, but you can customize that number here. If you have many different repositories, you may wish to reduce this to avoid filling your registry. 8428 TortoiseSVN stocke les 25 derniers commentaires que vous avez entrés pour chaque référentiel. Vous pouvez personnaliser le nombre stocké ici. Si vous avez beaucoup de référentiels différents, vous pouvez vouloir le réduire pour éviter de remplir votre registre.
66 - 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. 8473 Si votre projet a la propriété tsvn:lockmsgminsize, vous verrez tout de même la fenêtre de verrouillage parce que le projet a besoin de messages de verrouillage.
67 - Filter match 8566 filtrer
68 - 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 real time but it can take a few seconds for the overlays to change. 8735 Met en cache toute l'information de statut dans un processus séparé (TSVNCache.exe). Ce processus observe tous les disques pour les changements et va chercher le statut de nouveau si les fichiers à l'intérieur d'une copie de travail sont modifiés. Le processus s'exécute avec la priorité la plus faible possible pour que les autres programmes ne soient pas ralentis à cause de cela. Cela signifie aussi que l'information de statut n'est pas en temps réel mais cela peut prendre quelques secondes pour que les recouvrements changent.
69 - 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 tree view usually change too. 8740 Avantage : les recouvrements montrent le statut récursivement, c'est-à-dire si un fichier est modifié dans les profondeurs d'une copie de travail, tous les dossiers jusqu'à la racine de la copie de travail montreront aussi le recouvrement modifié. Et puisque le processus peut envoyer des notifications au shell, les recouvrements sur l'arborescence gauche changent d'habitude aussi.
70 - 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. 8777 Inconvénient : L'information de statut des fichiers et des dossiers n'est pas affichée dans l'Explorateur. Pour voir si vos copies de travail sont modifiées, vous devez utiliser la boîte de dialogue \"Vérifier les modifications\".
71 - Since it takes quite a while to fetch the status of a working copy, TortoiseSVN uses a cache to store the status 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: 8782 Puisque cela prend du temps de récupérer le statut d'une copie de travail, TortoiseSVN utilise un cache pour stocker le statut pour que l'explorateur ne soit pas trop bloqué en montrant les recouvrements. Vous pouvez choisir quel type de cache TortoiseSVN devrait utiliser selon votre système et la taille de la copie de travail ici :
72 - By default, overlay icons and context menus 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 and context menu only in explorer box. 8787 Par défaut, les icônes de recouvrement apparaîtront dans toutes les boîtes de dialogue Ouvrir/Enregistrer comme dans l'explorateur Windows. Si vous voulez qu'elles n'apparaissent que dans l'explorateur Windows, cochez la case Voir le recouvrement seulement dans l'explorateur.
73 - 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. This option is only available when you use the default status cache option (see below). 8792 Si vous sélectionnez l'option par défaut, vous pouvez aussi choisir de marquer les répertoires comme modifiés s'ils contiennent des éléments non versionnés. Cela peut être utile pour vous rappeler que vous avez créé de nouveaux fichiers qui ne sont pas encore versionnés. Cette option n'est disponible que lorsque vous utilisez l'option de statut de cache par défaut (voir ci-dessous)
74 - The next group allows you to select which classes of storage should show overlays. By default, only hard drives are selected. You can even disable all icon overlays, but where's the fun in that? 8797 Cette page vous permet de choisir les éléments pour lesquels TortoiseSVN montrera les recouvrements d'icône. Les disques réseau peuvent être très lents, donc par défaut les icônes ne s'affichent pas pour les copies de travail placées sur les partages de réseau. Vous pouvez même désactiver tous les recouvrements d'icône, mais qu'y-a-t-il d'amusant à cela ?
75 - 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, or if you only want TortoiseSVN to look in specific folders. 8810 Les Chemins exclus sont utilisés pour indiquer à TortoiseSVN que ces chemins ne devraient pas montrer les recouvrements d'icône et les colonnes de statut. Cela est utile si vous avez de très grandes copies de travail contenant seulement des bibliothèques que vous ne changerez pas du tout et donc pour lesquelles vous n'aurez pas besoin des recouvrements. Par exemple :
76 - The Settings Dialog, Icon Handlers Page 8888 La boîte de dialogue Configuration, page Ensemble d'icônes
77 - 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. 8913 Si vous devez mettre en place des réglages de proxy par référentiel, vous devez utiliser le fichier servers de Subversion. Utilisez Éditer pour y accéder directement. Consultez le Manuel Subversion pour plus de détails sur la façon d'utiliser ce fichier.
78 - 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. TortoiseSVN 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 TortoiseSVN will skip pre-processing the files. 9021 Si vous utilisez la propriété svn:keywords pour développer des mots-clés et en particulier la revision d'un fichier, alors il peut y avoir des différences entre les fichiers qui est purement dûe à la valeur actuelle du mot-clé. Aussi si vous utilisez svn:eol-style = native le fichier de BASE aura des fins de ligne LF tandis que votre fichier aura des fins de ligne CR-LF. TSVN cachera normalement ces différences automatiquement en analysant syntaxiquement le fichier de BASE pour étendre les mots-clés et les fins de ligne avant de faire l'opération de comparaison. Cependant, cela peut prendre du temps avec de grands fichiers. Si Convertir les fichiers lors d'une comparaison avec la BASE est décoché alors TSVN sautera le prétraitement les fichiers.
79 - If you have configured an alternate diff tool, you can access TortoiseMerge and the third party tool from the context menus. Context menuDiff uses the primary diff tool, and Shift+ Context menuDiff uses the secondary diff tool. 9030 À partir du menu contextuel de la boîte de dialogue vous pouvez afficher une comparaison des changements. Vérifiez les changements locaux que vous avez fait en utilisant Menu contextuelComparer avec la Base. Vérifiez les changements du référentiel faits par les autres en utilisant Menu contextuelVoir les différences en mode diff unifié.
80 - 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. 9101 Dans les réglages avancés, vous pouvez définir un programme de comparaison et de fusion différent pour chaque extension de fichier. Par exemple, vous pourriez associer Photoshop comme programme de comparaison pour les fichiers .jpg :-) Vous pouvez aussi associer la propriété svn:mime-type à un programme de comparaison ou de fusion.
81 - If you want to clear authentication data for one particular server only, read for instructions on how to find the cached data. 9178 Si vous voulez effacer des données d'authentification seulement pour un serveur particulier, lisez pour des instructions sur la façon de trouver les données mises en cache.
82 - 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 scripts are executed locally on the client. 9411 Cette boîte de dialogue vous permet de définir les scripts hook qui seront exécutés automatiquement lors de certaines actions de Subversion.
83 - Pre-connect 9487 Pre-commit
84 - 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. Note that the script must not be specified using a UNC path as Windows shell execute will not allow such scripts to run due to security restrictions. 9504 Ensuite vous devez spécifier la ligne de commande à exécuter, en commençant par le chemin du script de hook ou de l'exécutable. Ce peut être un script de batch, un exécutable ou quelqu'autre fichier que le système sache exécuter, par exemple un script perl.
85 - Sample client hook scripts can be found in the contrib folder in the TortoiseSVN repository. ( explains how to access the repository). 9581 Vous pouvez récupérer ces trois fichiers depuis notre référentiel : http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/contrib/other/svnindex. ( explique comment accéder au référentiel des sources de TortoiseSVN).
86 - 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 environment 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 . 9678 À partir de la version 1.3.0 de Subversion et de TortoiseSVN, vous pouvez définir la variable d'environnement SVN_ASP_DOT_NET_HACK. Si cette variable est définie, Subversion utilisera alors des dossiers _svn au lieu des dossiers .svn. Vous devez redémarrer votre shell pour que cette variable d'environnement entre en vigueur. Normalement cela revient à redémarrer votre PC. Pour que ce soit plus facile, vous pouvez maintenant faire cela depuis la page des réglages généraux en utilisant une simple case à cocher - référez-vous à .
87 - For more information, and other ways to avoid this problem in the first place, check out the article about this in our FAQ. 9683 Pour plus d'informations et d'autres façons d'éviter ce problème en premier lieu, regarder l'article à ce sujet dans notre FAQ.
88 - You can specify a different location for the Subversion configuration file here. This will affect all TortoiseSVN operations. 9700 Vous pouvez spécifier un emplacement différent pour le fichier de configuration Subversion en utilisant l'emplacement du registre HKCU\\Software\\TortoiseSVN\\ConfigDir. Ceci affectera toutes les opérations de TortoiseSVN.
89 - To add a cache tray icon for the TSVNCache program, set this value to true. This is really only useful for developers as it allows you to terminate the program gracefully. 9709 Pour ajouter une icône de notification de cache pour le programme TSVNCache, créez une clé DWORD avec une valeur de 1 à HKCU\\Software\\TortoiseSVN\\CacheTrayIcon. C'est vraiment seulement utile pour les développeurs puisqu'il vous permet de fermer le programme proprement.
90 - TortoiseSVN allows you to assign an external diff viewer. Most such viewers, however, are not suited for change blaming (), so you might wish to fall back to TortoiseMerge in this case. To do so, set this value to true. 9774 TortoiseSVN vous permet d'utiliser un comparateur de fichier tiers. Cependantn la plupart de ces logiciels ne sont pas adaptés à la gestion d'annotation (), auquel cas, vous pourriez vouloir utiliser TortoiseMerge pour cela. Pour ce faire, créer une clé de type DWORD avec la valeur 1 dans la base de registre sous HKCU\\Software\\TortoiseSVN\\DiffBlamesWithTortoiseMerge.
91 - 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 CDs and DVDs: 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. 9803 Pendant que nous travaillons sur TortoiseSVN, nous aimons bien écouter de la musique. Et puisque nous passons beaucoup d'heures sur le projet, nous avons besoin de beaucoup de musique. Donc nous avons créé quelques listes de voeux avec nos CD et DVD préférés : http://tortoisesvn.tigris.org/donate.html Regardez aussi s'il vous plaît la liste des personnes qui ont contribué au projet en envoyant des patches ou des traductions.
92 - Replaced with the current system date/time. This can be used to indicate the build time. Time formatting can be used as described for . 9965 Remplacé par la date/heure actuelle du système. Cela peut être utile pour indiquer l'heure de compilation. Le format de l'heure est comme décrit ci-dessus.
93 - \n
// testCOM.js - javascript file\n
// test script for the SubWCRev COM/Automation-object\n
\n
filesystem = new ActiveXObject(\"Scripting.FileSystemObject\");\n
\n
revObject1 = new ActiveXObject(\"SubWCRev.object\");\n
revObject2 = new ActiveXObject(\"SubWCRev.object\");\n
revObject3 = new ActiveXObject(\"SubWCRev.object\");\n
revObject4 = new ActiveXObject(\"SubWCRev.object\");\n
\n
revObject1.GetWCInfo(\n
filesystem.GetAbsolutePathName(\".\"), 1, 1);\n
revObject2.GetWCInfo(\n
filesystem.GetAbsolutePathName(\"..\"), 1, 1);\n
revObject3.GetWCInfo(\n
filesystem.GetAbsolutePathName(\"SubWCRev.cpp\"), 1, 1);\n
revObject4.GetWCInfo(\n
filesystem.GetAbsolutePathName(\"..\\\\..\"), 1, 1);\n
\n
wcInfoString1 = \"Revision = \" + revObject1.Revision +\n
\"\\n
Min Revision = \" + revObject1.MinRev +\n
\"\\n
Max Revision = \" + revObject1.MaxRev +\n
\"\\n
Date = \" + revObject1.Date +\n
\"\\n
URL = \" + revObject1.Url + \"\\n
Author = \" +\n
revObject1.Author + \"\\n
HasMods = \" +\n
revObject1.HasModifications + \"\\n
IsSvnItem = \" +\n
revObject1.IsSvnItem + \"\\n
NeedsLocking = \" +\n
revObject1.IsLocked + \"\\n
LockCreationDate = \" +\n
revObject1.LockCreationDate + \"\\n
LockOwner = \" +\n
revObject1.LockOwner + \"\\n
LockComment = \" +\n
revObject1.LockComment;\n
wcInfoString2 = \"Revision = \" + revObject2.Revision +\n
\"\\n
Min Revision = \" + revObject2.MinRev +\n
\"\\n
Max Revision = \" + revObject2.MaxRev +\n
\"\\n
Date = \" + revObject2.Date +\n
\"\\n
URL = \" + revObject2.Url + \"\\n
Author = \" +\n
revObject2.Author + \"\\n
HasMods = \" +\n
revObject2.HasModifications + \"\\n
IsSvnItem = \" +\n
revObject2.IsSvnItem + \"\\n
NeedsLocking = \" +\n
revObject2.IsLocked + \"\\n
LockCreationDate = \" +\n
revObject2.LockCreationDate + \"\\n
LockOwner = \" +\n
revObject2.LockOwner + \"\\n
LockComment = \" +\n
revObject2.LockComment;\n
wcInfoString3 = \"Revision = \" + revObject3.Revision +\n
\"\\n
Min Revision = \" + revObject3.MinRev +\n
\"\\n
Max Revision = \" + revObject3.MaxRev +\n
\"\\n
Date = \" + revObject3.Date +\n
\"\\n
URL = \" + revObject3.Url + \"\\n
Author = \" +\n
revObject3.Author + \"\\n
HasMods = \" +\n
revObject3.HasModifications + \"\\n
IsSvnItem = \" +\n
revObject3.IsSvnItem + \"\\n
NeedsLocking = \" +\n
revObject3.IsLocked + \"\\n
LockCreationDate = \" +\n
revObject3.LockCreationDate + \"\\n
LockOwner = \" +\n
revObject3.LockOwner + \"\\n
LockComment = \" +\n
revObject3.LockComment;\n
wcInfoString4 = \"Revision = \" + revObject4.Revision +\n
\"\\n
Min Revision = \" + revObject4.MinRev +\n
\"\\n
Max Revision = \" + revObject4.MaxRev +\n
\"\\n
Date = \" + revObject4.Date +\n
\"\\n
URL = \" + revObject4.Url + \"\\n
Author = \" +\n
revObject4.Author + \"\\n
HasMods = \" +\n
revObject4.HasModifications + \"\\n
IsSvnItem = \" +\n
revObject4.IsSvnItem + \"\\n
NeedsLocking = \" +\n
revObject4.IsLocked + \"\\n
LockCreationDate = \" +\n
revObject4.LockCreationDate + \"\\n
LockOwner = \" +\n
revObject4.LockOwner + \"\\n
LockComment = \" +\n
revObject4.LockComment;\n
\n
WScript.Echo(wcInfoString1);\n
WScript.Echo(wcInfoString2);\n
WScript.Echo(wcInfoString3);\n
WScript.Echo(wcInfoString4);\n
\n
10227 \n
// testCOM.js - javascript file\n
// test script for the SubWCRev COM/Automation-object\n
\n
filesystem = new ActiveXObject(\"Scripting.FileSystemObject\");\n
\n
revObject1 = new ActiveXObject(\"SubWCRev.object\");\n
revObject2 = new ActiveXObject(\"SubWCRev.object\");\n
revObject3 = new ActiveXObject(\"SubWCRev.object\");\n
revObject4 = new ActiveXObject(\"SubWCRev.object\");\n
\n
revObject1.GetWCInfo(\n
filesystem.GetAbsolutePathName(\".\"), 1, 1);\n
revObject2.GetWCInfo(\n
filesystem.GetAbsolutePathName(\"..\"), 1, 1);\n
revObject3.GetWCInfo(\n
filesystem.GetAbsolutePathName(\"SubWCRev.cpp\"), 1, 1);\n
revObject4.GetWCInfo(\n
filesystem.GetAbsolutePathName(\"..\\\\..\"), 1, 1);\n
\n
wcInfoString1 = \"Revision = \" + revObject1.Revision +\n
\"\\n
Min Revision = \" + revObject1.MinRev +\n
\"\\n
Max Revision = \" + revObject1.MaxRev +\n
\"\\n
Date = \" + revObject1.Date +\n
\"\\n
URL = \" + revObject1.Url + \"\\n
Author = \" +\n
revObject1.Author + \"\\n
HasMods = \" +\n
revObject1.HasModifications + \"\\n
IsSvnItem = \" +\n
revObject1.IsSvnItem + \"\\n
NeedsLocking = \" +\n
revObject1.NeedsLocking + \"\\n
IsLocked = \" +\n
revObject1.IsLocked + \"\\n
LockCreationDate = \" +\n
revObject1.LockCreationDate + \"\\n
LockOwner = \" +\n
revObject1.LockOwner + \"\\n
LockComment = \" +\n
revObject1.LockComment;\n
wcInfoString2 = \"Revision = \" + revObject2.Revision +\n
\"\\n
Min Revision = \" + revObject2.MinRev +\n
\"\\n
Max Revision = \" + revObject2.MaxRev +\n
\"\\n
Date = \" + revObject2.Date +\n
\"\\n
URL = \" + revObject2.Url + \"\\n
Author = \" +\n
revObject2.Author + \"\\n
HasMods = \" +\n
revObject2.HasModifications + \"\\n
IsSvnItem = \" +\n
revObject2.IsSvnItem + \"\\n
NeedsLocking = \" +\n
revObject2.NeedsLocking + \"\\n
IsLocked = \" +\n
revObject2.IsLocked + \"\\n
LockCreationDate = \" +\n
revObject2.LockCreationDate + \"\\n
LockOwner = \" +\n
revObject2.LockOwner + \"\\n
LockComment = \" +\n
revObject2.LockComment;\n
wcInfoString3 = \"Revision = \" + revObject3.Revision +\n
\"\\n
Min Revision = \" + revObject3.MinRev +\n
\"\\n
Max Revision = \" + revObject3.MaxRev +\n
\"\\n
Date = \" + revObject3.Date +\n
\"\\n
URL = \" + revObject3.Url + \"\\n
Author = \" +\n
revObject3.Author + \"\\n
HasMods = \" +\n
revObject3.HasModifications + \"\\n
IsSvnItem = \" +\n
revObject3.IsSvnItem + \"\\n
NeedsLocking = \" +\n
revObject3.NeedsLocking + \"\\n
IsLocked = \" +\n
revObject3.IsLocked + \"\\n
LockCreationDate = \" +\n
revObject3.LockCreationDate + \"\\n
LockOwner = \" +\n
revObject3.LockOwner + \"\\n
LockComment = \" +\n
revObject3.LockComment;\n
wcInfoString4 = \"Revision = \" + revObject4.Revision +\n
\"\\n
Min Revision = \" + revObject4.MinRev +\n
\"\\n
Max Revision = \" + revObject4.MaxRev +\n
\"\\n
Date = \" + revObject4.Date +\n
\"\\n
URL = \" + revObject4.Url + \"\\n
Author = \" +\n
revObject4.Author + \"\\n
HasMods = \" +\n
revObject4.HasModifications + \"\\n
IsSvnItem = \" +\n
revObject4.IsSvnItem + \"\\n
NeedsLocking = \" +\n
revObject4.NeedsLocking + \"\\n
IsLocked = \" +\n
revObject4.IsLocked + \"\\n
LockCreationDate = \" +\n
revObject4.LockCreationDate + \"\\n
LockOwner = \" +\n
revObject4.LockOwner + \"\\n
LockComment = \" +\n
revObject4.LockComment;\n
\n
WScript.Echo(wcInfoString1);\n
WScript.Echo(wcInfoString2);\n
WScript.Echo(wcInfoString3);\n
WScript.Echo(wcInfoString4);\n
\n
94 - The following listing is an example on how to use the SubWCRev COM object from C#: 10497 Les exemples suivants montrent comment l'interface devrait être utilisée.
95 - TortoiseSVN 1.5 and later can use plugins which implement the IBugtraqProvider interface. The interface provides a few methods which plugins can use to interact with the issue tracker. 10530 TortoiseSVN 1.5 peut être agrémenté de greffons qui ajouteront une interface pour IBugtraqProvider. Cette dernière fournira quelques méthodes que les greffons pourront utiliser pour s'interfacer avec le système de suivi d'anomalies logicielles.
96 - This method is called from the settings dialog where the user can add and configure the plugin. The parameters string can be used by a plugin to get additional required information, e.g., the URL to the issue tracker, login information, etc. The plugin should verify the parameters string and show an error dialog if the string is not valid. The hParentWnd parameter should be used for any dialog the plugin shows as the parent window. The plugin must return TRUE if the validation of the parameters string is successful. If the plugin returns FALSE, the settings dialog won't allow the user to add the plugin to a working copy path. 10564 Cette méthode est appele depuis la fenêtre des paramètres là où l'utilisateur peut ajouter et configurer le greffon. La chaine parametres peut être utilisée par un greffon pour avoir plus d'informations, i.e., les identifiants, l'URL du bug tracker, etc. Le greffon doit vérifier la chaine parametres et montrer une fenêtre d'erreur si la chaine n'est pas valide. Le paramètre hParentWnd permet au plugin d'accéder à la fenêtre mère. Le greffon DOIT renvoyer TRUE si la chaine parametres est validée. Si le greffon renvoie FALSE, la fenêtre de paramètrage n'autorisera pas l'utilisateur à ajouter le greffon au chemin d'une copie de travail.
97 - The plugin can provide a string here which is used in the TortoiseSVN commit dialog for the button which invokes the plugin, e.g., \"Choose issue\" or \"Select ticket\". Make sure the string is not too long, otherwise it might not fit into the button. If the method returns an error (e.g., E_NOTIMPL), a default text is used for the button. 10600 Le greffon peut fournir une chaine ici laquelle sera utilisée dans la fenêtre de livraison de TortoiseSVN par le bouton qui appelle le greffon, i.e., \"Choisir le bug\" ou \"Selectionner le ticket\". Assurez vous que la chaine n'est pas trop longue, sinon elle ne rentrera pas dans le bouton. Si la méthode retourne une erreur (i.e., E_NOTIMPL), un texte par défaut est utilisé pour le bouton.
98 - The newparameters return parameter must contain the parameters string which the plugin constructed from the info it gathered in its options dialog. That paramameters string is passed to all other IBugtraqProvider and IBugtraqProvider2 methods. 10837 Cette méthode est appellée depuis la fenêtre de configuration lorque l'utilisateur clique sur le bouton \"Options\" qui s'affiche quand HasOptions renvoie TRUE. Un plugin peut afficher une fenêtre d'options pour faciliter sa configuration par l'utilisateur. La chaîne de charactères parameters contient les informations déjà entrées dans les paramètres du plugin. La chaîne de charactère newparameters renvoyée doit contenir la chaîne de charactères construite par le plugin via les informations collectées dans la fenêtre d'options. Cette chaîne, parameters, est envoyée à toutes les autres méthodes de type IBugtraqProvider et IBugtraqProvider2.
99 - Because TortoiseSVN is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an 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. 10850 Parce que TortoiseSVN est développé tout le temps, il est parfois difficile de garder la documentation complètement à jour. Nous maintenons une FAQ interactive en ligne qui contient une sélection des questions les plus souvent posées sur les mailing lists de TortoiseSVN dev@tortoisesvn.tigris.org et users@tortoisesvn.tigris.org.
100 - 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. 10855 Nous maintenons aussi un Traqueur d'incident du projet qui vous indique certaines des choses que nous avons sur notre liste À faire, et les bugs qui ont déjà été corrigés. Si vous pensez que vous avez trouvé un bug, ou si vous voulez demander une nouvelle fonctionnalité, vérifiez d'abord ici pour savoir si quelqu'un d'autre ne l'a pas fait avant vous.
101 - 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 MenuSVN Copy versioned files here. or Context MenuSVN Move versioned files here. 10900 La façon recommandée est de glisser avec le bouton droit les fichiers au nouvel emplacement. Faites simplement un clic droit sur les fichiers que vous voulez déplacer/copier sans relâcher le bouton de souris. Traînez alors les fichiers au nouvel emplacement et relâchez le bouton de souris. Un menu contextuel apparaîtra où vous pouvez soit choisir Menu contextuelSVN Copier ici. Soit Menu contextuelSVN Déplacer ici.
102 - In the repository folder on the server, there's a sub-folder 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. 10933 Dans le dossier du référentiel sur le serveur, il y a un sous-dossier hooks qui contient quelques scripts hook exemples que vous pouvez utiliser. Le fichier pre-commit.tmpl contient un script type qui rejettera les livraisons si aucun commentaire n'est fourni, ou si le commentaire est trop court. Le fichier contient aussi des commentaires sur la façon d'installer/utiliser ce script. Suivez juste les instructions de ce fichier.
103 - 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. 11002 Sélectionnez la révision que vous voulez annuler. Si vous voulez défaire une plage de révisions, sélectionnez la première et maintenez la touche Maj en choisissant la dernière. Notez que pour des révisions multiples, la plage doit être continue sans écarts. Faites un clic droit sur les révisions choisies, puis sélectionnez Menu contextuelAnnuler les changements de ces révisions.
104 - Or if you want to make an earlier revision the new HEAD revision, right click on the selected revision, then select Context MenuRevert to this revision. This will discard all changes after the selected revision. 11007 Ou si vous voulez faire d'une révision précédente la nouvelle révision HEAD, faites un clic droit sur les révisions sélectionnées, puis sélectionnez Menu contextuelRevenir à cette révision. Cela annulera tous les changements après la révision choisie.
105 - 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. 11029 Dans le champ De : entrez l'URL complète du dossier de la branche ou de l'étiquette contenant les changements que vous voulez annuler dans votre copie de travail. Cela devrait être l'URL par défaut.
106 - 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. 11058 La seule façon de supprimer des données du référentiel est d'utiliser l'outil de ligne de commande de Subversion svnadmin. Vous pouvez trouver une description de son fonctionnement dans le Repository Maintenance.
107 - If you want to compare two revisions in an item'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. 11079 Si vous voulez comparer deux révisions dans l'historique d'un fichier, par exemple les révisions 100 et 200 du même fichier, utilisez simplement TortoiseSVNVoir le journal pour lister l'historique des révisions pour ce fichier. Choisissez les deux révisions que vous voulez comparer puis utilisez Context MenuComparer les révisions.
108 - If you want to compare the same item 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. 11084 Si vous voulez comparer le même fichier dans deux arborescences différentes, par exemple dans la version trunk et une branche, vous pouvez utiliser l'explorateur de référentiel pour ouvrir les deux arborescences, sélectionnez le fichier dans les deux emplacements, puis utilisez Menu contextuelComparer les révisions.
109 - 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. You can also export a tree structure containing all the changed files, or simply a list of all changed files. Read for more information. Alternatively use Context MenuUnified Diff of HEAD Revisions to see a summary of all differences, with minimal context. 11089 Si vous voulez comparer deux arborescences pour voir ce qui a changé, par exemple le tronc et une sortie étiquetée, vous pouvez utiliser TortoiseSVNGraphique de révision Sélectionnez les deux noeuds à comparer, utilisez ensuite Menu contextuelComparer les révisions HEAD. Cela montrera une liste de fichiers changés et vous pouvez alors choisir des fichiers individuels pour voir les changements en détail. Autrement utilisez Menu contextuelComparaison unifiée des révisions HEAD pour voir un résumé de toutes les différences, avec un contexte minimal.
110 - 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 sub-folder which you want to 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 . 11114 Définissez la propriété svn:externals sur un dossier de votre projet. Cette propriété consiste en une ou plusieurs lignes ; chaque ligne comporte le nom d'un sous-dossier que vous voulez utiliser comme dossier d'extraction pour du code commun et l'URL du référentiel que vous voulez extraire là. Pour des détails plus complets, référez-vous à .
111 - Commit the new folder. Now when you update, Subversion will pull a copy of that project from its repository into your working copy. The sub-folders 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. 11119 Livrez le nouveau dossier. Maintenant quand vous mettrez à jour, Subversion récupérera une copie de ce projet de son référentiel vers votre copie de travail. Les sous-dossiers seront créés automatiquement au besoin. Chaque fois que vous mettrez à jour votre copie de travail principale, vous recevrez aussi la dernière version de tous les projets externes.
112 - If you frequently need to open the repository browser at a particular location, you can create a desktop shortcut using the automation interface to TortoiseProc. Just create a new shortcut and set the target to: \n
TortoiseProc.exe /command:repobrowser /path:\"url/to/repository\"\n
Of course you need to include the real repository URL.
11190 Si vous devez fréquemment ouvrir l'explorateur de référentiel à un emplacement particulier, vous pouvez créer un raccourci sur le bureau en utilisant l'interface d'automatisation de TortoiseProc. Créez simplement un nouveau raccourci et définissez la cible : \n
TortoiseProc.exe /command:repobrowser /path:\"url/vers/le/référentiel\" /notempfile\n
Vous devez bien sûr inclure la vraie URL du référentiel.
113 - A good walk-through on how to do that can be found in the knowledge base article 314934 from Microsoft: http://support.microsoft.com/?kbid=314934. 11279 Un bon guide sur la façon de faire cela peut être trouvé dans l'article de la base de connaissance 314934 de Microsoft : http://support.microsoft.com/?kbid=314934.
114 - 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. 11284 Les versions 1.3.0 et supérieures de TortoiseSVN doivent être installées dans Configuration ordinateur et pas dans Configuration utilisateur. C'est parce que ces versions ont besoin des nouvelles dlls CRT et MFC, qui peuvent être seulement déployés par ordinateur et pas par utilisateur. Si vous devez vraiment installer TortoiseSVN sur une base par utilisateur, alors vous devez d'abord installer la version 8 du package MFC et CRT de Microsoft sur chaque ordinateur où vous voulez installer TortoiseSVN par utilisateur.
115 - 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 text file must have the following format: \n
1.4.1.6000\n
A new version of TortoiseSVN is available for you to download!\n
http://192.168.2.1/downloads/TortoiseSVN-1.4.1.6000-svn-1.4.0.msi\n
The first line in that file is the version string. You must make sure that it matches the exact version string of the TortoiseSVN installation package. The second line is a custom text, shown in the upgrade dialog. You can write there whatever you want. Just note that the space in the upgrade dialog is limited. Too long messages will get truncated! The third line is the URL to the new installation package. This URL is opened when the user clicks on the custom message label in the upgrade dialog. You can also just point the user to a web page instead of the MSI file directly. The URL is opened with the default web browser, so if you specify a web page, 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.
11317 Les versions 1.4.0 et supérieures de TortoiseSVN vous permettent de rediriger cette vérification de mise à niveau vers votre serveur intranet. Vous pouvez définir la clé de base de registre HKCU\\Software\\TortoiseSVN\\UpdateCheckURL (valeur chaîne) à une URL pointant sur un fichier texte dans votre intranet. Ce fichier texte doit avoir le format suivant : \n
1.4.1.6000\n
Un nouvelle version de TortoiseSVN est disponible au téléchargement !\n
http://192.168.2.1/downloads/TortoiseSVN-1.4.1.6000-svn-1.4.0.msi\n
La première ligne dans ce fichier est la chaîne de version. Vous devez vous assurer qu'elle corresponde à la chaîne de version exacte du package d'installation de TortoiseSVN. La deuxième ligne est un texte personnalisé, affiché dans la boîte de dialogue de mise à niveau. Vous pouvez écrire ici ce que vous voulez. Notez juste que l'espace dans la boîte de dialogue de mise à niveau est limité. De trop longs messages seront tronqués ! La troisième ligne est l'URL vers le nouveau package d'installation. Cette URL est ouverte quand l'utilisateur clique sur le label du message personnalisée dans la boîte de dialogue de mise à niveau. Vous pouvez aussi diriger simplement l'utilisateur vers une page Web plutôt que directement vers le fichier msi. L'URL est ouverte avec le navigateur Internet par défaut, donc si vous spécifiez une page Web, cette page est ouverte et montrée à l'utilisateur. Si vous spécifiez le package msi, le navigateur demandera à l'utilisateur de sauvegarder le fichier msi localement.
116 - 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 confusion for users who always install everything no matter whether they know what it is for. 11348 À partir des versions 1.4.0 et supérieures, l'installeur de TortoiseSVN ne fournit plus à l'utilisateur l'option pour mettre la variable d'environnement , puisque cela a causé beaucoup de problèmes et de confusion pour les utilisateurs qui installent toujours tout peu importe s'ils savent à quoi cela sert.
117 - To close the progress dialog at the end of a command automatically without using the permanent setting you can pass the parameter. To close the progress dialog for local operations if there were no errors or conflicts, pass the parameter. 11639 Pour fermer la boîte de dialogue de progression automatiquement à la fin d'une commande sans utiliser le réglage permanent, vous pouvez lui passer le paramètre .
118 - Opens the log dialog. The specifies the file or folder for which the log should be shown. Six additional options can be set: , , enables the 'stop-on-copy' checkbox, fills in the filter text, forces the filter to use text, not regex, or forces the filter to use regex, not simple text search, and with X being a number between 1 and 7. The numbers correspond to: 11751 Ouvre la boîte de dialogue des commentaires. Le spécifie le fichier ou le dossier duquel il faut afficher les commentaires. Six options supplémentaires peuvent être définies : , , (active la case à cocher 'stop-lors-de-la-copie'), remplit le texte de filtrage, (force le filtre à fonctionner en mode text, pas regexp) et X étant un chiffre compris entre 1 et 7. Les chiffres correspondent à :
119 - 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 . 11789 Met à jour la copie de travail dans vers HEAD. Si l'option est fournie alors une boîte de dialogue est affichée pour demander à l'utilisateur à quelle révision la mise à jour devrait se faire. Pour éviter la boîte de dialogue, spécifiez un numéro de révision . Les autres options sont et .
120 - 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 omitted, then the diff is done between the file in and its BASE. To explicitly set the revision numbers use and . If is set and is not set, then the diff is done by first blaming the files with the given revisions. The parameter specifies the line to jump to when the diff is shown. 11914 Démarre le programme externe de comparaison indiqué dans la configuration de TortoiseSVN. Le spécifie le premier fichier. Si l'option est activée, alors le programme de comparaison est lancé avec ces deux fichiers. Si est omit, alors la comparaison est faite entre le fichier dans et sa BASE.Pour renseigner explicitement les révisions à comparer, utiliser et . Si est activé et non, alors la comparaison est faite en bannissant d'abord les révisions données.
121 - In the descriptions which follow, the URL for a repository location is shown simply as URL, and an example might be http://tortoisesvn.googlecode.com/svn/trunk/. The working copy path is shown simply as PATH, and an example might be C:\\TortoiseSVN\\trunk. 12185 Dans les descriptions qui suivent, l'URL d'un référentiel est simplement affichée URL et un exemple pourrait être http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk. Le chemin de la copie de travail est simplement affiché PATH, et un exemple pourrait être C:\\TortoiseSVN\\trunk.
122 - Much of the information here comes from a tutorial provided by Marc Logemann, which has been archived at http://tortoisesvn.net/ssh_howto Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys! 12792 La plupart de ces informations est associé à un tutoriel fourni par Marc Logemann et qui peut être trouvé sur www.logemann.org. Des informations supplémentaires sur la configuration d'un serveur Windows sont fournies par Thorsten Müller. Merci les gars!
123 - The TortoiseSVN user interface has been translated into many different languages, so you may be able to download a language pack to suit your needs. You can find the language packs on our translation status page. And if there is no language pack available, why not join the team and submit your own translation ;-) 13065 L'interface utilisateur de TortoiseSVN a été traduite dans beaucoup de langues différentes, donc vous devez être capables de télécharger un pack de langue qui réponde à vos besoins. Vous pouvez trouver les packs de langue sur notre page du statut des traductions. Et s'il n'y a encore de pack de langue disponible, pourquoi ne pas rejoindre l'équipe et soumettre votre propre traduction ;-)
124 - Each language pack is packaged as a .msi installer. Just run the install program and follow the instructions. After the installation finishes, the translation will be available. 13070 Chaque pack de langue est empaqueté comme un installeur .exe. Exécutez juste le programme d'installation et suivez les instructions. La prochaine fois que vous redémarrez, la traduction sera disponible.
125 - The installer automatically adds the US and UK English dictionaries. If you want other languages, the easiest option is simply to install one of TortoiseSVN's language packs. This will install the appropriate dictionary files as well as the TortoiseSVN local user interface. After the installation finishes, the dictionary will be available too. 13095 L'installeur ajoute automatiquement les dictionnaires d'anglais américains et britanniques. Si vous voulez d'autres langues, l'option la plus facile est d'installer simplement un des packs de langue de TortoiseSVN. Cela installera les fichiers de dictionnaire appropriés en même temps que l'interface utilisateur TortoiseSVN locale. La prochaine fois que vous redémarrez, le dictionnaire sera disponible aussi.
Note: Line numbers are as in committed file, it may differ when you update to use newer .pot, also edited multi line messages may shift line position.

Total:125

Escaped chars test

This test check if all escaped chars are known and its using match with English. Even you get red here it may be legal for your language.
This test is in developing now. Ignored are: \r \n (wee new line style test) and \".

Index Line English Line Native
1 A file conflict occurs when two or more developers have changed the same few lines of a file. As Subversion knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <literal>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</literal>. The conflicting area is marked like this: <screen>\n
&lt;&lt;&lt;&lt;&lt;&lt;&lt; filename\n
your changes\n
=======\n
code merged from repository\n
&gt;&gt;&gt;&gt;&gt;&gt;&gt; revision\n
</screen> Also, for every conflicted file Subversion places three additional files in your directory: <placeholder-1/>
3008 Un conflit de fichier arrive quand 2 développeurs our plus modifient un même fichier. Dans la mesure où Subversion ne sait rien de votre projet, il laisse la résolution des conflits à la charge des développeurs. Dès qu'un conflit est détecté, vous devriez ouvrir le fichier en question, et chercher les lignes commençant par <literal>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</literal>. La zone en conflit est marquée de cette manière: <screen>\n
\t&lt;&lt;&lt;&lt;&lt;&lt;&lt; nom_de_fichier\n
\t\tvos modifications\n
\t=======\n
\t\tcode fusionné depuis le référentiel\n
\t&gt;&gt;&gt;&gt;&gt;&gt;&gt; révision\n
\t</screen> De plus, pour chaque conflit Subversion place trois fichiers dans votre répertoire: <placeholder-1/>
2 8784 You can specify a different location for the Subversion configuration file here. This will affect all TortoiseSVN operations. 8784 Vous pouvez spécifier un emplacement différent pour le fichier de configuration Subversion en utilisant l'emplacement du registre <literal>HKCU\\Software\\TortoiseSVN\\ConfigDir</literal>. Ceci affectera toutes les opérations de TortoiseSVN.
3 To add a cache tray icon for the TSVNCache program, set this value to <literal>true</literal>. This is really only useful for developers as it allows you to terminate the program gracefully. 8792 Pour ajouter une icône de notification de cache pour le programme TSVNCache, créez une clé <literal>DWORD</literal> avec une valeur de 1 à <literal>HKCU\\Software\\TortoiseSVN\\CacheTrayIcon</literal>. C'est vraiment seulement utile pour les développeurs puisqu'il vous permet de fermer le programme proprement.
4 TortoiseSVN allows you to assign an external diff viewer. Most such viewers, however, are not suited for change blaming (<xref linkend=\"tsvn-dug-blame-diffs\"/>), so you might wish to fall back to TortoiseMerge in this case. To do so, set this value to <literal>true</literal>. 8856 TortoiseSVN vous permet d'utiliser un comparateur de fichier tiers. Cependantn la plupart de ces logiciels ne sont pas adaptés à la gestion d'annotation (<xref linkend=\"tsvn-dug-blame-diffs\"/>), auquel cas, vous pourriez vouloir utiliser TortoiseMerge pour cela. Pour ce faire, créer une clé de type <literal>DWORD</literal> avec la valeur 1 dans la base de registre sous <literal>HKCU\\Software\\TortoiseSVN\\DiffBlamesWithTortoiseMerge</literal>.
Note: Line numbers are as in committed file, it may differ when you update to use newer .pot, also edited multi line messages may shift line position.

Total:4

PASS

RC Checks

Next few sections informs about duplicate accelerators in translation. There is no reason to be stressed about this, but some translators like to know it. In a fact even English translation contains duplicate.

Proc RC Check (fr)

RC checking is currently off for this language. If you like enable it for your translation drop me an email.


Icons by: DryIcons