Fix compiler warnings C4127 and C4512

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

#
# Slovenian 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:
# Matjaz Cepon <matjaz.cepon@gmail.comY, 2007
#
msgid ""
msgstr ""
"Project-Id-Version: TortoiseMerge Documentation\n"
"POT-Creation-Date: 2008-07-11 23:46 +0000\n"
"PO-Revision-Date: 2008-09-19 22:16+0100\n"
"Last-Translator: Matjaz Cepon <matjaz.cepon@gmail.com>\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-Poedit-Language: Slovenian\n"
"X-Poedit-Country: SLOVENIA\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 "Orodje za razlikovanje/spajanje v operacijskem sistemu 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 "Prvi"

#. (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 "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 "Ko delate na projektu, pa naj bo to odprtokodni projekt ali komercialni projekt, kjer poleg komponente prodajate tudi izvorno kodo, uporabniki in stranke v vaši kodi najdejo napake oziroma želijo projekt izboljšati. To storijo tako, da vam pošljejo datoteko popravkov, ki jih morate pregledati in se odločiti, ali jih boste uporabili."

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

#. (para)
#: ../source/TortoiseMerge_en.xml:50
msgid "Applying the patches"
msgstr "Uporaba popravkov"

#. (para)
#: ../source/TortoiseMerge_en.xml:41
msgid "TortoiseMerge helps you with both those tasks: <placeholder-1/>"
msgstr "TortoiseMerge vam pomaga pri obeh nalogah: <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 vam poleg tega pomaga pri reševanju spornih datotek, ki se pojavijo pri delu z orodji za nadzor različic, ko ostali uporabniki spreminjajo iste datoteke kot vi."

#. (title)
#: ../source/TortoiseMerge_en.xml:66
msgid "TortoiseMerge is free!"
msgstr "TortoiseMerge je brezplačno orodje!"

#. (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 je brezplačen. Zanj vam ni treba plačati, lahko ga uporabljate, kakor želite. Razvit je pod licenco 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 je odprtokodni projekt. To pomeni, da imate dostop do njegove izvorne kode. Po njej lahko brskate z uporabo naslednje povezave: <ulink url=\"http://TortoiseGit.tigris.org/svn/TortoiseGit/\"><citetitle>http://TortoiseGit.tigris.org/svn/TortoiseGit/</citetitle></ulink>. (Uporabniško ime:guest, geslo pustite prazno) Najnovejša različica, na kateri delamo, se nahaja v mapi <filename>/trunk/</filename>, izdane različice pa se nahajajo v mapi <filename>/tags/</filename>."

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

#. (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 "Čeprav sta programa TortoiseGit in TortoiseMerge brezplačna, lahko pomagate razvijalcem s pošiljanjem popravkov in igranjem aktivne vloge pri razvoju. Lahko nas tudi pomagate razvedriti med neštetimi urami, ki jih prebijemo pred računalnikom."

#. (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 "Medtem ko delamo na projektu TortoiseGit, radi poslušamo glasbo. In ker delamo na projektu veliko časa, potrebujemo <emphasis>veliko</emphasis> glasbe. Zato smo sestavili seznam želja z našimi priljubljenimi CDji in DVDji:  <ulink url=\"http://TortoiseGit.tigris.org/donate.html\"><citetitle>http://TortoiseGit.tigris.org/donate.html</citetitle></ulink>. Prosimo, poglejte tudi seznam ljudi, ki so prispevali k projektu s popravki ali prevodi."

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

#. (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 "za trdo delo na projektu 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 "za čudovite ikone, logotip, iskanje napak in urejanje dokumentacije"

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

#. (para)
#: ../source/TortoiseMerge_en.xml:142
msgid "for some of the styles which are reused in this documentation"
msgstr "za nekatere stile, ki so uporabljeni v tej dokumentaciji"

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

#. (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 popravke, poročila o napakah in nove ideje, za pomoč uporabnikom z odgovori na dopisnih seznamih"

#. (term)
#: ../source/TortoiseMerge_en.xml:160
msgid "Our Donators"
msgstr "Naši donatorji"

#. (para)
#: ../source/TortoiseMerge_en.xml:164
msgid "for many hours of joy with the music they sent us"
msgstr "za številne ure užitkov ob poslušanju glasbe, ki ste nam jo poslali"

#. (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 <firstterm>patches</firstterm>."
msgstr "TortoiseMerge je brezplačen/odprtokodni program. Omogoča pregledovanje razlik v besedilnih datotekah, spajanje teh sprememb in celo pregled in uporabo datotek poenotene razlike, pogosto imenovane <firstterm>datoteke popravkov</firstterm>."

#. (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 "Pri delu z besedilnimi datotekami, n. pr. datotekami izvorne kode v priljubljenem programskem jeziku ali datotekami html/xml files za vašo dokumentacijo ali spletno stran se pogosto znajdete v situaciji, ko morate primerjati različne verzije teh datotek. Včasih dobite drugo različico datoteke od sodelavca, včasih pa želite videti, kakšne spremembe ste naredili sami."

#. (para)
#: ../source/TortoiseMerge_en.xml:198
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 "Če delate s sistemi za nadzor različic (n. pr. s sistemom Git), se včasih pri posodabljanju datotek pojavijo <emphasis>spori</emphasis>. To se zgodi, če nek drug uporabnik spremeni isti del datoteke kot vi. V takšnem primeru morate ročno rešiti spore. Tu vam pomaga TortoiseMerge."

#. (para)
#: ../source/TortoiseMerge_en.xml:206
msgid "The following diagram shows you the relationships between the files involved in a conflict:"
msgstr "Naslednji diagram prikazuje razmerja med datotekami, ki so udeležene v sporu:"

#. (title)
#. (title)
#: ../source/TortoiseMerge_en.xml:211
#: ../source/TortoiseMerge_en.xml:347
msgid "File Conflict"
msgstr "Spori v datoteki"

#. (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 "Spor se lahko pojavi tudi, če poskusite popravek namestiti na zastarelo datoteko. V takšnih primerih morate brez uporabe programa TortoiseMerge prositi avtorja popravka za popravek, ki se nanaša na najnovejšo različico datoteke ali namestiti popravek ročno."

#. (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 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 "S programom TortoiseMerge vam tega ni potrebno več početi - vsaj v primeru uporabe sistema Git ne. TortoiseMerge razčleni datoteko popravkov za revizijo/verzijo, za katero je bil popravek ustvarjen in poskuša samodejno pridobiti določeno revizijo datoteke iz sistema za nadzor različic. Potem popravek namesti in vam omogoči pregled sprememb, ki ste jih naredili vi in avtor programa. Lahko se odločite, katere spremembe boste obdržali."

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

#. (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 "Med delom na projektu <ulink url=\"http://TortoiseGit.tigris.org\"><citetitle>TortoiseGit</citetitle></ulink> smo opazili, da imamo veliko dela z nameščanjem popravkov (izboljšave programa, odpravljene napake), ki nam jih pošljejo uporabniki. Ti popravki so bili pogosto zastareli, tako da nismo mogli uporabiti orodja ukazne vrstice <ulink url=\"http://unxutils.sourceforge.net/\"><citetitle>http://unxutils.sourceforge.net/</citetitle></ulink>. Datoteke smo namreč tudi sami spreminjali."

#. (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 "To je tudi glavni vzrok, zakaj program TortoiseGit na začetku ni ponujal ukaza  <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Ustvari popravek </guimenuitem></menuchoice>: raje smo videli, da so nam uporabniki pošiljali celotne datoteke, saj jih je bilo lažje uporabiti kot popravke."

#. (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 "Veliko časa smo zapravili za iskanje ustreznega grafičnega orodja na internetu, vendar smo lahko ugotovili le, da ne obstaja. Da skrajšamo celotno zgodbo: če nam nihče ne omogoča takšnega orodja, ga bomo morali napisati sami. Tako se je rodil program 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 "Ker TortoiseGit že uporablja knjižnice sistema Git, ki imajo vgrajeno dobro orodje za razlikovanje, je bila odločitev za uporabo teh knjižnic namesto sistema GNU diff enostavna."

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

#. (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 "Pregledovanje sprememb med dvema datotekama in spajanje sprememb v eno od datotek ali odstranjevanje neželjenih sprememb."

#. (para)
#: ../source/TortoiseMerge_en.xml:288
msgid "Editing conflicts between local changes and changes in the Git repository following an update."
msgstr "Urejanje sporov med krajevnimi spremembami in spremembami v skladišču Git po posodobitvi."

#. (para)
#: ../source/TortoiseMerge_en.xml:294
msgid "Applying patch files. This is the reason TortoiseMerge was created :)"
msgstr "Nameščanje popravkov. Za to je bil TortoiseMerge tudi ustvarjen :-)"

#. (para)
#: ../source/TortoiseMerge_en.xml:278
msgid "TortoiseMerge has several different uses: <placeholder-1/>"
msgstr "TortoiseMerge vam pomaga pri več nalogah: <placeholder-1/>"

#. (title)
#: ../source/TortoiseMerge_en.xml:303
msgid "Viewing and Merging Differences"
msgstr "Pregledovanje in spajanje sprememb"

#. (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 "V tem načinu primerjate dve datoteki. Datoteka na levi strani se smatra za izvirno (včasih ji rečeno <emphasis>njihova</emphasis>), datoteka na desni pa je spremenjena datoteka (včasih ji rečemo <emphasis>moja</emphasis>)."

#. (para)
#: ../source/TortoiseMerge_en.xml:315
msgid "Reverting changed lines back to the text shown in the left pane."
msgstr "Povrnitev spremenjenih vrstic nazaj na stanje, kot je v levi datoteki."

#. (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 "S kombinacijo ukazov lahko izberete tudi <emphasis>njihove</emphasis> spremembe pred <emphasis>svojimi</emphasis> ali <emphasis>svoje</emphasis> pred <emphasis>njihovimi</emphasis>."

#. (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 "Na desni datoteki lahko naredite enostavne vrstične spremembe, kar vključuje: <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 "V desnem podoknu lahko datoteko urejate prav tako kot v urejevalniku besedila. Spremenjene vrstice so označene s simbolom svinčnika. Če želite narediti kakšno spremembo na nivoju vrstice ali bloka besedila, je najbolje, da to storite najprej. Po ročnem urejanju namreč TortoiseMerge nima več povezave z izvornimi datotekami."

#. (title)
#: ../source/TortoiseMerge_en.xml:338
msgid "Editing Conflicts"
msgstr "Urejanje sporov"

#. (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 "Temu včasih rečemo tristransko spajanje, zato se prikazuje v treh delih. V bistvu pa se ukvarjamo s štirimi datotekami. Datoteka, ki ni prikazana, je skupna osnovna datoteka, zadnja skupna prednica datotek, ki sta v sporu. Razmerja med vsemi tremi datotekami so prikazana na spodnjem diagramu:"

#. (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 "Osnovna datoteka predstavlja najstarejšo različico datoteke, od kjer ste <emphasis>vi</emphasis> in <emphasis>oni</emphasis> začeli delati spremembe. <emphasis>Vaša</emphasis> datoteka predstavlja osnovno datoteko z vsemi spremembami, ki ste jih naredili <emphasis>vi</emphasis>, <emphasis>njihova</emphasis> pa je datoteka z vsemi spremembami, ki jih je na datoteki naredil <emphasis>nekdo drug</emphasis>. Leva stran prikazuje spremembe v <emphasis>njihovi</emphasis> datoteki, relativno na osnovno datoteko, desna stran pa prikazuje <emphasis>vašo</emphasis> datoteko, relativno na osnovno datoteko. Spodnji del je izhodna datoteka, kjer poskušate spore rešiti."

#. (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 "V pogledu rešitve spora lahko izberete blok iz <emphasis>Moj</emphasis> ali <emphasis>Njihov</emphasis> ali obeh. V tem primeru so spremembe vidne v spodnjem delu."

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

#. (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 "Datoteka popravkov je datoteka poenotene razlike sistema Git, ki vsebuje informacije, potrebne za namestitev sprememb na množico datotek. Popravek je mogoče poslal drug razvijalec, da njegove spremembe pregledate in jih po možnosti objavite v skladišču. Ali pa ga je ustvaril program TortoiseGit sam pri primerjanju map. To se zgodi pri primerjanju revizije iz skladišča z vašo delovno kopijo, pri primerjanju dveh revizij v skladišču ali pri primerjanju dveh poti v skladišču."

#. (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 "V vseh primerih vam TortoiseMerge pokaže majhno pogovorno okno s seznamom datotek, ki so vključene v popravek. Z dvoklikom na posamezno datoteko preberete ustrezno datoteko in namestite spremembe. Levi del prikazuje izvirno datoteko, desni pa datoteko po nameščenem popravku."

#. (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 "Datoteko lahko urejate na desni strani, tako kot bi jo v načinu primerjanja/urejanja."

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

#. (title)
#: ../source/TortoiseMerge_en.xml:402
msgid "Viewing Modes"
msgstr "Načini pregledovanja"

#. (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 ima tri različne glavne načine pregledovanja: enodelni, dvodelni in trodelni pogled. Eno- in dvodelni pogled se uporabljata za pregledovanje sprememb, trodelni pogled pa je namenjen reševanju sporov."

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

#. (title)
#: ../source/TortoiseMerge_en.xml:411
msgid "One Pane View"
msgstr "Enodelni pogled"

#. (title)
#: ../source/TortoiseMerge_en.xml:415
msgid "Two Pane View"
msgstr "Dvodelni pogled"

#. (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 "Spremembe v spremenjenih vrsticah so prikazane v drugačni barvi. Dodani nizi so prikazani s svetlejšo barvo, seveda pa lahko barve poljubno nastavite. Odstranjeni deli besedila so prikazani z rjavo vodoravno črto. Poglejte si posnetek okna, da vidite, kako stvar deluje."

#. (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 "Preurejanje kode ponavadi pomeni veliko sprememb presledkov (posamičnih presledkov, tabulatorjev, novih vrstic) in nobene dejanske spremembe kode. Primer: dolgo vrstico razdelite na več krajših ali pa več krajših združite v eno dolgo."

#. (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 "Takšne spremembe so prikazane z belim krogcem na levi strani okna. Če vidite takšno oznako, takoj veste, da ne gre za pravo spremembo kode in vam je tako ni treba podrobneje pregledovati."

#. (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 "Ročno urejanje datoteke v desnem podoknu je možno v dvodelnem pogledu. Takšne spremembe so označene s simbolom svinčnika."

#. (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 "Dvodelni pogled ima v primerjavi z enodelnim nekaj dodatnih možnosti: <placeholder-1/>"

#. (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 "Če želite primerjavi/spajati tri datoteke, vam TortoiseMerge prikaže razlike v tridelnem pogledu. Ta pogled se uporablja tudi pri reševanju sporov."

#. (title)
#: ../source/TortoiseMerge_en.xml:460
msgid "Three Pane View"
msgstr "Tridelni pogled"

#. (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 "Leva stran prikazuje spremembe med <emphasis>njihovo</emphasis> datoteko in <emphasis>osnovno</emphasis> datoteko, desna pa spremembe med <emphasis>vašo</emphasis> datoteko in <emphasis>osnovno</emphasis> datoteko. Spodnji del prikazuje rezultat spajanja <emphasis>osnovne</emphasis>, <emphasis>vaše</emphasis> in <emphasis>njihove</emphasis> datoteke z možnimi spori."

#. (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 "Če z miško nekoliko mirujete nad naslovom dela strani, vam namig prikaže imena datotek, ki so uporabljena za razlikovanje v posameznih delih."

#. (title)
#: ../source/TortoiseMerge_en.xml:484
msgid "Patch File List"
msgstr "Seznam datotek v popravku"

#. (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 "Ko TortoiseMerge razčleni datoteko popravkov, prikaže majhno pogovorno okno s seznamom vseh datotek, v katerih so narejene spremembe. <placeholder-1/> Če je ime datoteke izpisano v črni barvi, se lahko popravek namesti brez težav. To pomeni, da datoteka v primerjavi s popravkom ni zastarela. Če pa je ime datoteke izpisano v rdeči barvi, popravka ne morete namestiti neposredno, saj ste datoteko že spreminjali."

#. (para)
#: ../source/TortoiseMerge_en.xml:493
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 "Brez skrbi. Če delate s sistemom Git, lahko pridobite starejško različico datoteke in rešite spor. V bistvu poskusi TortoiseMerge samodejno pridobiti starejšo različico datoteke in vam prikazati razlike med <emphasis>osnovno</emphasis> (staro različico datoteke), <emphasis>vašo</emphasis> (datoteke, kakršna je trenutno v vaši delovni kopiji) in <emphasis>njihovo</emphasis> (starejšo različico datoteke z že nameščenim popravkom). Sedaj lahko možne spore rešite ročno."

#. (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 "Okno popravka vsebuje kontekstni meni, ki vam omogoča predogled učinka popravka na trenutno datoteko (nameščanje popravka brez shranjevanja), nameščanje popravka in shranjevanje sprememb za izbrane datoteko ali nameščanje in shranjevanje sprememb <emphasis>vseh</emphasis> datotek na seznamu. Dvoklik vam prikaže predogled."

#. (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 "Odvisno od tega, ali lahko TortoiseMerge namesti popravek neposredno ali s pridobivanjem starejše različice datoteke, prikaže dvodelni pogled (neposredno nameščanje popravka) ali tridelni pogled (pridobljena starejša različica datoteke)."

#. (title)
#: ../source/TortoiseMerge_en.xml:521
msgid "Buttons and Other Controls"
msgstr "Gumbi in ostale kontrole"

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

#. (para)
#: ../source/TortoiseMerge_en.xml:531
msgid "<guibutton>Open</guibutton> accesses the file-open dialog. What else?"
msgstr "<guibutton>Odpri</guibutton> prikaže okno za odpiranje datotek. Ste pričakovali kaj drugega?"

#. (para)
#: ../source/TortoiseMerge_en.xml:537
msgid "<guibutton>Save</guibutton> saves any changes you have made."
msgstr "Gumb <guibutton>Shrani</guibutton> shrani spremembe, ki ste jih naredili."

#. (para)
#: ../source/TortoiseMerge_en.xml:543
msgid "<guibutton>Reload</guibutton> discards any changes you have made in TortoiseMerge and reloads the files from disk."
msgstr "<guibutton>Ponovno naloži</guibutton> prekliče vse spremembe, ki ste jih naredili v programu TortoiseMerge, in ponovno naloži datoteke z diska."

#. (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>Prekliči</guibutton> omogoča večnivojski preklic, kar vam omogoča povrnitev katerekoli spremembe, ki ste jo naredili v programu 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 "Gumb <guibutton>Prejšnja/Naslednja sprememba</guibutton> omogoča skok na naslednjo točko, v kateri se datoteki razlikujeta. Tako vam ni potrebno brskati po nespremenjenih delih datoteke."

#. (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 "Če to naredite v dvodelnem pogledu, vam podrobni prikaz na dnu zaslona prikaže razlike med novimi in starimi vrsticami za prvo vrtico, ne glede na trenutni položaj miške."

#. (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 "Gumb <guibutton>Prejšnji/naslednji spor</guibutton> omogoča skok na naslednjo točko, pri kateri se pojavi spor in ga je potrebno rešiti."

#. (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 "Z gumbom <guibutton>Uporabi njihovo/Uporabi mojo</guibutton> izberemo spremembe trenutnega bloka iz leve oziroma iz desne strani. Za več informacij o urejanju sprememb in sporov preberite naslednji razdelek."

#. (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 "Gumb <guibutton>Njihovo pred mojim/Moje pred njihovim</guibutton> se uporablja za izbiro kombinacije sprememb v sporni datoteki. Za več informacij o urejanju sprememb in sporov preberite naslednji razdelek."

#. (para)
#: ../source/TortoiseMerge_en.xml:594
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>Označi kot rešeno</guibutton> Ko ste rešili vse spore v datoteki in spremembe shranili, lahko datoteko označite kot rešeno kar v programu TortoiseMerge, ne da bi vam bilo potrebno hoditi nazaj v Raziskovalca."

#. (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 "<guibutton>Pokaži presledke</guibutton> preklaplja med možnostjo prikaza presledkov in tabulatorjev s posebnimi simboli in navadnim prikazom. Tako lahko lažje vidite število in vrsto presledkov."

#. (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 "Gumb <guibutton>Spremembe v vrstici</guibutton> preklaplja med način prikaza razlik v vrstici. V besednem načinu se pri spremembi znaka označi cela beseda. V znakovnem načinu je vedno označena le spremenjena črka."

#. (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 "Besedni način je privzet in v večini primerov deluje bolje. Primer: če spremenite ime spremenljivke, se v besednem načinu označi ime cele spremenljivke. V znakovnem načinu vidite veliko dodanih in izbrisanih znakov, kar pa ni preveč smiselno. V nekaterih primerih pa se vsebina ne da lepo ločiti po besedah, n. pr. v šestnajstiških datotekah. Takrat je znakovna metoda boljša."

#. (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 "<guibutton>Preklopi pogled</guibutton> izbere enodelni ali dvodelni pogled. Gumb je onemogočen v primeru trodelnega pogleda."

#. (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 "<guibutton>Preklopi levi in desni pogled</guibutton> V dvodelnem pogledu zamenja levi in desno del. Ko primerjate datoteki v dveh različnih drevesih (za razliko od primerjanja dveh revizij iste datoteke), TortoiseGit ne ve, katera datoteka je <quote>izvirna/osnovna</quote>, ki naj se zato prikaže na levi strani. Če se zmoti, lahko sami zamenjate strani."

#. (para)
#: ../source/TortoiseMerge_en.xml:646
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>Pokaži/Skrij seznam popravkov</guibutton> Ko ima TortoiseMerge seznam popravkov, vam ta gumb omogoča, da seznam prikažete (tako da ga lahko pregledate) ali skrijete (in tako vidite oba dela strani)."

#. (para)
#: ../source/TortoiseMerge_en.xml:654
msgid "<guibutton>Settings</guibutton> takes you to TortoiseMerge's settings dialog."
msgstr "Gumb <guibutton>Nastavitve</guibutton> odpre pogovorno okno za nastavitve programa TortoiseMerge."

#. (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 "<placeholder-1/> Pod vrstico menijev se nahaja orodna vrstica, ki vam omogoča hiter dostop do najbolj uporabljenih orodij <placeholder-2/>"

#. (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 "Na levi strani okna se nahaja lokacijski trak. Ta prikazuje, kje v datoteki se nahajajo spremenjene vrstice. Trak ima tri stolpce. Levi stolpec se nanaša na levo stran, desni na desno, sredinski pa na spodnji del (če obstaja). Pri enodenem prikazu se uporablja le levi stolpec. Lokacijski trak se lahko uporablja tudi kot drsni trak za premikanje obeh oken hkrati."

#. (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 "Pod spodnjim oknom sem nahaja vrstica stanja. Ta prikazuje število dodanih in izbrisanih vrstic v datotekah <literal>njihova</literal> in <literal>moja</literal> in število še ne rešenih sporov. Vidite lahko tudi, kateri slog zaključevanja vrstic je v uporabi, vrsto kodiranja znakov (ASCII, UTF-8, etc), ki ga TortoiseMerge predpostavlja, in če se v datotekah UTF-8 uporablja byte-order-mark (BOM). Leva stran vrstice stanja se uporablja za prikaz namigov, ko z miško za hip mirujete na kontroli."

#. (title)
#: ../source/TortoiseMerge_en.xml:683
msgid "Line Status Icons"
msgstr "Ikone stanja vrstice"

#. (para)
#: ../source/TortoiseMerge_en.xml:684
msgid "Changed lines are marked with an icon to indicate what type of change has occurred."
msgstr "Spremenjene vrstice so označene z ikono, ki nakazuje, za kakšno spremembo gre."

#. (para)
#: ../source/TortoiseMerge_en.xml:688
msgid "<graphic fileref=\"images/TMerge_lineadded.png\"/> A line has been added."
msgstr "<graphic fileref=\"images/TMerge_lineadded.png\"/> Vrstica je bila dodana."

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

#. (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 "<graphic fileref=\"images/TMerge_lineequal.png\"/> Sprememba je bila preklicana s povrnitvijo na izvirno vsebino vrstice."

#. (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 "<graphic fileref=\"images/TMerge_linewhitespace.png\"/> Vrstica vsebuje le spremembe v presledkih. Kjer je označenih več zaporednih vrstic, gre najbrž za preoblikovanje odstavka, tako da se določene besede lahko premaknejo v sosednjo vrstico."

#. (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 "<graphic fileref=\"images/TMerge_lineedited.png\"/> Vrstica je bila urejana ročno z uporabo TortoiseMerge kot urejevalnika besedil."

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

#. (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 "<graphic fileref=\"images/TMerge_lineconflictedignored.png\"/> Vrstica je sporna, vendar se tega ne vidi zaradi nastavitev načina prikaza presledkov ali zaključkov vrstic."

#. (title)
#: ../source/TortoiseMerge_en.xml:721
msgid "Merging / Editing Conflicts"
msgstr "Spajanje / urejanje sporov"

#. (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 vam ne le <emphasis>prikaže</emphasis> razlike med datotekami, ampak vam omogoča tudi reševanje sporov in namestitev sprememb."

#. (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 "Če se nahajate v dvodelnem pogledu, lahko urejate le datoteko na desni strani (<literal>moja</literal>). Za namestitev sprememb, narejenih na levi strani (<literal>njihova</literal>), <action>desno kliknite</action> na spremenjene vrstrice in izberite <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Uporabi del besedila iz  <quote>njihovo</quote></guimenuitem></menuchoice>. S tem se spremembe z leve strani dodajo na desno datoteko."

#. (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 "Včasih želite uporabiti oba dela besedila, zato vam kontekstni meni ponudi tudi možnosti <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Uporabi oba dela besedila (tega najprej)</guimenuitem></menuchoice> in <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Uporabi oba dela besedila (tega zadnjega)</guimenuitem></menuchoice>."

#. (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 "Izhodno datoteko lahko urejate prav tako kot v urejevalniku besedil. Spremenjene vrstice so označene s simbolom svinčnika. Če želite narediti kakšno spremembo na nivoju vrstice ali bloka besedila, je najbolje, da to storite najprej. Po ročnem urejanju namreč TortoiseMerge nima več povezave z izvornimi datotekami."

#. (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 "Če se nahajate v tridelnem pogledu (včasih mu rečemo tudi <emphasis>pogled za spajanje</emphasis>), lahko urejate le datoteko v spodnjem delu (<literal>spojeno</literal>). Kot v primeru dvodelnega pogleda lahko tudi tu <action>desno kliknete</action> na sporne vrstice in izberete <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Uporabi del besedila iz <quote>njihovega</quote></guimenuitem></menuchoice> ali <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Uporabi del besedila iz <quote>mojega</quote></guimenuitem></menuchoice>. Če želite uporabiti <emphasis>oba</emphasis> dela besedila, lahko izberete <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem> Uporabi del besedila iz <quote>mojega</quote> pred <quote>njihovim</quote></guimenuitem></menuchoice> ali <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem> Uporabi del besedila iz <quote>njihovega</quote> pred <quote>mojim</quote></guimenuitem></menuchoice>. Glede na izbiro ukaza se spremembe prikažejo v <literal>spojeni</literal> datoteki."

#. (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 "Včasih Git označi kakšno datoteko kot sporno, ko pa jo pogledate s programom TortoiseMerge, ne vidite nobenega spora. Razlog je lahko v načinu prikaza presledkov in tabulatorjev. Če spremembe presledkov ali končnic vrstic prezrete, so takšne vrstice označene z ikono <emphasis>Spor prezrt</emphasis>. Za rešitev spora morate še vedno izbrati željeno verzijo vrstice."

#. (para)
#: ../source/TortoiseMerge_en.xml:804
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 "Včasih je spor preveč zahteven, da bi ga lahko rešili le z izbiro <literal>njihov</literal> in <literal>moj</literal>, zato je potrebno ročno urejanje. TortoiseMerge vam omogoča, da enostavne spremembe opravite vizuelno, shranite datoteko, nato pa zahtevnejše spremembe popravite ročno."

#. (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, <emphasis>will be discarded</emphasis> and the file will appear as it did when conflict-editing first started."
msgstr "Upoštevajte: če uporabite TortoiseMerge še enkrat na isti datoteki, bodo vse spremembe v delovni kopiji, narejene s TortoiseMerge ali ročno, <emphasis>preklicane</emphasis> in datoteka bo takšna, kot je bila pred začetkom reševanja sporov."

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

#. (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 "Če TortoiseMerge zaženete brez parameterov ukazne vrstice, morate datoteke odpreti ročno z uporabo ukaza <menuchoice><guimenu>Datoteka</guimenu><guimenuitem>Odpri</guimenuitem></menuchoice>."

#. (title)
#: ../source/TortoiseMerge_en.xml:833
msgid "The Open Dialog"
msgstr "Pogovorno okno Odpri"

#. (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 "Najprej se morate odločiti, ali želite samo primerjati/spajati datoteke, ali pa želite uporabiti datoteko popravkov. Vnosna polja in gumbi za brskanje se aktivirajo v skladu z vašo izbiro."

#. (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 <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 "Če želite primerjati/spajati datoteke, morate nastaviti vsaj dve od treh možnih poti za <literal>osnovno</literal>, <literal>vašo</literal> and <literal>njihovo</literal> datoteko. Če izberete le dve datoteki, vam TortoiseMerge pokaže razlike med datotekama - v enodelnem ali dvodelnem pogledu."

#. (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 <menuchoice><guimenu>File</guimenu><guimenuitem>Save As...</guimenuitem></menuchoice>. to save the results."
msgstr "Če želite spojiti tri datoteke, vam TortoiseMerge pokaže razlike v tridelnem pogledu. Ta pogled se v večini primerov uporablja za reševanje sporov. Izhodna datoteka je v tem primeru brez imena, tako da boste rezultat spajanja morali sami shraniti z ukazom <menuchoice><guimenu>Datoteka</guimenu><guimenuitem>Shrani kot...</guimenuitem></menuchoice>."

#. (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 "Če želite namestiti popravek, morate navesti pot popravka in pot mape, kjer naj se popravek namesti."

#. (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 "Trenutno so podprte le datoteke popravkov oblike <emphasis>poenotene razlike (Unified Diff Format)</emphasis>, ki jih je ustvarilo orodje Git. Druge oblike, kot naprimer datoteka popravkov, ki jo ustvari orodje CVS, niso podprte!"

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

#. (title)
#: ../source/TortoiseMerge_en.xml:886
msgid "Main Settings Page"
msgstr "Glavna stran nastavitev"

#. (title)
#: ../source/TortoiseMerge_en.xml:889
msgid "The Settings Main Page"
msgstr "Glavna stran nastavitev"

#. (para)
#: ../source/TortoiseMerge_en.xml:892
msgid "Most of the options here are self-explanatory, but a few points need clarifying."
msgstr "Večina možnosti je očitnih, nekaj pa jih potrebuje razlago."

#. (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 "<guilabel>Naredi varnostno kopijo izvorne datoteke</guilabel> preimenuje originalno datoteko v delovni kopiji v <literal>imedatoteke.bak</literal>, preden se shrani spremenjena različica."

#. (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 "<guilabel>Prezri zaključke vrstic</guilabel> skrije spremembe, ki so posledica zgolj zaradi razlik pri zaključkih vrstic."

#. (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 "<guilabel>Prezri spremembe velikih/malih črk</guilabel> skrije spremembe, ki so posledica menjave velikih in malih črk v besedilu. To je uporabno pri aplikacijah, kot je Visual Basic, ki spreminjajo velike in male črke brez opozorila."

#. (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 "<guilabel>Obarvaj spremembe v vrstici</guilabel> uporablja isti način kot trak za prikaz razlik v vrstici, tako da prikaže podrobne spremembe znotraj vrstice v glavnih oknih. Vrstice, ki so bile močno spremenjene, ne bodo prikazane s to metodo, saj bi rezultati povzročili preprosto preveč zmede. V takšnem primeru se vrstica pokaže kot zamenjana (stara izbrisana, nova dodana)."

#. (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 "<guilabel>Primerjaj presledke</guilabel> prikaže vse spremembe zamikanja in presledkov kot dodane/odstranjene vrstice (tako takšne spremembe obravnava Git)."

#. (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 "<guilabel>Prezri razlike presledkov</guilabel> skrije spremembe, ki so posledica spremembe števila presledkov, n. pr. pri zamikanju vrstic ali spremembi tabulatorjev v presledke. Dodajanje presledka na mesto, kjer ga prej ni bilo ali popolno odstranjevanje presledkov se še vedno prikaže kot sprememba."

#. (para)
#: ../source/TortoiseMerge_en.xml:932
msgid "<guilabel>Ignore all whitespaces</guilabel> hides all whitespace-only changes."
msgstr "<guilabel>Prezri vse presledke</guilabel> skrije vse spremembe, ki so posledica spremembe presledkov."

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

#. (title)
#: ../source/TortoiseMerge_en.xml:941
msgid "The Settings Color Page"
msgstr "Nastavitev barv"

#. (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 "To pogovorno okno omogoča izbiro barv ozadja za različno spremenjene vrstice."

#. (term)
#: ../source/TortoiseMerge_en.xml:950
msgid "Normal"
msgstr "Običajno"

#. (listitem)
#: ../source/TortoiseMerge_en.xml:951
msgid "All lines which are unchanged, or where changes are hidden."
msgstr "Vse vrstice, ki ne vsebujejo sprememb ali pa so spremembe skrite."

#. (term)
#: ../source/TortoiseMerge_en.xml:956
msgid "Added"
msgstr "Dodano"

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

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

#. (listitem)
#: ../source/TortoiseMerge_en.xml:963
msgid "Lines which have been deleted."
msgstr "Izbrisane vrstice."

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

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

#. (guilabel)
#: ../source/TortoiseMerge_en.xml:974
msgid "Colour code in-line changes"
msgstr "Barvno kodiranje sprememb v vrstici"

#. (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 "Vrstice, ki vsebujejo relativno majhne spremembe, so prikazane s spremembami v vrsticah. Ta barva se uporablja za del vrstice, ki ima status <placeholder-1/>. Spremenjeni deli se prikažejo z uporabo dodanih in izbrisanih barv, kot je to opisano spodaj. Če možnost <placeholder-2/> ni omogočena, barva ne bo uporabljena in spremenjene vrstice bodo vedno označene kot zamenjane."

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

#. (listitem)
#: ../source/TortoiseMerge_en.xml:981
msgid "Where the same line has been changed in both files."
msgstr "Kjer je bila ista vrstica spremenjena v obeh datotekah"

#. (term)
#: ../source/TortoiseMerge_en.xml:986
msgid "Conflict resolved"
msgstr "Spor rešen"

#. (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 "Kjer je bila ista vrstica spremenjena v obeh datotekah in ste se odločili, katera različica bo sedaj uporabljena"

#. (term)
#: ../source/TortoiseMerge_en.xml:993
msgid "Empty"
msgstr "Prazno"

#. (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 "Kjer so bile vrstice dodane v nasprotnem predelu, v tem predelu pa ne obstajajo."

#. (term)
#: ../source/TortoiseMerge_en.xml:1000
msgid "Inline added text"
msgstr "Dodano besedilo v vrstici"

#. (listitem)
#: ../source/TortoiseMerge_en.xml:1001
msgid "When inline diffs are shown, added text is shown in this colour."
msgstr "Kadar so prikazane razlike v vrstici, je dodano besedilo prikazano v tej barvi."

#. (term)
#: ../source/TortoiseMerge_en.xml:1006
msgid "Inline removed text"
msgstr "Izbrisano besedilo v vrstici"

#. (listitem)
#: ../source/TortoiseMerge_en.xml:1007
msgid "When inline diffs are shown, deleted text is shown in this colour."
msgstr "Kadar so prikazane razlike v vrstici, je izbrisano besedilo prikazano v tej barvi."

#. (term)
#: ../source/TortoiseMerge_en.xml:1012
msgid "Misc whitespaces"
msgstr "Razno - presledki"

#. (listitem)
#: ../source/TortoiseMerge_en.xml:1013
msgid "Characters used to indicate Whitespace are shown in a different colour from normal text."
msgstr "Znaki, ki označujejo presledke, so prikazani v drugačni barvi kot običajno besedilo."

#. (title)
#: ../source/TortoiseMerge_en.xml:1023
msgid "keyboard shortcuts"
msgstr "bližnjice s tipkovnico"

#. (para)
#: ../source/TortoiseMerge_en.xml:1025
msgid "List of keyboard shortcuts and commands."
msgstr "Seznam bližnjic in ukazov."

#. (title)
#: ../source/TortoiseMerge_en.xml:1030
msgid "Keyboard shortcuts"
msgstr "Bližnjice s tipkovnico"

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

#. (para)
#: ../source/TortoiseMerge_en.xml:1035
msgid "Quit the program"
msgstr "Izhod iz aplikacije"

#. (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 "Kopiraj izbrano besedilo na odložišče."

#. (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 "Odpri pogovorno okno za iskanje besedila"

#. (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 "Odpri datoteke za razlikovanje/spajanje"

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

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

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

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

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

#. (para)
#: ../source/TortoiseMerge_en.xml:1083
msgid "Go to next difference"
msgstr "Na naslednjo razliko"

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

#. (para)
#: ../source/TortoiseMerge_en.xml:1091
msgid "Go to previous difference"
msgstr "Na prejšnjo razliko"

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

#. (para)
#: ../source/TortoiseMerge_en.xml:1099
msgid "Go to next conflict"
msgstr "Na naslednji spor"

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

#. (para)
#: ../source/TortoiseMerge_en.xml:1107
msgid "Go to previous conflict"
msgstr "Na prejšnji spor"

#. (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 "Preklaplja med enodelnim in dvodelnim pregledovalnikom razlik"

#. (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 "Ponovno naloži datoteke in povrne vse spremembe"

#. (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 "Preklaplja med prikazom in skrivanjem presledkov"

#. (term)
#: ../source/TortoiseMerge_en.xml:1137
msgid "Ctrl-mousewheel"
msgstr "Ctrl-miškin kolešček"

#. (para)
#: ../source/TortoiseMerge_en.xml:1139
msgid "Scroll the display left/right"
msgstr "Okno premika levo/desno"

#. (title)
#: ../source/TortoiseMerge_en.xml:1148
msgid "Automating TortoiseMerge"
msgstr "Avtomatizacija 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 lahko poženemo s parametri ukazne vrstice. Tako nam po zagonu ni potrebno izbirati datotek z ukazom <guilabel>Odpri</guilabel>. Parametri so uporabni tudi, če želite TortoiseMerge uporabljati v okviru druge aplikacije."

#. (title)
#: ../source/TortoiseMerge_en.xml:1161
msgid "TortoiseMerge Command Line Switches"
msgstr "Stikala ukazne vrstice TortoiseMerge"

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

#. (primary)
#: ../source/TortoiseMerge_en.xml:1166
msgid "command line"
msgstr "ukazna vrstica"

#. (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 ""
"Večina stikal zahteva dodatno informacijo - pot ali kak drug niz. V takšnih primerih stikalu dodajte ':' in zahtevan niz. Primer: <screen>\n"
"/base:\"c:\\mapa\\moja osnovna datoteka.txt\"\n"
"</screen>"

#. (title)
#: ../source/TortoiseMerge_en.xml:1188
msgid "List of available command line options"
msgstr "Seznam možnosti ukazne vrstice"

#. (entry)
#: ../source/TortoiseMerge_en.xml:1194
msgid "Command"
msgstr "Ukaz"

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

#. (entry)
#: ../source/TortoiseMerge_en.xml:1201
msgid "Shows a dialog box with the most important command line switches."
msgstr "Prikaže pogovorno okno z najbolj pomembnimi stikali."

#. (option)
#: ../source/TortoiseMerge_en.xml:1209
msgid "?"
msgstr "?"

#. (entry)
#: ../source/TortoiseMerge_en.xml:1208
msgid "The same as <placeholder-1/>."
msgstr "Enako kot <placeholder-1/>."

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

#. (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 "Datoteka <placeholder-1/> v tridelnem pogledu. To je skupni prednik obeh primerjanih datotek, čeprav se ne pokaže v posebnem oknu. Pri dvodelnem pogledu je to leva datoteka."

#. (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 "Ime osnovne datoteke. Prikaže se v naslovu pogleda namesto poti datoteke. V tridelnem pogledu se prikaže kot namig naslova pogleda."

#. (emphasis)
#: ../source/TortoiseMerge_en.xml:1234
msgid "theirs"
msgstr "njihov"

#. (entry)
#: ../source/TortoiseMerge_en.xml:1233
msgid "Specifies the <placeholder-1/> file used in three way diffs, displayed in the left pane."
msgstr "Določi <placeholder-1/> datoteko, ki se uporablja v trodelnem pogledu, in jo prikaže na levi strani."

#. (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 "Ime njihove datoteke. Prikaže se v naslovu namesto poti datoteke."

#. (emphasis)
#: ../source/TortoiseMerge_en.xml:1248
msgid "mine"
msgstr "moj"

#. (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 "Določi <placeholder-1/> datoteko, ki se uporablja v trodelnem pogledu, in jo prikaže na desni strani. Pri dvodelnem pogledu je to desna datoteka."

#. (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 "Ime naše datoteke. Prikaže se v naslovu namesto poti datoteke."

#. (emphasis)
#: ../source/TortoiseMerge_en.xml:1263
msgid "merged"
msgstr "spojeno"

#. (entry)
#: ../source/TortoiseMerge_en.xml:1262
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 "Določi <placeholder-1/> datoteko, ki se uporablja v trodelnem pogledu. To je pot datoteke, v katero se shrani rezultat spajanja. Če vrednost ni nastavljena, bo TortoiseMerge o tem povprašal uporabnika."

#. (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 "Ime spojene datoteke. Prikaže se v naslovu namesto poti datoteke."

#. (emphasis)
#: ../source/TortoiseMerge_en.xml:1283
msgid "very long"
msgstr "zelo dolgo"

#. (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 <placeholder-1/>."
msgstr "Pot, kamor se namesti popravek. Če poti ne nastavite, jo bo TortoiseMerge poskušal poiskati sam, vendar lahko to traja <placeholder-1/>."

#. (entry)
#: ../source/TortoiseMerge_en.xml:1288
msgid "The name of the original file to patch. Used for the view title."
msgstr "Ime izvirne datoteke, na katero se namešča popravek. Pokaže se kot naslov."

#. (entry)
#: ../source/TortoiseMerge_en.xml:1295
msgid "The name of the resulting patched file. Used for the view title."
msgstr "Ime datoteke, na katero je nameščen popravek. Pokaže se kot naslov."

#. (entry)
#: ../source/TortoiseMerge_en.xml:1302
msgid "The path to the patch/diff file to apply to a directory."
msgstr "Pot do datoteke popravkov/sprememb, ki naj se namesti na mapo."

#. (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 "Prisili TortoiseMerge, da se zažene v enodelnem pogledu namesto v pogledu, ki ga je uporabnik nastavil v nastavitvah."

#. (entry)
#: ../source/TortoiseMerge_en.xml:1315
msgid "Switches the left and right view of the specified two files to diff."
msgstr "Zamenja levo in desno stran izbranih datotek za razlikovanje."

#. (literal)
#: ../source/TortoiseMerge_en.xml:1325
msgid "/origfile:\"path_to_original_file\""
msgstr "/origfile:\"pot_do_originalne_datoteke\""

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

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

#. (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 "Ustvari datoteko poenotene razlike datotek, nastavljenih z <placeholder-1/> in <placeholder-2/>. Ciljna pot je nastavljena z <placeholder-3/>. Če <placeholder-4/> ni nastavljen, se uporabniku prikaže pogovorno okno za shranjevanje datoteke, tako da lahko izbere lokacijo datoteke popravkov. Opomba: Če je nastavljen <placeholder-5/>, se ostali parametri ne upoštevajo."

#. (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 ""
"Zaradi združljivosti z ostalimi programi lahko v ukazni vrstici enostavno podate imena datotek v naslednji obliki: <screen>\n"
"TortoiseMerge PotOsnovneDatoteke PotMojeDatoteke [ PotNjihoveDatoteke ]\n"
"</screen> Če sta podani dve datoteki, ju program primerja med sabo. Če so podane tri datoteke, je prva datoteke OSNOVNA, ostali dve pa se primerjata z njo v trodelnem pogledu."

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

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

#. (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 "Ukaz sistema Git, ki se uporablja za dodajanje datoteke ali mapo v delovno kopijo. Novi elementi se v skladišče dodajo ob objavi."

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

#. (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 "Trenutna osnovna revizija datoteke ali mape v vaši <emphasis>delovni kopiji</emphasis>. To je revizija datoteke ali mapi pri zadnjem prevzemu, posodobitvi ali objavi. Revizija BASE v splošnem ni enaka reviziji HEAD."

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

#. (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 "Ta ukaz se uporablja le za besedilne datoteke, v katerih ob vsaki vrstici izpiše revizijo zadnje spremembe in avtorja te spremembe. Uporabniški vmesnik se imenuje TortoiseBlame in ob mirovanju miške na številki revizije pokaže tudi datum/čas objave in sporočilo dnevniškega zapisa."

#. (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. Dobro preizkušena baza za skladišča, ki se ne more uporabljati v mapah v skupni rabi. Privzeta oblika za skladišča pred različico 1.2."

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

#. (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 "Izraz, ki se pogosto uporablja v sistemih za nadzor različic, in opisuje dve različni poti razvoja, ki se razcepita v določeni točki. Vejo lahko ustvarite na glavni veji, da razvijate novo lastnost ločeno, ne da bi glavno vejo naredili nestabilno. Lahko pa naredite vejo stabilne izdaje, na kateri le popravljate napake, nadaljni razvoj aplikacije pa se izvaja na nestabilni glavni veji. V sistemu Git je veja narejena kot <quote>poceni kopija</quote>."

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

#. (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 "Ukaz sistema Git, ki iz skladišča prenese elemente pod nadzorom in tako ustvari krajevno delovno kopijo v prazni mapi."

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1424
msgid "Cleanup"
msgstr "Počisti"

#. (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 "Citat iz knjige The Git Book: <quote> Rekurzivno počisti delovno kopijo, tako da odstrani zaklepe in zaključi nedokončane operacije. Če se vam kdaj prikaže sporočilo <emphasis>delovna kopija zaklenjena</emphasis>, poženite ta ukaz, da ostranite zaklepe in naredite delovno kopijo spet uporabno.</quote> Upoštevajte, da v tem kontekstu <emphasis>zaklep</emphasis> pomeni zaklepanje datotečnega sistema in ne zaklepanje skladišča."

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

#. (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 "Ta ukaz omogoča prenos krajevnih sprememb v skladišče. S tem se v skladišču ustvari nova revizije."

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1451
msgid "Conflict"
msgstr "Spor"

#. (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 "Ob spajanju sprememb iz skladišča s krajevnimi spremembami se včasih zgodi, da se spremembe zgodijo v isti vrstici. V takšnem primeru se Git ne more sam odločiti, katera različica vrstice je pravilna. Rečemo, da je datoteka sporna. Pred objavo morate spremembe morate ročno popraviti in tako rešiti spore."

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

#. (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 "V skladišču In Git lahko ustvarjate kopije posameznih datotek ali celotnih dreves. Te kopije so <quote>poceni kopije</quote>, ki delujejo kot povezava na izvirno datoteko ali mapo in ne zavzemajo skoraj nič prostora. Usvarjanje kopije ohrani zgodovino kopiranega elementa, tako da lahko pregledujete spremembe tudi pred izdelavo kopije."

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1475
msgid "Delete"
msgstr "Izbriši"

#. (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 "Ko izbrišete datoteko pod nadzorom (in objavite spremembo), tega elementa ni več v skladišču od objavljene revizije naprej. Seveda pa še vedno obstaja v prejšnjih revizijah skladišča in tako lahko še vedno dostopate do njega. Če je potrebno, lahko skopirate izbrisan element in ga pripeljete nazaj med žive s celotno zgodovino."

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

#. (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 "Bližnjica za <quote>Pokaži razlike</quote>. Zelo uporabno, kadar želite videti, kakšne spremembe natančno ste naredili."

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

#. (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 "Ta ukaz ustvari kopijo mape pod nadzorom različic, prav takšno, kot je delovna kopija, vendar brez map <literal>.svn</literal>."

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

#. (para)
#: ../source/TortoiseMerge_en.xml:1508
msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories."
msgstr "Ekskluziven datotečni sistem za skladišča sistema Git. Uporablja se lahko tudi v omrežnih datotekah v skupni rabi. Privzet sistem pri različicah 1.2 in novejših."

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

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

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

#. (para)
#: ../source/TortoiseMerge_en.xml:1525
msgid "The latest revision of a file or folder in the <emphasis>repository</emphasis>."
msgstr "Najnovejša revizija datoteke ali mape v <emphasis>skladišču</emphasis>."

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

#. (para)
#: ../source/TortoiseMerge_en.xml:1533
msgid "Git command to import an entire folder hierarchy into the repository in a single revision."
msgstr "Ukaz sistema Git za uvoz celotne hierarhije map v skladišče v eni sami reviziji."

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

#. (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 "Ko element pod nadzorom zaklenete, ga s tem označite v skladišču in preprečite objave, razen iz delovne kopije, ki je zaklep zahtevala."

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1550
msgid "Log"
msgstr "Dnevniški zapis"

#. (para)
#: ../source/TortoiseMerge_en.xml:1552
msgid "Show the revision history of a file or folder. Also known as <quote>History</quote>."
msgstr "Prikaže zgodovino revizij datoteke ali mape. Uporablja se tudi termin <quote>Zgodovina</quote>."

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

#. (para)
#: ../source/TortoiseMerge_en.xml:1561
msgid "Show the revision history of a file or folder. Also known as <quote>Log</quote>."
msgstr "Prikaže zgodovino revizij datoteke ali mape. Uporablja se tudi termin <quote>Dnevnik</quote>."

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

#. (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 "Proces dodajanja sprememb iz skladišča v vašo delovno kopijo, ne da ob tem povozite krajevne spremembe. Včasih sprememb ni možno samodejno spojiti in takrat je delovno kopija sporna."

#. (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 "Spajanje se zgodi samodejno, ko posodabljate delovno kopijo. Lahko pa opravljate spajanje specifičnih sprememb iz druge veje z uporabo ukaza Spoji."

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

#. (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 "Če so se v delovni kopiji spremenile le besedilne datoteke, je možno z ukazom Razlikuj ustvariti datoteko s povzetkom sprememb v obliki poenotene različice (unified diff). Datoteka takšnega tipa se pogosto imenuje <quote>popravek</quote> in se lahko uporablja za pošiljanje sprememb po elektronski pošti vašemu sodelavcu ali dopisnemu seznamu. Ta datoteka se potem uporabi na neki drugi delovni kopiji. Nekdo, ki nima pravice pisanja po skladišču, lahko naredi spremembe in ustvari popravek, ki ga objavi nek drug uporabnik, ki ustrezne pravice ima. Ali pa če niste prepričani, da so vaše spremembe dobre, lahko na ta način drugim uporabnikom pošljete spremembe v pregled."

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

#. (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 "Poleg vodenja različic map in datotek Git omogoča tudi vodenje različic meta podatkov - rečemo jim <quote>lastnosti</quote> - za vsak element pod nadzorom. Vsaka lastnost ima ime in vrednost, podobno kot register. Git interno uporablja nekaj posebnih lastnosti, n. pr. <literal>svn:eol-style</literal>. Tudi TortoiseGit uporablja nekaj internih lastnosti, n. pr. <literal>tsvn:logminsize</literal>. Lahko pa dodate svoje lastnosti s poljubnim imenom in vrednostjo."

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

#. (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 "Če se skladišče premakne (ker ste ga premaknili v drugo mapo na strežniku ali pa se je spremenilo domensko ime),  morate narediti <quote>premik</quote> delovne kopije, da bodo poti URL do skladišča kazale na novo lokacijo."

#. (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 "Opomba: ta ukaz uporabljajte le, če delovna kopija kaže na isto lokacijo znotraj istega skladišča, skladišče pa je bilo premaknjeno na drugo lokacijo. V vseh ostalih primerih uporabite ukaz <quote>Preklopi</quote>."

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1631
msgid "Repository"
msgstr "Skladišče"

#. (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 "Skladišče je središčna lokacija, kjer se podatki shranjujejo in vzdržujejo. Skladišče je lahko lokacija, kjer so shranjene številne baze podatkov ali datoteke za distibucijo preko omrežja, lahko pa je tudi lokacija, ki je neposredno dostopna uporabniku, ne da bi uporabljal omrežje."

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1642
msgid "Resolve"
msgstr "Reši"

#. (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 <quote>Resolving Conflicts</quote>. When this is complete you can mark the conflicted files as being resolved, which allows them to be committed."
msgstr "Ko so datoteke v delovni kopiji sporne (zaradi spajanja), mora uporabnik te spore rešiti z uporabo urejevalnika (ali pa programa TortoiseMerge). Procesu rečemo <quote>reševanje sporov</quote>. Ko ste spore rešili, označite datoteko kot rešeno, kar vam omogoča njeno objavo."

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

#. (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 "Git hrani krajevno <quote>originalno</quote> kopijo vsake datoteke, kakršna je bila ob zadnji posodobitvi. Če ste na datoteki naredili spremembe in jih želite povrniti, uporabite ukaz <quote>povrni</quote>, da dobite nazaj originalno datoteko."

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

#. (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 "Vsakič ko objavite spremembe, naredite novo <quote>revizijo</quote> v skladišču. Vsaka revizija predstavlja stanje skladišča ob določeni točki v njegovi zgodovini. Če želite, si lahko ogledate skladišče, kakršno je bilo ob reviziji številka N."

#. (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 "Drug pogled: revizija je množica sprememb, ki so bile narejene, ko je bila revizija ustvarjena."

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1681
msgid "Revision Property (revprop)"
msgstr "Lastnost revizije (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 "Prav tako, kot imajo lastnosti datoteke, jih imajo tudi revizije v skladišču. Nekatere posebne se dodajo samodejno, ko se revizija ustvari: <literal>svn:date svn:author svn:log</literal>, ki predstavljajo datum/čas objave, avtorja in sporočilo dnevniškega zapisa. Vrednosti teh lastnosti lahko urejate, vendar upoštevajte, da niso pod nadzorom različic, tako da so spremembe trajne in se jih ne da povrniti."

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

#. (para)
#: ../source/TortoiseMerge_en.xml:1697
msgid "A frequently-used abbreviation for Git."
msgstr "Pogosto uporabljena okrajšava za Git"

#. (para)
#: ../source/TortoiseMerge_en.xml:1700
msgid "The name of the Git custom protocol used by the <quote>svnserve</quote> repository server."
msgstr "Ime lastnega protokola sistema Git, ki ga uporablja strežnik skladišč <quote>svnserve</quote>."

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

#. (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 "Prav tako kot ukaz <quote>posodobi-na-revizijo</quote> spremeni časovno okno delovne kopije, da izgleda tako, kot v neki določeni točki v zgodovini, ukaz <quote>Preklopi</quote> spremeni prostorsko okno delovne kopije, da kaže na drugo mesto v skladišču. To je uporabno predvsem takrat, kot delate na glavni veji in na stranskih vejah, na katerih je spremenjenih le nekaj datotek. Delovno kopijo lahko preklapljate, prenesejo pa se le spremenjene datoteke."

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

#. (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 "Ta ukaz Git prenese iz skladišča v delovno kopijo zadnje spremembe, pri tem spremembe spoji s krajevnimi spremembami, narejenimi v delovni kopiji."

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

#. (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 "To je vaše zasebno <quote>igrišče</quote>, območje, kjer delate z datotekami pod nadzorom, in se obilčajno nahaja na krajevnem trdem disku. Delovno kopijo naredite s <quote>prevzemom</quote> iz skladišča, spremembe pa v skladišče prenesete z ukazom <quote>Objavi</quote>."

#. Put one translator per line, in the form of NAME <EMAIL>.
#. (None)
#: ../source/TortoiseMerge_en.xml:0
msgid "translator-credits"
msgstr "Matjaž Čepon <matjaz.cepon@gmail.com>"

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