3 "Project-Id-Version: PACKAGE VERSION\n"
\r
4 "POT-Creation-Date: 2008-11-17 00:14 +0000\n"
\r
5 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
\r
6 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
\r
7 "Language-Team: LANGUAGE <LL@li.org>\n"
\r
8 "MIME-Version: 1.0\n"
\r
9 "Content-Type: text/plain; charset=UTF-8\n"
\r
10 "Content-Transfer-Encoding: 8bit\n"
\r
12 #: ../source/TortoiseMerge_en.xml:4
\r
14 msgid "TortoiseMerge"
\r
17 #: ../source/TortoiseMerge_en.xml:6
\r
19 msgid "A diff/merge tool for Windows"
\r
22 #. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated
\r
23 #: ../source/TortoiseMerge_en.xml:7
\r
25 msgid "Version $MajorVersion$.$MinorVersion$.$MicroVersion$"
\r
28 #: ../source/TortoiseMerge_en.xml:9
\r
33 #: ../source/TortoiseMerge_en.xml:12
\r
38 #: ../source/TortoiseMerge_en.xml:13
\r
43 #: ../source/TortoiseMerge_en.xml:16
\r
48 #: ../source/TortoiseMerge_en.xml:17
\r
53 #: ../source/TortoiseMerge_en.xml:20
\r
58 #: ../source/TortoiseMerge_en.xml:21
\r
63 #: ../source/TortoiseMerge_en.xml:28
\r
68 #: ../source/TortoiseMerge_en.xml:33
\r
70 msgid "When working on a project, either an open-source project where several people review your code, or a commercial project where you sell a component with your source code, there will be people and customers who find bugs or want to improve your project. To do that they send you patches which you have to review and decide if you want to apply them."
\r
73 #: ../source/TortoiseMerge_en.xml:45
\r
75 msgid "Reviewing patches"
\r
78 #: ../source/TortoiseMerge_en.xml:50
\r
80 msgid "Applying the patches"
\r
83 #: ../source/TortoiseMerge_en.xml:41
\r
85 msgid "TortoiseMerge helps you with both those tasks: <placeholder-1/>"
\r
88 #: ../source/TortoiseMerge_en.xml:56
\r
90 msgid "TortoiseMerge also helps you to sort out conflicted files which can occur if you're working with a source control system and others are working on the same files as you."
\r
93 #: ../source/TortoiseMerge_en.xml:66
\r
95 msgid "TortoiseMerge is free!"
\r
98 #: ../source/TortoiseMerge_en.xml:67
\r
100 msgid "TortoiseMerge is free. You don't have to pay for it, you can use it any way you want. It is developed under the GP license (GPL)."
\r
103 #: ../source/TortoiseMerge_en.xml:71
\r
105 msgid "TortoiseMerge is an Open Source project. That means you have full read access to the source code of this program. You can browse it on this link <ulink url=\"http://TortoiseGit.tigris.org/svn/TortoiseGit/\"><citetitle>http://TortoiseGit.tigris.org/svn/TortoiseGit/</citetitle></ulink>. You will be prompted to enter username and password. The username is <literal>guest</literal>, and the password must be left blank. The most recent version (where we're currently working) is located under <filename>/trunk/</filename>, and the released versions are located under <filename>/tags/</filename>."
\r
108 #: ../source/TortoiseMerge_en.xml:90
\r
113 #: ../source/TortoiseMerge_en.xml:91
\r
115 msgid "Even though TortoiseGit and TortoiseMerge are free, you can support the developers by sending in patches and play an active role in the development. You can also help to cheer us up during the endless hours we spend in front of our computers."
\r
118 #: ../source/TortoiseMerge_en.xml:97
\r
120 msgid "While working on TortoiseGit we love to listen to music. And since we spend many hours on the project we need a <emphasis>lot</emphasis> of music. Therefore we have set up some wish-lists with our favourite music CDs and DVDs: <ulink url=\"http://TortoiseGit.tigris.org/donate.html\"><citetitle>http://TortoiseGit.tigris.org/donate.html</citetitle></ulink> Please also have a look at the list of people who contributed to the project by sending in patches or translations."
\r
123 #: ../source/TortoiseMerge_en.xml:113
\r
125 msgid "Acknowledgments"
\r
128 #: ../source/TortoiseMerge_en.xml:117
\r
130 msgid "Stefan Küng"
\r
133 #: ../source/TortoiseMerge_en.xml:121
\r
135 msgid "for the hard work on TortoiseMerge"
\r
138 #: ../source/TortoiseMerge_en.xml:127
\r
140 msgid "Lübbe Onken"
\r
143 #: ../source/TortoiseMerge_en.xml:131
\r
145 msgid "for the beautiful icons, logo, bug hunting and taking care of the documentation"
\r
148 #: ../source/TortoiseMerge_en.xml:138
\r
150 msgid "The Tigris Style project"
\r
153 #: ../source/TortoiseMerge_en.xml:142
\r
155 msgid "for some of the styles which are reused in this documentation"
\r
158 #: ../source/TortoiseMerge_en.xml:149
\r
160 msgid "Our Contributors"
\r
163 #: ../source/TortoiseMerge_en.xml:153
\r
165 msgid "for the patches, bug reports and new ideas, and for helping others by answering questions on our mailing list."
\r
168 #: ../source/TortoiseMerge_en.xml:160
\r
170 msgid "Our Donators"
\r
173 #: ../source/TortoiseMerge_en.xml:164
\r
175 msgid "for many hours of joy with the music they sent us"
\r
178 #: ../source/TortoiseMerge_en.xml:175
\r
180 msgid "Introduction"
\r
183 #: ../source/TortoiseMerge_en.xml:184
\r
188 #: ../source/TortoiseMerge_en.xml:185
\r
190 msgid "TortoiseMerge is a free/open-source application. It lets you see differences in text files, merge those changes and even review and apply unified diff files, often called <firstterm>patches</firstterm>."
\r
193 #: ../source/TortoiseMerge_en.xml:190
\r
195 msgid "While working on text files, e.g. source files in your favourite programming language, or html/xml files for your documentation or website, you will often have a situation where you need to compare different versions of those files. Sometimes you get a different version from someone else, sometimes you just want to see the changes you've made."
\r
198 #: ../source/TortoiseMerge_en.xml:198
\r
200 msgid "If you're working with a version control system (e.g. Git) then you sometimes get <emphasis>conflicts</emphasis> when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you."
\r
203 #: ../source/TortoiseMerge_en.xml:206
\r
205 msgid "The following diagram shows you the relationships between the files involved in a conflict:"
\r
208 #: ../source/TortoiseMerge_en.xml:211
\r
210 #: ../source/TortoiseMerge_en.xml:347
\r
212 msgid "File Conflict"
\r
215 #: ../source/TortoiseMerge_en.xml:214
\r
217 msgid "A conflict can also occur if you try to apply an outdated patch file. In such cases, without TortoiseMerge, you would either have to ask the person you got that patch file from for a current version or try to apply that patch file manually."
\r
220 #: ../source/TortoiseMerge_en.xml:220
\r
222 msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Git. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep."
\r
225 #: ../source/TortoiseMerge_en.xml:235
\r
227 msgid "TortoiseMerge's History"
\r
230 #: ../source/TortoiseMerge_en.xml:236
\r
232 msgid "While working on <ulink url=\"http://TortoiseGit.tigris.org\"><citetitle>TortoiseGit</citetitle></ulink> we found that whenever users sent in patches to enhance the project or just to fix bugs, we had a lot of work just applying those patches. And many times those patches were outdated and couldn't be applied with the command line patch tool <ulink url=\"http://unxutils.sourceforge.net/\"><citetitle>http://unxutils.sourceforge.net/</citetitle></ulink> because we were working on those files and had sometimes changed those files already."
\r
235 #: ../source/TortoiseMerge_en.xml:251
\r
237 msgid "This was also the main reason why TortoiseGit did not originally have a <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Create Patch</guimenuitem></menuchoice> implemented: we preferred users to send us the whole files because with those it was easier to apply patches."
\r
240 #: ../source/TortoiseMerge_en.xml:261
\r
242 msgid "So we spent a lot of time, searching the Internet for a GUI tool which could apply patch files, but all we found was that such a tool didn't exist. So to cut a long story short: We decided that if no-one else could provide such a tool we would have to write our own. That's when TortoiseMerge was born."
\r
245 #: ../source/TortoiseMerge_en.xml:268
\r
247 msgid "Since TortoiseGit already uses the Git library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff."
\r
250 #: ../source/TortoiseMerge_en.xml:276
\r
252 msgid "Basic Concepts"
\r
255 #: ../source/TortoiseMerge_en.xml:282
\r
257 msgid "Viewing the difference between two files and merging changes into one of them, or removing unwanted changes."
\r
260 #: ../source/TortoiseMerge_en.xml:288
\r
262 msgid "Editing conflicts between local changes and changes in the Git repository following an update."
\r
265 #: ../source/TortoiseMerge_en.xml:294
\r
267 msgid "Applying patch files. This is the reason TortoiseMerge was created :)"
\r
270 #: ../source/TortoiseMerge_en.xml:278
\r
272 msgid "TortoiseMerge has several different uses: <placeholder-1/>"
\r
275 #: ../source/TortoiseMerge_en.xml:303
\r
277 msgid "Viewing and Merging Differences"
\r
280 #: ../source/TortoiseMerge_en.xml:304
\r
282 msgid "In this mode you are comparing two files. The file in the left pane is considered to be the original file (sometimes referred to as <emphasis>Theirs</emphasis>, and the file in the right pane is the modified file (sometimes referred to as <emphasis>Mine</emphasis>."
\r
285 #: ../source/TortoiseMerge_en.xml:315
\r
287 msgid "Reverting changed lines back to the text shown in the left pane."
\r
290 #: ../source/TortoiseMerge_en.xml:320
\r
292 msgid "Using a combination of both blocks, either <emphasis>Theirs</emphasis> before <emphasis>Mine</emphasis> or <emphasis>Mine</emphasis> before <emphasis>Theirs</emphasis>."
\r
295 #: ../source/TortoiseMerge_en.xml:310
\r
297 msgid "You can make simple line-based changes to the file in the right pane which include: <placeholder-1/>"
\r
300 #: ../source/TortoiseMerge_en.xml:328
\r
302 msgid "You can also edit the file in the right pane just as you would in a text editor. Such lines are marked using a pencil icon. Please note that if you want to make any of the line/block-based changes described above, it is better to do those first since once you start editing the file yourself it becomes impossible for TortoiseMerge to keep track of the relationship to the original files."
\r
305 #: ../source/TortoiseMerge_en.xml:338
\r
307 msgid "Editing Conflicts"
\r
310 #: ../source/TortoiseMerge_en.xml:339
\r
312 msgid "This is sometimes referred to as a three-way merge, and is shown in three panes. However there are actually four files involved. The file which is not shown is the common base file, the last common ancestor of the two files which are now in conflict. The relationships between the three files are explained in the diagram below:"
\r
315 #: ../source/TortoiseMerge_en.xml:350
\r
317 msgid "The base file represents the oldest version of a file, from where <emphasis>You</emphasis> and <emphasis>They</emphasis> start making changes. <emphasis>Mine</emphasis> represents the base file with all the changes <emphasis>you</emphasis> made, and <emphasis>Theirs</emphasis> is the file with all the changes <emphasis>someone else</emphasis> made to the file. The left pane shows the changes in <emphasis>Theirs</emphasis> relative to the base file and the right pane shows the changes in <emphasis>Mine</emphasis> relative to the base file. The bottom pane is the output file which is where you are trying to resolve the conflicts."
\r
320 #: ../source/TortoiseMerge_en.xml:362
\r
322 msgid "In conflict resolution view, you can choose to use blocks from <emphasis>Mine</emphasis> or <emphasis>Theirs</emphasis> or both. But in this case, the changes are shown in the bottom pane."
\r
325 #: ../source/TortoiseMerge_en.xml:369
\r
327 #: ../source/TortoiseMerge_en.xml:478
\r
329 #: ../source/TortoiseMerge_en.xml:866
\r
331 msgid "Applying Patches"
\r
334 #: ../source/TortoiseMerge_en.xml:370
\r
336 msgid "A patch file is a Git unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseGit when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths."
\r
339 #: ../source/TortoiseMerge_en.xml:380
\r
341 msgid "In either case TortoiseMerge will show a small window listing the files included in the patch. By double clicking on one of these files you fetch the relevant file and apply the changes. The left pane shows the original file content and the right pane shows it after the patch is applied."
\r
344 #: ../source/TortoiseMerge_en.xml:387
\r
346 msgid "You can edit the file in the right pane exactly as you would in compare/edit mode."
\r
349 #: ../source/TortoiseMerge_en.xml:394
\r
351 msgid "Using TortoiseMerge"
\r
354 #: ../source/TortoiseMerge_en.xml:402
\r
356 msgid "Viewing Modes"
\r
359 #: ../source/TortoiseMerge_en.xml:403
\r
361 msgid "TortoiseMerge has three main viewing modes: one-pane, two-pane and three-pane view. One/two-pane view is used to view changes and three-pane view is used to resolve conflicts."
\r
364 #: ../source/TortoiseMerge_en.xml:409
\r
366 #: ../source/TortoiseMerge_en.xml:843
\r
368 msgid "Viewing / Merging"
\r
371 #: ../source/TortoiseMerge_en.xml:411
\r
373 msgid "One Pane View"
\r
376 #: ../source/TortoiseMerge_en.xml:415
\r
378 msgid "Two Pane View"
\r
381 #: ../source/TortoiseMerge_en.xml:423
\r
383 msgid "Changes inside the modified lines are shown in different colors. Added string parts are shown with a lighter color, but you can of course configure the colors used here. Removed parts are indicated with a dark brown vertical line in the string. Check out the screenshot above to see how this works."
\r
386 #: ../source/TortoiseMerge_en.xml:433
\r
388 msgid "Code reorganization usually means a lot of changes in whitespaces (space, tab, newlines) but no actual code change. For example, you split up a very long line into several lines, or you sometimes compact several lines together into one."
\r
391 #: ../source/TortoiseMerge_en.xml:439
\r
393 msgid "Such changes are marked with a white circle symbol on the left side of the views. If you see such a white circle, you know immediately that no real code change is there and you don't have to check the changed block further."
\r
396 #: ../source/TortoiseMerge_en.xml:447
\r
398 msgid "Hand editing of the file in the right pane is possible in two-pane view. Such changes are marked with a pencil symbol."
\r
401 #: ../source/TortoiseMerge_en.xml:418
\r
403 msgid "The two pane view has some features which are not available in the one pane view: <placeholder-1/>"
\r
406 #: ../source/TortoiseMerge_en.xml:454
\r
408 msgid "If you want to compare/merge three files, TortoiseMerge will show you the differences in a three pane view. This view is also used if you need to resolve conflicted files."
\r
411 #: ../source/TortoiseMerge_en.xml:460
\r
413 msgid "Three Pane View"
\r
416 #: ../source/TortoiseMerge_en.xml:463
\r
418 msgid "The left pane shows you the differences between <emphasis>Their</emphasis> file and the <emphasis>Base</emphasis> file, while the right pane shows you the differences between <emphasis>Mine</emphasis> file and the <emphasis>Base</emphasis> file. The bottom pane shows you the result of merging <emphasis>Base</emphasis>, <emphasis>Mine</emphasis> and <emphasis>Theirs</emphasis> with possible conflicts."
\r
421 #: ../source/TortoiseMerge_en.xml:472
\r
423 msgid "If you hover the mouse over the pane title, a tooltip will show the filenames used for the diff in each pane."
\r
426 #: ../source/TortoiseMerge_en.xml:484
\r
428 msgid "Patch File List"
\r
431 #: ../source/TortoiseMerge_en.xml:479
\r
433 msgid "After TortoiseMerge parses the patch file it will show you a small window with all the files which have changes according to the patch file. <placeholder-1/> If the filename is shown in black, then the patch can be applied without any problems. That means the file is not outdated according to the patch. However, if the filename is shown in red, then the patch can't get applied directly because you already changed that file."
\r
436 #: ../source/TortoiseMerge_en.xml:493
\r
438 msgid "But don't worry. If you're working with Git you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between <emphasis>Base</emphasis> (the older version of the file), <emphasis>Mine</emphasis> (the file as it is currently in your working copy) and <emphasis>Theirs</emphasis> (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually."
\r
441 #: ../source/TortoiseMerge_en.xml:504
\r
443 msgid "The patch file window has a context menu which allows you to preview the effect of the patch on the current file (apply without saving), to apply and save the changes for the selected file, or to apply and save changes to <emphasis>all</emphasis> files in the list. The double-click action is to preview."
\r
446 #: ../source/TortoiseMerge_en.xml:512
\r
448 msgid "Depending on whether TortoiseMerge can apply the patch directly or by fetching an older version of the file first, it shows you a two pane view (patch can be applied directly) or a three pane view (older version of file fetched)."
\r
451 #: ../source/TortoiseMerge_en.xml:521
\r
453 msgid "Buttons and Other Controls"
\r
456 #: ../source/TortoiseMerge_en.xml:524
\r
458 msgid "The Toolbar"
\r
461 #: ../source/TortoiseMerge_en.xml:531
\r
463 msgid "<guibutton>Open</guibutton> accesses the file-open dialog. What else?"
\r
466 #: ../source/TortoiseMerge_en.xml:537
\r
468 msgid "<guibutton>Save</guibutton> saves any changes you have made."
\r
471 #: ../source/TortoiseMerge_en.xml:543
\r
473 msgid "<guibutton>Reload</guibutton> discards any changes you have made in TortoiseMerge and reloads the files from disk."
\r
476 #: ../source/TortoiseMerge_en.xml:550
\r
478 msgid "<guibutton>Undo</guibutton> implements a multi-level undo, allowing you to reverse any changes you have made within TortoiseMerge."
\r
481 #: ../source/TortoiseMerge_en.xml:557
\r
483 msgid "<guibutton>Prev/Next Difference</guibutton> jumps directly to the next point where the files differ. This saves scrolling through all the unchanged parts of the file."
\r
486 #: ../source/TortoiseMerge_en.xml:563
\r
488 msgid "When you do this in 2-pane diff mode, the detail bar at the bottom of the screen will show you the inline differences for the first line, regardless of where the mouse is hovering."
\r
491 #: ../source/TortoiseMerge_en.xml:570
\r
493 msgid "<guibutton>Prev/Next Conflict</guibutton> jumps directly to the next point where the file differences are in conflict and need to be resolved."
\r
496 #: ../source/TortoiseMerge_en.xml:577
\r
498 msgid "<guibutton>Use Theirs/Use Mine</guibutton> selects whether to use a block from the left or the right pane. Refer to the next section for more information about editing changes and conflicts."
\r
501 #: ../source/TortoiseMerge_en.xml:586
\r
503 msgid "<guibutton>Theirs before Mine/Mine before Theirs</guibutton> is used when you want to combine changes in a conflicted file. Refer to the next section for more information about editing changes and conflicts."
\r
506 #: ../source/TortoiseMerge_en.xml:594
\r
508 msgid "<guibutton>Mark as Resolved</guibutton> When you have resolved all the conflicts in a file and saved the changes, you can mark it as resolved from within TortoiseMerge, rather than going back to explorer and marking as resolved from there."
\r
511 #: ../source/TortoiseMerge_en.xml:603
\r
513 msgid "<guibutton>Show Whitespaces</guibutton> toggles the option to display space and tab characters as symbols so you can distinguish white space changes."
\r
516 #: ../source/TortoiseMerge_en.xml:610
\r
518 msgid "<guibutton>Inline Diff Word-wise</guibutton> toggles the method used to display inline diffs. In word-wise mode, when a character is changed, the whole word is highlighted. In char-wise mode, each individual changed character is highlighted."
\r
521 #: ../source/TortoiseMerge_en.xml:617
\r
523 msgid "Word-wise is the default and in most cases it works better. For example if you change a variable name, the whole name is highlighted in word-wise mode, whereas in char-wise mode you tend to get a mess of added and deleted characters which doesn't make much sense. However, some content does not resolve neatly into words, for example a hex file, and in that case, char-wise display works better."
\r
526 #: ../source/TortoiseMerge_en.xml:628
\r
528 msgid "<guibutton>Switch View</guibutton> selects between one-pane and two-pane view. Disabled in 3-pane view."
\r
531 #: ../source/TortoiseMerge_en.xml:635
\r
533 msgid "<guibutton>Switch Left and Right View</guibutton> In 2-pane view, swaps the left and right windows. When you are comparing a file in 2 different trees, as opposed to 2 revisions of the same file, TortoiseGit does not know which one should go in the left pane as the <quote>original/base</quote> version. If it gets this wrong, you can change it to make viewing easier."
\r
536 #: ../source/TortoiseMerge_en.xml:646
\r
538 msgid "<guibutton>Show/Hide Patch List</guibutton> When TortoiseMerge has a patch list, this button allows you to hide it (so you can see both windows), or show it (so you can review the file list)."
\r
541 #: ../source/TortoiseMerge_en.xml:654
\r
543 msgid "<guibutton>Settings</guibutton> takes you to TortoiseMerge's settings dialog."
\r
546 #: ../source/TortoiseMerge_en.xml:522
\r
548 msgid "<placeholder-1/> Below the menu bar lies the tool bar. This provides easy access to the most commonly used tools, which are <placeholder-2/>"
\r
551 #: ../source/TortoiseMerge_en.xml:661
\r
553 msgid "On the left side of the window is a locator bar. This provides a quick visual reference as to where the changes lie within the file. The bar has three columns. The left column refers to the left pane, the right column to the right pane, and the centre column to the bottom pane (if present). In one-pane view only the left column is used. The locator bar can also be used as a scroll bar to scroll all the windows simultaneously."
\r
556 #: ../source/TortoiseMerge_en.xml:670
\r
558 msgid "Below the bottom window is the status bar. This shows the number of lines added and deleted in <literal>Theirs</literal> and <literal>Mine</literal>, and the number of unresolved conflicts remaining. You can also see which line-ending style is in use, what encoding (ASCII, UTF-8, etc) is assumed by TortoiseMerge, and whether there is a byte-order-mark (BOM) present in UTF-8 files. The left side of the status bar is used to display hints when you hover the mouse over a control."
\r
561 #: ../source/TortoiseMerge_en.xml:683
\r
563 msgid "Line Status Icons"
\r
566 #: ../source/TortoiseMerge_en.xml:684
\r
568 msgid "Changed lines are marked with an icon to indicate what type of change has occurred."
\r
571 #: ../source/TortoiseMerge_en.xml:688
\r
573 msgid "<graphic fileref=\"images/TMerge_lineadded.png\"/> A line has been added."
\r
576 #: ../source/TortoiseMerge_en.xml:692
\r
578 msgid "<graphic fileref=\"images/TMerge_lineremoved.png\"/> A line has been removed."
\r
581 #: ../source/TortoiseMerge_en.xml:696
\r
583 msgid "<graphic fileref=\"images/TMerge_lineequal.png\"/> A change has been undone by reverting to the original content of the line."
\r
586 #: ../source/TortoiseMerge_en.xml:700
\r
588 msgid "<graphic fileref=\"images/TMerge_linewhitespace.png\"/> This line contains only whitespace changes. Where several consecutive lines are marked, the paragraph may have been re-wrapped, causing words to shuffle onto adjacent lines."
\r
591 #: ../source/TortoiseMerge_en.xml:706
\r
593 msgid "<graphic fileref=\"images/TMerge_lineedited.png\"/> A line has been edited by hand, using TortoiseMerge as a text editor."
\r
596 #: ../source/TortoiseMerge_en.xml:710
\r
598 msgid "<graphic fileref=\"images/TMerge_lineconflicted.png\"/> This line is in conflict."
\r
601 #: ../source/TortoiseMerge_en.xml:714
\r
603 msgid "<graphic fileref=\"images/TMerge_lineconflictedignored.png\"/> This line is conflicted, but the effect is hidden by whitespace or line-ending settings."
\r
606 #: ../source/TortoiseMerge_en.xml:721
\r
608 msgid "Merging / Editing Conflicts"
\r
611 #: ../source/TortoiseMerge_en.xml:722
\r
613 msgid "TortoiseMerge not only <emphasis>shows</emphasis> you the differences between files but also lets you resolve conflicts or apply changes."
\r
616 #: ../source/TortoiseMerge_en.xml:726
\r
618 msgid "If you're in two pane view, then you can only edit the file in the right pane (<literal>Mine</literal>). To apply changes made in the left file (<literal>Theirs</literal>), <action>right-click</action> on the changed lines and select <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Use text block from <quote>theirs</quote></guimenuitem></menuchoice>. Then the changes from the left file are added to the right file."
\r
621 #: ../source/TortoiseMerge_en.xml:738
\r
623 msgid "Sometimes you actually want both text blocks, and the context menu also offers you <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Use both text blocks (this one first)</guimenuitem></menuchoice> and <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Use both text blocks (this one last)</guimenuitem></menuchoice>."
\r
626 #: ../source/TortoiseMerge_en.xml:751
\r
628 msgid "You can also edit the output file just as you would in a text editor. Such lines are marked using a pencil icon. Please note that if you want to make any of the line/block-based changes described above, it is better to do those first since once you start editing the file yourself it becomes impossible for TortoiseMerge to keep track of the relationship to the original files."
\r
631 #: ../source/TortoiseMerge_en.xml:759
\r
633 msgid "If you're in three pane view (sometimes called <emphasis>merge view</emphasis>) you can only edit the file in the bottom view (<literal>Merged</literal>). As in two pane view, you can <action>right-click</action> on conflicted lines and either select <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Use text block from <quote>theirs</quote></guimenuitem></menuchoice> or <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Use text block from <quote>mine</quote></guimenuitem></menuchoice>. In addition, if you want <emphasis>both</emphasis> blocks, you can select <menuchoice><guimenu>Context Menu</guimenu><guimenuitem> Use text block from <quote>mine</quote> before <quote>theirs</quote></guimenuitem></menuchoice> or <menuchoice><guimenu>Context Menu</guimenu><guimenuitem> Use text block from <quote>theirs</quote> before <quote>mine</quote></guimenuitem></menuchoice>. According to the command you've selected, the changes are used in the resulting <literal>Merged</literal> file."
\r
636 #: ../source/TortoiseMerge_en.xml:796
\r
638 msgid "Sometimes a file will be marked as conflicted in Git, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the <emphasis>Conflict-Ignored</emphasis> icon. To resolve the conflict you still need to pick which version you want to use."
\r
641 #: ../source/TortoiseMerge_en.xml:804
\r
643 msgid "Sometimes the conflict is too difficult to resolve by simply picking <literal>Theirs</literal> and <literal>Mine</literal> and it requires hand editing. TortoiseMerge allows you to do all the easy changes visually first and then save the file, leaving only the difficult changes to be resolved by hand-editing."
\r
646 #: ../source/TortoiseMerge_en.xml:812
\r
648 msgid "Note that if you use TortoiseMerge on the same files again, any changes to your working copy, whether in TortoiseMerge, or by hand-editing, <emphasis>will be discarded</emphasis> and the file will appear as it did when conflict-editing first started."
\r
651 #: ../source/TortoiseMerge_en.xml:822
\r
656 #: ../source/TortoiseMerge_en.xml:824
\r
658 msgid "When you start TortoiseMerge without any command line switches then you have to open the files manually, using <menuchoice><guimenu>File</guimenu><guimenuitem>Open</guimenuitem></menuchoice>."
\r
661 #: ../source/TortoiseMerge_en.xml:833
\r
663 msgid "The Open Dialog"
\r
666 #: ../source/TortoiseMerge_en.xml:836
\r
668 msgid "The first thing you have to do is to decide whether you just want to compare/merge files, or whether you want to apply a patch file. Depending on what you choose, the corresponding edit boxes and browse buttons are activated."
\r
671 #: ../source/TortoiseMerge_en.xml:844
\r
673 msgid "If you want to compare / merge files you have to set at least two of the three possible paths for <literal>Base</literal>, <literal>Mine</literal> and <literal>Theirs</literal>. If you select only two files, then TortoiseMerge will show you the differences between those two files, either in a two pane view or in a one pane view."
\r
676 #: ../source/TortoiseMerge_en.xml:852
\r
678 msgid "If you want to merge three files, TortoiseMerge will show you the differences in a three pane view. This view is generally used if you need to resolve conflicted files. The output file is not named in this case and you will have to use the <menuchoice><guimenu>File</guimenu><guimenuitem>Save As...</guimenuitem></menuchoice>. to save the results."
\r
681 #: ../source/TortoiseMerge_en.xml:867
\r
683 msgid "If you want to apply a patch file you have to set both the path to the patch file itself and the path to the folder where the patch file should be applied."
\r
686 #: ../source/TortoiseMerge_en.xml:873
\r
688 msgid "Currently, only patch files in <emphasis>Unified Diff Format</emphasis> are supported. And only files which were generated from a Git working copy. Other formats like patch files generated by CVS are currently not supported!"
\r
691 #: ../source/TortoiseMerge_en.xml:884
\r
696 #: ../source/TortoiseMerge_en.xml:886
\r
698 msgid "Main Settings Page"
\r
701 #: ../source/TortoiseMerge_en.xml:889
\r
703 msgid "The Settings Main Page"
\r
706 #: ../source/TortoiseMerge_en.xml:892
\r
708 msgid "Most of the options here are self-explanatory, but a few points need clarifying."
\r
711 #: ../source/TortoiseMerge_en.xml:896
\r
713 msgid "<guilabel>Backup original file</guilabel> renames the original file in the WC to <literal>filename.bak</literal> before saving the modified version."
\r
716 #: ../source/TortoiseMerge_en.xml:901
\r
718 msgid "<guilabel>Ignore line endings</guilabel> hides changes which are due solely to difference in line-end style."
\r
721 #: ../source/TortoiseMerge_en.xml:905
\r
723 msgid "<guilabel>Ignore case changes</guilabel> hides changes which are due solely to case changes within the text. This can be useful with apps such as Visual Basic, which changes case in variables without warning."
\r
726 #: ../source/TortoiseMerge_en.xml:911
\r
728 msgid "<guilabel>Colour code in-line changes</guilabel> uses the same scheme as the line diff bar to show the detailed in-line changes within the main display panes. Lines which have been heavily modified will not be shown using this method as the results are simply confusing. In this case the line will be shown as replaced (old line deleted, new line added)."
\r
731 #: ../source/TortoiseMerge_en.xml:919
\r
733 msgid "<guilabel>Compare whitespaces</guilabel> shows all changes in indentation and inline whitespace as added/removed lines (which is how Git treats such changes)."
\r
736 #: ../source/TortoiseMerge_en.xml:924
\r
738 msgid "<guilabel>Ignore whitespace changes</guilabel> hides changes which are due solely to a change in the amount or type of whitespace, eg. changing the indentation or changing tabs to spaces. Adding whitespace where there was none before, or removing a whitespace completely is still shown as a change."
\r
741 #: ../source/TortoiseMerge_en.xml:932
\r
743 msgid "<guilabel>Ignore all whitespaces</guilabel> hides all whitespace-only changes."
\r
746 #: ../source/TortoiseMerge_en.xml:938
\r
748 msgid "Colour Settings Page"
\r
751 #: ../source/TortoiseMerge_en.xml:941
\r
753 msgid "The Settings Color Page"
\r
756 #: ../source/TortoiseMerge_en.xml:944
\r
758 msgid "This dialog allows you to select the background color coding used to highlight the different line changes."
\r
761 #: ../source/TortoiseMerge_en.xml:950
\r
766 #: ../source/TortoiseMerge_en.xml:951
\r
768 msgid "All lines which are unchanged, or where changes are hidden."
\r
771 #: ../source/TortoiseMerge_en.xml:956
\r
776 #: ../source/TortoiseMerge_en.xml:957
\r
778 msgid "Lines which have been added."
\r
781 #: ../source/TortoiseMerge_en.xml:962
\r
786 #: ../source/TortoiseMerge_en.xml:963
\r
788 msgid "Lines which have been deleted."
\r
791 #: ../source/TortoiseMerge_en.xml:968
\r
796 #: ../source/TortoiseMerge_en.xml:971
\r
801 #: ../source/TortoiseMerge_en.xml:974
\r
803 msgid "Colour code in-line changes"
\r
806 #: ../source/TortoiseMerge_en.xml:969
\r
808 msgid "Lines which have relatively small changes, and are shown using inline diff. This colour is used for the <placeholder-1/> portion of the line content. Changed portions will be shown using the inline added and deleted colours described below. If <placeholder-2/> is not enabled, this colour will not be used and changed lines will always be shown as replacements."
\r
811 #: ../source/TortoiseMerge_en.xml:980
\r
816 #: ../source/TortoiseMerge_en.xml:981
\r
818 msgid "Where the same line has been changed in both files."
\r
821 #: ../source/TortoiseMerge_en.xml:986
\r
823 msgid "Conflict resolved"
\r
826 #: ../source/TortoiseMerge_en.xml:987
\r
828 msgid "Where the same line has been changed in both files, and you have now selected which version should be used."
\r
831 #: ../source/TortoiseMerge_en.xml:993
\r
836 #: ../source/TortoiseMerge_en.xml:994
\r
838 msgid "Where lines have been added in the opposite pane, and no such line existed in this pane."
\r
841 #: ../source/TortoiseMerge_en.xml:1000
\r
843 msgid "Inline added text"
\r
846 #: ../source/TortoiseMerge_en.xml:1001
\r
848 msgid "When inline diffs are shown, added text is shown in this colour."
\r
851 #: ../source/TortoiseMerge_en.xml:1006
\r
853 msgid "Inline removed text"
\r
856 #: ../source/TortoiseMerge_en.xml:1007
\r
858 msgid "When inline diffs are shown, deleted text is shown in this colour."
\r
861 #: ../source/TortoiseMerge_en.xml:1012
\r
863 msgid "Misc whitespaces"
\r
866 #: ../source/TortoiseMerge_en.xml:1013
\r
868 msgid "Characters used to indicate Whitespace are shown in a different colour from normal text."
\r
871 #: ../source/TortoiseMerge_en.xml:1023
\r
873 msgid "keyboard shortcuts"
\r
876 #: ../source/TortoiseMerge_en.xml:1025
\r
878 msgid "List of keyboard shortcuts and commands."
\r
881 #: ../source/TortoiseMerge_en.xml:1030
\r
883 msgid "Keyboard shortcuts"
\r
886 #: ../source/TortoiseMerge_en.xml:1033
\r
891 #: ../source/TortoiseMerge_en.xml:1035
\r
893 msgid "Quit the program"
\r
896 #: ../source/TortoiseMerge_en.xml:1041
\r
901 #: ../source/TortoiseMerge_en.xml:1043
\r
903 msgid "Copy the selected text to the clipboard"
\r
906 #: ../source/TortoiseMerge_en.xml:1049
\r
911 #: ../source/TortoiseMerge_en.xml:1051
\r
913 msgid "Open the Find dialog for text searches"
\r
916 #: ../source/TortoiseMerge_en.xml:1057
\r
921 #: ../source/TortoiseMerge_en.xml:1059
\r
923 msgid "Open files to diff/merge"
\r
926 #: ../source/TortoiseMerge_en.xml:1065
\r
931 #: ../source/TortoiseMerge_en.xml:1067
\r
933 msgid "Save the changes"
\r
936 #: ../source/TortoiseMerge_en.xml:1073
\r
938 msgid "Ctrl-Shift-S"
\r
941 #: ../source/TortoiseMerge_en.xml:1075
\r
946 #: ../source/TortoiseMerge_en.xml:1081
\r
951 #: ../source/TortoiseMerge_en.xml:1083
\r
953 msgid "Go to next difference"
\r
956 #: ../source/TortoiseMerge_en.xml:1089
\r
961 #: ../source/TortoiseMerge_en.xml:1091
\r
963 msgid "Go to previous difference"
\r
966 #: ../source/TortoiseMerge_en.xml:1097
\r
971 #: ../source/TortoiseMerge_en.xml:1099
\r
973 msgid "Go to next conflict"
\r
976 #: ../source/TortoiseMerge_en.xml:1105
\r
981 #: ../source/TortoiseMerge_en.xml:1107
\r
983 msgid "Go to previous conflict"
\r
986 #: ../source/TortoiseMerge_en.xml:1113
\r
991 #: ../source/TortoiseMerge_en.xml:1115
\r
993 msgid "Toggle between one-pane diff and two-pane diff"
\r
996 #: ../source/TortoiseMerge_en.xml:1121
\r
1001 #: ../source/TortoiseMerge_en.xml:1123
\r
1003 msgid "Reload the files and revert all changes made"
\r
1006 #: ../source/TortoiseMerge_en.xml:1129
\r
1011 #: ../source/TortoiseMerge_en.xml:1131
\r
1013 msgid "Toggles between showing whitespaces or not"
\r
1016 #: ../source/TortoiseMerge_en.xml:1137
\r
1018 msgid "Ctrl-mousewheel"
\r
1021 #: ../source/TortoiseMerge_en.xml:1139
\r
1023 msgid "Scroll the display left/right"
\r
1026 #: ../source/TortoiseMerge_en.xml:1148
\r
1028 msgid "Automating TortoiseMerge"
\r
1031 #: ../source/TortoiseMerge_en.xml:1150
\r
1033 msgid "TortoiseMerge can be started with command line parameters to avoid having to go through the <guilabel>Open</guilabel> dialog to select the files yourself. This is useful also if you want to use TortoiseMerge from another application."
\r
1036 #: ../source/TortoiseMerge_en.xml:1161
\r
1038 msgid "TortoiseMerge Command Line Switches"
\r
1041 #: ../source/TortoiseMerge_en.xml:1163
\r
1043 msgid "automation"
\r
1046 #: ../source/TortoiseMerge_en.xml:1166
\r
1048 msgid "command line"
\r
1051 #: ../source/TortoiseMerge_en.xml:1168
\r
1053 msgid "Most switches require additional information like a path or some other string. In those cases, append an ':' to the switch and put the string/path after it. Example: <screen>\n/base:\"c:\\folder\\my base file.txt\"\n</screen>"
\r
1056 #: ../source/TortoiseMerge_en.xml:1188
\r
1058 msgid "List of available command line options"
\r
1061 #: ../source/TortoiseMerge_en.xml:1194
\r
1066 #: ../source/TortoiseMerge_en.xml:1195
\r
1068 msgid "Description"
\r
1071 #: ../source/TortoiseMerge_en.xml:1201
\r
1073 msgid "Shows a dialog box with the most important command line switches."
\r
1076 #: ../source/TortoiseMerge_en.xml:1209
\r
1081 #: ../source/TortoiseMerge_en.xml:1208
\r
1083 msgid "The same as <placeholder-1/>."
\r
1086 #: ../source/TortoiseMerge_en.xml:1215
\r
1091 #: ../source/TortoiseMerge_en.xml:1214
\r
1093 msgid "Specifies the <placeholder-1/> file used in three way diffs. This is the common ancestor of the files being diffed, although it is not shown in a separate window. For two way diffs, this is the left file."
\r
1096 #: ../source/TortoiseMerge_en.xml:1224
\r
1098 msgid "The name of the base file. This is shown in the view title instead of the file path. For three way diffs it is shown in a tooltip for the view title."
\r
1101 #: ../source/TortoiseMerge_en.xml:1234
\r
1106 #: ../source/TortoiseMerge_en.xml:1233
\r
1108 msgid "Specifies the <placeholder-1/> file used in three way diffs, displayed in the left pane."
\r
1111 #: ../source/TortoiseMerge_en.xml:1240
\r
1113 msgid "The name of the theirs file. This is shown in the view title instead of the file path."
\r
1116 #: ../source/TortoiseMerge_en.xml:1248
\r
1121 #: ../source/TortoiseMerge_en.xml:1247
\r
1123 msgid "Specifies the <placeholder-1/> file used in three way diffs, displayed in the right pane. For two way diffs, this is the right file."
\r
1126 #: ../source/TortoiseMerge_en.xml:1255
\r
1128 msgid "The name of the mine file. This is shown in the view title instead of the file path."
\r
1131 #: ../source/TortoiseMerge_en.xml:1263
\r
1136 #: ../source/TortoiseMerge_en.xml:1262
\r
1138 msgid "Specifies the resulting <placeholder-1/> file used in three way diffs. This is the file path where the result of the merge/conflict resolving is saved. If this is not set, then TortoiseMerge will ask the user where to save the result."
\r
1141 #: ../source/TortoiseMerge_en.xml:1272
\r
1143 msgid "The name of the merged file. This is shown in the view title instead of the file path."
\r
1146 #: ../source/TortoiseMerge_en.xml:1283
\r
1151 #: ../source/TortoiseMerge_en.xml:1279
\r
1153 msgid "The path where a patch should be applied to. If you don't set this path, then TortoiseMerge will try to find the path itself to match the paths in the patch file, but that can take <placeholder-1/>."
\r
1156 #: ../source/TortoiseMerge_en.xml:1288
\r
1158 msgid "The name of the original file to patch. Used for the view title."
\r
1161 #: ../source/TortoiseMerge_en.xml:1295
\r
1163 msgid "The name of the resulting patched file. Used for the view title."
\r
1166 #: ../source/TortoiseMerge_en.xml:1302
\r
1168 msgid "The path to the patch/diff file to apply to a directory."
\r
1171 #: ../source/TortoiseMerge_en.xml:1308
\r
1173 msgid "Forces TortoiseMerge to start with the one-way view instead of the view the user specified in the settings."
\r
1176 #: ../source/TortoiseMerge_en.xml:1315
\r
1178 msgid "Switches the left and right view of the specified two files to diff."
\r
1181 #: ../source/TortoiseMerge_en.xml:1325
\r
1183 msgid "/origfile:\"path_to_original_file\""
\r
1186 #: ../source/TortoiseMerge_en.xml:1326
\r
1188 msgid "/modifiedfile:\"path_to_modified_file\""
\r
1191 #: ../source/TortoiseMerge_en.xml:1328
\r
1193 msgid "/outfile:\"path_to_resulting_patchfile\""
\r
1196 #: ../source/TortoiseMerge_en.xml:1329
\r
1201 #: ../source/TortoiseMerge_en.xml:1332
\r
1203 msgid "/createunifieddiff"
\r
1206 #: ../source/TortoiseMerge_en.xml:1322
\r
1208 msgid "Creates a unified diff file (patch file) of two files specified with <placeholder-1/> and <placeholder-2/>. The target path is set with <placeholder-3/>. If <placeholder-4/> is not set, a file save dialog is shown so the user can choose the location to save the patch file. Note: If <placeholder-5/> is set, all other parameters are ignored."
\r
1211 #: ../source/TortoiseMerge_en.xml:1340
\r
1213 msgid "You can also supply simple filenames on the command line for compatibility with other diff programs. In this simplified form the command line is <screen>\nTortoiseMerge BaseFilePath MyFilePath [ TheirFilePath ]\n</screen> If two files are given they will be compared with each other. If three files are given, the first is taken as the BASE file, and the other two are compared with it in a three-way diff."
\r
1216 #: ../source/TortoiseMerge_en.xml:1356
\r
1221 #: ../source/TortoiseMerge_en.xml:1358
\r
1226 #: ../source/TortoiseMerge_en.xml:1360
\r
1228 msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit."
\r
1231 #: ../source/TortoiseMerge_en.xml:1368
\r
1233 msgid "BASE revision"
\r
1236 #: ../source/TortoiseMerge_en.xml:1370
\r
1238 msgid "The current base revision of a file or folder in your <emphasis>working copy</emphasis>. This is the revision the file or folder was in, when the last checkout, update or commit was run. The BASE revision is normally not equal to the HEAD revision."
\r
1241 #: ../source/TortoiseMerge_en.xml:1379
\r
1246 #: ../source/TortoiseMerge_en.xml:1381
\r
1248 msgid "This command is for text files only, and it annotates every line to show the repository revision in which it was last changed, and the author who made that change. Our GUI implementation is called TortoiseBlame and it also shows the commit date/time and the log message when you hover the mouse of the revision number."
\r
1251 #: ../source/TortoiseMerge_en.xml:1391
\r
1256 #: ../source/TortoiseMerge_en.xml:1393
\r
1258 msgid "Berkeley DB. A well tested database backend for repositories, that cannot be used on network shares. Default for pre 1.2 repositories."
\r
1261 #: ../source/TortoiseMerge_en.xml:1400
\r
1266 #: ../source/TortoiseMerge_en.xml:1402
\r
1268 msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a <quote>cheap copy</quote>."
\r
1271 #: ../source/TortoiseMerge_en.xml:1415
\r
1276 #: ../source/TortoiseMerge_en.xml:1417
\r
1278 msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository."
\r
1281 #: ../source/TortoiseMerge_en.xml:1424
\r
1286 #: ../source/TortoiseMerge_en.xml:1426
\r
1288 msgid "To quote from the Git book: <quote> Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a <emphasis>working copy locked</emphasis> error, run this command to remove stale locks and get your working copy into a usable state again. </quote> Note that in this context <emphasis>lock</emphasis> refers to local filesystem locking, not repository locking."
\r
1291 #: ../source/TortoiseMerge_en.xml:1441
\r
1296 #: ../source/TortoiseMerge_en.xml:1443
\r
1298 msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision."
\r
1301 #: ../source/TortoiseMerge_en.xml:1451
\r
1306 #: ../source/TortoiseMerge_en.xml:1453
\r
1308 msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes."
\r
1311 #: ../source/TortoiseMerge_en.xml:1463
\r
1316 #: ../source/TortoiseMerge_en.xml:1465
\r
1318 msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as <quote>cheap copies</quote> which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made."
\r
1321 #: ../source/TortoiseMerge_en.xml:1475
\r
1326 #: ../source/TortoiseMerge_en.xml:1477
\r
1328 msgid "When you delete a versioned item (and commit the change) the item no longer exists in the repository after the committed revision. But of course it still exists in earlier repository revisions, so you can still access it. If necessary, you can copy a deleted item and <quote>resurrect</quote> it complete with history."
\r
1331 #: ../source/TortoiseMerge_en.xml:1487
\r
1336 #: ../source/TortoiseMerge_en.xml:1489
\r
1338 msgid "Shorthand for <quote>Show Differences</quote>. Very useful when you want to see exactly what changes have been made."
\r
1341 #: ../source/TortoiseMerge_en.xml:1496
\r
1346 #: ../source/TortoiseMerge_en.xml:1498
\r
1348 msgid "This command produces a copy of a versioned folder, just like a working copy, but without the local <literal>.svn</literal> folders."
\r
1351 #: ../source/TortoiseMerge_en.xml:1506
\r
1356 #: ../source/TortoiseMerge_en.xml:1508
\r
1358 msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories."
\r
1361 #: ../source/TortoiseMerge_en.xml:1515
\r
1366 #: ../source/TortoiseMerge_en.xml:1517
\r
1368 msgid "Group policy object"
\r
1371 #: ../source/TortoiseMerge_en.xml:1523
\r
1373 msgid "HEAD revision"
\r
1376 #: ../source/TortoiseMerge_en.xml:1525
\r
1378 msgid "The latest revision of a file or folder in the <emphasis>repository</emphasis>."
\r
1381 #: ../source/TortoiseMerge_en.xml:1531
\r
1386 #: ../source/TortoiseMerge_en.xml:1533
\r
1388 msgid "Git command to import an entire folder hierarchy into the repository in a single revision."
\r
1391 #: ../source/TortoiseMerge_en.xml:1540
\r
1396 #: ../source/TortoiseMerge_en.xml:1542
\r
1398 msgid "When you take out a lock on a versioned item, you mark it in the repository as non-committable, except from the working copy where the lock was taken out."
\r
1401 #: ../source/TortoiseMerge_en.xml:1550
\r
1406 #: ../source/TortoiseMerge_en.xml:1552
\r
1408 msgid "Show the revision history of a file or folder. Also known as <quote>History</quote>."
\r
1411 #: ../source/TortoiseMerge_en.xml:1559
\r
1416 #: ../source/TortoiseMerge_en.xml:1561
\r
1418 msgid "Show the revision history of a file or folder. Also known as <quote>Log</quote>."
\r
1421 #: ../source/TortoiseMerge_en.xml:1568
\r
1426 #: ../source/TortoiseMerge_en.xml:1570
\r
1428 msgid "The process by which changes from the repository are added to your working copy without disrupting any changes you have already made locally. Sometimes these changes cannot be reconciled automatically and the working copy is said to be in conflict."
\r
1431 #: ../source/TortoiseMerge_en.xml:1576
\r
1433 msgid "Merging happens automatically when you update your working copy. You can also merge specific changes from another branch using TortoiseGit's Merge command."
\r
1436 #: ../source/TortoiseMerge_en.xml:1584
\r
1441 #: ../source/TortoiseMerge_en.xml:1586
\r
1443 msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a <quote>Patch</quote>, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review."
\r
1446 #: ../source/TortoiseMerge_en.xml:1599
\r
1451 #: ../source/TortoiseMerge_en.xml:1601
\r
1453 msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as <quote>properties</quote> to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as <literal>svn:eol-style</literal>. TortoiseGit has some too, such as <literal>tsvn:logminsize</literal>. You can add your own properties with any name and value you choose."
\r
1456 #: ../source/TortoiseMerge_en.xml:1614
\r
1461 #: ../source/TortoiseMerge_en.xml:1616
\r
1463 msgid "If your repository moves, perhaps because you have moved it to a different directory on your server, or the server domain name has changed, you need to <quote>relocate</quote> your working copy so that its repository URLs point to the new location."
\r
1466 #: ../source/TortoiseMerge_en.xml:1622
\r
1468 msgid "Note: you should only use this command if your working copy is referring to the same location in the same repository, but the repository itself has moved. In any other circumstance you probably need the <quote>Switch</quote> command instead."
\r
1471 #: ../source/TortoiseMerge_en.xml:1631
\r
1473 msgid "Repository"
\r
1476 #: ../source/TortoiseMerge_en.xml:1633
\r
1478 msgid "A repository is a central place where data is stored and maintained. A repository can be a place where multiple databases or files are located for distribution over a network, or a repository can be a location that is directly accessible to the user without having to travel across a network."
\r
1481 #: ../source/TortoiseMerge_en.xml:1642
\r
1486 #: ../source/TortoiseMerge_en.xml:1644
\r
1488 msgid "When files in a working copy are left in a conflicted state following a merge, those conflicts must be sorted out by a human using an editor (or perhaps TortoiseMerge). This process is referred to as <quote>Resolving Conflicts</quote>. When this is complete you can mark the conflicted files as being resolved, which allows them to be committed."
\r
1491 #: ../source/TortoiseMerge_en.xml:1654
\r
1496 #: ../source/TortoiseMerge_en.xml:1656
\r
1498 msgid "Git keeps a local <quote>pristine</quote> copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the <quote>revert</quote> command to go back to the pristine copy."
\r
1501 #: ../source/TortoiseMerge_en.xml:1665
\r
1506 #: ../source/TortoiseMerge_en.xml:1667
\r
1508 msgid "Every time you commit a set of changes, you create one new <quote>revision</quote> in the repository. Each revision represents the state of the repository tree at a certain point in its history. If you want to go back in time you can examine the repository as it was at revision N."
\r
1511 #: ../source/TortoiseMerge_en.xml:1674
\r
1513 msgid "In another sense, a revision can refer to the set of changes that were made when that revision was created."
\r
1516 #: ../source/TortoiseMerge_en.xml:1681
\r
1518 msgid "Revision Property (revprop)"
\r
1521 #: ../source/TortoiseMerge_en.xml:1683
\r
1523 msgid "Just as files can have properties, so can each revision in the repository. Some special revprops are added automatically when the revision is created, namely: <literal>svn:date svn:author svn:log</literal> which represent the commit date/time, the committer and the log message respectively. These properties can be edited, but they are not versioned, so any change is permanent and cannot be undone."
\r
1526 #: ../source/TortoiseMerge_en.xml:1695
\r
1531 #: ../source/TortoiseMerge_en.xml:1697
\r
1533 msgid "A frequently-used abbreviation for Git."
\r
1536 #: ../source/TortoiseMerge_en.xml:1700
\r
1538 msgid "The name of the Git custom protocol used by the <quote>svnserve</quote> repository server."
\r
1541 #: ../source/TortoiseMerge_en.xml:1707
\r
1546 #: ../source/TortoiseMerge_en.xml:1709
\r
1548 msgid "Just as <quote>Update-to-revision</quote> changes the time window of a working copy to look at a different point in history, so <quote>Switch</quote> changes the space window of a working copy so that it points to a different part of the repository. It is particularly useful when working on trunk and branches where only a few files differ. You can switch your working copy between the two and only the changed files will be transferred."
\r
1551 #: ../source/TortoiseMerge_en.xml:1721
\r
1556 #: ../source/TortoiseMerge_en.xml:1723
\r
1558 msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy."
\r
1561 #: ../source/TortoiseMerge_en.xml:1731
\r
1563 msgid "Working Copy"
\r
1566 #: ../source/TortoiseMerge_en.xml:1733
\r
1568 msgid "This is your local <quote>sandbox</quote>, the area where you work on the versioned files, and it normally resides on your local hard disk. You create a working copy by doing a <quote>Checkout</quote> from a repository, and you feed your changes back into the repository using <quote>Commit</quote>."
\r
1571 #. Put one translator per line, in the form of NAME <EMAIL>.
\r
1572 #: ../source/TortoiseMerge_en.xml:0
\r
1574 msgid "translator-credits"
\r
1577 #. Place the translation of 'translation' here.
\r
1578 #: ../source/TortoiseMerge_en.xml:0
\r
1580 msgid "translator-translation"
\r
OSDN Git Service
