Fixed issue #1426: Pull Dialog: Unknown option 'no-ff' when using no-tags

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

#
# Serbian latin 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:
# Milorad Popović <miloradspopovic@gmail.com>, 2008
#
#
msgid ""
msgstr ""
"Project-Id-Version: TortoiseMerge Documentation\n"
"POT-Creation-Date: 2008-11-17 00:14 +0000\n"
"PO-Revision-Date: 2008-11-17 23:16+0100\n"
"Last-Translator: Milorad Popović\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: Serbian\n"
"X-Poedit-Country: SERBIA\n"
"X-Poedit-SourceCharset: utf-8\n"

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

#. (subtitle)
#: ../source/TortoiseMerge_en.xml:6
msgid "A diff/merge tool for Windows"
msgstr "Diff/merge alat za 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 "Verzija $MajorVersion$.$MinorVersion$.$MicroVersion$"

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

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

#. (surname)
#: ../source/TortoiseMerge_en.xml:13
msgid "Küng"
msgstr "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 "Kada se radi na projektu, ili projktu otvorenog koda gde više ljudi razvija vaš kod, ili komercijalni projekt gde vi prodajete komponente sa vašim izvornim kodom, biće ljudi i potrošača koji će naći bagove ili želeti da poboljšaju vaš projekat. Da bi to uradili oni vam šalju zakrpe koje vi trba da pregledate i odlučite da li ih želite primeniti."

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

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

#. (para)
#: ../source/TortoiseMerge_en.xml:41
msgid "TortoiseMerge helps you with both those tasks: <placeholder-1/>"
msgstr "TortoiseMerge vam pomaže u oba ova zadatka: <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 takođe pomaže da sortirate konfliktne fajlove koji se mogu pojaviti ako radite sa sistemom kontrole izvornog koda i ostali rade na istim fajlovima kao vi."

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

#. (para)
#: ../source/TortoiseMerge_en.xml:67
msgid "TortoiseMerge is free. You don't have to pay for it, you can use it any way you want. It is developed under the GP license (GPL)."
msgstr "TortoiseMerge je besplatan. Vi ne treba da platite za njega, možete ga koristiti kako god želite. Razvijen je pod GP licencom (GPL=."

#. (para)
#: ../source/TortoiseMerge_en.xml:71
msgid "TortoiseMerge is an Open Source project. That means you have full read access to the source code of this program. You can browse it on this link <ulink url=\"http://TortoiseGit.tigris.org/svn/TortoiseGit/\"><citetitle>http://TortoiseGit.tigris.org/svn/TortoiseGit/</citetitle></ulink>. You will be prompted to enter username and password. The username is <literal>guest</literal>, and the password must be left blank. The most recent version (where we're currently working) is located under <filename>/trunk/</filename>, and the released versions are located under <filename>/tags/</filename>."
msgstr "TortoiseMerge je Otvoren Kod projekat. To znači da imate pun pristup izvornom kodu ovog projekta. Možete ga pretraživati na vezi <ulink url=\"http://TortoiseGit.tigris.org/svn/TortoiseGit/\"><citetitle>http://TortoiseGit.tigris.org/svn/TortoiseGit/</citetitle></ulink>.Bi'ete pitani da unesete korisnika i loyinku. Korisnik je <literal>guest</literal>, a lozinka mora ostati prazna. Najskorija verzija (gde mi trenutno radimo) locirana je pod <filename>/trunk/</filename> realizovana verzija je pod <filename>/tags/</filename>."

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

#. (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 "Bez obzira što su TortoiseGit i TortoiseMerge besplatni, možete podržati razvoj slanjem zakrpa i igranjem aktivne uloge u razvoju. Možete pomoći ako nas pohvalite za beskonačne sate provedene ispred naših kompjutera."

#. (para)
#: ../source/TortoiseMerge_en.xml:97
msgid "While working on 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 "Dok radimo na TortoiseGit volimo da slušamo muziku. I pošto trošimo mnogo sati na ovom projktu treba nam <emphasis>mnogo</emphasis> muzike. Zato smo sastavili listu želja sa našim muzičkim favoritima CDima i DVDima: <ulink url=\"http://TortoiseGit.tigris.org/donate.html\"><citetitle>http://TortoiseGit.tigris.org/donate.html</citetitle></ulink>  Molim vas da takođe pogledate listu ljudi koji učestvuju u projektu slanjem zakrpa ili prevoda."

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

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

#. (para)
#: ../source/TortoiseMerge_en.xml:121
msgid "for the hard work on TortoiseMerge"
msgstr "za težak rad na TortoiseMerge"

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

#. (para)
#: ../source/TortoiseMerge_en.xml:131
msgid "for the beautiful icons, logo, bug hunting and taking care of the documentation"
msgstr "za lepe ikone, logo, lov na bagove i brigu o dokumentaciji"

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

#. (para)
#: ../source/TortoiseMerge_en.xml:142
msgid "for some of the styles which are reused in this documentation"
msgstr "za neke stilove koji su preuzeti u ovoj dokumentaciji"

#. (term)
#: ../source/TortoiseMerge_en.xml:149
msgid "Our Contributors"
msgstr "Naši priložnici"

#. (para)
#: ../source/TortoiseMerge_en.xml:153
msgid "for the patches, bug reports and new ideas, and for helping others by answering questions on our mailing list."
msgstr "za zakrpe, izveštaje o bagovima i novim idejama i za pomoć drugima odgovarajući na pitanja sa naše poštanske liste."

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

#. (para)
#: ../source/TortoiseMerge_en.xml:164
msgid "for many hours of joy with the music they sent us"
msgstr "za mnoge sate uživanja sa muzikom koju nam šalju"

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

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

#. (para)
#: ../source/TortoiseMerge_en.xml:185
msgid "TortoiseMerge is a free/open-source application. It lets you see differences in text files, merge those changes and even review and apply unified diff files, often called <firstterm>patches</firstterm>."
msgstr "TortoiseMerge je besplatna/otvoren-kod aplikacija. Dozvoljava vam da vidite razlike u tekst fajlu, stopite ove izmene i čak pregledate i primenite objedinjene diff fajlove, često nazivane  <firstterm>zakrpe</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 "Dok se radi sa tekst fajlovima, tj. fajlovi izvornog koda u vašem najdražem programskom jeziku, ili html/hml fajlovima za vašu dokumentaciju ili vebsajt, vi ćete često biti u situaciji gde treba da uporedite nečije različite verzije, ponekad baš želite da vidite izmene koje ste vi napravili."

#. (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 "Ako radite sa sistemom kontrole verzija (tj. Subverzija)  tada ponekad dobijete <emphasis>konflikte</emphasis> kada ažurirate vašu radnu kopiju. Ovo se dešava ako je još neko izmenio iste delove fajla na kome ste vi trenutno radili. Tada imate da rešite ove konflikte ručno. Tu vam TortoiseMerge može pomoći."

#. (para)
#: ../source/TortoiseMerge_en.xml:206
msgid "The following diagram shows you the relationships between the files involved in a conflict:"
msgstr "Sledeći dijagram prikazuje veze između fajlova obuhvaćenih konfliktom:"

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

#. (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 " Konflikt se takođe može javiti ako pokušate primeniti zastareli fajl zakrpe. U takvim slučajevima, bez TortoiseMerge, vi ste imali da pitate osobu koja vam je dala fajl zakrpu za tekuću verziju ili da pokušate primeniti tu zakrpu ruč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 "Ali sada sa TortoiseMerge ovo više nije neophodno - ni najmanje ako radite sa sistemom kontrole verzija kao što je Subverzija. TortoiseMerge analizira fajl zakrpe za revizija/verzija zakrpe kreirane i automatski pokušava da nađe specijalnu verziju iz vaše sors-kontrole. Zatim se primenjuje na zakrpe i omogućava vam da pregledate oboje, vaše izmene fajla i od drugih. Zatim možete odlučiti koje izmene želite da zadržite."

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

#. (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 "Dok radite na <ulink url=\"http://TortoiseGit.tigris.org\"><citetitle>TortoiseGit</citetitle></ulink> našli smo da kadgod korisnici pošalju zakrpe da poboljšaju projekat ili samo da fiksiraju bagove, imali smo puno posla samo da primenimo te zakrpe. Mnogo puta ove zakrpe su bile zastarele i nisu se mogle primenite alatom iz komandne linije.<ulink url=\"http://unxutils.sourceforge.net/\"><citetitle>http://unxutils.sourceforge.net/</citetitle></ulink> zato što smo radili na tim fajlovima i nekad  već izmenili te fajlove."

#. (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 takođe glavni razlog zašto TortoiseGit originalno nije imao <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Kreiraj zakrpu</guimenuitem></menuchoice> primenjeno: preferiramo da korisnici cele fajlove jer je sa njima lakše primeniti zakrpe."

#. (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 "Tako smo potrošili puno vremena pretražujući internet za GUI alat koji će primeniti fajlove zakrpa, ali sve što smo našli je da takav alat ne postoji. Dakle da presečemo dugu priču ukratko: Odlučili smo da, ako niko ne nudi takav alat, mi ćemo ga sami napisati. Tako je rođen 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 "kako TortoiseGit već koristi Subverzionu biblioteku, koja ima fino razlikovanje u sebi, bilo je prirodno da se koristi biblioteka umesto GNU razl."

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

#. (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 "Gledanje razlike između dva fajla i spajanje izmena u jedan od njih, ili izbacivanjem neželjenih izmena."

#. (para)
#: ../source/TortoiseMerge_en.xml:288
msgid "Editing conflicts between local changes and changes in the Git repository following an update."
msgstr "Uređenje konflikata između lokalnih izmena i izmena u Subverzionom spremištu prateći ažuriranje."

#. (para)
#: ../source/TortoiseMerge_en.xml:294
msgid "Applying patch files. This is the reason TortoiseMerge was created :)"
msgstr "Primena fajlova zakrpa. Ovo je razlog zašto je TortoiseMerge kreiran :)"

#. (para)
#: ../source/TortoiseMerge_en.xml:278
msgid "TortoiseMerge has several different uses: <placeholder-1/>"
msgstr "TortoiseMerge ima više različitih korišćenja: <placeholder-1/>"

#. (title)
#: ../source/TortoiseMerge_en.xml:303
msgid "Viewing and Merging Differences"
msgstr "Pregledanje i spajanje razlika"

#. (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 "U ovom modu upoređujete dva fajla. Fajl u levom panelu zamislimo da je originalni fajl (ponekad označen kao <emphasis>NJihov</emphasis>, i fajl u desnom panelu koji je modifikovan fajl (ponekad označen kao <emphasis>Moj</emphasis>."

#. (para)
#: ../source/TortoiseMerge_en.xml:315
msgid "Reverting changed lines back to the text shown in the left pane."
msgstr "Vraćanje izmenjenih linija nazad kao tekst u levom panelu."

#. (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 "Korišćenje kombinacije oba bloka, ili <emphasis>NJihov</emphasis> pre <emphasis>Moj</emphasis> ili <emphasis>Moj</emphasis> pre <emphasis>NJihov</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 "Možete uraditi izmene zasnovane na liniji u fajlu u desnom panelu koji uključ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 "Možete takođe urediti fajl u desnom panelu baš kako želite u tekst editoru. Takve linije su markirane koresteći ikonu olovku. Molim primetite to da ako želite da uradite bilo koju linija/blok-zasnovane izmene opisane gore, bolje je to uraditi prvo kad počnete uređivanje fajla to postaje nemoguće za TortoiseMerge da čuva relacije u originalnim fajlovima."

#. (title)
#: ../source/TortoiseMerge_en.xml:338
msgid "Editing Conflicts"
msgstr "Konflikt uređenja"

#. (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 "Ovo se ponekad pominje kao trostruko spajanje  i prikazuje se u tri panela. Međutim postoji stvarno četiri fajla uklljučeno. Fajl koji nije prikazan je fajl zajedničke osnove, zadnji zajednički predak  dva fajla koji su sada u konfliktu. Veze između tri fajla prikazane su na sledećem dijagramu:"

#. (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 "Osnovni fajl prikazuje najstariju verziju fajla, odakle <emphasis>Vi</emphasis> i <emphasis>Oni</emphasis>kreću izrade izmena. <emphasis>Moj</emphasis> prikazuje osnovni fajl sa svim izmenama koje ste<emphasis>vi</emphasis> uradili, i <emphasis>NJihov</emphasis>  je fajl sa svim izmenama <emphasis>još nekog</emphasis> ko je učinio u fajlu. Levi panel prikazuje izmene u <emphasis>NJihovim</emphasis> relativno osnovnom fajlu i desni panel prikazuje izmene u <emphasis>Moj</emphasis> relativno osnovnom fajlu. Donji panel je izlaz fajla gde pokušavate rešite konflikt."

#. (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 "U izgledu konfliktnog rešenja<emphasis>Moj</emphasis> ili <emphasis>NJihov</emphasis> ili oba. Ali u ovom slučaju izmene su prikazane u donjem panelu."

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

#. (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 "Fajl zakrpe je Subverzioni objedinjeni diff fajl, koji sadrži informacije koje zahtevaju da se primene izmene u skupu fajlova. Drugi ljudi iz razvoja su nabavljali zakrpe tako da možete videti izmene koje su urađene možda urezati ih u spremište. Ili može biti generisan interno pomoću TortoiseGit kada se uporede dva imenika. Ovo se dešava kada se uporede revizije spremišta sa vašim imenikom  radne kopije, ili ako uporedite dve razlike revizija spremišta, ili ako uporedite dve različite putanje spremišta."

#. (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 "U svakom slučaju TortoiseMerge  će prikazati mali vindouz listing fajlova uključenim u zakrpi. Dvostrukim klikom na jednom od ovih fajlova naći ćete odgovarajući fajl i primeniti izmene. Levi panel prikazuje sadržaj originalnog fajla i desni panel prikazuje to posle primene zakrpe. "

#. (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 "Možete urediti fajl u desnom panelu tačno kako želite u uporedi/uredi modu."

#. (title)
#: ../source/TortoiseMerge_en.xml:394
msgid "Using TortoiseMerge"
msgstr "Korišćenje TortoiseMerge"

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

#. (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 glavna moda gledanja: jedan-panel, dva-panela i tri-panela gledanje. Jedan/dva-panel gledanje se koristi da se gledaju izmene i tri-panel gledanje se koristi da se reši konflikti."

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

#. (title)
#: ../source/TortoiseMerge_en.xml:411
msgid "One Pane View"
msgstr "Jedan panel pregled"

#. (title)
#: ../source/TortoiseMerge_en.xml:415
msgid "Two Pane View"
msgstr "Dva panela pregled"

#. (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 "Izmene unutar izmenjenih linija su prikazane u raznim bojama. Dodati delovi stringa su prikazali svetlijom bojom, ali svakako možete konfigurisati boje koje se ovde koriste. Izbačeni delovi su označeni tamnom bojom vertikalne linije u stringu. Preuzmite gornju sliku da vidite kako to radi."

#. (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 "Reorganizacija koda obično znači puno izmena u belim poljima (razmak, tab, novred) ali ne i stvarne izmene koda. Na primer, podelite veoma dugačke linije, ili ponekad stopite više linija zajedno u jednu liniju."

#. (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 "Takve izmene se označe belim krugom sa leve strane pregleda. Ako vidite takav beli krug odmah znate da to nije stvarna izmena koda tamo i vi nemate da proveravate izmenjene blokove dalje."

#. (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 "Ručno uređenje fajla u desnom panelu moguće je u pogledu dva-panela. Takve izmene su označene simbolom olovke."

#. (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 "Pogled sa dva panela ima neke osobine koje nisu dostupne u pogledu jednog panela: <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 "Ako želiti da poredite/stopite fajlove stabla, TortoiseMerge će vam pokazati razlike u pogledu tri panela. Ovaj pogled je takođe korišćen ako vam treba da rešite konfliktne fajlove."

#. (title)
#: ../source/TortoiseMerge_en.xml:460
msgid "Three Pane View"
msgstr "Tri panela pregled"

#. (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 "Levi panel vam prikazuje razlike između <emphasis>NJihov</emphasis> fajl i <emphasis>Osnovni</emphasis> fajl, dok desni panel vam prikazuje razlike između <emphasis>Moj</emphasis> fajl i <emphasis>Osnovni</emphasis> fajl.Donji panel prikazuje rezultate spajanja  <emphasis>Osnovni</emphasis>, <emphasis>Moj</emphasis> i <emphasis>NJihovi</emphasis> sa mogućim konfliktima."

#. (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 "Ako letite mišem preko naslova panela, alatobaveštenja će pokazati imena fajlova korišćena za diff u svakom panelu."

#. (title)
#: ../source/TortoiseMerge_en.xml:484
msgid "Patch File List"
msgstr "Lista fajla zakrpe"

#. (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 "Posle analize TortoiseMerge fajla zakrpa biće pokazano mali prozor sa svim fajlovima koji su izmenjeni u saglasnosti fajla zakrpe. <placeholder-1/> Ako je fajlime prikazanje u crnom onda će zakrpa biti primenjena bez bilo kog problema.To znači da fajl nije zastareo saglasno zakrpi. Međutim, ako je fajlime prikazano crveno tada se zakrpa ne  može direktno primeniti jer ste već menjali taj fajl. "

#. (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 "Ali ne brinite. Ako radite sa Subverzijom možete vratiti staru verziju fajla i rešiti konflikt. U stvari, TortoiseMerge automatski pokušava da dobije staru verziju fajla i onda vam pokazuje diff između <emphasis>Osnove</emphasis> (stara verzija fajla), <emphasis>Moj</emphasis> (fajl kao onaj koji je trenutno u vašoj radnoj kopiji) i <emphasis>NJihovi</emphasis> (stara verzija fajla sa zakrpom koja je već primenjena). Tada možete rešiti moguće konflikte ruč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 "Prozor fajla zakrpe ima kontekst meni koji omogućava da pregledate efekte zakrpe na tekući fajl (primenjen bez memorisanja), da se primeni i sačuvaju izmene za izabrane fajlove, ili da se primeni i sačuvaju izmene <emphasis>sve</emphasis> fajlove u listi. Dvostruki-klik akcija je za pregled."

#. (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 "U zavisnosti gde TortoiseMerge može primeniti zakrpe direktno ili prvo  nalazeći staru verziju fajla, to pokazuje pogled dva panela (zakrpa može biti primenjena direktno) ili pogled panel stabla (stara verzija fajla dohvaćena)."

#. (title)
#: ../source/TortoiseMerge_en.xml:521
msgid "Buttons and Other Controls"
msgstr "Dugmići i druge kontrole"

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

#. (para)
#: ../source/TortoiseMerge_en.xml:531
msgid "<guibutton>Open</guibutton> accesses the file-open dialog. What else?"
msgstr "<guibutton>Otvori</guibutton> pristupa fajl-otvori dijalogu. Šta više?"

#. (para)
#: ../source/TortoiseMerge_en.xml:537
msgid "<guibutton>Save</guibutton> saves any changes you have made."
msgstr "<guibutton>Sačuvaj</guibutton> čuva bilo koje izmene koje ste uradili."

#. (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>Reunos</guibutton> uništava bilo koju izmenu urađenu u TortoiseMerge i  reunosi fajlove sa 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>Poništi</guibutton> postavlja multi-nivo poništavanja, omogućavajući vam da vratite bilo koje izmene koje su urađene sa 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 "<guibutton>Prethodne/Sledeće razlike</guibutton> skače direktno na sledeću tačku gde se fajlovi razlikuju. Ovo pamti prelazak preko nepromenljivih delova fajla."

#. (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 "Kada to radite u 2-panela diff modu, detaljan pult na dnu ekrana će vam pokazati unutarlinijske razlike za prvu liniju, bezobzira gde miš lebdi."

#. (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 "<guibutton>Prethodni/Sledeći konflikt</guibutton> skače direktno na sledeću tačku gde razlike fajla su u konfliktu i treba da budu rešeni."

#. (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 "<guibutton>Koristi NJihove/Koristi Moje</guibutton> bira gde koristiti blok iz levog ili desnog panela. Pogledajte sledeći deo za više informacija o uređenju izmena i konflikta."

#. (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 "<guibutton>NJihov pre Moj/Moj pre NJihov</guibutton> je korišćen kada želite da kombinujete izmene u konfliktnim fajlovima. Pogledajte sledeći deo za više informacija o uređenju izmena i konflikata."

#. (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 kao rešeno</guibutton> Kada rešite sve konflikte u fajlu i sačuvate izmene, možete ga označiti kao rešen uz TortoiseMerge, radije nego da se ide nazad u eksplorer i da se reši odatle."

#. (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>Prikaži belapolja</guibutton> menjaju opcije da prikažu razmak i tab karaktere kao simbole tako da možete razlikovati izmene razmaka."

#. (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 "<guibutton>Unutarlinije diff Reč-način</guibutton> menjaju metode korišćene unutarlinijske razl. U reč-način modu, kada je karakter izmenjen, cela reč je osvetljena. U karakter-način modu, svaki individualni karakter je osvetljen."

#. (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 "Reč-način je uobičajen i u većini slučajeva to radi bolje. Na primer, ako izmenite ime promenljive, celo ime je osvetljeno u reč-način modu, dok u karakter-način modu vi nameravate da dobijete nered  u dodatim i izbrisanim karakterima koji se mnogo ne primećuju. Međutim, neki sadržaj se ne rešava uredno u rečima, na primer heksa fajlovi i u tom slučaju  karakter-način displej radi bolje. "

#. (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>Prebaci pogled</guibutton> bira između jedan-panel i dva-panela pogleda. Onemogućen u 3-panela pogledu."

#. (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>Prebaci levi i desni pogled</guibutton> U 2-panela pogledu izmenjuje levi i desni prozor. Kada poredite fajlove u 2 različita stabla, nasuprot od 2 revizije istog fajla, TortoiseGit ne zna koji treba da ide u levi panel kao <quote>originalna/osnovna</quote> verzija. Ako uzme pogrešnu vi je možete zameniti da napraviti lakši pregled."

#. (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>Prikaži/Sakri listu zakrpa</guibutton> Kada TortoiseGit ima listu zakrpa, ovo dugme vam omogućava da je sakrijete (tako da možete videti oba prozora), ili je prikazati (tako da možete pregledati listu fajlova)."

#. (para)
#: ../source/TortoiseMerge_en.xml:654
msgid "<guibutton>Settings</guibutton> takes you to TortoiseMerge's settings dialog."
msgstr "<guibutton>Podešavanje</guibutton> vam donosi TortoiseMerge dijaog podešavanja."

#. (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/> Ispod meni pulta leži alat pult. Ovo omogućava lak pristup mnogim često korišćenim alatima koji su <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 "Sa leve strane prozora je lokator pult. On omogućava brz vizualni pregled gde leže izmene unutar fajla. Pult ima tri kolone. Leva kolona se odnosi na levi panel, desna kolona na desni panel, centralna kolona na donji panel (ako je prisutan). U jedan-panel pregledu samo se leva kolona koristi. Lokator pult se takođe može koristiti kao pult premotavanja da premotava sve prozore simultano."

#. (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 "Ispod donjeg prozora je statusni pult. On prikazuje broj linija dodatih i obrisanih u <literal>NJihov</literal> i <literal>Moj</literal>, i broj nerešenih  preostalih konflikta. Takođe možete videti koji se kraj-linije stil koristi, koje kodiranje (ASCII, UTF-8,itd.) je usvojeno od TortoiseMerge, i gde je bajt-red-oznaka (BRO) prisutna u UTF-8 fajlovima. Leva strana status pulta se koristi da prikaže napomene kada letite mišem preko kontrole."

#. (title)
#: ../source/TortoiseMerge_en.xml:683
msgid "Line Status Icons"
msgstr "Ikona statusa linije"

#. (para)
#: ../source/TortoiseMerge_en.xml:684
msgid "Changed lines are marked with an icon to indicate what type of change has occurred."
msgstr "Izmenjene linije su označene ikonom da označe koji tip izmena se javlja."

#. (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\"/> Linija je dodata."

#. (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\"/> Linija je uklonjena"

#. (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\"/> Izmena je poništena vraćanjem u originalni sadržaj linije."

#. (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\"/> Ova linija sadrži samo belapolja izmene. Ge je označeno više konsekutivnih linija paragraf može biti ponovo prelomljen što prouzrokuje da reči  da se vuku u susedne linije. "

#. (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\"/> Lanija je uređena ručno koristeći TortoiseMerge kao tekst uređivač."

#. (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\"/>Ova linija je u konfliktu."

#. (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\"/> Ova linija je u konfliktu, ali efekat je skriven belimpoljem ili kraj-linije podešavanjem."

#. (title)
#: ../source/TortoiseMerge_en.xml:721
msgid "Merging / Editing Conflicts"
msgstr "Spajanje/Uređenje konflikata"

#. (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 ne <emphasis>prikazuje</emphasis> vam samo rzlike između fajlova ali vam i omogućava da rešite konflikte ili primenite izmene."

#. (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 "Ako ste u dva panela pogledu tada možete samo da uredite fajl u desnom panelu (<literal>Moj</literal>). Da primenite izmene u fajlu levo fajl (<literal>NJihov</literal>), <action>desni-klik</action> na izmenjenim linijama izaberite <menuchoice><guimenu>Kontekst meni</guimenu><guimenuitem>Koristi tekst blok <quote>njihov</quote></guimenuitem></menuchoice>. Zatim izmene iz levog fajla su dodate u desni fajl."

#. (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 "Ponekad vi stavarno želite oba tekst bloka, i kontekst meni takođe vam nudi <menuchoice><guimenu>Kontekst Meni</guimenu><guimenuitem>Koristite oba tekst bloka (ovo najpre)</guimenuitem></menuchoice> i <menuchoice><guimenu>Kontekst Meni</guimenu><guimenuitem>Koristite oba tekst bloka (ovo poslednje)</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 "Možete takođe urediti izlazni fajl  baš kao što želite u tekst uređivaču. Takve linije su označene koristeći olovku ikonu. Molim vas notirajte da želite uraditi bilo koju linija/blok-osnova izmene opisanu gore, bolje je uraditi ovo najpre od kako odjednom počinje uređenje fajla lično to postaje nemoguće za TortoiseMerge da se čuvaju odnosi sa originalnim fajlovima."

#. (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 "Ako ste u tri panela pogledu (ponekad zvan <emphasis>pogled spajanja</emphasis>) možete samo urediti fajl u donjem pogledu (<literal>Spojen</literal>). Kao u dva panela pogledu, možete  <action>desni-klik</action> na konfliktne linije i ili izaberite <menuchoice><guimenu>Kontekst Meni</guimenu><guimenuitem>Koristite tekst blok od <quote>njihov</quote></guimenuitem></menuchoice> ili <menuchoice><guimenu>Kontekst Meni</guimenu><guimenuitem>Koristite tekst blok od <quote>moj</quote></guimenuitem></menuchoice>. Usto, ako želite  <emphasis>oba</emphasis> bloka, možete izabrati <menuchoice><guimenu>Kontekst Meni</guimenu><guimenuitem>Koristite tekst blok od <quote>mine</quote> pre <quote>njihov</quote></guimenuitem></menuchoice> ili <menuchoice><guimenu>Kontekst Meni</guimenu><guimenuitem> Koristite tekst blok od <quote>njihov</quote> pre <quote>moj</quote></guimenuitem></menuchoice>. Saglasno komandi koju ste izabrali izmene su korišćene u proizvedenom <literal>Spojenom</literal>  fajlu."

#. (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 "Ponekad fajl će biti označen kao konfliktan u Subverziji, ali kada ga pogledate pomoću TortoiseMerge neće biti prikazanih konflikata. Ovo se može desiti zbog načina na koji ste rukovali belimpoljimlj. Ako izaberete da zanemarite linijski-završetak il belapolja izmene, te linije će biti označene koeisteći <emphasis>Konflikt-Zanemaren</emphasis> ikeone. Da se reši konflikt treba samo odabrati koju verziju da koristite."

#. (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 "Ponekad je konflikt suviše težak da se reši samo izborom <literal>NJihov</literal> i <literal>Moj</literal> i zahteva ručno uređenje. TortoiseMerge dozvoljava da jednostavno uradite izmene najpre vizualno a zatim da sačuvate fajl, ostavljajući samo teške izmene da se reše ručnim-uređenjem."

#. (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 "Primetimo da ako koristite TortoiseMerge na istim fajlovima ponovo, sve izmene u vašoj radnoj verziji, da li u TortoiseMerge ili ručnim-uređenjem <emphasis>biće odbačene</emphasis> i fajl će se pojaviti onakav kao kad je konflikt-uređene bilo na početku."

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

#. (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 "Kada pokrenete TortoiseMerge bez bilo kog komandnog prekidača morate otvoriti falove ručno, koristeći <menuchoice><guimenu>Fajl</guimenu><guimenuitem>Open</guimenuitem></menuchoice>."

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

#. (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 "Prva stvar koju imate da uradite je da odlučite da li samo želite da uporedite/stopite fajlove, ili da li želite da upotrebite fajl zakrpu. U zavisnosti šta izaberete odgovarajući edit boksovi i dugmići za pretraživanje se aktiviraju."

#. (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 "Ako želite uporedi/stopi fajlove imate da podesite najmanje dve od tri moguće putanje za <literal>Osnova</literal>, <literal>Moj</literal> i <literal>NJihov</literal>. Ako izaberete samo dva fajla, tada TortoiseMerge prikazuje razlike između tih fajlova, ili u dva panela pogledu ili u jedan panel 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 "Ako želite da stopite tri fajla, TortoiseMerge će prikazati razlike u tri panela pogledu. Ovaj pogled je generalno korišćen ako vam je potrebno da rešite konfliktne fajlove. Izlazni fajl nije imenovan u ovom slučaju i preostaje vam da koristite <menuchoice><guimenu>Fajl</guimenu><guimenuitem>Sačuvaj kao...</guimenuitem></menuchoice>. da sačuvate rezultat."

#. (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 "Ako želite da primenite fajl zakrpu imate da podesite obe putanje do samog fajla zakrpe i putanju do imenika gde fajl zakrpe će biti upotrebljen."

#. (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, samo fajlovi zakrpe u mphasis>Ujedinjen Diff Format</emphasis> je podržan. I samo fajlovi koji su generisani iz Subverzione radne kopije. Ostali formati kao fajlovi zakrpe generisani sa CVS trenutno nisu podržani."

#. (title)
#: ../source/TortoiseMerge_en.xml:884
msgid "Settings"
msgstr "Podešavanje"

#. (title)
#: ../source/TortoiseMerge_en.xml:886
msgid "Main Settings Page"
msgstr "Glavna stranica podešavanja"

#. (title)
#: ../source/TortoiseMerge_en.xml:889
msgid "The Settings Main Page"
msgstr "Podešavanje glavne stranice"

#. (para)
#: ../source/TortoiseMerge_en.xml:892
msgid "Most of the options here are self-explanatory, but a few points need clarifying."
msgstr "Većina opcija ovde je samo-objašnjiva, ali nekoliko tačaka treba pojasniti."

#. (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>Osiguran originalni fajl</guilabel> preimenije originalni fajl u RK u <literal>fajlime.bak</literal> pre nego se sačuva izmenjena verzija."

#. (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>Zanemari linijski završetak</guilabel> skriva izmene koje su samo zbog toga  da se naprave razlike u linijski-završetak stilu."

#. (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>Zanemari izmene velizine slova</guilabel> sakriva izmene samo zbog izmene veličine slova u tekstu. Ovo može biti korisno sa aplikacijama kao što je Vižual Bejzik, koji menja veličinu slova u promenljivim bez upozorenja."

#. (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>Kolor kod u-liniji izmene</guilabel> koristi istu šemu kao i linijski diff pult da prikaže detaljne u-liniji promene u okviru panela glavnog displeja. Linije koje su teško izmenjene neće biti prikazane korišćenjem ove metode što je  rezultat jednostavne konfuzije.U ovom slučaju linije će biti prikazane kao zamenjene (stara linija izbrisana, nova linija dodata)."

#. (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>Poređenje belihpolja</guilabel> prikazuje sve izmene u uvlačenju linija i unutarlinijska belapolja kao dodate/uklonjene linije (kako Subverzija tretira takve izmene)."

#. (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>Zanemarivanje izmena belihpolja</guilabel> sakriva izmene  koje su samo zbog izmena u iznosu ili tipu belihpolja, npr. izmenom uvlačenja linije ili izmenom tabova u razmake. Dodavanjem belihpolja gde nisu bila ranije, ili potpunim uklanjanjem belihpolja još uvek je prikazano kao promena."

#. (para)
#: ../source/TortoiseMerge_en.xml:932
msgid "<guilabel>Ignore all whitespaces</guilabel> hides all whitespace-only changes."
msgstr "<guilabel>Zanemarivanje svih belihpolja</guilabel> sakriva sve izmene samo-belihpolja."

#. (title)
#: ../source/TortoiseMerge_en.xml:938
msgid "Colour Settings Page"
msgstr "Stranica podešavanja boja"

#. (title)
#: ../source/TortoiseMerge_en.xml:941
msgid "The Settings Color Page"
msgstr "Podešavanje stranice boja"

#. (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 "Ovaj dijalog omogućava da se izabere kod boje osnove korišćen za osvetljenje izmena različitih linija."

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

#. (listitem)
#: ../source/TortoiseMerge_en.xml:951
msgid "All lines which are unchanged, or where changes are hidden."
msgstr "Sve linije koje su nepromenjene, ili gde su izmene sakrivene."

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

#. (listitem)
#: ../source/TortoiseMerge_en.xml:957
msgid "Lines which have been added."
msgstr "Linije koje su dodate."

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

#. (listitem)
#: ../source/TortoiseMerge_en.xml:963
msgid "Lines which have been deleted."
msgstr "Linije koje su bile uklonjene."

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

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

#. (guilabel)
#: ../source/TortoiseMerge_en.xml:974
msgid "Colour code in-line changes"
msgstr "Kolor kod u izmenama u liniji"

#. (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 "Linije koje imaju relativno male izmene, i prikazane su koristeći unutarlinije razl. Ova boja se koristi za <placeholder-1/> deo linijskog sadržaja. Izmenjeni deo će biti prikazan korišćenjem unutarlinije dodatih i obrisanih boja opisanih niže. Ako <placeholder-2/>  nije omogućen, ova boja neće biti korišćena i izmenjene linije će uvek biti prikazane kao zamene."

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

#. (listitem)
#: ../source/TortoiseMerge_en.xml:981
msgid "Where the same line has been changed in both files."
msgstr "Gde iste linije su promenjene u oba fajla."

#. (term)
#: ../source/TortoiseMerge_en.xml:986
msgid "Conflict resolved"
msgstr "Conflikt razreš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 "Gde su iste linije izmenjene u oba fajla, i imate sada izabrane"

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

#. (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 "Gde su linije dodate u supronom panelu, i nema takvih linija da egzistiraju u ovom panelu."

#. (term)
#: ../source/TortoiseMerge_en.xml:1000
msgid "Inline added text"
msgstr "Unutar linuje dodat tekst"

#. (listitem)
#: ../source/TortoiseMerge_en.xml:1001
msgid "When inline diffs are shown, added text is shown in this colour."
msgstr "Kada je unutarlinijska diff prikazana, dodat tekst je prikazan u ovoj boji."

#. (term)
#: ../source/TortoiseMerge_en.xml:1006
msgid "Inline removed text"
msgstr "Unutar linije uklonjen tekst"

#. (listitem)
#: ../source/TortoiseMerge_en.xml:1007
msgid "When inline diffs are shown, deleted text is shown in this colour."
msgstr "Kada je unutarlinijska raѕl prikazana, izbrisan tekst je prikazan u ovoj boji."

#. (term)
#: ../source/TortoiseMerge_en.xml:1012
msgid "Misc whitespaces"
msgstr "Različita belapolja"

#. (listitem)
#: ../source/TortoiseMerge_en.xml:1013
msgid "Characters used to indicate Whitespace are shown in a different colour from normal text."
msgstr "Karakteri korišćeni da označe Belapolja prikazani u drugačijoj boji od normalnog teksta. "

#. (title)
#: ../source/TortoiseMerge_en.xml:1023
msgid "keyboard shortcuts"
msgstr "skraćenice tastature"

#. (para)
#: ../source/TortoiseMerge_en.xml:1025
msgid "List of keyboard shortcuts and commands."
msgstr "Lista skraćenica tastature i komande."

#. (title)
#: ../source/TortoiseMerge_en.xml:1030
msgid "Keyboard shortcuts"
msgstr "Skraćenice tastature"

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

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

#. (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 izabrani tekst u klipbord"

#. (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 "Otvori Nađi dijalog za traženje teksta"

#. (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 "Otvori fajlove za diff/merge"

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

#. (para)
#: ../source/TortoiseMerge_en.xml:1067
msgid "Save the changes"
msgstr "Sačuvaj izmene"

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

#. (para)
#: ../source/TortoiseMerge_en.xml:1075
msgid "Save as..."
msgstr "Sačuvaj kao..."

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

#. (para)
#: ../source/TortoiseMerge_en.xml:1083
msgid "Go to next difference"
msgstr "Idi na sledeću razliku"

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

#. (para)
#: ../source/TortoiseMerge_en.xml:1091
msgid "Go to previous difference"
msgstr "Idi na prethodnu razliku"

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

#. (para)
#: ../source/TortoiseMerge_en.xml:1099
msgid "Go to next conflict"
msgstr "Idi na sledeći konflikt"

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

#. (para)
#: ../source/TortoiseMerge_en.xml:1107
msgid "Go to previous conflict"
msgstr "Idi na prethodni konflikt"

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

#. (para)
#: ../source/TortoiseMerge_en.xml:1115
msgid "Toggle between one-pane diff and two-pane diff"
msgstr "Pređi između jedan-panel diff i dva-panela razl"

#. (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 "Ponovo unesi fajlove i vrati sve urađene izmene"

#. (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 "Pređi između prikazivanja belih razmaka ili ne"

#. (term)
#: ../source/TortoiseMerge_en.xml:1137
msgid "Ctrl-mousewheel"
msgstr "Ctrl-mištočkić"

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

#. (title)
#: ../source/TortoiseMerge_en.xml:1148
msgid "Automating TortoiseMerge"
msgstr "Automatizuj 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 može biti pokrenut parametrima komandne linije da se izbegne da se ide kriz <guilabel>Otvori</guilabel> dijalog da izaberete fajlove lično. Ovo je takođe korisno ako želite da koristite TortoiseMerge iz drugih aplikacija. "

#. (title)
#: ../source/TortoiseMerge_en.xml:1161
msgid "TortoiseMerge Command Line Switches"
msgstr "TortoiseMerge prekidači komandne linije"

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

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

#. (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 prekidača zahteva dodatne informacije kao putanja ili neki drugi stribgovi. U ovim slučajevima dodavanje ':'prekidaču i stavljajući string/putanja posle toga. Primer: <screen>\n"
"/base:\"c:\\folder\\my base file.txt\"\n"
"</screen>"

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

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

#. (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 "Prikazuje dijalog biks sa najvažnijim prekidačima comandne linije."

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

#. (entry)
#: ../source/TortoiseMerge_en.xml:1208
msgid "The same as <placeholder-1/>."
msgstr "Isto kao <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 "Specificira  <placeholder-1/> fajl korišćen u tri načina razl. Ovo je zajednički predak fajlova koji su razlovani, takođe to nije prikazano u izdvojenom prozoru. Za dva načina ral, ovo je levi fajl. "

#. (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 osnovnog fajla. Ovo je prikazano u naslovu pogleda umesto putanja fajla. Za tri načina diff prikazano je u alatpultu za pogled naslova."

#. (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 "Specificira <placeholder-1/> fajl korišćen u tri načina razl, prikazana u levom panelu."

#. (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 njihovog fajla. Ovo je prikazano u pogledu naslova umesto putanje fajla."

#. (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 "Specificira <placeholder-1/> fajl korišćen u tri načina razl, prikazan u desnom panelu. Za dva načina razl, ovo je desni fajl."

#. (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 mog fajla. Ovo je prikazano u pogledu naslova umesto putanje fajla."

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

#. (entry)
#: ../source/TortoiseMerge_en.xml:1262
msgid "Specifies the resulting <placeholder-1/> file used in three way diffs. This is the file path where the result of the merge/conflict resolving is saved. If this is not set, then TortoiseMerge will ask the user where to save the result."
msgstr "Specificira rezultantni <placeholder-1/> fajl korišćenu tri načina razl. Ovo je fajlputanja gde rezultat stapanje/konflikt rešenje se sačuva. Ako ovo nije podešeno TortoiseMerge će pitati korisnika gde da sačuva rezultat."

#. (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 spojenog fajla. Ovo je prikazano u pogledu naslova fajl putanje."

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

#. (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 "Putanja gde će zakrpa biti primenjena. Ako ne podesite ovu putanju tada će TortoiseMerge pokušati da nađe putanju sam tražeći putanje u fajlu zakrpe, ali to može uzeti <placeholder-1/>."

#. (entry)
#: ../source/TortoiseMerge_en.xml:1288
msgid "The name of the original file to patch. Used for the view title."
msgstr "Ime originalnog fajla za zakrpu. Koristi se za pogled naslova."

#. (entry)
#: ../source/TortoiseMerge_en.xml:1295
msgid "The name of the resulting patched file. Used for the view title."
msgstr "Ime rezultujućeg fajla zakrpe. Koristi se pogled naslova."

#. (entry)
#: ../source/TortoiseMerge_en.xml:1302
msgid "The path to the patch/diff file to apply to a directory."
msgstr "Putanja ka zakrpa/diff fajl da se primeni na imenik."

#. (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 "Forsirati TortoiseMerge da krene sa jedan-način pogled umesto pogleda koji specificira korisnik u podešavanju."

#. (entry)
#: ../source/TortoiseMerge_en.xml:1315
msgid "Switches the left and right view of the specified two files to diff."
msgstr "Prebaci levi i desni pogled specificirana dva fajla za razl."

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

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

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

#. (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 "Kreira ujedinjen raz fajl (fajl zakrpa) od dva fajla specificiranih sa <placeholder-1/> i <placeholder-2/>. Cilj putanja je podešena sa <placeholder-3/>. Ako <placeholder-4/> nije podešen fajl sačuvaj dijalog je prikazan tako da korisnik može izabrati lokaciju da se sačuva fajl zakrpa. Beleška: Ako <placeholder-5/> je podešen svi drugi parametri se zanemaruju."

#. (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 ""
"Možete takođe snabdeti jednostavna fajlimena u komandnoj liniji zbog kompatibilnosti sa drugim diff programima. U ovoj pojednostavljenoj formi komandne linije je <screen>\n"
"TortoiseMerge BaseFilePath MyFilePath [ TheirFilePath ]\n"
"</screen> Ako su data dva fajla oni će biti upoređeni jedan sa drugim. Ako su tri fajla data prvi se uzima kao OSNOVNI fajl, i druga dva se upoređuju sa njim u tri-načina razl."

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

#. (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 "Subverziona komanda koja se koristi da doda fajl ili imenik u vašu radnu kopiju. Nova stavka je dodata u spremište kada urezujete."

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

#. (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 "Tekuća osnovna revizija fajla ili imenika u vašu <emphasis>radnu kopiju</emphasis>. Ovo je revizija fajla ili imenika koja je unutra, kada je poslednje preuzimanje, ažuriranje ili urezivanje urađeno. OSNOVNA revizija normalno nije jednaka GLAVNOJ reviziji."

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

#. (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 "Ova komanda je samo za tekst fajl i anotira svaku liniju da prikaže reviziju spremišta u kojoj je bila zadnja izmena i autora ko je uradio izmene. Naš GUI implementacija se zove TortoiseBlame i takođe prikazuje urezivanje datum/vreme i dnevnik poruka kada letite mišem preko revizionog broja."

#. (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 "Berkli DB. Dobro testirana baza podataka u osnovi spremišta, ne može se koristiti na mrežnoj podeli. Uobičajeno za spremišta pre 1.2."

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

#. (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 "Termin često korišćen u sistemu kontrole verzija da opiše šta se dešava kada ljudi iz razvoja u posebnom uprave i slede 2 odvojene putanje. Možete kreirati granu linije glavnog razvoja tako da razvijete nove osobine bez da učinite glavnu liniju nestabilnom. Ili možete granati stabilnu realizaciju gde se fiksirali bagove, dok novi razvoj krene na nestabilnom deblu. U Subverziji grana se inplementira kao  <quote>jeftina kopija</quote>."

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

#. (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 "Subverziona komanda koja kreira lokalnu radnu kopiju u praznom imeniku skidanjem verzionisanih fajlova iz spremišta."

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

#. (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 "Da citiramo iz Subverzione knjige: <quote> Rekurzivno brišite radnu kopiju, izbacite ključeve i ponovite nezavršene operacije. Ako ikad dobijete <emphasis>radna kopija zaključavanja</emphasis> greška, uradite ovu komandu da izbacite bajate ključeve i dovedete radnu kopiju u korisnom stanju. </quote> Primetimo da u ovom kontekstu  <emphasis>zaključavanje</emphasis> se odnosi na zaključavanje fajlsistema, nije zaključavanje spremišta."

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

#. (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 "Subverziona komanda se koristi da se prođu izmene u vašoj lokalnoj radnoj kopiji nazad u spremište, kreiranjem nove revizije spremišta."

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

#. (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 "Kada se izmene iz spremišta spoje sa lokalnim izmenama, ponekad ove izmene se pojavljuju u istoj liniji. U tom slučaju Subverzija ne može automatski da odluči koju verziju da koristi i za fajl se kaže da je u konfliktu. Imate da uredite fajl ručno i rešite konflikt pre nego što urežete dalje izmene."

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

#. (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 "U Subverzionom spremištu možete kreirati kopiju pojedinog fajla ili prazno stablo. Ovo je primenjeno kao <quote>jeftine kopije</quote> koje pomalo liče na na veze ka originalima u tome da gotovo nemaju ramake. Praveći kopiju sačuva se istorija stvke u kopiji tako da možete pratiti izmene pre nego je kopija napravljena."

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

#. (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 "Kada obrišete verzionisanu sztavku (i urežete izmene) stavka više ne postoji u spremištu posle urezivanje revizije. Ali svakako to tek postojiu ranijim revizijama spremišta, tako da mu još možete pristupiti. Ako je neophodno možete kopirati izbrisane stavke i <quote>povratiti</quote> ih kompletirati ih istorijom."

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

#. (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 "Skraćenica za <quote>Prikaži Razlike</quote>. Vrlo korisno kada želite da vidite koje izmene su urađene."

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

#. (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 "Ova komanda proizvodi kopiju verzionisanih imenika, samo kao radna kopija, ali bez lokalnog <literal>.svn</literal> imenike."

#. (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 "Ovlašćeni Subverzioni fajlsistem u osnovi spremišta. Može se koristiti u mrežnoj podeli. Uobičajen za 1.2 i novija spremišta."

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

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

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

#. (para)
#: ../source/TortoiseMerge_en.xml:1525
msgid "The latest revision of a file or folder in the <emphasis>repository</emphasis>."
msgstr "Zadnja revizije fajla i imenika u <emphasis>spremištu</emphasis>."

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

#. (para)
#: ../source/TortoiseMerge_en.xml:1533
msgid "Git command to import an entire folder hierarchy into the repository in a single revision."
msgstr "Subverziona komanda da uveze celu hijerarhiju imenika u spremište u jednoj reviziji."

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

#. (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 "Kada izbacite ključ na verzinisanoj stavci obeležite to u spremištu kao ne-ureziva, osim iz radne kopije gde je ključ izbačen."

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

#. (para)
#: ../source/TortoiseMerge_en.xml:1552
msgid "Show the revision history of a file or folder. Also known as <quote>History</quote>."
msgstr "Prikazuje istoriju revizija fajla i imenika. Takođe poznat kao <quote>Istorija</quote>."

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

#. (para)
#: ../source/TortoiseMerge_en.xml:1561
msgid "Show the revision history of a file or folder. Also known as <quote>Log</quote>."
msgstr "Prikazuje istoriju revizija fajla ili imenika. Takođe poznat kao <quote>Log</quote>."

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

#. (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 pomoću koga su izmene iz spremišta dodate vašoj radnoj kopiji bez uništanje bilo kojih izmena koje ste uradili lokalno. Ponekad ove izmene ne mogu se uskladiti automatski i kaže se da je radna kopija u konfliktu."

#. (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 "Stapanje se dešava automatski kada ažurirate radnu kopiju. Možete takođe stopiti specifične izmene od druge grane koristeći TortoiseGitovu Stopi komandu."

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

#. (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 "Radna kopija ima izmene samo tekst fajlova, moguće je koristiti Subverzione Diff komande da se generiše pojedinačan fajl rezultata tih izmena u Ujedinjenom Diff formatu. Fajl ovog tipa se često odnosi na <quote>Zakrpu</quote>, i može poslato epoštom još nekom (ili na poštansku listu) i primeniti se u sledećoj radnoj kopiji.Neko bez pristupa urezivanju može uraditi izmene i poslati fajl zakrpu autorizovanom urezivaču da je primeni. Ili ako niste sigurni u izmene možete poslati zakrpu drugima da je pregledaju. "

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

#. (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 "U dodatku verzionisanju vaših imenika i fajlova, Subverzija omogućava da dodate verzionisane metapodatke - označenih kao <quote>osobine</quote> svakog od verzionisanih imenika i fajlova. Svaka osobina ima ime i vrednost, radije kao ključ registra. Subverzija ima neke specijalne osobine koje se koriste interno, tako kao <literal>svn:eol-stil</literal>. TortoiseGit ima neke takođe, kao <literal>tsvn:logminsajz</literal>. Možete dodati vaše osobine sa bilo kojim imenom i vrednošću koju izaberete. "

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

#. (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 "Ako se vaše spremište pomeri, možda zato što ga vi pomerite u različit imenik na vašem serveru, ili se promeni ime domena servera, potrebnoje da <quote>relocirate</quote> vašu radnu kopiju tako da URL spremišta ukazuje na novu lokaciju."

#. (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 "Primedba: koristićete ovu komandu samo ako radna kopija ukazuje na istu lokaciju u istom spremištu, ali samo spremište je pomereno. U bilo kojoj drugoj situaciji verovatno vam je potrebna  <quote>Prebaci</quote> komanda umesto ove."

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

#. (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 "Spremište je središnje mesto gde su podaci sačuvani i održavani. Spremište može biti mesto gde je smešteno više baza podataka ili fajlovi za distribuciju preko mreže, ili spremište može biti lokacija kojoj se direktno pristupa bez putovanja kroz mrežu."

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

#. (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 "Kada fajlovi u radnoj kopiji ostanu u konfliktnom stanju posle spajanja, ove konflikte mora  urediti  čovek koristeći uređivač (ili možda TortoiseMerge). Ovaj proces se označava kao <quote>Rešenje konflikta</quote>. Kada je to kompletirano ,ožete označiti konfliktne fajlove da su rešeni, što im omogućava da budu urezani."

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

#. (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 "Subverzija čuva lokalnu <quote>neizmenjenu</quote> kopiju svakog fajla kakav je bio kada ste poslednji put ažurirali radnu kopiju. Ako uradite izmene i odlučite da ih poništite treba da koristite <quote>vrati</quote> komandu da se vratite na neizmenjenu kopiju."

#. (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 "Svaki put kad urezujete skup izmena, kreirate novu <quote>reviziju</quote> u spremištu. Svaka revizija predstavlja stanje stabla spremišta u izvsnom trenutku njegove istorije. Ako želite da se vratite u vreme možete pregledati spremište kakvo je bilo u reviziji 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 "UDrugačije, revizija može ukazivati na izmene koje su načinjene kada je revizija kreirana."

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1681
msgid "Revision Property (revprop)"
msgstr "Reviziona svojstva (revsvoj)"

#. (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 "Kao što fajlovi imaju svojstva to može i svaka revizija u spremištu. Neka specijalna revsvoj su dodata automatski kada je revizija kreirana, npr:<literal>svn:datum svn:autor svn:dnevnik</literal> koji predstalja datum/vreme urezivanja, urezivač i dnevnik poruka respektivno. Ova svojstva mogu biti uređivana, ali ona nisu verzionisana, tako da bilo koja promena je permanentna i ne može biti poništena. "

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

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

#. (para)
#: ../source/TortoiseMerge_en.xml:1700
msgid "The name of the Git custom protocol used by the <quote>svnserve</quote> repository server."
msgstr "Ime Subverzionog običnog protokola korišćenog od <quote>svnserv</quote> servera spremišta."

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

#. (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 "Kao i <quote>Ažuriraj-do-revizije</quote> menja prozor vremena radne kopije da gleda u različite tačke istorije, tako <quote>Prekidač</quote> menja prostor prozora radne kopije da ona upućije na različite delove spremišta. To je delimično korisno kada se radi na deblu i grane su samo za nekoliko fajlova različite. Možete prebaciti vašu radnu kopiju između dva i samo izmenjeni fajlovi će biti preneti."

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1721
msgid "Update"
msgstr "Ažuriranje"

#. (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 "Subverziona komanda dovlači zadnje izmene iz spremišta u vašu radnu kopiju, spajajući bilo koju izmenu urađenu od drugih sa lokalnim izmenama u radnoj kopiji."

#. (glossterm)
#: ../source/TortoiseMerge_en.xml:1731
msgid "Working Copy"
msgstr "Radna 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 "Ovo je vaša lokalna <quote>igraonica</quote>, predeo gde radite na verzionisanim fajlovima i ona se normalno nalazi na vašem lokalnom tvrdom disku. Vi keirate radnu kopiju izvršavajući <quote>Preuzimanje</quote> iz spremišta i pohranite vaše izmene nazad u spremište koristeći <quote>Urezivanje</quote>."

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

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