msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2008-07-11 23:46 +0000\n" "PO-Revision-Date: 2008-10-08 13:31+0100\n" "Last-Translator: Milorad Popović \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Serbian latin\n" "X-Poedit-Country: SERBIA\n" #. (title) #: ../source/TortoiseMerge_en.xml:4 msgid "TortoiseMerge" msgstr "TortozMerdž" #. (subtitle) #: ../source/TortoiseMerge_en.xml:6 msgid "A diff/merge tool for Windows" msgstr "Razl/spoji alat za Vindouz" #. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated #. (subtitle) #: ../source/TortoiseMerge_en.xml:7 msgid "Version $MajorVersion$.$MinorVersion$.$MicroVersion$" msgstr "Verzija $MajorVersion$.$MinorVersion$.$MicroVersion$" #. (edition) #: ../source/TortoiseMerge_en.xml:9 msgid "First" msgstr "Prvi" #. (firstname) #: ../source/TortoiseMerge_en.xml:12 msgid "Stefan" msgstr "Stefan" #. (surname) #: ../source/TortoiseMerge_en.xml:13 msgid "Küng" msgstr "Kung" #. (firstname) #: ../source/TortoiseMerge_en.xml:16 msgid "Lübbe" msgstr "Lube" #. (surname) #: ../source/TortoiseMerge_en.xml:17 msgid "Onken" msgstr "Onken" #. (firstname) #: ../source/TortoiseMerge_en.xml:20 msgid "Simon" msgstr "Simon" #. (surname) #: ../source/TortoiseMerge_en.xml:21 msgid "Large" msgstr "Ladž" #. (title) #: ../source/TortoiseMerge_en.xml:28 msgid "Preface" msgstr "Predgovor" #. (para) #: ../source/TortoiseMerge_en.xml:33 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." msgstr "Kada se radi na projektu, ili projktu otvorenog koda gde više ljudi razvija vaš kod, ili komercijalni projekt gde vi prodajete komponente sa vašim izvornim kodom, biće ljudi i potrošača koji će naći bagove ili želeti da poboljšaju vaš projekat. Da bi to uradili oni vam šalju zakrpe koje vi trba da pregledate i odlučite da li ih želite primeniti." #. (para) #: ../source/TortoiseMerge_en.xml:45 msgid "Reviewing patches" msgstr "Pregled zakrpa" #. (para) #: ../source/TortoiseMerge_en.xml:50 msgid "Applying the patches" msgstr "Primena zakrpa" #. (para) #: ../source/TortoiseMerge_en.xml:41 msgid "TortoiseMerge helps you with both those tasks: " msgstr "TortozMerdž vam pomaže u oba ova zadatka: " #. (para) #: ../source/TortoiseMerge_en.xml:56 msgid "TortoiseMerge also helps you to sort out conflicted files which can occur if you're working with a source control system and others are working on the same files as you." msgstr "TortozMerdž vam takođe pomaže da sortirate konfliktne fajlove koji se mogu pojaviti ako radite sa sistemom kontrole izvornog koda i ostali rade na istim fajlovima kao vi." #. (title) #: ../source/TortoiseMerge_en.xml:66 msgid "TortoiseMerge is free!" msgstr "TortozMrdž je besplatan!" #. (para) #: ../source/TortoiseMerge_en.xml:67 msgid "TortoiseMerge is free. You don't have to pay for it, you can use it any way you want. It is developed under the GP license (GPL)." msgstr "TortozMerdž je besplatan. Vi ne treba da platite za njega, možete ga koristiti kako god želite. Razvijen je pod GP licencom (GPL=." #. (para) #: ../source/TortoiseMerge_en.xml:71 msgid "TortoiseMerge is an Open Source project. That means you have full access to the source code of this program. You can browse it on this link http://tortoisesvn.tigris.org/svn/tortoisesvn/. (Username:guest, for password hit enter) The most recent version (where we're currently working) is located under /trunk/ the released versions are located under /tags/." msgstr "TortozMerdž je Otvoren Kod projekat. To znači da imate pun pristup izvornom kodu ovog projekta. Možete ga pretraživati na vezi http://tortoisesvn.tigris.org/svn/tortoisesvn/. (Korisnik: guest, za lozinku pritisnite enter) Najskorija verzija (gde mi trenutno radimo) locirana je pod /trunk/ realizovana verzija je pod /tags/." #. (title) #: ../source/TortoiseMerge_en.xml:90 msgid "Donate!" msgstr "Donirajte!" #. (para) #: ../source/TortoiseMerge_en.xml:91 msgid "Even though TortoiseSVN and TortoiseMerge are free, you can support the developers by sending in patches and play an active role in the development. You can also help to cheer us up during the endless hours we spend in front of our computers." msgstr "Bez obzira što su TortozSVN i TortozMerdž besplatni, možete podržati razvoj slanjem zakrpa i igranjem aktivne uloge u razvoju. Možete pomoći ako nas pohvalite za beskonačne sate provedene ispred naših kompjutera." #. (para) #: ../source/TortoiseMerge_en.xml:97 msgid "While working on TortoiseSVN we love to listen to music. And since we spend many hours on the project we need a lot of music. Therefore we have set up some wish-lists with our favourite music 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." msgstr "Dok radimo na TortozSVN volimo da slušamo muziku. I pošto trošimo mnogo sati na ovom projktu treba nam mnogo muzike. Zato smo sastavili listu želja sa našim muzičkim favoritima CDima i DVDima: http://tortoisesvn.tigris.org/donate.html Molim vas da takođe pogledate listu ljudi koji učestvuju u projektu slanjem zakrpa ili prevoda." #. (title) #: ../source/TortoiseMerge_en.xml:113 msgid "Acknowledgments" msgstr "Zahvalnost" #. (term) #: ../source/TortoiseMerge_en.xml:117 msgid "Stefan Küng" msgstr "Stefan Kung" #. (para) #: ../source/TortoiseMerge_en.xml:121 msgid "for the hard work on TortoiseMerge" msgstr "za težak rad na TortozMerdž" #. (term) #: ../source/TortoiseMerge_en.xml:127 msgid "Lübbe Onken" msgstr "Lube Onken" #. (para) #: ../source/TortoiseMerge_en.xml:131 msgid "for the beautiful icons, logo, bug hunting and taking care of the documentation" msgstr "za lepe ikone, logo, lov na bagove i brigu o dokumentaciji" #. (term) #: ../source/TortoiseMerge_en.xml:138 msgid "The Tigris Style project" msgstr "Tigris Stil projekat" #. (para) #: ../source/TortoiseMerge_en.xml:142 msgid "for some of the styles which are reused in this documentation" msgstr "za neke stilove koji su preuzeti u ovoj dokumentaciji" #. (term) #: ../source/TortoiseMerge_en.xml:149 msgid "Our Contributors" msgstr "Naši priložnici" #. (para) #: ../source/TortoiseMerge_en.xml:153 msgid "for the patches, bug reports and new ideas, and for helping others by answering questions on our mailing list." msgstr "za zakrpe, izveštaje o bagovima i novim idejama i za pomoć drugima odgovarajući na pitanja sa naše poštanske liste." #. (term) #: ../source/TortoiseMerge_en.xml:160 msgid "Our Donators" msgstr "Naši donatori" #. (para) #: ../source/TortoiseMerge_en.xml:164 msgid "for many hours of joy with the music they sent us" msgstr "za mnoge sate uživanja sa muzikom koju nam šalju" #. (title) #: ../source/TortoiseMerge_en.xml:175 msgid "Introduction" msgstr "Uvod" #. (title) #: ../source/TortoiseMerge_en.xml:184 msgid "Overview" msgstr "Pregled" #. (para) #: ../source/TortoiseMerge_en.xml:185 msgid "TortoiseMerge is a free/open-source application. It lets you see differences in text files, merge those changes and even review and apply unified diff files, often called patches." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:190 msgid "While working on text files, e.g. source files in your favourite programming language, or html/xml files for your documentation or website, you will often have a situation where you need to compare different versions of those files. Sometimes you get a different version from someone else, sometimes you just want to see the changes you've made." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:198 msgid "If you're working with a version control system (e.g. Subversion) then you sometimes get conflicts when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:206 msgid "The following diagram shows you the relationships between the files involved in a conflict:" msgstr "" #. (title) #. (title) #: ../source/TortoiseMerge_en.xml:211 #: ../source/TortoiseMerge_en.xml:347 msgid "File Conflict" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:214 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." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:220 msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Subversion. TortoiseMerge parses the 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." msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:235 msgid "TortoiseMerge's History" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:236 msgid "While working on TortoiseSVN we found that whenever users sent in patches to enhance the project or just to fix bugs, we had a lot of work just applying those patches. And many times those patches were outdated and couldn't be applied with the command line patch tool http://unxutils.sourceforge.net/ because we were working on those files and had sometimes changed those files already." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:251 msgid "This was also the main reason why TortoiseSVN did not originally have a TortoiseSVNCreate Patch implemented: we preferred users to send us the whole files because with those it was easier to apply patches." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:261 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." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:268 msgid "Since TortoiseSVN already uses the Subversion library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff." msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:276 msgid "Basic Concepts" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:282 msgid "Viewing the difference between two files and merging changes into one of them, or removing unwanted changes." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:288 msgid "Editing conflicts between local changes and changes in the Subversion repository following an update." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:294 msgid "Applying patch files. This is the reason TortoiseMerge was created :)" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:278 msgid "TortoiseMerge has several different uses: " msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:303 msgid "Viewing and Merging Differences" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:304 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 Theirs, and the file in the right pane is the modified file (sometimes referred to as Mine." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:315 msgid "Reverting changed lines back to the text shown in the left pane." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:320 msgid "Using a combination of both blocks, either Theirs before Mine or Mine before Theirs." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:310 msgid "You can make simple line-based changes to the file in the right pane which include: " msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:328 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." msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:338 msgid "Editing Conflicts" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:339 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:" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:350 msgid "The base file represents the oldest version of a file, from where You and They start making changes. Mine represents the base file with all the changes you made, and Theirs is the file with all the changes someone else made to the file. The left pane shows the changes in Theirs relative to the base file and the right pane shows the changes in Mine relative to the base file. The bottom pane is the output file which is where you are trying to resolve the conflicts." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:362 msgid "In conflict resolution view, you can choose to use blocks from Mine or Theirs or both. But in this case, the changes are shown in the bottom pane." msgstr "" #. (title) #. (title) #. (title) #: ../source/TortoiseMerge_en.xml:369 #: ../source/TortoiseMerge_en.xml:478 #: ../source/TortoiseMerge_en.xml:866 msgid "Applying Patches" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:370 msgid "A patch file is a Subversion 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 TortoiseSVN 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." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:380 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." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:387 msgid "You can edit the file in the right pane exactly as you would in compare/edit mode." msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:394 msgid "Using TortoiseMerge" msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:402 msgid "Viewing Modes" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:403 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." msgstr "" #. (title) #. (title) #: ../source/TortoiseMerge_en.xml:409 #: ../source/TortoiseMerge_en.xml:843 msgid "Viewing / Merging" msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:411 msgid "One Pane View" msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:415 msgid "Two Pane View" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:423 msgid "Changes inside the modified lines are shown in different colors. Added string parts are shown with a lighter color, but you can of course configure the colors used here. Removed parts are indicated with a dark brown vertical line in the string. Check out the screenshot above to see how this works." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:433 msgid "Code reorganization usually means a lot of changes in whitespaces (space, tab, newlines) but no actual code change. For example, you split up a very long line into several lines, or you sometimes compact several lines together into one." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:439 msgid "Such changes are marked with a white circle symbol on the left side of the views. If you see such a white circle, you know immediately that no real code change is there and you don't have to check the changed block further." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:447 msgid "Hand editing of the file in the right pane is possible in two-pane view. Such changes are marked with a pencil symbol." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:418 msgid "The two pane view has some features which are not available in the one pane view: " msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:454 msgid "If you want to compare/merge three files, TortoiseMerge will show you the differences in a three pane view. This view is also used if you need to resolve conflicted files." msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:460 msgid "Three Pane View" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:463 msgid "The left pane shows you the differences between Their file and the Base file, while the right pane shows you the differences between Mine file and the Base file. The bottom pane shows you the result of merging Base, Mine and Theirs with possible conflicts." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:472 msgid "If you hover the mouse over the pane title, a tooltip will show the filenames used for the diff in each pane." msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:484 msgid "Patch File List" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:479 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. If the filename is shown in black, then the patch can be applied without any problems. That means the file is not outdated according to the patch. However, if the filename is shown in red, then the patch can't get applied directly because you already changed that file." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:493 msgid "But don't worry. If you're working with Subversion you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between Base (the older version of the file), Mine (the file as it is currently in your working copy) and Theirs (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:504 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 all files in the list. The double-click action is to preview." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:512 msgid "Depending on whether TortoiseMerge can apply the patch directly or by fetching an older version of the file first, it shows you a two pane view (patch can be applied directly) or a three pane view (older version of file fetched)." msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:521 msgid "Buttons and Other Controls" msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:524 msgid "The Toolbar" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:531 msgid "Open accesses the file-open dialog. What else?" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:537 msgid "Save saves any changes you have made." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:543 msgid "Reload discards any changes you have made in TortoiseMerge and reloads the files from disk." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:550 msgid "Undo implements a multi-level undo, allowing you to reverse any changes you have made within TortoiseMerge." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:557 msgid "Prev/Next Difference jumps directly to the next point where the files differ. This saves scrolling through all the unchanged parts of the file." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:563 msgid "When you do this in 2-pane diff mode, the detail bar at the bottom of the screen will show you the inline differences for the first line, regardless of where the mouse is hovering." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:570 msgid "Prev/Next Conflict jumps directly to the next point where the file differences are in conflict and need to be resolved." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:577 msgid "Use Theirs/Use Mine 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." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:586 msgid "Theirs before Mine/Mine before Theirs 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." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:594 msgid "Mark as Resolved When you have resolved all the conflicts in a file and saved the changes, you can mark it as resolved from within TortoiseMerge, rather than going back to explorer and marking as resolved from there." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:603 msgid "Show Whitespaces toggles the option to display space and tab characters as symbols so you can distinguish white space changes." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:610 msgid "Inline Diff Word-wise 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." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:617 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." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:628 msgid "Switch View selects between one-pane and two-pane view. Disabled in 3-pane view." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:635 msgid "Switch Left and Right View In 2-pane view, swaps the left and right windows. When you are comparing a file in 2 different trees, as opposed to 2 revisions of the same file, TortoiseSVN does not know which one should go in the left pane as the original/base version. If it gets this wrong, you can change it to make viewing easier." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:646 msgid "Show/Hide Patch List When TortoiseMerge has a patch list, this button allows you to hide it (so you can see both windows), or show it (so you can review the file list)." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:654 msgid "Settings takes you to TortoiseMerge's settings dialog." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:522 msgid " Below the menu bar lies the tool bar. This provides easy access to the most commonly used tools, which are " msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:661 msgid "On the left side of the window is a locator bar. This provides a quick visual reference as to where the changes lie within the file. The bar has three columns. The left column refers to the left pane, the right column to the right pane, and the centre column to the bottom pane (if present). In one-pane view only the left column is used. The locator bar can also be used as a scroll bar to scroll all the windows simultaneously." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:670 msgid "Below the bottom window is the status bar. This shows the number of lines added and deleted in Theirs and Mine, and the number of unresolved conflicts remaining. You can also see which line-ending style is in use, what encoding (ASCII, UTF-8, etc) is assumed by TortoiseMerge, and whether there is a byte-order-mark (BOM) present in UTF-8 files. The left side of the status bar is used to display hints when you hover the mouse over a control." msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:683 msgid "Line Status Icons" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:684 msgid "Changed lines are marked with an icon to indicate what type of change has occurred." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:688 msgid " A line has been added." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:692 msgid " A line has been removed." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:696 msgid " A change has been undone by reverting to the original content of the line." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:700 msgid " 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." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:706 msgid " A line has been edited by hand, using TortoiseMerge as a text editor." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:710 msgid " This line is in conflict." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:714 msgid " This line is conflicted, but the effect is hidden by whitespace or line-ending settings." msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:721 msgid "Merging / Editing Conflicts" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:722 msgid "TortoiseMerge not only shows you the differences between files but also lets you resolve conflicts or apply changes." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:726 msgid "If you're in two pane view, then you can only edit the file in the right pane (Mine). To apply changes made in the left file (Theirs), right-click on the changed lines and select Context MenuUse text block from theirs. Then the changes from the left file are added to the right file." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:738 msgid "Sometimes you actually want both text blocks, and the context menu also offers you Context MenuUse both text blocks (this one first) and Context MenuUse both text blocks (this one last)." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:751 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." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:759 msgid "If you're in three pane view (sometimes called merge view) you can only edit the file in the bottom view (Merged). As in two pane view, you can right-click on conflicted lines and either select Context MenuUse text block from theirs or Context MenuUse text block from mine. In addition, if you want both blocks, you can select Context Menu Use text block from mine before theirs or Context Menu Use text block from theirs before mine. According to the command you've selected, the changes are used in the resulting Merged file." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:796 msgid "Sometimes a file will be marked as conflicted in Subversion, 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 Conflict-Ignored icon. To resolve the conflict you still need to pick which version you want to use." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:804 msgid "Sometimes the conflict is too difficult to resolve by simply picking Theirs and Mine and it requires hand editing. TortoiseMerge allows you to do all the easy changes visually first and then save the file, leaving only the difficult changes to be resolved by hand-editing." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:812 msgid "Note that if you use TortoiseMerge on the same files again, any changes to your working copy, whether in TortoiseMerge, or by hand-editing, will be discarded and the file will appear as it did when conflict-editing first started." msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:822 msgid "Open Files" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:824 msgid "When you start TortoiseMerge without any command line switches then you have to open the files manually, using FileOpen." msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:833 msgid "The Open Dialog" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:836 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." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:844 msgid "If you want to compare / merge files you have to set at least two of the three possible paths for Base, Mine and Theirs. If you select only two files, then TortoiseMerge will show you the differences between those two files, either in a two pane view or in a one pane view." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:852 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 FileSave As.... to save the results." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:867 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." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:873 msgid "Currently, only patch files in Unified Diff Format are supported. And only files which were generated from a Subversion working copy. Other formats like patch files generated by CVS are currently not supported!" msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:884 msgid "Settings" msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:886 msgid "Main Settings Page" msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:889 msgid "The Settings Main Page" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:892 msgid "Most of the options here are self-explanatory, but a few points need clarifying." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:896 msgid "Backup original file renames the original file in the WC to filename.bak before saving the modified version." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:901 msgid "Ignore line endings hides changes which are due solely to difference in line-end style." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:905 msgid "Ignore case changes hides changes which are due solely to case changes within the text. This can be useful with apps such as Visual Basic, which changes case in variables without warning." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:911 msgid "Colour code in-line changes uses the same scheme as the line diff bar to show the detailed in-line changes within the main display panes. Lines which have been heavily modified will not be shown using this method as the results are simply confusing. In this case the line will be shown as replaced (old line deleted, new line added)." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:919 msgid "Compare whitespaces shows all changes in indentation and inline whitespace as added/removed lines (which is how Subversion treats such changes)." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:924 msgid "Ignore whitespace changes hides changes which are due solely to a change in the amount or type of whitespace, eg. changing the indentation or changing tabs to spaces. Adding whitespace where there was none before, or removing a whitespace completely is still shown as a change." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:932 msgid "Ignore all whitespaces hides all whitespace-only changes." msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:938 msgid "Colour Settings Page" msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:941 msgid "The Settings Color Page" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:944 msgid "This dialog allows you to select the background color coding used to highlight the different line changes." msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:950 msgid "Normal" msgstr "" #. (listitem) #: ../source/TortoiseMerge_en.xml:951 msgid "All lines which are unchanged, or where changes are hidden." msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:956 msgid "Added" msgstr "" #. (listitem) #: ../source/TortoiseMerge_en.xml:957 msgid "Lines which have been added." msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:962 msgid "Removed" msgstr "" #. (listitem) #: ../source/TortoiseMerge_en.xml:963 msgid "Lines which have been deleted." msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:968 msgid "Modified" msgstr "" #. (emphasis) #: ../source/TortoiseMerge_en.xml:971 msgid "unchanged" msgstr "" #. (guilabel) #: ../source/TortoiseMerge_en.xml:974 msgid "Colour code in-line changes" msgstr "" #. (listitem) #: ../source/TortoiseMerge_en.xml:969 msgid "Lines which have relatively small changes, and are shown using inline diff. This colour is used for the portion of the line content. Changed portions will be shown using the inline added and deleted colours described below. If is not enabled, this colour will not be used and changed lines will always be shown as replacements." msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:980 msgid "Conflicted" msgstr "" #. (listitem) #: ../source/TortoiseMerge_en.xml:981 msgid "Where the same line has been changed in both files." msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:986 msgid "Conflict resolved" msgstr "" #. (listitem) #: ../source/TortoiseMerge_en.xml:987 msgid "Where the same line has been changed in both files, and you have now selected which version should be used." msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:993 msgid "Empty" msgstr "" #. (listitem) #: ../source/TortoiseMerge_en.xml:994 msgid "Where lines have been added in the opposite pane, and no such line existed in this pane." msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:1000 msgid "Inline added text" msgstr "" #. (listitem) #: ../source/TortoiseMerge_en.xml:1001 msgid "When inline diffs are shown, added text is shown in this colour." msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:1006 msgid "Inline removed text" msgstr "" #. (listitem) #: ../source/TortoiseMerge_en.xml:1007 msgid "When inline diffs are shown, deleted text is shown in this colour." msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:1012 msgid "Misc whitespaces" msgstr "" #. (listitem) #: ../source/TortoiseMerge_en.xml:1013 msgid "Characters used to indicate Whitespace are shown in a different colour from normal text." msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:1023 msgid "keyboard shortcuts" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1025 msgid "List of keyboard shortcuts and commands." msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:1030 msgid "Keyboard shortcuts" msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:1033 msgid "Ctrl-Q" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1035 msgid "Quit the program" msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:1041 msgid "Ctrl-C" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1043 msgid "Copy the selected text to the clipboard" msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:1049 msgid "Ctrl-F" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1051 msgid "Open the Find dialog for text searches" msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:1057 msgid "Ctrl-O" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1059 msgid "Open files to diff/merge" msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:1065 msgid "Ctrl-S" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1067 msgid "Save the changes" msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:1073 msgid "Ctrl-Shift-S" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1075 msgid "Save as..." msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:1081 msgid "F7" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1083 msgid "Go to next difference" msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:1089 msgid "Shift-F7" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1091 msgid "Go to previous difference" msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:1097 msgid "F8" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1099 msgid "Go to next conflict" msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:1105 msgid "Shift-F8" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1107 msgid "Go to previous conflict" msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:1113 msgid "Ctrl-D" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1115 msgid "Toggle between one-pane diff and two-pane diff" msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:1121 msgid "Ctrl-R" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1123 msgid "Reload the files and revert all changes made" msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:1129 msgid "Ctrl-T" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1131 msgid "Toggles between showing whitespaces or not" msgstr "" #. (term) #: ../source/TortoiseMerge_en.xml:1137 msgid "Ctrl-mousewheel" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1139 msgid "Scroll the display left/right" msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:1148 msgid "Automating TortoiseMerge" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1150 msgid "TortoiseMerge can be started with command line parameters to avoid having to go through the Open dialog to select the files yourself. This is useful also if you want to use TortoiseMerge from another application." msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:1161 msgid "TortoiseMerge Command Line Switches" msgstr "" #. (primary) #: ../source/TortoiseMerge_en.xml:1163 msgid "automation" msgstr "" #. (primary) #: ../source/TortoiseMerge_en.xml:1166 msgid "command line" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1168 msgid "" "Most switches require additional information like a path or some other string. In those cases, append an ':' to the switch and put the string/path after it. Example: \n" "/base:\"c:\\folder\\my base file.txt\"\n" "" msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:1188 msgid "List of available command line options" msgstr "" #. (entry) #: ../source/TortoiseMerge_en.xml:1194 msgid "Command" msgstr "" #. (entry) #: ../source/TortoiseMerge_en.xml:1195 msgid "Description" msgstr "" #. (entry) #: ../source/TortoiseMerge_en.xml:1201 msgid "Shows a dialog box with the most important command line switches." msgstr "" #. (option) #: ../source/TortoiseMerge_en.xml:1209 msgid "?" msgstr "" #. (entry) #: ../source/TortoiseMerge_en.xml:1208 msgid "The same as ." msgstr "" #. (emphasis) #: ../source/TortoiseMerge_en.xml:1215 msgid "base" msgstr "" #. (entry) #: ../source/TortoiseMerge_en.xml:1214 msgid "Specifies the file used in three way diffs. This is the common ancestor of the files being diffed, although it is not shown in a separate window. For two way diffs, this is the left file." msgstr "" #. (entry) #: ../source/TortoiseMerge_en.xml:1224 msgid "The name of the base file. This is shown in the view title instead of the file path. For three way diffs it is shown in a tooltip for the view title." msgstr "" #. (emphasis) #: ../source/TortoiseMerge_en.xml:1234 msgid "theirs" msgstr "" #. (entry) #: ../source/TortoiseMerge_en.xml:1233 msgid "Specifies the file used in three way diffs, displayed in the left pane." msgstr "" #. (entry) #: ../source/TortoiseMerge_en.xml:1240 msgid "The name of the theirs file. This is shown in the view title instead of the file path." msgstr "" #. (emphasis) #: ../source/TortoiseMerge_en.xml:1248 msgid "mine" msgstr "" #. (entry) #: ../source/TortoiseMerge_en.xml:1247 msgid "Specifies the file used in three way diffs, displayed in the right pane. For two way diffs, this is the right file." msgstr "" #. (entry) #: ../source/TortoiseMerge_en.xml:1255 msgid "The name of the mine file. This is shown in the view title instead of the file path." msgstr "" #. (emphasis) #: ../source/TortoiseMerge_en.xml:1263 msgid "merged" msgstr "" #. (entry) #: ../source/TortoiseMerge_en.xml:1262 msgid "Specifies the resulting file used in three way diffs. This is the filepath where the result of the merge/conflict resolving is saved. If this is not set, then TortoiseMerge will ask the user where to save the result." msgstr "" #. (entry) #: ../source/TortoiseMerge_en.xml:1272 msgid "The name of the merged file. This is shown in the view title instead of the file path." msgstr "" #. (emphasis) #: ../source/TortoiseMerge_en.xml:1283 msgid "very long" msgstr "" #. (entry) #: ../source/TortoiseMerge_en.xml:1279 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 ." msgstr "" #. (entry) #: ../source/TortoiseMerge_en.xml:1288 msgid "The name of the original file to patch. Used for the view title." msgstr "" #. (entry) #: ../source/TortoiseMerge_en.xml:1295 msgid "The name of the resulting patched file. Used for the view title." msgstr "" #. (entry) #: ../source/TortoiseMerge_en.xml:1302 msgid "The path to the patch/diff file to apply to a directory." msgstr "" #. (entry) #: ../source/TortoiseMerge_en.xml:1308 msgid "Forces TortoiseMerge to start with the one-way view instead of the view the user specified in the settings." msgstr "" #. (entry) #: ../source/TortoiseMerge_en.xml:1315 msgid "Switches the left and right view of the specified two files to diff." msgstr "" #. (literal) #: ../source/TortoiseMerge_en.xml:1325 msgid "/origfile:\"path_to_original_file\"" msgstr "" #. (literal) #: ../source/TortoiseMerge_en.xml:1326 msgid "/modifiedfile:\"path_to_modified_file\"" msgstr "" #. (literal) #: ../source/TortoiseMerge_en.xml:1328 msgid "/outfile:\"path_to_resulting_patchfile\"" msgstr "" #. (literal) #: ../source/TortoiseMerge_en.xml:1329 msgid "/outfile" msgstr "" #. (literal) #: ../source/TortoiseMerge_en.xml:1332 msgid "/createunifieddiff" msgstr "" #. (entry) #: ../source/TortoiseMerge_en.xml:1322 msgid "Creates a unified diff file (patch file) of two files specified with and . The target path is set with . If is not set, a file save dialog is shown so the user can choose the location to save the patch file. Note: If is set, all other parameters are ignored." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1340 msgid "" "You can also supply simple filenames on the command line for compatibility with other diff programs. In this simplified form the command line is \n" "TortoiseMerge BaseFilePath MyFilePath [ TheirFilePath ]\n" " If two files are given they will be compared with each other. If three files are given, the first is taken as the BASE file, and the other two are compared with it in a three-way diff." msgstr "" #. (title) #: ../source/TortoiseMerge_en.xml:1356 msgid "Glossary" msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1358 msgid "Add" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1360 msgid "A Subversion command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1368 msgid "BASE revision" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1370 msgid "The current base revision of a file or folder in your working copy. This is the revision the file or folder was in, when the last checkout, update or commit was run. The BASE revision is normally not equal to the HEAD revision." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1379 msgid "Blame" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1381 msgid "This command is for text files only, and it annotates every line to show the repository revision in which it was last changed, and the author who made that change. Our GUI implementation is called TortoiseBlame and it also shows the commit date/time and the log message when you hover the mouse of the revision number." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1391 msgid "BDB" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1393 msgid "Berkeley DB. A well tested database backend for repositories, that cannot be used on network shares. Default for pre 1.2 repositories." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1400 msgid "Branch" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1402 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 Subversion a branch is implemented as a cheap copy." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1415 msgid "Checkout" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1417 msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1424 msgid "Cleanup" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1426 msgid "To quote from the Subversion book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1441 msgid "Commit" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1443 msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1451 msgid "Conflict" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1453 msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Subversion cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1463 msgid "Copy" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1465 msgid "In a Subversion repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1475 msgid "Delete" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1477 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 resurrect it complete with history." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1487 msgid "Diff" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1489 msgid "Shorthand for Show Differences. Very useful when you want to see exactly what changes have been made." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1496 msgid "Export" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1498 msgid "This command produces a copy of a versioned folder, just like a working copy, but without the local .svn folders." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1506 msgid "FSFS" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1508 msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1515 msgid "GPO" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1517 msgid "Group policy object" msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1523 msgid "HEAD revision" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1525 msgid "The latest revision of a file or folder in the repository." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1531 msgid "Import" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1533 msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1540 msgid "Lock" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1542 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." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1550 msgid "Log" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1552 msgid "Show the revision history of a file or folder. Also known as History." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1559 msgid "History" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1561 msgid "Show the revision history of a file or folder. Also known as Log." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1568 msgid "Merge" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1570 msgid "The process by which changes from the repository are added to your working copy without disrupting any changes you have already made locally. Sometimes these changes cannot be reconciled automatically and the working copy is said to be in conflict." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1576 msgid "Merging happens automatically when you update your working copy. You can also merge specific changes from another branch using TortoiseSVN's Merge command." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1584 msgid "Patch" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1586 msgid "If a working copy has changes to text files only, it is possible to use Subversion's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1599 msgid "Property" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1601 msgid "In addition to versioning your directories and files, Subversion allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Subversion has some special properties which it uses internally, such as svn:eol-style. TortoiseSVN has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1614 msgid "Relocate" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1616 msgid "If your repository moves, perhaps because you have moved it to a different directory on your server, or the server domain name has changed, you need to relocate your working copy so that its repository URLs point to the new location." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1622 msgid "Note: you should only use this command if your working copy is referring to the same location in the same repository, but the repository itself has moved. In any other circumstance you probably need the Switch command instead." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1631 msgid "Repository" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1633 msgid "A repository is a central place where data is stored and maintained. A repository can be a place where multiple databases or files are located for distribution over a network, or a repository can be a location that is directly accessible to the user without having to travel across a network." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1642 msgid "Resolve" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1644 msgid "When files in a working copy are left in a conflicted state following a merge, those conflicts must be sorted out by a human using an editor (or perhaps TortoiseMerge). This process is referred to as Resolving Conflicts. When this is complete you can mark the conflicted files as being resolved, which allows them to be committed." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1654 msgid "Revert" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1656 msgid "Subversion keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1665 msgid "Revision" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1667 msgid "Every time you commit a set of changes, you create one new revision in the repository. Each revision represents the state of the repository tree at a certain point in its history. If you want to go back in time you can examine the repository as it was at revision N." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1674 msgid "In another sense, a revision can refer to the set of changes that were made when that revision was created." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1681 msgid "Revision Property (revprop)" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1683 msgid "Just as files can have properties, so can each revision in the repository. Some special revprops are added automatically when the revision is created, namely: svn:date svn:author svn:log which represent the commit date/time, the committer and the log message respectively. These properties can be edited, but they are not versioned, so any change is permanent and cannot be undone." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1695 msgid "SVN" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1697 msgid "A frequently-used abbreviation for Subversion." msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1700 msgid "The name of the Subversion custom protocol used by the svnserve repository server." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1707 msgid "Switch" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1709 msgid "Just as Update-to-revision changes the time window of a working copy to look at a different point in history, so Switch changes the space window of a working copy so that it points to a different part of the repository. It is particularly useful when working on trunk and branches where only a few files differ. You can switch your working copy between the two and only the changed files will be transferred." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1721 msgid "Update" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1723 msgid "This Subversion command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy." msgstr "" #. (glossterm) #: ../source/TortoiseMerge_en.xml:1731 msgid "Working Copy" msgstr "" #. (para) #: ../source/TortoiseMerge_en.xml:1733 msgid "This is your local sandbox, the area where you work on the versioned files, and it normally resides on your local hard disk. You create a working copy by doing a Checkout from a repository, and you feed your changes back into the repository using Commit." msgstr "" #. Put one translator per line, in the form of NAME . #. (None) #: ../source/TortoiseMerge_en.xml:0 msgid "translator-credits" msgstr "" #. Place the translation of 'translation' here. #. (None) #: ../source/TortoiseMerge_en.xml:0 msgid "translator-translation" msgstr ""