added text from http://code.google.com/p/tortoisegit/wiki/UsingPuTTY

[TortoiseGit.git] / doc / po / TortoiseMerge_nl.po

#
# Dutch translation for TortoiseMerge
# Copyright (C) 2004-2008 the TortoiseGit team
# This file is distributed under the same license as TortoiseGit
#
# Last commit by:
# $Author: luebbe $
# $Date: 2009-01-08 17:19:56 +0800 (Thu, 08 Jan 2009) $
# $Rev: 15043 $
#
# Authors:
# Bob Hulst <bob.hulst@hiq.fi>, 2007.
#
msgid ""
msgstr ""
"Project-Id-Version: TortoiseMerge\n"
"POT-Creation-Date: 2006-10-11 21:52GMT Daylight Time\n"
"PO-Revision-Date: 2008-09-15 21:57+0200\n"
"Last-Translator: Bob Hulst <bob.hulst@hiq.fi>\n"
"Language-Team: TortoiseGit translation team <tortoisegit-dev@googlegroups.com >\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
"X-Poedit-Language: Dutch\n"
"X-Poedit-Country: NETHERLANDS\n"
"X-Poedit-SourceCharset: utf-8\n"

#. (title)
#: ../source/TortoiseMerge_en.xml:4
msgid "TortoiseMerge"
msgstr "TortoiseMerge"

#. (subtitle)
#: ../source/TortoiseMerge_en.xml:6
msgid "A diff/merge tool for Windows"
msgstr "Een diff/merge utility voor Windows"

#. 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 "Version $MajorVersion$.$MinorVersion$.$MicroVersion$"

#. (edition)
#: ../source/TortoiseMerge_en.xml:9
msgid "First"
msgstr "Eerste"

#. (firstname)
#: ../source/TortoiseMerge_en.xml:12
msgid "Stefan"
msgstr "Stefan"

#. (surname)
#: ../source/TortoiseMerge_en.xml:13
msgid "Küng"
msgstr "Küng"

#. (firstname)
#: ../source/TortoiseMerge_en.xml:16
msgid "Lübbe"
msgstr "Lübbe"

#. (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 "Large"

#. (title)
#: ../source/TortoiseMerge_en.xml:28
msgid "Preface"
msgstr "Voorwoord"

#. (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 "Tijdens het werken aan een project, of een open-bronproject waar verscheidene mensen uw code, of een commercieel project herzien waar u een component met uw broncode verkoopt, zullen er mensen en klanten zijn die software fouten vinden of uw project willen verbeteren. Om te doen dat zenden zij u software updates u moet herzien en beslissen of u deze wilt toepassen."

#. (para)
#: ../source/TortoiseMerge_en.xml:45
msgid "Reviewing patches"
msgstr "Patches herzien"

#. (para)
#: ../source/TortoiseMerge_en.xml:50
msgid "Applying the patches"
msgstr "Toepassen van de patches"

#. (para)
#: ../source/TortoiseMerge_en.xml:41
msgid "TortoiseMerge helps you with both those tasks: <placeholder-1/>"
msgstr "TortoiseMerge helpt U met beide taken: <placeholder-1/>"

#. (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 "TortoiseMerge helpt ook bij het sorteren van conflicterende bestanden die kunnen ontstaan als je met een versie controle system werkt terwijl ook anderen aan dezelfde bestanden werken als jij."

#. (title)
#: ../source/TortoiseMerge_en.xml:66
msgid "TortoiseMerge is free!"
msgstr "TortoiseMerge is kostenloos!"

#. (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 "TortoiseMerge is gratis. U hoeft er niet voor te betalen en kan overal worden gebruikt. Het is ontwikkeld onder licentie van de GP license (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 <ulink url=\"http://TortoiseGit.tigris.org/svn/TortoiseGit/\"><citetitle>http://TortoiseGit.tigris.org/svn/TortoiseGit/</citetitle></ulink>. (Username:guest, for password hit enter) The most recent version (where we're currently working) is located under <filename>/trunk/</filename> the released versions are located under <filename>/tags/</filename>."
msgstr "TortoiseMerge is een Open Source project. De volledige bron code is beschikbaar. Volg deze link voor de bron code <ulink url=\"http://TortoiseGit.tigris.org/svn/TortoiseGit/\"><citetitle>http://TortoiseGit.tigris.org/svn/TortoiseGit/</citetitle></ulink>. (Gebruikersnaam:guest, password geef enter) De meest recente versie (waar nu aan wordt gewerkt) bevindt zich in <filename>/trunk/</filename> en de uitgegeven versie staan in <filename>/tags/</filename>."

#. (title)
#: ../source/TortoiseMerge_en.xml:90
msgid "Donate!"
msgstr "Geef een donatie!"

#. (para)
#: ../source/TortoiseMerge_en.xml:91
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."
msgstr "Desondanks dat TortoiseGit en TortoiseMerge gratis zijn, kan je het ontwikkel team helpen door het zenden van patches en een actieve rol te hebben in de ontwikkeling van dit product. Ook kan je ons aanmoedigen tijdens de eindeloze uren die we voor onze computer schermen doorbrengen."

#. (para)
#: ../source/TortoiseMerge_en.xml:97
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."
msgstr "Tijdens het werken aan TortoiseGit luisteren we graag naar muziek. En omdat we <emphasis>vele</emphasis>  uren aan dit project besteden luisteren we <emphasis>veel</emphasis> muziek. Daarom hebben we een verlanglijst met onze favoriete CDs en DVDs: <ulink url=\"http://TortoiseGit.tigris.org/donate.html\"><citetitle>http://TortoiseGit.tigris.org/donate.html</citetitle></ulink> Als je wilt kan je er een kijkje nemen en een geschenk geven aan een developer of vertaler in dit project."

#. (title)
#: ../source/TortoiseMerge_en.xml:113
msgid "Acknowledgments"
msgstr "Kennisgevingen"

#. (term)
#: ../source/TortoiseMerge_en.xml:117
msgid "Stefan Küng"
msgstr "Stefan Kûng"

#. (para)
#: ../source/TortoiseMerge_en.xml:121
msgid "for the hard work on TortoiseMerge"
msgstr "voor het harde werk aan TortoiseMerge"

#. (term)
#: ../source/TortoiseMerge_en.xml:127
msgid "Lübbe Onken"
msgstr "Lübbe Onken "

#. (para)
#: ../source/TortoiseMerge_en.xml:131
msgid "for the beautiful icons, logo, bug hunting and taking care of the documentation"
msgstr "voor de mooie ikonen, het logo, software fouten zoeken en het onderhouden van de documentatie"

#. (term)
#: ../source/TortoiseMerge_en.xml:138
msgid "The Tigris Style project"
msgstr "Het Tigris Style project"

#. (para)
#: ../source/TortoiseMerge_en.xml:142
msgid "for some of the styles which are reused in this documentation"
msgstr "voor sommige stijlen die worden her-gebruikt in deze  documentatie"

#. (term)
#: ../source/TortoiseMerge_en.xml:149
msgid "Our Contributors"
msgstr "Onze Medewerkers"

#. (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 ""

#. (term)
#: ../source/TortoiseMerge_en.xml:160
msgid "Our Donators"
msgstr "Onze Donateuren"

#. (para)
#: ../source/TortoiseMerge_en.xml:164
msgid "for many hours of joy with the music they sent us"
msgstr "voor de vele uren plezier met de muziek die zij ons zonden"

#. (title)
#: ../source/TortoiseMerge_en.xml:175
msgid "Introduction"
msgstr "Introductie"

#. (title)
#: ../source/TortoiseMerge_en.xml:184
msgid "Overview"
msgstr "Overzicht"

#. (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 <firstterm>patches</firstterm>."
msgstr "TortoiseMerge is een gratis/open-source applicatie. Je kan er verschillen tussen text bestanden weergeven, deze veranderingen samenvoegen en zelfs evalueren en toepassen op andere bestanden, ook wel <firstterm>patchen</firstterm> genoemd."

#. (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
#, fuzzy
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."
msgstr "<emphasis></emphasis> TortoiseMerge."

#. (para)
#: ../source/TortoiseMerge_en.xml:206
msgid "The following diagram shows you the relationships between the files involved in a conflict:"
msgstr "Het volgende diagram geeft de relatie weer tussen twee conflicterende bestanden:"

#. (title)
#. (title)
#: ../source/TortoiseMerge_en.xml:211
#: ../source/TortoiseMerge_en.xml:347
msgid "File Conflict"
msgstr "Bestands konflikt"

#. (para)
#: ../source/TortoiseMerge_en.xml:214
#, fuzzy
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 "TortoiseMerge."

#. (para)
#: ../source/TortoiseMerge_en.xml:220
#, fuzzy
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."
msgstr "TortoiseMerge TortoiseMerge."

#. (title)
#: ../source/TortoiseMerge_en.xml:235
msgid "TortoiseMerge's History"
msgstr "TortoiseMerge geschiedenis"

#. (para)
#: ../source/TortoiseMerge_en.xml:236
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."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:251
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."
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 "We doorbrachten veel tijd op het internet op zoek naar een GUI tool die bestanden kan patchen, maar alles wat we vonden was dat zoiets niet bestaat. Om een lang verhaal kort te maken: Als niemand anders het maakt dan schrijven we ons eigen software. En toen kwam TortoiseMerge."

#. (para)
#: ../source/TortoiseMerge_en.xml:268
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."
msgstr "Omdat TortoiseGit al gebruik maakt van de Git library, met ingebouwde diffing engine, was het heel natuurlijk om deze te gebruiken in plaats van de GNU diff."

#. (title)
#: ../source/TortoiseMerge_en.xml:276
msgid "Basic Concepts"
msgstr "Basis Beginselen"

#. (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 Git repository following an update."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:294
msgid "Applying patch files. This is the reason TortoiseMerge was created :)"
msgstr "Het toepassen van patch bestanden. Dit is de reden waarom TortoiseMerge was ontstaan. :-)"

#. (para)
#: ../source/TortoiseMerge_en.xml:278
msgid "TortoiseMerge has several different uses: <placeholder-1/>"
msgstr "TortoiseMerge heeft meerdere functies: <placeholder-1/>"

#. (title)
#: ../source/TortoiseMerge_en.xml:303
msgid "Viewing and Merging Differences"
msgstr "Bekijken en samenvoegening van de verschillen"

#. (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 <emphasis>Theirs</emphasis>, and the file in the right pane is the modified file (sometimes referred to as <emphasis>Mine</emphasis>."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:315
msgid "Reverting changed lines back to the text shown in the left pane."
msgstr "Wijzigingen ongedaan maken en weergeven zoals in het linker scherm."

#. (para)
#: ../source/TortoiseMerge_en.xml:320
msgid "Using a combination of both blocks, either <emphasis>Theirs</emphasis> before <emphasis>Mine</emphasis> or <emphasis>Mine</emphasis> before <emphasis>Theirs</emphasis>."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:310
msgid "You can make simple line-based changes to the file in the right pane which include: <placeholder-1/>"
msgstr "Simpele in-line wijzigingen kunnen worden gemaakt in het rechter venster dat bevat: <placeholder-1/>"

#. (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 "Bestands konflikten oplossen"

#. (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 <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."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:362
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."
msgstr ""

#. (title)
#. (title)
#. (title)
#: ../source/TortoiseMerge_en.xml:369
#: ../source/TortoiseMerge_en.xml:478
#: ../source/TortoiseMerge_en.xml:866
msgid "Applying Patches"
msgstr "Toepassen van Patches"

#. (para)
#: ../source/TortoiseMerge_en.xml:370
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."
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 "In beide gevallen zal TortoiseMerge een klein venster weergeven voor de bestanden in deze patch. Met de dubbel-klik op een bestand wordt de patch toegepast in het opgehaalde bestand. Het linker venster laat de originele versie zien en de rechter nadat het patch is verwerkt."

#. (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 "Het bestand kan direkt in het rechter venster worden gewijzigd zoals gebruikelijk in de vergelijk/wijzig mode."

#. (title)
#: ../source/TortoiseMerge_en.xml:394
msgid "Using TortoiseMerge"
msgstr "Het gebruiken van TortoiseMerge"

#. (title)
#: ../source/TortoiseMerge_en.xml:402
msgid "Viewing Modes"
msgstr "Bekijk Mode"

#. (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 "TortoiseMerge heeft drie mogelijkeden om de veranderingen te bekijken: één-venster, twee-vensters en drie-vensters. De eerste twee worden gebruikt om de veranderingen te bekijken en met drie vensters kunnen ook de konflikten zichtbaar worden gemaakt."

#. (title)
#. (title)
#: ../source/TortoiseMerge_en.xml:409
#: ../source/TortoiseMerge_en.xml:843
msgid "Viewing / Merging"
msgstr "Bekijken / Samenvoegen"

#. (title)
#: ../source/TortoiseMerge_en.xml:411
msgid "One Pane View"
msgstr "Weergave in één venster"

#. (title)
#: ../source/TortoiseMerge_en.xml:415
msgid "Two Pane View"
msgstr "Weergave in twee vensters"

#. (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: <placeholder-1/>"
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 "Als je drie bestanden wilt vergelijken/samenvoegen, dan zal TortoiseMerge de verschillen in een drieluik weergeven. Dit scherm wordt ook gebruikt bij het oplossen van conflicterende bestanden."

#. (title)
#: ../source/TortoiseMerge_en.xml:460
msgid "Three Pane View"
msgstr "Weergave in drie vensters"

#. (para)
#: ../source/TortoiseMerge_en.xml:463
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."
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 "Lijst met Patch Bestanden"

#. (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. <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."
msgstr "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."

#. (para)
#: ../source/TortoiseMerge_en.xml:493
#, fuzzy
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."
msgstr "TortoiseMerge<literal></literal><literal></literal><literal></literal>."

#. (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 <emphasis>all</emphasis> files in the list. The double-click action is to preview."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:512
#, fuzzy
msgid "Depending on whether TortoiseMerge can apply the patch directly or by fetching an older version of the file first, it shows you a two pane view (patch can be applied directly) or a three pane view (older version of file fetched)."
msgstr "TortoiseMerge."

#. (title)
#: ../source/TortoiseMerge_en.xml:521
msgid "Buttons and Other Controls"
msgstr "Knoppen en andere regelaars"

#. (title)
#: ../source/TortoiseMerge_en.xml:524
msgid "The Toolbar"
msgstr "De Toolbar"

#. (para)
#: ../source/TortoiseMerge_en.xml:531
msgid "<guibutton>Open</guibutton> accesses the file-open dialog. What else?"
msgstr "<guibutton>Open</guibutton> geeft het bestands dialoog venster weer. Wat had je anders gedacht?"

#. (para)
#: ../source/TortoiseMerge_en.xml:537
msgid "<guibutton>Save</guibutton> saves any changes you have made."
msgstr "<guibutton>Bewaar</guibutton> schrijft alle veranderingen weg naar disk."

#. (para)
#: ../source/TortoiseMerge_en.xml:543
#, fuzzy
msgid "<guibutton>Reload</guibutton> discards any changes you have made in TortoiseMerge and reloads the files from disk."
msgstr "<guibutton></guibutton> TortoiseMerge."

#. (para)
#: ../source/TortoiseMerge_en.xml:550
msgid "<guibutton>Undo</guibutton> implements a multi-level undo, allowing you to reverse any changes you have made within TortoiseMerge."
msgstr "<guibutton>Ongedaan maken</guibutton> verwijderd op meerdere niveaus de wijzigingen die gemaakt zijn met TortoiseMerge."

#. (para)
#: ../source/TortoiseMerge_en.xml:557
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."
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 "<guibutton>Prev/Next Conflict</guibutton> 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 "<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."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:586
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."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:594
#, fuzzy
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."
msgstr "<guibutton></guibutton> TortoiseMerge."

#. (para)
#: ../source/TortoiseMerge_en.xml:603
msgid "<guibutton>Show Whitespaces</guibutton> 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 "<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."
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 "<guibutton>Switch View</guibutton> selects between one-pane and two-pane view. Disabled in 3-pane view."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:635
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."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:646
#, fuzzy
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)."
msgstr "<guibutton></guibutton> TortoiseMerge."

#. (para)
#: ../source/TortoiseMerge_en.xml:654
msgid "<guibutton>Settings</guibutton> takes you to TortoiseMerge's settings dialog."
msgstr "<guibutton>Instellingen</guibutton> opent de TortoiseMerge's instelling dialoogvenster."

#. (para)
#: ../source/TortoiseMerge_en.xml:522
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/>"
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 <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."
msgstr ""

#. (title)
#: ../source/TortoiseMerge_en.xml:683
msgid "Line Status Icons"
msgstr "Regel Status Pictogrammen"

#. (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 "<graphic fileref=\"images/TMerge_lineadded.png\"/> A line has been added."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:692
msgid "<graphic fileref=\"images/TMerge_lineremoved.png\"/> A line has been removed."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:696
msgid "<graphic fileref=\"images/TMerge_lineequal.png\"/> A change has been undone by reverting to the original content of the line."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:700
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."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:706
msgid "<graphic fileref=\"images/TMerge_lineedited.png\"/> A line has been edited by hand, using TortoiseMerge as a text editor."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:710
msgid "<graphic fileref=\"images/TMerge_lineconflicted.png\"/> This line is in conflict."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:714
msgid "<graphic fileref=\"images/TMerge_lineconflictedignored.png\"/> 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 "Samenvoegings / Wijzigings Conflicten"

#. (para)
#: ../source/TortoiseMerge_en.xml:722
msgid "TortoiseMerge not only <emphasis>shows</emphasis> you the differences between files but also lets you resolve conflicts or apply changes."
msgstr "TortoiseMerge geeft niet alleen <emphasis>weer</emphasis> de verschillen tussen de bestanden maar ook mogelijke conflicten die je kan verhelpen."

#. (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 (<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."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:738
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>."
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 <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."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:796
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."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:804
#, fuzzy
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."
msgstr "<literal></literal><literal></literal> TortoiseMerge."

#. (para)
#: ../source/TortoiseMerge_en.xml:812
#, fuzzy
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."
msgstr "TortoiseMerge TortoiseMerge<emphasis></emphasis>."

#. (title)
#: ../source/TortoiseMerge_en.xml:822
msgid "Open Files"
msgstr "Open Bestanden"

#. (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 <menuchoice><guimenu>File</guimenu><guimenuitem>Open</guimenuitem></menuchoice>."
msgstr "Wanneer TortoiseMerge start zonder commando regel argumenten dan moet het bestand handmatig worden geopend, volgens <menuchoice><guimenu>Bestand</guimenu><guimenuitem>Open</guimenuitem></menuchoice>."

#. (title)
#: ../source/TortoiseMerge_en.xml:833
msgid "The Open Dialog"
msgstr "Catalogus openen"

#. (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
#, fuzzy
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."
msgstr "<literal></literal><literal></literal><literal></literal> TortoiseMerge<menuchoice><guimenu></guimenu><guimenuitem></guimenuitem></menuchoice>"

#. (para)
#: ../source/TortoiseMerge_en.xml:852
#, fuzzy
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."
msgstr "TortoiseMerge."

#. (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 <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!"
msgstr ""

#. (title)
#: ../source/TortoiseMerge_en.xml:884
msgid "Settings"
msgstr "Instellingen"

#. (title)
#: ../source/TortoiseMerge_en.xml:886
msgid "Main Settings Page"
msgstr "Hoofd Instellingen Pagina"

#. (title)
#: ../source/TortoiseMerge_en.xml:889
msgid "The Settings Main Page"
msgstr "De instellingen hoofdpagina"

#. (para)
#: ../source/TortoiseMerge_en.xml:892
msgid "Most of the options here are self-explanatory, but a few points need clarifying."
msgstr "De meeste opties zijn overduidelijk, slechts een paar behoeven uitleg."

#. (para)
#: ../source/TortoiseMerge_en.xml:896
msgid "<guilabel>Backup original file</guilabel> renames the original file in the WC to <literal>filename.bak</literal> before saving the modified version."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:901
msgid "<guilabel>Ignore line endings</guilabel> hides changes which are due solely to difference in line-end style."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:905
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."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:911
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)."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:919
msgid "<guilabel>Compare whitespaces</guilabel> shows all changes in indentation and inline whitespace as added/removed lines (which is how Git treats such changes)."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:924
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."
msgstr ""

#. (para)
#: ../source/TortoiseMerge_en.xml:932
msgid "<guilabel>Ignore all whitespaces</guilabel> hides all whitespace-only changes."
msgstr ""

#. (title)
#: ../source/TortoiseMerge_en.xml:938
msgid "Colour Settings Page"
msgstr "Kleur Settings Pagina"

#. (title)
#: ../source/TortoiseMerge_en.xml:941
msgid "The Settings Color Page"
msgstr "De Kleur Instellingen Pagina"

#. (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 "Normaal"

#. (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 "Toegevoegd"

#. (listitem)
#: ../source/TortoiseMerge_en.xml:957
msgid "Lines which have been added."
msgstr "Toegevoegde regels."

#. (term)
#: ../source/TortoiseMerge_en.xml:962
msgid "Removed"
msgstr "Verwijderd"

#. (listitem)
#: ../source/TortoiseMerge_en.xml:963
msgid "Lines which have been deleted."
msgstr "Regels die zijn verwijderd."

#. (term)
#: ../source/TortoiseMerge_en.xml:968
msgid "Modified"
msgstr "Veranderd"

#. (emphasis)
#: ../source/TortoiseMerge_en.xml:971
msgid "unchanged"
msgstr "onveranderd"

#. (guilabel)
#: ../source/TortoiseMerge_en.xml:974
msgid "Colour code in-line changes"
msgstr "Kleur code bij wijzigingen in-line "

#. (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 <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."
msgstr ""

#. (term)
#: ../source/TortoiseMerge_en.xml:980
msgid "Conflicted"
msgstr "Conflicterende"

#. (listitem)
#: ../source/TortoiseMerge_en.xml:981
msgid "Where the same line has been changed in both files."
msgstr "Waar de zelfde regel is veranderd in beide bestanden."

#. (term)
#: ../source/TortoiseMerge_en.xml:986
msgid "Conflict resolved"
msgstr "Conflikt verholpen"

#. (listitem)
#: ../source/TortoiseMerge_en.xml:987
#, fuzzy
msgid "Where the same line has been changed in both files, and you have now selected which version should be used."
msgstr "Waar de zelfde regel is veranderd in beide bestanden."

#. (term)
#: ../source/TortoiseMerge_en.xml:993
msgid "Empty"
msgstr "[LEEG]"

#. (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 "Inline toegevoegde tekst"

#. (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 "Inline verwijderde tekst"

#. (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 "Div lege karakters"

#. (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 "toetsenbord snelkoppelingen"

#. (para)
#: ../source/TortoiseMerge_en.xml:1025
msgid "List of keyboard shortcuts and commands."
msgstr "Lijst met toetsenbord snelkoppelingen en commandos"

#. (title)
#: ../source/TortoiseMerge_en.xml:1030
msgid "Keyboard shortcuts"
msgstr "Toetsenbord snelkoppelingen"

#. (term)
#: ../source/TortoiseMerge_en.xml:1033
msgid "Ctrl-Q"
msgstr "ctrl-Q"

#. (para)
#: ../source/TortoiseMerge_en.xml:1035
msgid "Quit the program"
msgstr "Programma afsluiten"

#. (term)
#: ../source/TortoiseMerge_en.xml:1041
msgid "Ctrl-C"
msgstr "ctrl-C"

#. (para)
#: ../source/TortoiseMerge_en.xml:1043
msgid "Copy the selected text to the clipboard"
msgstr "Kopieer de geselecteerde regel(s) naar het clipboard"

#. (term)
#: ../source/TortoiseMerge_en.xml:1049
msgid "Ctrl-F"
msgstr "ctrl-F"

#. (para)
#: ../source/TortoiseMerge_en.xml:1051
msgid "Open the Find dialog for text searches"
msgstr "Open de Zoek dailoog voor zoeken in tekst"

#. (term)
#: ../source/TortoiseMerge_en.xml:1057
msgid "Ctrl-O"
msgstr "ctrl-O"

#. (para)
#: ../source/TortoiseMerge_en.xml:1059
msgid "Open files to diff/merge"
msgstr "Open bestanden voor diff/merge"

#. (term)
#: ../source/TortoiseMerge_en.xml:1065
msgid "Ctrl-S"
msgstr "ctrl-S"

#. (para)
#: ../source/TortoiseMerge_en.xml:1067
msgid "Save the changes"
msgstr "Veranderingen opslaan"

#. (term)
#: ../source/TortoiseMerge_en.xml:1073
msgid "Ctrl-Shift-S"
msgstr "Ctrl-Shift-S"

#. (para)
#: ../source/TortoiseMerge_en.xml:1075
msgid "Save as..."
msgstr "Opslaan als..."

#. (term)
#: ../source/TortoiseMerge_en.xml:1081
msgid "F7"
msgstr "F7"

#. (para)
#: ../source/TortoiseMerge_en.xml:1083
msgid "Go to next difference"
msgstr "Ga naar het volgende verschil"

#. (term)
#: ../source/TortoiseMerge_en.xml:1089
msgid "Shift-F7"
msgstr "Shift-F7"

#. (para)
#: ../source/TortoiseMerge_en.xml:1091
msgid "Go to previous difference"
msgstr "Ga naar het vorige verschil"

#. (term)
#: ../source/TortoiseMerge_en.xml:1097
msgid "F8"
msgstr "F8"

#. (para)
#: ../source/TortoiseMerge_en.xml:1099
msgid "Go to next conflict"
msgstr "Ga naar het volgende konflikt"

#. (term)
#: ../source/TortoiseMerge_en.xml:1105
msgid "Shift-F8"
msgstr "Shift-F8"

#. (para)
#: ../source/TortoiseMerge_en.xml:1107
msgid "Go to previous conflict"
msgstr "Ga naar het vorige konflikt"

#. (term)
#: ../source/TortoiseMerge_en.xml:1113
msgid "Ctrl-D"
msgstr "Ctrl-D"

#. (para)
#: ../source/TortoiseMerge_en.xml:1115
msgid "Toggle between one-pane diff and two-pane diff"
msgstr "Schakel tussen een scherm diff of twee schermen diff"

#. (term)
#: ../source/TortoiseMerge_en.xml:1121
msgid "Ctrl-R"
msgstr "Ctrl-R"

#. (para)
#: ../source/TortoiseMerge_en.xml:1123
msgid "Reload the files and revert all changes made"
msgstr "Bestanden opnieuw laden en alle wijzigingen ongedaan maken"

#. (term)
#: ../source/TortoiseMerge_en.xml:1129
msgid "Ctrl-T"
msgstr "Ctrl-T"

#. (para)
#: ../source/TortoiseMerge_en.xml:1131
msgid "Toggles between showing whitespaces or not"
msgstr "Geef blanco spaties weer of niet"

#. (term)
#: ../source/TortoiseMerge_en.xml:1137
msgid "Ctrl-mousewheel"
msgstr "Ctrl-muiswiel"

#. (para)
#: ../source/TortoiseMerge_en.xml:1139
msgid "Scroll the display left/right"
msgstr "Verplaats het scherm links/rechts"

#. (title)
#: ../source/TortoiseMerge_en.xml:1148
msgid "Automating TortoiseMerge"
msgstr "Automatiseer TortoiseMerge"

#. (para)
#: ../source/TortoiseMerge_en.xml:1150
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."
msgstr "TortoiseMerge kan worden gestart via een commando zonder eerst via het menu <guilabel>Open</guilabel> het bestand op te zoeken. Dit is handig wanneer je TortoiseMerge start vanuit een ander software pakket."

#. (title)
#: ../source/TortoiseMerge_en.xml:1161
msgid "TortoiseMerge Command Line Switches"
msgstr "TortoiseMerge Commando Parser Opties"

#. (primary)
#: ../source/TortoiseMerge_en.xml:1163
msgid "automation"
msgstr "automatisch"

#. (primary)
#: ../source/TortoiseMerge_en.xml:1166
msgid "command line"
msgstr "Parser-commando:"

#. (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: <screen>\n"
"/base:\"c:\\folder\\my base file.txt\"\n"
"</screen>"
msgstr ""

#. (title)
#: ../source/TortoiseMerge_en.xml:1188
msgid "List of available command line options"
msgstr "De lijst met beschikbare commando regel opties"

#. (entry)
#: ../source/TortoiseMerge_en.xml:1194
msgid "Command"
msgstr "Parser-commando:"

#. (entry)
#: ../source/TortoiseMerge_en.xml:1195
msgid "Description"
msgstr "Beschrijving"

#. (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 <placeholder-1/>."
msgstr "Het zelfde als <placeholder-1/>."

#. (emphasis)
#: ../source/TortoiseMerge_en.xml:1215
msgid "base"
msgstr "Basismap:"

#. (entry)
#: ../source/TortoiseMerge_en.xml:1214
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."
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 "theirs"

#. (entry)
#: ../source/TortoiseMerge_en.xml:1233
msgid "Specifies the <placeholder-1/> 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 "mijn"

#. (entry)
#: ../source/TortoiseMerge_en.xml:1247
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."
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 "samengevoegd"

#. (entry)
#: ../source/TortoiseMerge_en.xml:1262
#, fuzzy
msgid "Specifies the resulting <placeholder-1/> 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 "<placeholder-1/> TortoiseMerge."

#. (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 "zeer lang"

#. (entry)
#: ../source/TortoiseMerge_en.xml:1279
#, fuzzy
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/>."
msgstr "TortoiseMerge<placeholder-1/>."

#. (entry)
#: ../source/TortoiseMerge_en.xml:1288
msgid "The name of the original file to patch. Used for the view title."
msgstr "De naam van het originele bestand. Wordt gebruikt in de titel."

#. (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 "Forceert TortoiseMerge te starten met slechts één venster ongeacht de instellingen van de gebruiker."

#. (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 "/origfile:\"path_naar_originele_bestand\""

#. (literal)
#: ../source/TortoiseMerge_en.xml:1326
msgid "/modifiedfile:\"path_to_modified_file\""
msgstr "/modifiedfile:\"path_to_modified_file\""

#. (literal)
#: ../source/TortoiseMerge_en.xml:1328
msgid "/outfile:\"path_to_resulting_patchfile\""
msgstr "/outfile:\"path_naar_resultaat_patchbestand\""

#. (literal)
#: ../source/TortoiseMerge_en.xml:1329
msgid "/outfile"
msgstr "/outfile"

#. (literal)
#: ../source/TortoiseMerge_en.xml:1332
msgid "/createunifieddiff"
msgstr "/createunifieddiff"

#. (entry)
#: ../source/TortoiseMerge_en.xml:1322
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."
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 <screen>\n"
"TortoiseMerge 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."
msgstr ""

#. (title)
#: ../source/TortoiseMerge_en.xml:1356
msgid "Glossary"
msgstr "Glossary"

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1358
msgid "Add"
msgstr "Toevoegen"

#. (para)
#: ../source/TortoiseMerge_en.xml:1360
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."
msgstr ""

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1368
msgid "BASE revision"
msgstr "Basismap revisie:"

#. (para)
#: ../source/TortoiseMerge_en.xml:1370
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."
msgstr ""

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1379
msgid "Blame"
msgstr "Blame"

#. (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 "BDB"

#. (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 "Berkeley DB. Een uitvoerig getest database backend, die niet kan worden gebruikt op netwerk shares. De default database backend voor pre 1.2 repositories."

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1400
msgid "Branch"
msgstr "Tak"

#. (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 Git a branch is implemented as a <quote>cheap copy</quote>."
msgstr ""

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1415
msgid "Checkout"
msgstr "Checkout"

#. (para)
#: ../source/TortoiseMerge_en.xml:1417
msgid "A Git 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 "Opschonen"

#. (para)
#: ../source/TortoiseMerge_en.xml:1426
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."
msgstr ""

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1441
msgid "Commit"
msgstr "Vastleggen"

#. (para)
#: ../source/TortoiseMerge_en.xml:1443
msgid "This Git 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 "Validatie-conflict"

#. (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 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."
msgstr ""

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1463
msgid "Copy"
msgstr "Kopie"

#. (para)
#: ../source/TortoiseMerge_en.xml:1465
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."
msgstr ""

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1475
msgid "Delete"
msgstr "Verwijderen"

#. (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 <quote>resurrect</quote> it complete with history."
msgstr ""

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1487
msgid "Diff"
msgstr "Diff"

#. (para)
#: ../source/TortoiseMerge_en.xml:1489
msgid "Shorthand for <quote>Show Differences</quote>. Very useful when you want to see exactly what changes have been made."
msgstr ""

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1496
msgid "Export"
msgstr "Exporteren als..."

#. (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 <literal>.svn</literal> folders."
msgstr ""

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1506
msgid "FSFS"
msgstr "FSFS"

#. (para)
#: ../source/TortoiseMerge_en.xml:1508
#, fuzzy
msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories."
msgstr "Berkeley DB. Een uitvoerig getest database backend, die niet kan worden gebruikt op netwerk shares. De default database backend voor pre 1.2 repositories."

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1515
msgid "GPO"
msgstr "GPO"

#. (para)
#: ../source/TortoiseMerge_en.xml:1517
msgid "Group policy object"
msgstr "Groepsbeleid object"

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1523
msgid "HEAD revision"
msgstr "HEAD revisie"

#. (para)
#: ../source/TortoiseMerge_en.xml:1525
msgid "The latest revision of a file or folder in the <emphasis>repository</emphasis>."
msgstr ""

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1531
msgid "Import"
msgstr "Importeer"

#. (para)
#: ../source/TortoiseMerge_en.xml:1533
msgid "Git command to import an entire folder hierarchy into the repository in a single revision."
msgstr ""

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1540
msgid "Lock"
msgstr "Bescherm"

#. (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 "Log"

#. (para)
#: ../source/TortoiseMerge_en.xml:1552
msgid "Show the revision history of a file or folder. Also known as <quote>History</quote>."
msgstr ""

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1559
msgid "History"
msgstr "Historie"

#. (para)
#: ../source/TortoiseMerge_en.xml:1561
msgid "Show the revision history of a file or folder. Also known as <quote>Log</quote>."
msgstr ""

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1568
msgid "Merge"
msgstr "Samenvoegen"

#. (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 TortoiseGit's Merge command."
msgstr ""

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1584
msgid "Patch"
msgstr "Patch"

#. (para)
#: ../source/TortoiseMerge_en.xml:1586
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."
msgstr ""

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1599
msgid "Property"
msgstr "Eigenschap"

#. (para)
#: ../source/TortoiseMerge_en.xml:1601
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."
msgstr ""

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1614
msgid "Relocate"
msgstr "Verplaats"

#. (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 <quote>relocate</quote> 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 <quote>Switch</quote> command instead."
msgstr ""

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1631
msgid "Repository"
msgstr "Archief"

#. (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 "Los op"

#. (para)
#: ../source/TortoiseMerge_en.xml:1644
#, fuzzy
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."
msgstr "TortoiseMerge<quote></quote>."

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1654
msgid "Revert"
msgstr "Maak ongedaan"

#. (para)
#: ../source/TortoiseMerge_en.xml:1656
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."
msgstr ""

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1665
msgid "Revision"
msgstr "Revisie"

#. (para)
#: ../source/TortoiseMerge_en.xml:1667
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."
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 "Revisie Eigenschap (revprop)"

#. (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: <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."
msgstr ""

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1695
msgid "SVN"
msgstr "SVN"

#. (para)
#: ../source/TortoiseMerge_en.xml:1697
msgid "A frequently-used abbreviation for Git."
msgstr "Een vaak gebruikte afkorting voor Git."

#. (para)
#: ../source/TortoiseMerge_en.xml:1700
msgid "The name of the Git custom protocol used by the <quote>svnserve</quote> repository server."
msgstr ""

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1707
msgid "Switch"
msgstr "Schakel"

#. (para)
#: ../source/TortoiseMerge_en.xml:1709
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."
msgstr ""

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1721
msgid "Update"
msgstr "Bijwerken"

#. (para)
#: ../source/TortoiseMerge_en.xml:1723
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."
msgstr ""

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1731
msgid "Working Copy"
msgstr "Werk Kopie"

#. (para)
#: ../source/TortoiseMerge_en.xml:1733
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>."
msgstr "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>."

#. Put one translator per line, in the form of NAME <EMAIL>.
#. (None)
#: ../source/TortoiseMerge_en.xml:0
msgid "translator-credits"
msgstr "Bob Hulst"

#. Place the translation of 'translation' here.
#. (None)
#: ../source/TortoiseMerge_en.xml:0
msgid "translator-translation"
msgstr "Vertaling"