Fixed issue #365: Log - enter closes dialog

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

#
# Croatian 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:
# Mario Šarić <mario.saric@helix.hr>, 2006.
# Dinko Srkoč <dinko.srkoc@helix.hr>, 2006.
#
msgid ""
msgstr ""
"Project-Id-Version: TortoiseGit Documentation\n"
"POT-Creation-Date: 2006-06-30 00:11GMT Daylight Time\n"
"PO-Revision-Date: 2006-07-26 14:58+0100\n"
"Last-Translator: Lübbe Onken <luebbe@tigris.org>\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: Croatian\n"
"X-Poedit-Country: CROATIA\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-Basepath: ..\\\n"

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

#: source/TortoiseMerge_en.xml:6
#: (subtitle)
msgid "A diff/merge tool for Windows"
msgstr "Alat za pronalaženje razlika/stapanje datoteka"

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

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

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

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

#: source/TortoiseMerge_en.xml:17
#: (surname)
msgid "Onken"
msgstr "Onken"

#: source/TortoiseMerge_en.xml:24
#: (title)
msgid "Preface"
msgstr "Uvod"

#: source/TortoiseMerge_en.xml:29
#: (para)
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 sourcecode, 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 "U izradi projekata, bilo open-source gdje nekoliko osoba pregledava novi kod, ili u komercijalnim projektima uvijek će postojati korisnici koji će pronalaziti greške ili će htjeti nekako  pomoći projektu. Da bi to ostvarili slati će zakrpe koje će trebati pregledati i odlučiti da li ih želite prihvatiti, tj. primjeniti."

#: source/TortoiseMerge_en.xml:41
#: (para)
msgid "Reviewing patches"
msgstr "Pregledavanje zakrpa"

#: source/TortoiseMerge_en.xml:46
#: (para)
msgid "Applying the patches"
msgstr "Primjena zakrpa"

#: source/TortoiseMerge_en.xml:37
#: (para)
msgid "TortoiseMerge helps you with both those tasks: <placeholder-1/>"
msgstr "TortoiseMerge pomaže u oba zadatka: <placeholder-1/>"

#: source/TortoiseMerge_en.xml:52
#: (para)
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 također pomaže da sredite sporne datoteke koje su se mijenjale od strane različitih korisnika na istim djelovima koje ste i vi mijenjali."

#: source/TortoiseMerge_en.xml:62
#: (title)
msgid "TortoiseMerge is free!"
msgstr "TortoiseMerge je slobodan!"

#: source/TortoiseMerge_en.xml:63
#: (para)
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 slobodan. Ne trebate ništa platiti, možete ga koristiti na bilo koji način. Razvijan je pod licencom GPL licencom."

#: source/TortoiseMerge_en.xml:67
#: (para)
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 Open Source projekt. To znači da imate potpuni pristup izvornom kodu programa. Možete ga pogledati na ovom linku <ulink url=\"http://TortoiseGit.tigris.org/svn/TortoiseGit/\"><citetitle>http://TortoiseGit.tigris.org/svn/TortoiseGit/</citetitle></ulink>. (Korisnik guest, password ostavite prazno)Najnovija razvojna verzija (na kojoj trenutno radimo) je smještena na stazi <filename>/trunk/</filename>, a zadnja gotova verzija se nalazi u <filename>/tags/</filename>."

#: source/TortoiseMerge_en.xml:86
#: (title)
msgid "Wishlist"
msgstr "Popis želja"

#: source/TortoiseMerge_en.xml:87
#: (para)
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 "Iako su TortoiseGit i TortoiseMerge slobodni, možete podržati razvoj slanjem zakrpi i svojom aktivnom ulogom u razvoju. Možete nam također pomoći i razveseliti nas u dugim satima koje provodimo ispred naših računala."

#: source/TortoiseMerge_en.xml:93
#: (para)
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 CD's and DVD's: <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 "Dok radimo na TortoiseGit volimo slušati muziku. I kako provodimo mnoge sate na projektu potrebno nam je <emphasis>puno</emphasis> muzike. Zato smo postavili popis želja s odabranim glazbenim CD-ima i DVD-ovima: <ulink url=\"http://TortoiseGit.tigris.org/donate.html\"><citetitle>http://TortoiseGit.tigris.org/donate.html</citetitle></ulink> Molimo Vas da također da pogledate popis osoba koje doprinose projektu tako što šalju zakrpe ili prijevode."

#: source/TortoiseMerge_en.xml:109
#: (title)
msgid "Acknowledgments"
msgstr "Priznanja"

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

#: source/TortoiseMerge_en.xml:117
#: (para)
msgid "for the hard work on TortoiseMerge"
msgstr "za pravi posao na TortoiseMerge"

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

#: source/TortoiseMerge_en.xml:127
#: (para)
msgid "for the beautiful icons, logo, bughunting and taking care of the documentation"
msgstr "za divne ikone, logo, istjerivanje buha i brigu o dokumentaciji"

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

#: source/TortoiseMerge_en.xml:138
#: (para)
msgid "for some of the styles which are reused in this documentation"
msgstr "za neke stilove koji su korišteni u izradi dokumentacije"

#: source/TortoiseMerge_en.xml:145
#: (term)
msgid "Our Contributors"
msgstr "Našim suradnicima"

#: source/TortoiseMerge_en.xml:149
#: (para)
msgid "for the patches, bug reports and new ideas, and for helping others by answering questions on our mailing list."
msgstr "za zakrpe, izvještaje o greškama, novim idejama te za pomaganje u odgovorima na listama elektroničke pošte."

#: source/TortoiseMerge_en.xml:156
#: (term)
msgid "Our Donators"
msgstr "Našim donatorima"

#: source/TortoiseMerge_en.xml:160
#: (para)
msgid "for many hours of joy with the music they sent us"
msgstr "za mnoge sate veselja i uživanja u glazbi koju su nam poslali"

#: source/TortoiseMerge_en.xml:171
#: (title)
msgid "Introduction"
msgstr "Uvod"

#: source/TortoiseMerge_en.xml:180
#: (title)
msgid "Overview"
msgstr "Kratki pregled"

#: source/TortoiseMerge_en.xml:181
#: (para)
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 slobodan/open-source program. Omogućava pregled razlika u tekst datotekama, stapanje razlika i uređivanje i primjenu datoteka objedinjenih razlika - često nazivanih <firstterm>zakrpama</firstterm>."

#: source/TortoiseMerge_en.xml:186
#: (para)
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 "Dok radite na tekst datotekama, napr. programirate u vašem omiljenom programskom jeziku ili pišete html/xml datoteke za dokumentaciju, često ćete poželjeti usporediti različite verzije istih datoteka. Ponekad ćete od nekoga dobiti raličitu verziju datoteke, ili drugi put ćete htjeti pogledati koje ste promjene sami napravili."

#: source/TortoiseMerge_en.xml:194
#: (para)
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 "Ako koristite sustav za upravljanje verzijama (napr. Git) tada ćete ponekad imati <emphasis>sporne dijelove</emphasis> kada obnavljate vašu radnu kopiju. To se događa ako netko drugi promjeni iste dijelove datoteke koju ste i vi promijenili. Tada treba ručno riješiti ove sporove. U tome će vam pomoći TortoiseMerge."

#: source/TortoiseMerge_en.xml:202
#: (para)
msgid "The following diagram shows you the relationships between the files involved in a conflict:"
msgstr "Slijedeći dijagram pokazuje odnose između datoteka koje imaju sporne dijelove."

#: source/TortoiseMerge_en.xml:207
#: (title) source/TortoiseMerge_en.xml:381
msgid "File Conflict"
msgstr "Sukob datoteka"

#: source/TortoiseMerge_en.xml:210
#: (para)
msgid "A conflict can also occur if you try to apply an outdated patchfile. In such cases, without TortoiseMerge, you would either have to ask the person you got that patchfile from for a current version or try to apply that patchfile manually."
msgstr "Sukob se može dogoditi ako pokušate primjeniti zastarjele zakrpe. U tim slučajevima, bez TortoiseMergea, morali biste tražiti osobu od koje ste dobili zakrpu da vam pošalje trenutnu verziju ili pokušati primjeniti zakrpu ručno."

#: source/TortoiseMerge_en.xml:216
#: (para)
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 patchfile 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 "No ako koristite Git ili TortoiseMerge to više nije potrebno. TortoiseMerge parsira zakrpu kako bi pronašao verziju za koju je zakrpa namijenjena i automatski pokušava dobaviti tu verziju iz skladišta verzija. Tada primijenjuje zakrpu i omogućava vam pregled promjena \"pokrpanoj\" datoteci i vaših promjena. Vi tada odlučujete koje promjene želite zadržati."

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

#: source/TortoiseMerge_en.xml:232
#: (para)
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 "Tijekom rada na <ulink url=\"http://TortoiseGit.tigris.org\"><citetitle>TortoiseGit</citetitle></ulink> primjetili smo da imamo dosta posla kad nam korisnici pošalju zakrpu kako bi ispravili neku grešku ili unaprijedili program. I u mnogo slučajeva zakrpe su bili zastarjele i nismo ih mogli primjeniti koristeći komandnolinijski alat <ulink url=\"http://unxutils.sourceforge.net/\"><citetitle>http://unxutils.sourceforge.net/</citetitle></ulink> zato jer smo i sami promjenili iste datoteke."

#: source/TortoiseMerge_en.xml:247
#: (para)
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 bio i glavni razlog zašto TortoiseGit nije odmah u početku imao naredbu <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Izradii zakrpu</guimenuitem></menuchoice>: zapravo nam je bilo jednostavnije primjeniti izmjene kad od korisnika dobijemo cijele datoteke."

#: source/TortoiseMerge_en.xml:257
#: (para)
msgid "So we spent a lot of time, searching the internet for a GUI tool which could apply patchfiles, 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 "Tada smo potrošili dosta vremena u potrazi za GUI alatom kojim bismo mogli primjenti zakrpe, ali sve što smo našli na internetu bilo je da takav alat ne postoji. Da skratimo priču: Odlučili smo da ovakav alat sami napišemo. Tako se rodio TortoiseMerge."

#: source/TortoiseMerge_en.xml:264
#: (para)
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. Also it reduces the size of the executable since TortoiseGit and TortoiseMerge can both use the same dll's."
msgstr "Kako TortoiseGit već upotrebljava Git library, koji ima ugrađene spretne razlikovne algoritme, bilo je prirodno da koristimo tu zbirku umjesto GNU programa za razlike. Tako smo dobili uštedu na veličini datoteka programa jer su TortoiseGit i TortoiseMerge upotrebljavali iste dll-ove."

#: source/TortoiseMerge_en.xml:274
#: (title)
msgid "Using TortoiseMerge"
msgstr "Korištenje TortoiseMergea"

#: source/TortoiseMerge_en.xml:283
#: (title)
msgid "Open Files"
msgstr "Otvaranje datoteka"

#: source/TortoiseMerge_en.xml:285
#: (para)
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 "Kada pokrenete TortoiseMerge bez argumenata, trebat ćete otvoriti datoteke ručno koristeći <menuchoice><guimenu>Datoteka</guimenu><guimenuitem>Otvori</guimenuitem></menuchoice>."

#: source/TortoiseMerge_en.xml:294
#: (title)
msgid "The Open Dialog"
msgstr "Dijalog za otvaranje datoteke"

#: source/TortoiseMerge_en.xml:297
#: (para)
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 patchfile. Depending on what you choose, the corresponding edit boxes and browse buttons are activated."
msgstr "Prva stvar koju trebate napraviti jest odluka da li želite usporediti ili stopiti dvije verzije iste datoteke, ili želite primjeniti zakrpu. Ovisno o toj odluci, aktiviraju se odgovarajuće komponente na dijalogu."

#: source/TortoiseMerge_en.xml:304
#: (title)
msgid "Viewing / Merging"
msgstr "Pregled / Stapanje"

#: source/TortoiseMerge_en.xml:305
#: (para)
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. You can switch between those two views with the menu command <menuchoice><guimenu>View</guimenu><guimenuitem>Oneway Diff</guimenuitem></menuchoice>"
msgstr "Ako želite usporediti / stopiti datoteke, morate postaviti najmanje dvije od tri moguće staze za  <literal>Osnovnu</literal>, <literal>Moju</literal> and <literal>Njihovu</literal> datoteku. Ako odaberete samo dvije datoteke, TortoiseMerge će pokazati razlike između dvije datoteke, ili pomoću dva usporedna okvira ili u jednom okviru. Možete sami odabrati / mijenjati ovaj način pregledavanja razlika pomoću izbornika <menuchoice><guimenu>Pogled</guimenu><guimenuitem>Jednostruke razlike</guimenuitem></menuchoice>"

#: source/TortoiseMerge_en.xml:319
#: (title)
msgid "One Pane View"
msgstr "Pogled na razlike u jednom prozoru"

#: source/TortoiseMerge_en.xml:323
#: (title)
msgid "Two Pane View"
msgstr "Pogled na razlike u dva prozora"

#: source/TortoiseMerge_en.xml:331
#: (para)
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 "Promjene unutar mijenjanih linija se prikazuju u različitim bojama. Dodani tekst je prikazan svijetlijom bojom, a sami možete izabrati boje. Obrisani dijelovi se prikazuju tamno smeđom okomitom crtom u tekstu. U slici iznad možete vidjeti primjer."

#: source/TortoiseMerge_en.xml:341
#: (para)
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 "Reorganizacija izvornog koda podrazumijeva puno promijena u prazninama (razmaci, nove linije i dr.) ali bez pravih promjena koda. Na primjer, prelomite jako dugu liniju u nekoliko redaka, ili ponekad spojite nekoliko redaka u jedan."

#: source/TortoiseMerge_en.xml:340
#: (listitem)
msgid "<placeholder-1/> 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. <placeholder-2/>"
msgstr "<placeholder-1/> Takve promjene su označene bijelim kružnim simbolom na lijevoj strani. Ako vidite takav simbol, odmah znate da tu nema pravih promjena i ne morate provjeravati taj blok. <placeholder-2/>"

#: source/TortoiseMerge_en.xml:326
#: (para)
msgid "The two pane view has some features which are not available in the one pane view: <placeholder-1/>"
msgstr "Dvostrani pogled ima neke mogućnosti koje nisu dostupne u jednostrukom pogledu: <placeholder-1/>"

#: source/TortoiseMerge_en.xml:356
#: (para)
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 "Ako želite usporediti/stopiti tri datoteke, TortoiseMerge će pokazati razlike u trostrukom pogledu. Ovaj način se koristi i ako želite razriješiti sukobljene datoteke."

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

#: source/TortoiseMerge_en.xml:365
#: (para)
msgid "The left pane shows you the differences between <literal>Their</literal> file and the <literal>Base</literal> file, while the right pane shows you the differences between <literal>Mine</literal> file and the <literal>Base</literal> file. The bottom pane shows you the result of merging <literal>Base</literal>, <literal>Mine</literal> and <literal>Theirs</literal> with possible conflicts. If you hover the mouse over the pane title, a tooltip will show the filenames used for the diff in each pane."
msgstr "Lijevi okvir pokazuje razlike između <literal>Njihove</literal> datoteke i <literal>Osnove</literal>, dok desni okvir  pokazuje razlike između <literal>Moje</literal> datoteke i  <literal>Osnove</literal>. Donji okvir pokazuje rezultat stapanja sve tri datoteke (<literal>Osnove</literal>, <literal>Moje</literal> i <literal>Njihove</literal> sa mogućim sukobima. Ako pređete mišem iznad naslova nekog okvira, pojavit će se imena datoteka koje su korištene za razlike prikazane u tom okviru."

#: source/TortoiseMerge_en.xml:376
#: (para)
msgid "The relationships between the three files are explained in the diagram below:"
msgstr "Odnosi između tri datoteke su opisane slijedećim dijagramom:"

#: source/TortoiseMerge_en.xml:384
#: (para)
msgid "The base file represents the oldest version of a file, from where <literal>You</literal> and <literal>They</literal> start making changes. <literal>Mine</literal> represents the base file with all the changes <emphasis>you</emphasis> made, and <literal>Theirs</literal> is the file with all the changes <emphasis>someone else</emphasis> made to the file."
msgstr "Osnova predstavlja najstariju verziju datoteke od koje ste <literal>Vi</literal> i <literal>Oni</literal> počeli raditi izmjene. <literal>Moja</literal> datoteka predstavlja osnovnu datoteku sa svim promjena koju ste <emphasis>vi</emphasis> napravili, a <literal>Njihova</literal> je datoteka sa svim promjenama koje je <emphasis>netko drugi</emphasis> napravio na datoteci."

#: source/TortoiseMerge_en.xml:394
#: (title)
msgid "Applying Patches"
msgstr "Primjena zakrpi"

#: source/TortoiseMerge_en.xml:395
#: (para)
msgid "If you want to apply a patchfile you have to set both the path to the patchfile itself and the path to the folder where the patchfile should be applied."
msgstr "Ako želite primjeniti zakrpu morate postaviti datoteku sa zarkpom i datoteku na koju zarkpu želite primjeniti."

#: source/TortoiseMerge_en.xml:401
#: (para)
msgid "Currently, only patchfiles in <emphasis>Unified Diff Format</emphasis> are supported. And only files which were generated from a Git working copy. Other formats like patchfiles generated by CVS are currently not supported!"
msgstr "Trenutno su podržane samo zakrpe u formatu <emphasis>objedinjenih razlika</emphasis>, te datoteke koje su generirane iz radne kopije Gita. Ostali formati kao zakrpe koje generira CVS trenutno nisu podržane!"

#: source/TortoiseMerge_en.xml:414
#: (title)
msgid "Patch Filelist"
msgstr "Popis zakrpi"

#: source/TortoiseMerge_en.xml:409
#: (para)
msgid "If TortoiseMerge is able to parse the patchfile it will show you a small window with all the files which have changes according to the patchfile. <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 "Ako TortoiseMerge može parsirati zakrpu pokazat će se mali prozor sa svim datotekama koje su se promijenile prema odabranoj zakrpi. <placeholder-1/> Ako  je datoteka navedena crnim slovima, tada se zakrpa može primjeniti bez problema. To znači da datoteka nije zastarjela. Kad je datoteka u popisu navedena crvenim slivma, zakrpa se ne može direktno primjeniti jer ste datoteku i sami mijenjali."

#: source/TortoiseMerge_en.xml:423
#: (para)
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 <literal>Base</literal> (the older version of the file), <literal>Mine</literal> (the file as it is currently in your working copy) and <literal>Theirs</literal> (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually."
msgstr "No, ne brinite. Ako ste radili sa Git-om, možete dobaviti stariju verziju datoteke i razriješiti sukob. U stvari, TortoiseMerge automatski pokušava dobiti stariju datoteku i prikazuje razlike izmjeđu <literal>Osnove</literal> (starija verzija datoteke)  i <literal>Moje</literal> i <literal>Njihove</literal> datoteke. Tada možete ručno razrijšti moguće sukobe."

#: source/TortoiseMerge_en.xml:434
#: (para)
msgid "The patchfile 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 "Prozor ima izbornik okoline koji omogućava da pregledate rezultat \"krpanja\" (primjene zakrpe), a također i da snimite promjene na odbaranoj datoteci ili da primjenite zakrpe i snimite  <emphasis>sve</emphasis> datoteke iz popisa. Duplim klikom dobivate pregled zakrpane datoteke."

#: source/TortoiseMerge_en.xml:442
#: (para)
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 "Ovisno o tome da li TortoiseMerge može zakrpati datoteku direktno ili tako da dohvati stariju verziju iste, pokazuje dvostrani (direktna primjena zakrpe)  ili trostrani pogled na razlike (dohvaćanje starije verzije datoteke)."

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

#: source/TortoiseMerge_en.xml:457
#: (title)
msgid "The Toolbar"
msgstr "Traka s alatima"

#: source/TortoiseMerge_en.xml:464
#: (para)
msgid "<guibutton>Open</guibutton> accesses the file-open dialog. What else?"
msgstr "<guibutton>Otvori</guibutton> otvara dijalog za odabir datoteke. A što bi drugo? :-))"

#: source/TortoiseMerge_en.xml:470
#: (para)
msgid "<guibutton>Save</guibutton> saves any changes you have made. If you have selected <guilabel>Resolve conflicted Git status on save</guilabel> in the settings dialog, then Git's conflict working files will be deleted automatically if all conflicts were resolved."
msgstr "<guibutton>Snimi</guibutton> sprema sve promjene koje ste  napravili. Ako ste u postavkama odabrali <guilabel>Razriješi Git status sukoba prilikom snimanja</guilabel>, tada će Git dodatne datoteke za obradu sukoba biti obrisane ako su svi sukobi razriješeni."

#: source/TortoiseMerge_en.xml:481
#: (para)
msgid "<guibutton>Reload</guibutton> discards any changes you have made and reloads the original files."
msgstr "<guibutton>Ponovo učitaj</guibutton> odbacuje sve promjene i ponovo učitava datoteke."

#: source/TortoiseMerge_en.xml:488
#: (para)
msgid "<guibutton>Undo</guibutton> This feature is not enabled yet."
msgstr "<guibutton>Undo</guibutton> Ova mogućnost još nije implementirana."

#: source/TortoiseMerge_en.xml:494
#: (para)
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 "<guibutton>Prethodna/Slijedeća razlika</guibutton> skače direktno na slijedeće mjesto gdje se datoteke razlikuju."

#: source/TortoiseMerge_en.xml:500
#: (para)
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 "Kada to radite u dvostranom pogledu razlika, traka na dnu ekrana će pokazivati na razlike unutar prvog retka tog bloka, bez obzira na to gdje se nalazi miš."

#: source/TortoiseMerge_en.xml:507
#: (para)
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 "<guibutton>Prethodni/slijedeći sukob</guibutton> skače direktno na slijedeće mjesto gdje su datoteke u sukobu i treba ga razriješiti."

#: source/TortoiseMerge_en.xml:514
#: (para)
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 kao riješeno</guibutton> Kad razriješite sve sukobe u datoteci i snimite izmjene, možete odmah označiti datoteke kao riješene umjesto da odlazite nazad u explorer kako bi ih tamo označili."

#: source/TortoiseMerge_en.xml:523
#: (para)
msgid "<guibutton>Show Spaces</guibutton> toggles the option to display space and tab characters as symbols so you can distinguish white space changes."
msgstr "<guibutton>Pokaži razmake</guibutton> klacka opciju za pokazivanje razmaka i tabova kao simbola, tako da možete razlikovati razlike u razmacima."

#: source/TortoiseMerge_en.xml:530
#: (para)
msgid "<guibutton>Switch View</guibutton> selects between one-pane and two-pane view. Disabled in 3-pane view."
msgstr "<guibutton>Zamijeni pogled</guibutton> gumbom mijenjate jednostrani i dvostrani pogled. Ovo je onemogućeno u trostranom pogledu."

#: source/TortoiseMerge_en.xml:537
#: (para)
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>Zamijeni lijevo i desno</guibutton> U dvostranom pogledu, zamijenjuje lijevi i desni okvir. Kada uspoređujete datoteku u dvjema različitim mapama, suprotno od dvije različite revizije iste datoteke, TortoiseGit ne zna koju datoteku bi pokazao lijevo kao <quote>originalnu/osnovnu</quote> verziju. Kad to krivo odabere, možete to promijeniti ovim gumbom kako biste lakše pregledali razlike. "

#: source/TortoiseMerge_en.xml:548
#: (para)
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/sakrij popis zakrpi</guibutton> Kad TortoiseMerge ima popis zakrpi, ovaj gumb omogućava da se taj popis sakrije (da vidite oba okvira), ili da se pokaže (kako biste pregledali popis datoteka)."

#: source/TortoiseMerge_en.xml:556
#: (para)
msgid "<guibutton>Settings</guibutton> takes you to TortoiseMerge's settings dialog."
msgstr "<guibutton>Postavke</guibutton> otvara dijalog s TortoiseMerge postavkama."

#: source/TortoiseMerge_en.xml:455
#: (para)
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/> Ispod trake s izbornikom nalazi se traka s alatima. Ona omogućava brži pristup najčešće korištenim alatima, koji su <placeholder-2/>"

#: source/TortoiseMerge_en.xml:563
#: (para)
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 lijevoj strani prozora je traka s lokacijom. Ona nudi brzu viizualnu sliku gdje su promjene unutar datoteke. Ova traka ima tri stupca. Lijevi stupac odgovara lijevom okviru, desni stupac - desnom, a srednji stupac odgovara donjem okviru (ako je aktivan trostrani pogled). U jednostranom pogledu koristi se samo lijevi stupac. Ova traka može se također koristiti za pomicanje unutar svih otvorenih datoteka odjednom."

#: source/TortoiseMerge_en.xml:572
#: (para)
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. The left side of the status bar is used to display hints when you hover the mouse over a control."
msgstr "Ispod donjeg okvira nalazi se traka statusa. Ona pokazuje broj redaka koji su dodani i obrasani u <literal>Njihovoj</literal> i <literal>Mojoj</literal> datoteci, a također i broj preostalih neriješenih sukoba. Lijeva strana trake statusa se koristi za ispis savjeta kada se miš nalazi iznad neke kontrole."

#: source/TortoiseMerge_en.xml:585
#: (title)
msgid "Merging / Editing Conflicts"
msgstr "Stapanje / Uređivanje sukoba"

#: source/TortoiseMerge_en.xml:586
#: (para)
msgid "TortoiseMerge not only <emphasis>shows</emphasis> you the differences between files but also lets you resolve conflicts or apply changes."
msgstr "TortoiseMerge nije ovdje samo kako bi <emphasis>pokazao</emphasis> razlike između datoteka, već i omogućava da razriješite sukobe ili primjenite izmjene."

#: source/TortoiseMerge_en.xml:590
#: (para)
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 "U dvostranom pogledu možete uređivati datoteku u desnom okviru (<literal>Moja</literal>). Kako bi preuzeli promjene iz lijevog okvira (<literal>Njihova</literal>), <action>desni klik</action> na promijenjenim retcima i odaberite <menuchoice><guimenu>Menu</guimenu><guimenuitem>Uzmi blok redaka iz <quote>Njihove</quote></guimenuitem></menuchoice>. Tako će se promjene iz lijeve strane prenesti u desnu datoteku."

#: source/TortoiseMerge_en.xml:602
#: (para)
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 "Ako ste u trostranom pogledu (ponekad ga zovemo <emphasis>pogled za stapanje</emphasis>) možete uređivati samo datoteku u donjem okviru (<literal>Stopljena</literal>). Kao i u dvostranom pogledu, možete koristiti <action>desni klik</action> na redcima u sukobu i odabrati <menuchoice><guimenu>Menu</guimenu><guimenuitem>Uzmi blok redaka iz <quote>njihove</quote></guimenuitem></menuchoice> ili <menuchoice><guimenu>Menu</guimenu><guimenuitem>Uzmi blok redaka iz Uzmi blok redaka iz  <quote>moje</quote></guimenuitem></menuchoice>. Dodatno, ako želite preuzeti <emphasis>oba</emphasis> bloka, možete odabrati <menuchoice><guimenu>Menu</guimenu><guimenuitem> Uzmi blok iz <quote>moje</quote> prije <quote>njihovog</quote></guimenuitem></menuchoice> ili <menuchoice><guimenu>Context Menu</guimenu><guimenuitem> Uzmi blok iz <quote>njihove</quote> prije <quote>mog</quote></guimenuitem></menuchoice>. Već prema odabranoj akciji promjene će se vidjeti u <literal>Stopljenoj</literal> datoteci."

#: source/TortoiseMerge_en.xml:639
#: (para)
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 "Ponekad je sukob teško razriješiti tako da odaberete <literal>Njihovu</literal> i/ili <literal>Moju</literal> i zahtjeva ručno mijenjanje. TortoiseMerge omogućava da napravite sve lagane/vizualne promjene i snimite datoteku, tako da vam ostanu samo teže promjene koje traže ručnu promjenu teksta."

#: source/TortoiseMerge_en.xml:647
#: (para)
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 "Ako koristite TortoiseMerge na istim datoteka ponovo, sve promene na radnoj kopiji, bilo u TortoiseMerge ili ručne promjene <emphasis>bit će izgubljene</emphasis> i datoteka će biti onakva kakva je bila prije početka razrješavanja sukoba."

#: source/TortoiseMerge_en.xml:655
#: (para)
msgid "If you need to copy lines of text to insert in another file using your favourite text editor, you can select multiple lines to copy within TortoiseMerge. <action>Click</action> on the first line of the block, then <action>Shift+Click</action> on the last line of the block. As usual, <action>Ctrl+C</action> can be used to copy the selected lines to the clipboard."
msgstr "Ako želite kopirati retke teksta da bi ih umetnuli u drugu datoteku koristeći vaš omiljeni tekst editor, možete označiti više redaka da bi ih kopirali unutar TortoiseMergea. <action>Klik</action> na prvom redku bloka, te onda <action>Shift+klik</action> na zadnjem redku bloka. Kao i običnol, <action>Ctrl+C</action> možete koristiti kako bi označene redke kopirali u priručni spremnik."

#: source/TortoiseMerge_en.xml:668
#: (title)
msgid "Settings"
msgstr "Postavke"

#: source/TortoiseMerge_en.xml:670
#: (title)
msgid "Main Settings Page"
msgstr "Osnovne postavke"

#: source/TortoiseMerge_en.xml:673
#: (title)
msgid "The Settings Main Page"
msgstr "Glavna stranica za postavke"

#: source/TortoiseMerge_en.xml:676
#: (para)
msgid "Most of the options here are self-explanatory, but a few points need clarifying."
msgstr "Većina mogućnosti je sama po sebi razumljiva, no nekoliko njih traži pojašnjenje."

#: source/TortoiseMerge_en.xml:680
#: (para)
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>Spremanje originalne datoteke</guilabel> mijenja ime originalnoj datoteci u radnoj kopiji u <literal>datoteka.bak</literal> prije snimanja promjena."

#: source/TortoiseMerge_en.xml:685
#: (para)
msgid "<guilabel>Ignore lineendings</guilabel> hides changes which are due solely to difference in line-end style."
msgstr "<guilabel>Zanemari završetke redaka</guilabel> sakriva one promjene koje su nastale samo zbog razlike u stilu završetaka redaka."

#: source/TortoiseMerge_en.xml:689
#: (para)
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>Zanemari velika/mala slova</guilabel> sakriva promjene koje su nastale samo zbog razlika u velikim ili malim slovima unutar tekstač. Ovo može biti dosta korisno s aplikacijama kao što je Visual Basic, koji mijenja velika/mala slova u varijablama automatski i bez upozorenja."

#: source/TortoiseMerge_en.xml:695
#: (para)
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>Usporedi praznine</guilabel> pokazuje sve promjene u uvlačenju i prazninama unutar retka kao i u dodanim ili obrisanim retcima (kao i Git za pohranjivanje verzija)"

#: source/TortoiseMerge_en.xml:700
#: (para)
msgid "<guilabel>Ignore Leading Whitespaces</guilabel> hides changes which are due solely to leading whitespace (indentation). Other whitespace changes within a line are shown <quote>inline</quote> rather than as added/removed lines."
msgstr "<guilabel>Zanemari vodeće praznine</guilabel> sakriva promjene koje su nastale samo zbog uvlačenja retka (vodeće praznine). Ostale promjene u razmacima unutar retka su prikazane."

#: source/TortoiseMerge_en.xml:706
#: (para)
msgid "<guilabel>Ignore All Whitespaces</guilabel> hides all whitespace-only changes."
msgstr "<guilabel>Zanemari sve praznine</guilabel> sakriva sve promjene nastale zbog praznina."

#: source/TortoiseMerge_en.xml:712
#: (title)
msgid "Colour Settings Page"
msgstr "Postavke boja"

#: source/TortoiseMerge_en.xml:715
#: (title)
msgid "The Settings Color Page"
msgstr "Stranica za postavke boja"

#: source/TortoiseMerge_en.xml:718
#: (para)
msgid "This dialog allows you to select the background color coding used to highlight the different line changes."
msgstr "Ovaj dijalog omogućava vam da odaberete postavke boja koje se koriste za označavanje razlčitih promjena."

#: source/TortoiseMerge_en.xml:724
#: (term)
msgid "Normal"
msgstr "Normal"

#: source/TortoiseMerge_en.xml:725
#: (listitem)
msgid "All lines which are unchanged, or where changes are hidden."
msgstr "Svi redci koji nisu mijenjani ili promjene zbog postavki nisu prikazane."

#: source/TortoiseMerge_en.xml:730
#: (term)
msgid "Removed"
msgstr "Uklonjeni"

#: source/TortoiseMerge_en.xml:731
#: (listitem)
msgid "Lines which have been deleted."
msgstr "Redci koji su obrisani."

#: source/TortoiseMerge_en.xml:736
#: (term)
msgid "Added"
msgstr "Dodani"

#: source/TortoiseMerge_en.xml:737
#: (listitem)
msgid "Lines which have been added."
msgstr "Redci koji su dodani."

#: source/TortoiseMerge_en.xml:742
#: (term)
msgid "Empty"
msgstr "Prazni"

#: source/TortoiseMerge_en.xml:743
#: (listitem)
msgid "Where lines have been added in the opposite pane, and no such line existed in this pane."
msgstr "Gdje su redci dodani u suprotnom okviru, a takvi redci nisu postojali u trenutnom okviru."

#: source/TortoiseMerge_en.xml:749
#: (term)
msgid "Conflicted"
msgstr "Sukobljeni"

#: source/TortoiseMerge_en.xml:750
#: (listitem)
msgid "Where the same line has been changed in both files."
msgstr "Gdje je isti redak bio mijenjan u obje datoteke."

#: source/TortoiseMerge_en.xml:755
#: (term)
msgid "Line with whitespace diff"
msgstr "Redci sa razlikama u prazninama"

#: source/TortoiseMerge_en.xml:759
#: (guilabel)
msgid "Ignore leading whitespace"
msgstr "Zanemari vodeće praznine"

#: source/TortoiseMerge_en.xml:756
#: (listitem)
msgid "Lines which contain whitespace differences other than leading whitespace. Only appears when <placeholder-1/> is selected."
msgstr "Redci koji sadrže razlike u prazninama a da to nisu samo vodeće praznine. Pojavljuje se samo kad je označeno <placeholder-1/>."

#: source/TortoiseMerge_en.xml:764
#: (term)
msgid "Whitespace diff"
msgstr "Razlike u prazninama"

#: source/TortoiseMerge_en.xml:765
#: (listitem)
msgid "In the case above, the actual whitespace difference is highlighted using this color."
msgstr "U gornjem slučaju, razlika u prazninama je označena ovom bojom."

#: source/TortoiseMerge_en.xml:775
#: (title)
msgid "keyboard shortcuts"
msgstr "prečaci na tipkovnici"

#: source/TortoiseMerge_en.xml:777
#: (para)
msgid "List of keyboard shortcuts and commands."
msgstr "Popis prečaca i akcija."

#: source/TortoiseMerge_en.xml:782
#: (title)
msgid "Keyboard shortcuts"
msgstr "Prečaci sa tipkovnice"

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

#: source/TortoiseMerge_en.xml:787
#: (para)
msgid "Quit the program"
msgstr "Izađi iz programa"

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

#: source/TortoiseMerge_en.xml:795
#: (para)
msgid "Copy the selected line(s) to the clipboard"
msgstr "Kopiraj označene redke u priručni spremnik"

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

#: source/TortoiseMerge_en.xml:803
#: (para)
msgid "Open the Find dialog for text searches"
msgstr "Otvara dijalog za pretraživanje teksta"

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

#: source/TortoiseMerge_en.xml:811
#: (para)
msgid "Open files to diff/merge"
msgstr "Otvara datoteke za usporedbu/stapanje"

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

#: source/TortoiseMerge_en.xml:819
#: (para)
msgid "Save the changes"
msgstr "Snima promjene"

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

#: source/TortoiseMerge_en.xml:827
#: (para)
msgid "Save as..."
msgstr "Snimi kao..."

#: source/TortoiseMerge_en.xml:833
#: (term)
msgid "F7 or cursor-right"
msgstr "F7 ili desna strelica"

#: source/TortoiseMerge_en.xml:835
#: (para)
msgid "Go to next difference"
msgstr "Skoči na slijedeću razliku"

#: source/TortoiseMerge_en.xml:841
#: (term)
msgid "Shift-F7 or cursor-left"
msgstr "Shift-F7 ili lijeva strelica"

#: source/TortoiseMerge_en.xml:843
#: (para)
msgid "Go to previous difference"
msgstr "Skoči na prethodnu razliku"

#: source/TortoiseMerge_en.xml:849
#: (term)
msgid "Shift-cursor-right"
msgstr "Shift-desna strelica"

#: source/TortoiseMerge_en.xml:851
#: (para)
msgid "Go to next conflict"
msgstr "Skoči na slijedeći sukob"

#: source/TortoiseMerge_en.xml:857
#: (term)
msgid "Shift-cursor-left"
msgstr "Shift-lijeva strelica"

#: source/TortoiseMerge_en.xml:859
#: (para)
msgid "Go to previous conflict"
msgstr "Skoči na prethodni sukob"

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

#: source/TortoiseMerge_en.xml:867
#: (para)
msgid "Toggle between one-pane diff and two-pane diff"
msgstr "Zamijeni jednostrani i dvostrani pogled"

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

#: source/TortoiseMerge_en.xml:875
#: (para)
msgid "Reload the files and revert all changes made"
msgstr "Ponovo učitaj datoteke i poništi sve promjene"

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

#: source/TortoiseMerge_en.xml:883
#: (para)
msgid "Toggles between showing whitespaces or not"
msgstr "Zamijeni sa ili bez prikaza praznina"

# mi
#: source/TortoiseMerge_en.xml:889
#: (term)
msgid "Ctrl-wheelmouse"
msgstr "Ctrl-kotačić miša"

#: source/TortoiseMerge_en.xml:891
#: (para)
msgid "Scroll the display left/right"
msgstr "Pomakni prikaz lijevo/desno"

#: source/TortoiseMerge_en.xml:900
#: (title)
msgid "Automating TortoiseMerge"
msgstr "Automatiziranje TortoiseMergea"

#: source/TortoiseMerge_en.xml:902
#: (para)
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 se može pokrenuti sa parametrima u komandoj liniji kako bi se izbjegla potraga za datotekom pomoću dijaloga Otvori. Ovo je korisno i ako želite koristiiti TortoiseMerge iz neke druge aplikacije."

#: source/TortoiseMerge_en.xml:913
#: (title)
msgid "TortoiseMerge Command Line Switches"
msgstr "TortoiseMerge komandno linijski parametri"

#: source/TortoiseMerge_en.xml:915
#: (primary)
msgid "automation"
msgstr "automatizacija"

#: source/TortoiseMerge_en.xml:918
#: (primary)
msgid "command line"
msgstr "komandna linija"

#: source/TortoiseMerge_en.xml:920
#: (para)
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 opcija zahtjeva dodatnu informaciju kao neki tekst. U tim slučajevima dodajte ':' na opciju i iza napišite text. Na primjer: <screen>\n"
"/base:\"c:\\mapa\\moja osnovna datoteka.txt\"\n"
"</screen>"

#: source/TortoiseMerge_en.xml:940
#: (title)
msgid "List of available command line options"
msgstr "Popis dostupnih opcija komandne linije"

#: source/TortoiseMerge_en.xml:946
#: (entry)
msgid "Command"
msgstr "Naredba"

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

#: source/TortoiseMerge_en.xml:953
#: (entry)
msgid "Shows a dialog box with the most important command line switches."
msgstr "Pokazuje dijalog s najznačajnijim opcijama komandne linije"

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

#: source/TortoiseMerge_en.xml:960
#: (entry)
msgid "The same as <placeholder-1/>."
msgstr "Isto kao i <placeholder-1/>."

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

#: source/TortoiseMerge_en.xml:966
#: (entry)
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 "Određuje <placeholder-1/> datoteku korištenu za trostranu razliku. Ovo je zajednička starija verzija za datoteke koje se uspoređuju, mada nije prikazana u posebnom prozoru. U dvostranom pogledu ovo bi bila datoteka iz lijevog okvira."

#: source/TortoiseMerge_en.xml:976
#: (entry)
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. Ovo je prikazano u naslovu umjesto pune staze datoteke. U trostranom pogledu ovo je prikazano kao tooltip za naslov."

#: source/TortoiseMerge_en.xml:986
#: (emphasis)
msgid "theirs"
msgstr "njihova"

#: source/TortoiseMerge_en.xml:985
#: (entry)
msgid "Specifies the <placeholder-1/> file used in three way diffs, displayed in the left pane."
msgstr "Označava <placeholder-1/> datoteku korištenu u trostranom pogledu, prikazanu u lijevom okviru."

#: source/TortoiseMerge_en.xml:992
#: (entry)
msgid "The name of the theirs file. This is shown in the view title instead of the file path."
msgstr "Ime njihove datoteke. Ovo je pokazano u naslovu pogleda umjesto pune staze datoteke."

#: source/TortoiseMerge_en.xml:1000
#: (emphasis)
msgid "mine"
msgstr "moja"

#: source/TortoiseMerge_en.xml:999
#: (entry)
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 "Označava <placeholder-1/> datoteku koja se koristi u trostranom pogledu, prikazana u desnom okviru. Za dvostranu razliku, ovo je desna datoteka."

#: source/TortoiseMerge_en.xml:1007
#: (entry)
msgid "The name of the mine file. This is shown in the view title instead of the file path."
msgstr "Ime moje datoteke. Ono je prikazano u naslovu pogleda umjesto pune staze datoteke."

#: source/TortoiseMerge_en.xml:1015
#: (emphasis)
msgid "merged"
msgstr "stopljeno"

#: source/TortoiseMerge_en.xml:1014
#: (entry)
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 "Označava datoteku koja je proizvod <placeholder-1/> stapanja u trostranom načinu. Ovo je ime datoteke u koju će se snimiti rezultat stapanja/sukoba. Ako ovo nije postavljeno, TortoiseMerge će pitati kamo da snimi rezultat."

#: source/TortoiseMerge_en.xml:1024
#: (entry)
msgid "The name of the merged file. This is shown in the view title instead of the file path."
msgstr "Ime stopljene datoteke. Ovo je prikazano u naslovu pogleda umjesto punog imena datoteke."

#: source/TortoiseMerge_en.xml:1035
#: (emphasis)
msgid "very long"
msgstr "vrlo dugačko"

#: source/TortoiseMerge_en.xml:1031
#: (entry)
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 patchfile, but that can take <placeholder-1/>."
msgstr "Puno ime datoteke gdje će zakrpa biti primjenjena. Ako niste postavili stazu, TortoiseMerge će pokušati sam pronaći stazu kako bi je uskladio sa stazama nevedenim u zakrpi, no to može potrajati <placeholder-1/>. "

#: source/TortoiseMerge_en.xml:1040
#: (entry)
msgid "The name of the original file to patch. Used for the view title."
msgstr "Ime originalne datoteke za krpanje. Nalazi se u naslovu prozora."

#: source/TortoiseMerge_en.xml:1047
#: (entry)
msgid "The name of the resulting patched file. Used for the view title."
msgstr "Ime zakrpane datoteke. Nalazi se u naslovu prozora."

#: source/TortoiseMerge_en.xml:1054
#: (entry)
msgid "The path to the patch/diff file to apply to a directory."
msgstr "Staza do zakrpe ili razlike koju treba primjeniti na mapu."

#: source/TortoiseMerge_en.xml:1060
#: (entry)
msgid "Forces TortoiseMerge to start with the one-way view instead of the view the user specified in the settings."
msgstr "Određuje da će se TortoiseMerge pokrenuti u jednostranom pogledu umjesto u načinu koji je odredio korisnik u postavkama."

#: source/TortoiseMerge_en.xml:1067
#: (entry)
msgid "Switches the left and right view of the specified two files to diff."
msgstr "Zamjenjuje lijevu i desnu stranu za datoteke koje se žele usporediti."

#: source/TortoiseMerge_en.xml:1082
#: (title)
msgid "Glossary"
msgstr "Riječnik"

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

#: source/TortoiseMerge_en.xml:1086
#: (para)
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 "Git naredba koja se koristi kako bi se datoteka ili mapa dodala u skladište. Treba znati da će skladište sadržavati nove stavke tek kad sve promjene (tako i dodavanje datoteka/mapa) spremite u skladište naredbom pohrani."

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

#: source/TortoiseMerge_en.xml:1096
#: (para)
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 revizija datoteke ili mape u vašoj <emphasis>radnoj kopiji</emphasis>. Ovo je revizija datoteke ili mape u kojoj se nalazi, kada se dogodila zadnja obnova, pohrana ili preuzimanje. Osnovna revizija ne mora biti jednaka najnovijoj i obično nije."

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

#: source/TortoiseMerge_en.xml:1107
#: (para)
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 "Ova naredba je moguća samo za tekst datoteke i ona označava svaki redak sa podacima o reviziji u kojoj je taj redak zadnji put mijenjan i autoru koji je tu promjenu napravio. Naša GUI implmentacija se naziva TortoiseBlame i također pokazuje datum i vrijeme pohrane izmjene, te poruku dnevnika kad je miš iznad broja revizije."

#: source/TortoiseMerge_en.xml:1117
#: (glossterm)
msgid "BDB"
msgstr "BDB"

#: source/TortoiseMerge_en.xml:1119
#: (para)
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 testirana baza za skladišta, ne može se koristiti na mrežnom disku (već samo na lokalnom). Ovo je bila osnovna baza za Git sladišta prije verzije 1.2."

#: source/TortoiseMerge_en.xml:1126
#: (glossterm)
msgid "Branch"
msgstr "Grana"

#: source/TortoiseMerge_en.xml:1128
#: (para)
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 bugfixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a <quote>cheap copy</quote>."
msgstr "Ovaj termin se često koristi u sustavima za upravljanje verzijama da bi se opisalo što se događa kad se razvoj razdvoji u nekoj točki i dalje se kreće u dvije odvojene staze. Ponekad se napravi nova grana od glavne razvojne tako da se u njoj implementira neka nova mogućnost bez utjecaja na stabilnost glavne razvoje grane. Ponekad se grana odvoji od neke stabline točke kako bi se u njoj radio samo ispravak grešaka, dok se novi razvoj događa na nestabilnoj glavnoj grani. U Gitu grana je implementirana kao <quote>jeftina/lagana kopija</quote>."

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

#: source/TortoiseMerge_en.xml:1143
#: (para)
msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository."
msgstr "Naredba Gita kojom se kreira lokalna radna kopija u praznoj mapi tako da se preuzmu datoteke iz skladišta odgovarajuće, najčešće najnovije verzije."

#: source/TortoiseMerge_en.xml:1150
#: (glossterm)
msgid "Cleanup"
msgstr "Čišćenje"

#: source/TortoiseMerge_en.xml:1152
#: (para)
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 <literal>working copy locked</literal> error, run this command to remove stale locks and get your working copy into a usable state again. </quote> Note that in this context <quote>lock</quote> refers to local filesystem locking, not repository locking."
msgstr "Da citiramo Git knjigu: <quote>Rekurzivno čisti radnu kopiju, tako da uklanja zaključavanja i nastavlja nezavršene operacije. Ako ikada dobijete grešku <literal>radna kopije je zaključana</literal>, pokrenite ovu naredbu da biste uklonili zaključavanja i dobili vašu radnu kopiju u upotrebljivom stanju. </quote> Treba znati da se termin <quote>zaključavanja</quote> ovdje koristi za lokalno zakljućavanje datoteka u datotečnom sustavu, a ne na zaključavanje u skladištu."

#: source/TortoiseMerge_en.xml:1167
#: (glossterm)
msgid "Commit"
msgstr "Pohrana"

#: source/TortoiseMerge_en.xml:1169
#: (para)
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 "Ova naredba se koristi da bi proslijedila promjene u vašoj radnoj kopiji nazad u skladište i time kreirala novu reviziju u skladištu."

#: source/TortoiseMerge_en.xml:1177
#: (glossterm)
msgid "Conflict"
msgstr "Sukob"

#: source/TortoiseMerge_en.xml:1179
#: (para)
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 "Kad se promjene iz skladišta stapaju sa lokalnim promjenama, ponekad se te promjene dogode na istim redcima. U tom slučaju Git ne može automatski odlučiti koju verziju da koristi i tada se kaže da je takva datoteka u sukobu. Morate sami ručno urediti datoteku da biste razriješili sukob i to prije pohranjivanja novih promjena."

#: source/TortoiseMerge_en.xml:1189
#: (glossterm)
msgid "Copy"
msgstr "Kopiranje"

#: source/TortoiseMerge_en.xml:1191
#: (para)
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 "U Git skladištu možete napraviti kopiju jedne datoteke ili cijelog stabla mapa. Ovo je implementirano kao <quote>jeftina kopija</quote>  što izgleda kao veza prema originalnoj datotekci u smislu da nova kopija gotovo da ne zauzima ništa mjesta. Izrada kopije čuva povijest stavke u kopiranju, tako da možete pratiti izmjene i prije trenutka izrade kopije."

#: source/TortoiseMerge_en.xml:1201
#: (glossterm)
msgid "Delete"
msgstr "Brisanje"

#: source/TortoiseMerge_en.xml:1203
#: (para)
msgid "When you delete a versioned item (and commit the change) the item no longer exists in the repository after the commited 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 "Kada brišete neku datoteku s verzijom (i pohranite ovu izmjenu) ova datoteka više ne postoji u skladištu nakon revizije u kojoj je obrisana. Naravno, ona postoji za ranije revizije tako da ju još uvijek možete dobiti. Ako je potrebno, možete kopirati obrisanu datoteku i time je držati aktivnom sa povijesti na nekom drugom mjestu u skladištu."

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

#: source/TortoiseMerge_en.xml:1215
#: (para)
msgid "Shorthand for <quote>Show Differences</quote>. Very useful when you want to see exactly what changes have been made."
msgstr "Prečica za <quote>Pokaži razlike</quote>. Vrlo korisno kad želite točno vidjeti koje su promjene napravljene."

#: source/TortoiseMerge_en.xml:1222
#: (glossterm)
msgid "Export"
msgstr "Izvoz"

#: source/TortoiseMerge_en.xml:1224
#: (para)
msgid "This command produces a copy of a versioned folder, just like a working copy, but without the local <literal>.svn</literal> folders."
msgstr "Ova naredba izrađuje kopiju mape,poput radne kopije (preuzimanje) ali bez lokalnih <literal>.svn</literal> mapa."

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

#: source/TortoiseMerge_en.xml:1234
#: (para)
msgid "FS Filesystem. A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories."
msgstr "FS datotečni sustav. Ovo je posebni Git sustav za skladišta. Može se koristiti i na mrežnim diskovima. Ovaj sustav je osnovni za skladišta Gita od verzije 1.2."

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

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

#: source/TortoiseMerge_en.xml:1249
#: (glossterm)
msgid "HEAD revision"
msgstr "Najnovija revizija"

#: source/TortoiseMerge_en.xml:1251
#: (para)
msgid "The latest revision of a file or folder in the <emphasis>repository</emphasis>."
msgstr "Zadnja revizija datoteke ili mape u <emphasis>skladištu</emphasis>."

#: source/TortoiseMerge_en.xml:1257
#: (glossterm)
msgid "Import"
msgstr "Uvoz"

#: source/TortoiseMerge_en.xml:1259
#: (para)
msgid "Git command to import an entire folder hierarchy into the repository in a single revision."
msgstr "Git naredba za uvoz cijele mape u skladište i to jednoj reviziji."

#: source/TortoiseMerge_en.xml:1266
#: (glossterm)
msgid "Lock"
msgstr "Zaključavanje"

#: source/TortoiseMerge_en.xml:1268
#: (para)
msgid "When you take out a lock on a versioned item, you mark it in the repository as uncommittable, except from the working copy where the lock was taken out."
msgstr "Kada želite zaključati datoteku, ona se u skladištu označi tako da nitko ne može pohraniti novu reviziju osim radne kopije koje je zatražila zaključavanje."

#: source/TortoiseMerge_en.xml:1276
#: (glossterm)
msgid "Log"
msgstr "Dnevnik"

#: source/TortoiseMerge_en.xml:1278
#: (para)
msgid "Show the revision history of a file or folder. Also known as <quote>History</quote>."
msgstr "Pokazuje povijest revizija neke datoteke ili mape. To zovemo i <quote>Povijest</quote>."

#: source/TortoiseMerge_en.xml:1285
#: (glossterm)
msgid "History"
msgstr "Povijest"

#: source/TortoiseMerge_en.xml:1287
#: (para)
msgid "Show the revision history of a file or folder. Also known as <quote>Log</quote>."
msgstr "Pokazuje povijest datoteke ili mape. To zovemo i <quote>Dnevnik</quote>."

#: source/TortoiseMerge_en.xml:1294
#: (glossterm)
msgid "Merge"
msgstr "Stapanje"

#: source/TortoiseMerge_en.xml:1296
#: (para)
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 u kojem se promjene iz skladišta prenose u radnu kopiju bez brisanja promjena koje ste vi napravili lokalno. Poekad se izmjene u skladuštu ne mogu automatski primjeniti, već je potrebno to riješititi ručno. Za takvu situaciju kažemo da je radna kopija u sukobu."

#: source/TortoiseMerge_en.xml:1302
#: (para)
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 "Stapanje se automatski poziva kad se obnavlja radna kopija. Također se mogu stapati i promjene iz druge grane koristeći Git naredbu Stopi."

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

#: source/TortoiseMerge_en.xml:1312
#: (para)
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 "Ako vaša radna kopija ima promjene samo u tekst datotekama, moguće je koristiti Git naredbu Razlike kako bi se izradila datoteka sažetka svih promjena u formatu objedinjenih razlika. Datoteka ovog tipa se naziva <quote>zakrpa</quote>, i može se poslati elektroničkom poštom nekome tko će primjeniti vaše promjene na svojoj radnoj kopiji. Netko bez prava pohrane može tako napraviti promjene i poslati zakrpu onome tko je autoriziran pohraniti novu reviziju u skladištu. Također, ako niste sigurni da su vaše promjene \"dobre\" za skladište, možete na ovaj način poslati promjene nekome tko će ih pregledati (bez prethodne pohrane u skladište)."

#: source/TortoiseMerge_en.xml:1325
#: (glossterm)
msgid "Property"
msgstr "Svojstvo"

#: source/TortoiseMerge_en.xml:1327
#: (para)
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 "Osim praćenja promjena u datotekama, Git omogućava da datotekama ili mapama dodajete metapodatke koji se također pohranjuju u revizijama. Ove metapodatke nazivamo <quote>svojstvima</quote> svakog pojedine stavke (datoteke ili mape). Svako svojstvo ima svoje ime i vrijednost. Git ima posebna svojstva koja koristi interno, kao <literal>svn:eol-style</literal>. TortoiseGit također ima svoja svojstva kao <literal>tsvn:logminsize</literal>. I vi možete dodati svoja svojstva, te im odabrati i imena i vrijednosti. "

#: source/TortoiseMerge_en.xml:1340
#: (glossterm)
msgid "Relocate"
msgstr "Premještanje"

#: source/TortoiseMerge_en.xml:1342
#: (para)
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 "Ako se skladište seli, možda zbog toga jer ste promjenili mapu na serveru ili se promjenilo ime servera, trebate <quote>premjestiti</quote> vašu radnu kopiju tako da URL skladišta pokazuje na novu lokaciju."

#: source/TortoiseMerge_en.xml:1348
#: (para)
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 "Primjetite: trebali biste koristiti ovu naredbu ako se vaša radna kopija veže na istu stazu unutar istog skladišta, a skladište se promjestilo na drugu lokaciju. U bilo kojim drugim okolnostima, trebali biste korisiti naredbu <quote>Zamijeni</quote>."

#: source/TortoiseMerge_en.xml:1357
#: (glossterm)
msgid "Repository"
msgstr "Skladište"

#: source/TortoiseMerge_en.xml:1359
#: (para)
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šte je središnje mjesto gdje se podaci pohranjuju. Skladište može biti mjesto na mreži koje se koristi za mrežnu distribuciju, ili mjesto koje je direktno dostupno korisniku bez potrebe za mrežni promet."

#: source/TortoiseMerge_en.xml:1368
#: (glossterm)
msgid "Resolve"
msgstr "Razriješavanje sukoba"

#: source/TortoiseMerge_en.xml:1370
#: (para)
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 "Kad datoteke u radnoj kopiji ostanu u sukobu nakon obnovljanja ili stapanja, ovi sukobi trebaju biti riješeni ručno u editoru ili TortoiseMergeu. Ovaj proces nazivamo <quote>razrješavnjem sukoba</quote>. Kada završite s ovim postupkom možete označiti sukobljene datoteke kao riješene kako biste ih mogli kasnije pohraniti."

#: source/TortoiseMerge_en.xml:1380
#: (glossterm)
msgid "Revert"
msgstr "Vratiti na staro"

#: source/TortoiseMerge_en.xml:1382
#: (para)
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 lokalno pohranjuje <quote>prijašnju</quote> kopiju svake datoteke kakva je bila kad ste je zadnji put obnovili vašu radnu kopiju. Ako ste napravili izmjene i odulučili ih ponuištiti, možete kosristi naredbu <quote>Vrati na staro</quote> kako biste datoteku vratili na njezinu prijašnju kopiju."

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

#: source/TortoiseMerge_en.xml:1393
#: (para)
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 "Svaki put kad pohranite neke izmjene izrađujete novu <quote>reviziju</quote> u skladištu. Svaka revizija predstavlja stanje stabla repozitorija u određenom trenutku u vremenu. Ako želite pogledati stanje skladišta u prošlosti jednostavno pogledate stanje  skladišta u reviziji N."

#: source/TortoiseMerge_en.xml:1400
#: (para)
msgid "In another sense, a revision can refer to the set of changes that were made when that revision was created."
msgstr "Revizija se upotrebljava i u drugom smilsu i znači skupinu izmjena koja je napravljenja kad je određena revizija kreirana."

#: source/TortoiseMerge_en.xml:1407
#: (glossterm)
msgid "Revision Property (revprop)"
msgstr "Svojstva revizije (revprop)"

#: source/TortoiseMerge_en.xml:1409
#: (para)
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 "Kao što datoteke mogu imati svojstva, tako i svaka revizija u skladištu može imati svojstva. Nekoliko posebnih svojstava su dodana automatski kad se kreira revizija i to: <literal>svn:date svn:author svn:log</literal> koja predstavljaju datum pohrane, autora izmjena i poruku za dnevnik. Ova svojstva se mogu uređivati, ali ne mogu imati verzije tako da svaka promjena ovih svojstava je trajna i ne može se poništiti."

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

#: source/TortoiseMerge_en.xml:1423
#: (para)
msgid "A frequently-used abbreviation for Git."
msgstr "Često korištena skraćenica za Git."

#: source/TortoiseMerge_en.xml:1426
#: (para)
msgid "The name of the Git custom protocol used by the <quote>svnserve</quote> repository server."
msgstr "Ime posebnog Git protokola kojeg koristi <quote>svnserve</quote> server Git kladišta."

#: source/TortoiseMerge_en.xml:1433
#: (glossterm)
msgid "Switch"
msgstr "Zamjena"

#: source/TortoiseMerge_en.xml:1435
#: (para)
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 "Kao što <quote>Obnovi prema reviziji</quote> mijenja radnu kopiju kako bi bila jednaka kakva je izgledala u nekom trenutku u prošlosti, tako <quote>Zamijeni</quote>  mijenja radnu kopiju da pokazuje na drugo mijesto u skladištu. To je posebno korisno kada se radi na glavnoj i pomoćnoj grani gdje se razlikuje samo nekoliko datoteka. Možete zamijeniti radnu kopiju s jedne na drugu granu, a samo mijenjane datoteke će se prenositi mrežom."

#: source/TortoiseMerge_en.xml:1447
#: (glossterm)
msgid "Update"
msgstr "Obnovi"

#: source/TortoiseMerge_en.xml:1449
#: (para)
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 "Git naredba povlači zadnje izmjene iz skladišta u vašu radnu kopiju, stapajući sve promjene iz skladišta sa vašim lokalnim izmjenama u radnoj kopiji."

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

#: source/TortoiseMerge_en.xml:1459
#: (para)
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 "Ovo je vaš lokalni <quote>pješčanik</quote>, mjesto gdje radite na datotekama s verzijama i koje se uobičajno nalazi na lokalnom tvrdom disku. Radnu kopiju možete izraditi tako da napravite <quote>preuzimanje</quote> iz skladišta. Vaše promjene spremate u skladište koristeći naredbu <quote>pohrani</quote>."

#. Put one translator per line, in the form of NAME <EMAIL>.
#: source/TortoiseMerge_en.xml:0
#: (None)
msgid "translator-credits"
msgstr ""
"Mario Šarić <mario.saric@helix.hr>\n"
"Dinko Srkoč <dinko.srkoc@helix.hr>"

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