# # Serbian latin translation for TortoiseGit # Copyright (C) 2008-2009 the TortoiseGit team # This file is distributed under the same license as TortoiseGit # # Last commit by: # $Author: luebbe $ # $Date: 2009-01-22 16:58:13 +0800 (Thu, 22 Jan 2009) $ # $Rev: 15157 $ # # Authors: # Milorad Popović , 2008 # # msgid "" msgstr "" "Project-Id-Version: TortoiseGit Documentation\n" "POT-Creation-Date: 2009-01-12 08:46 +0000\n" "PO-Revision-Date: 2009-01-21 20:08+0100\n" "Last-Translator: Milorad Popović\n" "Language-Team: TortoiseGit translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Serbian latin\n" "X-Poedit-Country: SERBIA\n" #. When image changes, this message will be marked fuzzy or untranslated for you. #. It doesn't matter what you translate it to: it's not used at all. #. (None) #: ../source/TortoiseGit_en.xml:13324 msgid "@@image: 'images/svn_move.png'; md5=THIS FILE DOESN'T EXIST" msgstr "@@image: 'images/svn_move.png'; md5=THIS FILE DOESN'T EXIST" #. (title) #. (secondary) #: ../source/TortoiseGit_en.xml:4 #: ../source/TortoiseGit_en.xml:3022 msgid "TortoiseGit" msgstr "TortoiseGit" #. (subtitle) #: ../source/TortoiseGit_en.xml:5 msgid "A Git client for Windows" msgstr "Subverzioni klijent za Vindouz" #. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated #. (subtitle) #: ../source/TortoiseGit_en.xml:6 msgid "Version $MajorVersion$.$MinorVersion$.$MicroVersion$" msgstr "Verzija $MajorVersion$.$MinorVersion$.$MicroVersion$" #. (edition) #: ../source/TortoiseGit_en.xml:8 msgid "First" msgstr "Prvi" #. (firstname) #: ../source/TortoiseGit_en.xml:11 msgid "Stefan" msgstr "Stefan" #. (surname) #: ../source/TortoiseGit_en.xml:12 msgid "Küng" msgstr "Küng" #. (firstname) #: ../source/TortoiseGit_en.xml:15 msgid "Lübbe" msgstr "Lübbe" #. (surname) #: ../source/TortoiseGit_en.xml:16 msgid "Onken" msgstr "Onken" #. (firstname) #: ../source/TortoiseGit_en.xml:19 msgid "Simon" msgstr "Simon" #. (surname) #: ../source/TortoiseGit_en.xml:20 msgid "Large" msgstr "Large" #. (title) #: ../source/TortoiseGit_en.xml:27 msgid "Preface" msgstr "Predgovor" #. (para) #: ../source/TortoiseGit_en.xml:35 msgid "Do you work in a team?" msgstr "Da li radite u timu?" #. (para) #: ../source/TortoiseGit_en.xml:40 msgid "Has it ever happened that you were working on a file, and someone else was working on the same file at the same time? Did you lose your changes to that file because of that?" msgstr "Da li vam se ikad desilo da ste radili na fajlu, i da je neko drugi radio na istom fajlu u isto vreme? Da li ste zbog toga izgubili vaše izmene tog fajla?" #. (para) #: ../source/TortoiseGit_en.xml:47 msgid "Have you ever saved a file, and then wanted to revert the changes you made? Have you ever wished you could see what a file looked like some time ago?" msgstr "Da li ste ikada sačuvali fajl i onda poželeli da vratite izmene koje ste uradili? Da li ste ikada poželeli da možete da vidite kako je fajl izgledao pre nekog vremena?" #. (para) #: ../source/TortoiseGit_en.xml:54 msgid "Have you ever found a bug in your project and wanted to know when that bug got into your files?" msgstr "Da li ste ikada našli bag u svom projektu i želeli da znate kada je bag nastao u vašim fajlovima." #. (para) #: ../source/TortoiseGit_en.xml:61 msgid "If you answered yes to one of these questions, then TortoiseGit is for you! Just read on to find out how TortoiseGit can help you in your work. It's not that difficult." msgstr "Ako odgovorite da na jedno od ovih pitanja,TortoiseGit je za vas! Nastavite sa čitanjem da bi ste našli kako vam TortoiseGit može pomoći u poslu. To nije tako teško." #. (title) #: ../source/TortoiseGit_en.xml:71 msgid "Audience" msgstr "Auditorijum" #. (para) #: ../source/TortoiseGit_en.xml:72 msgid "This book is written for computer literate folk who want to use Git to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." msgstr "Ova knjiga je napisana za poznavaoce kompjutera koji žele da koriste Subverziju da upravljaju svojim podacima, a nije im zgodno da koriste programe koji to rade iz komandne linije. Kako je TortoiseGit proširenje vindouz školjke uzima se da je korisnik upoznat sa vindouz pretraživačem i zna kako ga koristiti." #. (title) #: ../source/TortoiseGit_en.xml:84 msgid "Reading Guide" msgstr "Vodič za čitanje" #. (para) #: ../source/TortoiseGit_en.xml:85 msgid "This explains a little about the TortoiseGit project, the community of people who work on it, and the licensing conditions for using it and distributing it." msgstr " objašnjava osnove TortoiseGit projekta, zajednicu ljudi koji rade na njemu, i uslove licence za korišćenje i distribuciju. " #. (para) #: ../source/TortoiseGit_en.xml:90 msgid "The explains what TortoiseGit is, what it does, where it comes from and the basics for installing it on your PC." msgstr " objašnjava šta je TortoiseGit, šta radi, odakle dolazi i osnove za instalaciju na PC." #. (para) #: ../source/TortoiseGit_en.xml:95 msgid "In we give a short introduction to the Git revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Git project and explains the different approaches to version control, and how Git works." msgstr "U dali smo kratak uvod u Subverzija revizioni kontrolni sistem koji pokriva TortoiseGit. Ovo je pozajmljeno iz dokumentacije za projekat Subverzije i objašnjava rezličite pristupe kontroli verzija, i kako Subverzija radi." #. (para) #: ../source/TortoiseGit_en.xml:102 msgid "Even most Git users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators." msgstr "Većina Korisnika Subverzije neće nikada sami podešavati server. Sledeće poglavlje se bavi postupkom podešavanja servera i korisno je za administratore. " #. (para) #: ../source/TortoiseGit_en.xml:107 msgid "The chapter on explains how to set up a local repository, which is useful for testing Git and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." msgstr "Poglavlje objašnjava kako podesiti lokalno spremište, koje je korisno za testiranje Subverzije i TortoiseGit koristeći jedan PC. Ono takođe objašnjava nešto malo o administriranju spremišta što je relevantno za spremišta locirana na serveru." #. (para) #: ../source/TortoiseGit_en.xml:113 msgid "The is the most important section as it explains all the main features of TortoiseGit and how to use them. It takes the form of a tutorial, starting with checking out a working copy, modifying it, committing your changes, etc. It then progresses to more advanced topics." msgstr " je najvažniji deo jer objašnjava sve glavne mogućnosti TortoiseGit i kako ih koristiti. U obliku je tutorijala, počinje proverom radne kopije, njenim izmenama, urezivanjem vaših izmena itd. Nastavlja se naprednijim temama." #. (para) #: ../source/TortoiseGit_en.xml:120 msgid " is a separate program included with TortoiseGit which can extract the information from your working copy and write it into a file. This is useful for including build information in your projects." msgstr " je poseban program pridodat TortoiseGit koji može izdvojiti informacije iz vaše radne kopije i upisati ih u fajl. Ovo je korisno za uključivanje razvojne informacije u vaš projekat." #. (para) #: ../source/TortoiseGit_en.xml:125 msgid "The section answers some common questions about performing tasks which are not explicitly covered elsewhere." msgstr " deo odgovara na neka opšta pitanja o primeni zadataka koji nisu eksplicitno pokriveni bilo gde." #. (para) #: ../source/TortoiseGit_en.xml:129 msgid "The section on shows how the TortoiseGit GUI dialogs can be called from the command line. This is useful for scripting where you still need user interaction." msgstr "Deo prikazuje kako TortoiseGit GUI dijalozi mogu biti pozvani iz komandne linije. Ovo je korisno za pravljenje skripta tamo gde je još potrebna interakcija korisnika." #. (para) #: ../source/TortoiseGit_en.xml:134 msgid "The give a correlation between TortoiseGit commands and their equivalents in the Git command line client svn.exe." msgstr " daje korelaciju između TortoiseGit komandi i njihovih ekvivalenata u Subverzija klijenta komandne linije svn.exe." #. (title) #: ../source/TortoiseGit_en.xml:144 msgid "TortoiseGit is free!" msgstr "TortoiseGit je besplatan!" #. (para) #: ../source/TortoiseGit_en.xml:145 msgid "TortoiseGit is free. You don't have to pay to use it, and you can use it any way you want. It is developed under the GNU General Public License (GPL)." msgstr "TortoiseGit je besplatan. Vi ne morate da platite da bi ga koristili, možete ga koristiti kako god želite. Razvijen je pod GNU Generlnom Javnom Licencom (GJL)" #. (para) #: ../source/TortoiseGit_en.xml:149 msgid "TortoiseGit 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 http://TortoiseGit.tigris.org/svn/TortoiseGit/. You will be prompted to enter username and password. The username is guest, and the password must be left blank. The most recent version (where we're currently working) is located under /trunk/, and the released versions are located under /tags/." msgstr "TortoiseGit je projekat Otvorenog Koda. To znači da imate pun pristup izvornom kodu programa. Možete ga potražiti na linku http://TortoiseGit.tigris.org/svn/TortoiseGit/. Bićete pitani da unesete korisnika i lozinku. Korisnikguest, a lozinka mora ostati prazna. Najskorija verzija (gde je izrada u toku)locirana je na /trunk/ realizovana verzija je pod /tags/." #. (title) #: ../source/TortoiseGit_en.xml:168 msgid "Community" msgstr "Zajednica" #. (para) #: ../source/TortoiseGit_en.xml:169 msgid "Both TortoiseGit and Git are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs." msgstr "I TortoiseGit i Subverzija su razvijeni od zajednice ljudi koji rade na tim projektima. Oni dolaze iz raznih zemalja iz celog sveta i udružuju se da zajedno naprave izvanredne programe." #. (title) #: ../source/TortoiseGit_en.xml:180 msgid "Acknowledgments" msgstr "Zahvalnosti" #. (term) #: ../source/TortoiseGit_en.xml:183 msgid "Tim Kemp" msgstr "Tim Kemp" #. (para) #: ../source/TortoiseGit_en.xml:185 msgid "for founding the TortoiseGit project" msgstr "za osnivanje TortoiseGit projekta" #. (term) #: ../source/TortoiseGit_en.xml:191 msgid "Stefan Küng" msgstr "Stefan Kung" #. (para) #: ../source/TortoiseGit_en.xml:193 msgid "for the hard work to get TortoiseGit to what it is now" msgstr "za težak rad da se TortoiseGit dovede do onog šta je sada" #. (term) #: ../source/TortoiseGit_en.xml:199 msgid "Lübbe Onken" msgstr "Lube Onken" #. (para) #: ../source/TortoiseGit_en.xml:201 msgid "for the beautiful icons, logo, bug hunting, translating and managing the translations" msgstr "za lepe ikone, logo, lovljenje bagova, prevođenje i upravljanjem prevodima" #. (term) #: ../source/TortoiseGit_en.xml:208 msgid "Simon Large" msgstr "Simon Lardž" #. (para) #: ../source/TortoiseGit_en.xml:210 msgid "for helping with the documentation and bug hunting" msgstr "za pomaganje u dokumentaciji i traženju bagova" #. (term) #: ../source/TortoiseGit_en.xml:216 msgid "The Git Book" msgstr "Knjiga Subverzija" #. (para) #: ../source/TortoiseGit_en.xml:218 msgid "for the great introduction to Git and its chapter 2 which we copied here" msgstr "za veliki uvod u Subverziju i poglavlje 2 koje smo kopirali ovde" #. (term) #: ../source/TortoiseGit_en.xml:225 msgid "The Tigris Style project" msgstr "Tigris stil projekat" #. (para) #: ../source/TortoiseGit_en.xml:227 msgid "for some of the styles which are reused in this documentation" msgstr "za neke stilove koje su preuzete u ovu dokumentaciju" #. (term) #: ../source/TortoiseGit_en.xml:233 msgid "Our Contributors" msgstr "Naši dopisnici" #. (para) #: ../source/TortoiseGit_en.xml:235 msgid "for the patches, bug reports and new ideas, and for helping others by answering questions on our mailing list." msgstr "za zakrpe, report bagova i nove ideje, i za pomaganje drugima odgovaranjem na pitanja na našoj poštanskoj listi." #. (term) #: ../source/TortoiseGit_en.xml:242 msgid "Our Donators" msgstr "Naši donatori" #. (para) #: ../source/TortoiseGit_en.xml:244 msgid "for many hours of joy with the music they sent us" msgstr "za mnogo časova uživanja u muzici koju su nam slali" #. (title) #: ../source/TortoiseGit_en.xml:255 msgid "Terminology used in this document" msgstr "Terminologija korišćena u ovom dokumentu" #. (para) #: ../source/TortoiseGit_en.xml:256 msgid "To make reading the docs easier, the names of all the screens and Menus from TortoiseGit are marked up in a different font. The Log Dialog for instance." msgstr "Da bi se olakšalo čitanje dokumenata imena svih ekrana i Menija u TortoiseGit su obeležena u različitom pismu. Na primer Dialog dnevnika" #. (para) #: ../source/TortoiseGit_en.xml:261 msgid "A menu choice is indicated with an arrow. TortoiseGitShow Log means: select Show Log from the TortoiseGit context menu." msgstr "Izbor menija prikazana strelicom. TortoiseGitDnevnik prikaza means: selekt Dnevniik prikazaiz TortoiseGit meni sadržaja." #. (para) #: ../source/TortoiseGit_en.xml:270 msgid "Where a local context menu appears within one of the TortoiseGit dialogs, it is shown like this: Context MenuSave As ..." msgstr "Tamo gde se lokalni kontekstni meni pojavljuje u okviru TortoiseGit dijaloga, to je prikazano kao: Kontekstni MeniUpamti kao ..." #. (para) #: ../source/TortoiseGit_en.xml:278 msgid "User Interface Buttons are indicated like this: Press OK to continue." msgstr "Dugme korisničkog interfejsa prikazano je kao: PritisniDA da nastavi. " #. (para) #: ../source/TortoiseGit_en.xml:282 msgid "User Actions are indicated using a bold font. Alt+A: press the Alt-Key on your keyboard and while holding it down press the A-Key as well. Right-drag: press the right mouse button and while holding it down drag the items to the new location." msgstr "Korisničke akcije su prikazane korišćenjem masnog pisma. Alt+A: pritisni Alt-Taster na tastaturi i dok ga držite pritisnite A-tasterl. Desno vučenje:pritisnite desno dugme miša i dok ga držite vucitestavku na novu lokaciju." #. (para) #: ../source/TortoiseGit_en.xml:290 msgid "System output and keyboard input is indicated with a different font as well." msgstr "Sistemski izlaz i ulaz sa tastature označen je sa različitim pismom takođe." #. (para) #: ../source/TortoiseGit_en.xml:295 msgid "Important notes are marked with an icon." msgstr "Važne zabeleške su označene ikonom." #. (para) #: ../source/TortoiseGit_en.xml:300 msgid "Tips that make your life easier." msgstr "Saveti koji vam čine život lakšim." #. (para) #: ../source/TortoiseGit_en.xml:305 msgid "Places where you have to be careful what you are doing." msgstr "Mesta gde treba da brinete šta radite." #. (para) #: ../source/TortoiseGit_en.xml:310 msgid "Where extreme care has to be taken, data corruption or other nasty things may occur if these warnings are ignored." msgstr "Tamo gde je izuzetna briga preduzeta, uništavanje podataka ili druge loše stvari mogu se javiti ako se upozorenja ignorišu." #. (title) #. (title) #. (title) #: ../source/TortoiseGit_en.xml:319 #: ../source/TortoiseGit_en.xml:1482 #: ../source/TortoiseGit_en.xml:2481 msgid "Introduction" msgstr "Uvod" #. (primary) #: ../source/TortoiseGit_en.xml:323 msgid "version control" msgstr "kontrola verzije" #. (para) #: ../source/TortoiseGit_en.xml:325 msgid "Version control is the art of managing changes to information. It has long been a critical tool for programmers, who typically spend their time making small changes to software and then undoing or checking some of those changes the next day. Imagine a team of such developers working concurrently - and perhaps even simultaneously on the very same files! - and you can see why a good system is needed to manage the potential chaos." msgstr "Kontrola verzija je umetnost upravljanja izmenama informacija.To je dugo bio kritičan alat za programere, koji tipično troše svoje vreme praveći male izmene softvera zatim vraćaju ili proveravaju te izmene sledećeg dana. Zamislimo tim takvih ljudi koji rade istovremeno - i možda čak simultano na vrlo sličnim fajlovima! - i vi možete videti zašto je potreban dobar sistem da upravljanje potencijalnim haosom." #. (title) #: ../source/TortoiseGit_en.xml:339 msgid "What is TortoiseGit?" msgstr "Šta je TortoiseGit?" #. (para) #: ../source/TortoiseGit_en.xml:340 msgid "TortoiseGit is a free open-source client for the Git version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central repository. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Git and version control systems in general as a sort of time machine." msgstr "TortoiseGit je beplatan klijent otvorenog koda za Subverzioni sistem kontrole verzija. Dakle, TortoiseGit upravlja fajlovima i imenicima prekovremeno. Fajlovi su smešteni u centralnom spremištu. Spremište je u mnogome kao pravi fajl server, osim što pamti svaku promenu ikada napravljenu na vašim fajlovima i imenicima. Ovo vam dozvoljava da pozovete stare verzije vaših fajlova i proučite istoriju kako i kada su podaci promenjeni, i ko ih je promenio. Zbog toga mnogi ljudi o Subverziji i sistemima kontrole verzija uopšteno misle da su to vremenske mašine." #. (para) #: ../source/TortoiseGit_en.xml:352 msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Git, however, is not one of these systems; it is a general system that can be used to manage any collection of files, including source code." msgstr "Neki sistemi kontrole verzija su takođe softver sistemi upravljanja konfiguracijom (SUK). Ovi sistemi su specijalno priagođeni da upravljaju stabla izvornog koda, i imaju mnoge osobine specifične za razvoj softvera - kao što je prirodno razumevanje programskih jezika, ili snabdevanjem alatima za izradu softvera. Subverzija, međutim, nije jedan od tih sistema; ona je opšti sistem koji se može koristiti da upravlja svaki skup fajlova, obuhvatajući i izvorni kod." #. (title) #: ../source/TortoiseGit_en.xml:368 msgid "TortoiseGit's History" msgstr "TortoiseGit istorija" #. (para) #: ../source/TortoiseGit_en.xml:369 msgid "In 2002, Tim Kemp found that Git was a very good version control system, but it lacked a good GUI client. The idea for a Git client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." msgstr "U 2002 Tim Kemp je našao da je Subverzija bila jako dobar sistem kontrole verzija, ali je nedostajao dobar GUI klijent. Ideja za Sbverzioni klijent kao Vindouz integrisanu školjku inspirisana je sličnim klijentom za CVS imenom TortoiseCVS." #. (para) #: ../source/TortoiseGit_en.xml:375 msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain TortoiseGit.org and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Git and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained." msgstr "Tim je proučio izvorni kod TortoiseCVS i iskoristio ga kao osnovu za TortoiseGit. On je zatim započeo sa projektom, registrujući domen TortoiseGit.org i stavio je izvorni kod onlajn. U to vreme, Stefan King je tražio dobar i besplatan sistem kontrole verzija i našao Subverziju i izvorni kod za TortoiseGit. Pošto TortoiseGit još nije bio spreman za korišćenje on se pridružio projektu i počeo da programira. Uskoro je prepisao većinu postojećeg koda i počeo da dodaje komande i mogućnosti, sve do tačke gde ništa od originalnog koda nije ostalo. " #. (para) #: ../source/TortoiseGit_en.xml:386 msgid "As Git became more stable it attracted more and more users who also started using TortoiseGit as their Git client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation." msgstr "Što je Subverzija postajala stabilnija privlačila je sve više korisnika koji su počeli da koriste TortoiseGit kao Subverzioni klijent. Korisnička osnova raste brzo (i još uvek raste svaki dan). To je od kad je Lube Onken ponudio da pomogne sa lepim ikonama i logom za TortoiseGit. On vodi brigu o vebsajtu i upravlja prevodima." #. (title) #: ../source/TortoiseGit_en.xml:399 msgid "TortoiseGit's Features" msgstr "TortoiseGit osobine" #. (para) #: ../source/TortoiseGit_en.xml:400 msgid "What makes TortoiseGit such a good Git client? Here's a short list of features." msgstr "Šta čini TortoiseGit tako dobrim Subverzionim klijentom? Ovde je kratka lista osobina." #. (term) #: ../source/TortoiseGit_en.xml:406 msgid "Shell integration" msgstr "Integracija školjke" #. (primary) #: ../source/TortoiseGit_en.xml:409 msgid "Windows shell" msgstr "Vindouz školjka" #. (primary) #: ../source/TortoiseGit_en.xml:412 msgid "explorer" msgstr "pretraživač" #. (para) #: ../source/TortoiseGit_en.xml:414 msgid "TortoiseGit integrates seamlessly into the Windows shell (i.e. the explorer). This means you can keep working with the tools you're already familiar with. And you do not have to change into a different application each time you need functions of the version control!" msgstr "TortoiseGit se bešvno integriše u Vindouz školjku (tj. pretraživač). Ovo znači da možete nastaviti rad sa alatom sa kojim ste već familijarni. Vi ne morate da ulazite u drugačiju aplikaciju svaki put kada vam trebaju funkcije iz kontrole verzija!" #. (para) #: ../source/TortoiseGit_en.xml:421 msgid "And you are not even forced to use the Windows Explorer. TortoiseGit's context menus work in many other file managers, and in the File/Open dialog which is common to most standard Windows applications. You should, however, bear in mind that TortoiseGit is intentionally developed as extension for the Windows Explorer. Thus it is possible that in other applications the integration is not as complete and e.g. the icon overlays may not be shown." msgstr "I niste čak ni obavezni da koristite Vindouz Eksplorer. TortoiseGitov kontekst meni radi u mnogim drugim fajl menadžerima, i u Fajl/Otvori dijalogu koji je zajednički za većinu standardnih Vindouz aplikacija. Vi treba, međutim, imati na umu da TortoiseGit namerno razvijen kao proširenje za Vindouz Eksplorer. Zbog toga je moguće da u drugim aplikacijama integracija nije kompletna i npr. ikone za prekrivanje možda neće biti prikazane." #. (term) #: ../source/TortoiseGit_en.xml:435 msgid "Icon overlays" msgstr "Ikone prekrivači" #. (para) #: ../source/TortoiseGit_en.xml:437 msgid "The status of every versioned file and folder is indicated by small overlay icons. That way you can see right away what the status of your working copy is." msgstr "Status svakog verzionisanog fajla i imenika označen je prekrivanjem ikonom. Na taj način možete videti status vaše radne kopije." #. (term) #: ../source/TortoiseGit_en.xml:445 msgid "Easy access to Git commands" msgstr "Lak pristup Subverzionim komandama." #. (para) #: ../source/TortoiseGit_en.xml:447 msgid "All Git commands are available from the explorer context menu. TortoiseGit adds its own submenu there." msgstr "Sve Subverzione komande su dostupne iz eksplorerovog kontekstnog menija. TortoiseGit dodaje svoj submeni onde." #. (para) #: ../source/TortoiseGit_en.xml:454 msgid "Since TortoiseGit is a Git client, we would also like to show you some of the features of Git itself:" msgstr "Kako je TortoiseGit Subverzioni klijent, mi bismo voleli da prikažemo neke osobine same Subverzije:" #. (term) #: ../source/TortoiseGit_en.xml:460 msgid "Directory versioning" msgstr "Verzionisanje imenika" #. (para) #: ../source/TortoiseGit_en.xml:462 msgid "CVS only tracks the history of individual files, but Git implements a virtual versioned filesystem that tracks changes to whole directory trees over time. Files and directories are versioned. As a result, there are real client-side move and copy commands that operate on files and directories." msgstr "CVS prati samo istoriju individualnih fajlova, dok Subverzija implementiravirtualni verzionisani fajlsistem koji beleži promene celog stabla imenika prekovremeno. Fajlovi i imenici su verzionisani. Kao reziltat, postoji prava klijent-strana premesti i kopiraj komande koje rade na fajlovima i imenicima." #. (term) #: ../source/TortoiseGit_en.xml:475 msgid "Atomic commits" msgstr "Atomsko urezivanje" #. (para) #: ../source/TortoiseGit_en.xml:477 msgid "A commit either goes into the repository completely, or not at all. This allows developers to construct and commit changes as logical chunks." msgstr "Urezivanje ili ide u spremište kompletno, ili ništa. Ovo omogućava ljudima iz razvoja da naprave i urežu izmene kao logičke delove. " #. (term) #: ../source/TortoiseGit_en.xml:485 msgid "Versioned metadata" msgstr "Verzionisani metapodaci" #. (para) #: ../source/TortoiseGit_en.xml:487 msgid "Each file and directory has an invisible set of properties attached. You can invent and store any arbitrary key/value pairs you wish. Properties are versioned over time, just like file contents." msgstr "Svaki fajl i imenik ima dodat nevidljivi skup osobina. Vi možete smisliti i smestiti bilo koji ključ/vrednost par koji želite. Osobine se verzionišu prekovremeno, upravo kao sadržaji fajla. " #. (term) #: ../source/TortoiseGit_en.xml:497 msgid "Choice of network layers" msgstr "Izbor mrežnih slojeva" #. (para) #: ../source/TortoiseGit_en.xml:499 msgid "Git has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Git's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Git a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Git server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." msgstr "Subverzija ima apstraktnu ideju pristupa spremištu, čineći ga lakim da ljudi inplementiraj u nove mrežne mehanizme.Subverzioni napredni mrežni serverje modul za apač veb server, koji govori varijantu HTTP zvanu VebDAV/DeltaV. To daje Subverziji veliku prednost u stabilnosti i operatibilnosti, i omogućava razne ključne osobine besplatno: autentikaciju, autorizaciju, compresiju, i pretraživanje spremišta, na primer.Mali, samostalni Subverzioni server proces je takođe dostupan. Ovaj server govori uopbičajeni protokol koji može biti lako provučen kroz ssh." #. (term) #: ../source/TortoiseGit_en.xml:516 msgid "Consistent data handling" msgstr "Skladno rukovanje podacima" #. (para) #: ../source/TortoiseGit_en.xml:518 msgid "Git expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network." msgstr "Subverzija izlaže fajl razlike koristeći binarni diferencijalni algoritam, koji radi identično na tekst (ljudski čitljivim) i binarnim (ljudski nečitljivim) fajlovima. Oba tipa fajlova su smeštena jednako komprimovani u spremištu, i razlike su prenete u oba smera kroz mrežu." #. (term) #: ../source/TortoiseGit_en.xml:529 msgid "Efficient branching and tagging" msgstr "Efikasno grananje i označavanje" #. (para) #: ../source/TortoiseGit_en.xml:531 msgid "The cost of branching and tagging need not be proportional to the project size. Git creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository." msgstr "Cena grananja i označavanja ne treba da bude proporcionalno veličini projekta. Subverzija stvara grane i značke jednostavnim kopiranjem projekta, koristeći mehanizam sličan čvrstim linkovima. Zato ove operacije uzimaju veoma mali, konstantan iznos vremena, i veoma mali prostor u spremištu." #. (term) #: ../source/TortoiseGit_en.xml:542 msgid "Hackability" msgstr "Hakerabiliti" #. (para) #: ../source/TortoiseGit_en.xml:544 msgid "Git has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Git extremely maintainable and usable by other applications and languages." msgstr "Subverzija nema istrijski prtljag; ona je implementirana kao kolekcija deljivih C biblioteka sa dobro definisanim APIjem. To čini Subverziju ekstremno podržavajućom i iskoristivom od drugih aplikacija i jezika." #. (title) #: ../source/TortoiseGit_en.xml:558 msgid "Installing TortoiseGit" msgstr "Instaliranje TortoiseGit" #. (title) #: ../source/TortoiseGit_en.xml:560 msgid "System requirements" msgstr "Zahtevi sistema" #. (para) #: ../source/TortoiseGit_en.xml:561 msgid "TortoiseGit runs on Windows 2000 SP2, Windows XP or higher. Windows 98, Windows ME and Windows NT4 are no longer supported since TortoiseGit 1.2.0, but you can still download the older versions if you really need them." msgstr "TortoiseGit radi na Windows 2000 SO2, Windows XP ili viši, Windows ME i Windows NT4 više nisu podržani od TortoiseGit 1.2.0, ali još možete preneti stare verzije ako su vam stvarno potrebne." #. (para) #: ../source/TortoiseGit_en.xml:567 msgid "If you encounter any problems during or after installing TortoiseGit please refer to first." msgstr "Ako naiđete na bilo kakav problem posle instaliranja TortoiseGit molim obratite se najpre. " #. (title) #: ../source/TortoiseGit_en.xml:575 msgid "Installation" msgstr "Instalacija" #. (primary) #: ../source/TortoiseGit_en.xml:577 msgid "install" msgstr "instaliraj" #. (para) #: ../source/TortoiseGit_en.xml:579 msgid "TortoiseGit comes with an easy to use installer. Double click on the installer file and follow the instructions. The installer will take care of the rest." msgstr "TortoiseGit dolazi sa instalatorom koji je lak za upotrebu. Dvostruko kliknite na instalator fajl i pratite instrukcije. Instalator će brinuti o ostalom." #. (para) #: ../source/TortoiseGit_en.xml:585 msgid "You need Administrator privileges to install TortoiseGit." msgstr "Potrebne su vam Administratorske privelegije da instalirate TortoiseGit." #. (title) #: ../source/TortoiseGit_en.xml:591 msgid "Language Packs" msgstr "Jezički paketi" #. (primary) #: ../source/TortoiseGit_en.xml:593 msgid "language packs" msgstr "jezički paketi" #. (primary) #: ../source/TortoiseGit_en.xml:596 msgid "translations" msgstr "prevodi" #. (para) #: ../source/TortoiseGit_en.xml:598 msgid "The TortoiseGit user interface has been translated into many different languages, so you may be able to download a language pack to suit your needs. You can find the language packs on our translation status page. And if there is no language pack available yet, why not join the team and submit your own translation ;-)" msgstr "TortoiseGit korisnički interfejs je preveden na mnoge različite jezike, tako da možete da prenesete jezički paket koji vam je potreban. Jezičke pakete možete naći na translation status page. I ako jezički paket još nije dostupan, zašto se ne priključiti timu i podnesete svoj lični prevod; -)" #. (para) #: ../source/TortoiseGit_en.xml:609 msgid "Each language pack is packaged as a .exe installer. Just run the install program and follow the instructions. Next time you restart, the translation will be available." msgstr "Svaki jezički paket je spakovanu kao .exe instalacija. Samo izvršite instalacioni program i sledite instrukcije. Sledeći put kad restartuje kompjuter prevod će biti dostupan. " #. (title) #: ../source/TortoiseGit_en.xml:616 msgid "Spellchecker" msgstr "Pravopiskontrola" #. (primary) #: ../source/TortoiseGit_en.xml:618 msgid "spellchecker" msgstr "pravopiskontrola" #. (primary) #: ../source/TortoiseGit_en.xml:621 msgid "dictionary" msgstr "rečnik" #. (para) #: ../source/TortoiseGit_en.xml:623 msgid "TortoiseGit includes a spell checker which allows you to check your commit log messages. This is especially useful if the project language is not your native language. The spell checker uses the same dictionary files as OpenOffice and Mozilla." msgstr "TortoiseGit uključuje kontrolu pravopisa koja vam dozvoljava da kontrolišete vaše dnevnik poruka urezivanja. Ovo je naročito korisno ako jezik projekta nije vaš maternji jezik. Kontrolor pravopisa koristi iste fajlove rečnika kao OpenOffice i Mozilla." #. (para) #: ../source/TortoiseGit_en.xml:636 msgid "The installer automatically adds the US and UK English dictionaries. If you want other languages, the easiest option is simply to install one of TortoiseGit's language packs. This will install the appropriate dictionary files as well as the TortoiseGit local user interface. Next time you restart, the dictionary will be available too." msgstr "Instalacija automatski dodaje US i UK Engleski rečnik. Ako želite druge jezike, najlakša mogućnost je da instalirate jedan od TortoiseGit jezičkih paketa. To će instalirati odgovarajuće fajlove rečnika kao i TortoiseGit lokalni korisnički interfejs. Po restartovanju kompjutera rečnik će takođe biti dostupan." #. (para) #: ../source/TortoiseGit_en.xml:644 msgid "Or you can install the dictionaries yourself. If you have OpenOffice or Mozilla installed, you can copy those dictionaries, which are located in the installation folders for those applications. Otherwise, you need to download the required dictionary files from http://wiki.services.openoffice.org/wiki/Dictionaries" msgstr "Ili možete instalirati rečnik sami. Ako imate OpenOfis ili Mozilu instalirane možete kopirati njihove rečnike, koji su smešteni u instalacionom imeniku tih aplikacija. Inače, potrebno je da prenesete željene fajlove rečnika sa http://wiki.services.openoffice.org/wiki/Dictionaries" #. (filename) #: ../source/TortoiseGit_en.xml:661 msgid "en_US.aff" msgstr "en_US.aff" #. (filename) #: ../source/TortoiseGit_en.xml:666 msgid "en_US.dic" msgstr "en_US.dic" #. (para) #: ../source/TortoiseGit_en.xml:653 msgid "Once you have got the dictionary files, you probably need to rename them so that the filenames only have the locale chars in it. Example: Then just copy them to the bin sub-folder of the TortoiseGit installation folder. Normally this will be C:\\Program Files\\TortoiseGit\\bin. If you don't want to litter the bin sub-folder, you can instead place your spell checker files in C:\\Program Files\\TortoiseGit\\Languages. If that folder isn't there, you have to create it first. The next time you start TortoiseGit, the spell checker will be available." msgstr "Jednom kad imate fajlove rečnika, verovatno će trebati da ih preimenujete tako imena fajlova imaju samo lokalne karaktere. Primer: Zatim samo ih kopirajte u bin sub-imenik TortoiseGit instalacionog imenika. Normalno to će biti C:\\Program Files\\TortoiseGit\\bin. Ako ne želite da opterećujete bin sub-imenik, umesto toga možete smestiti kontrolne fajlove u filename>C:\\Program Files\\TortoiseGit\\Languages. Ako nema tog imenika, kreirajte ga. Kada sledeći put pokrenete TortoiseGit, pravopisna kontrola će biti dostupna." #. (para) #: ../source/TortoiseGit_en.xml:684 msgid "Check the tsvn:projectlanguage setting. Refer to for information about setting project properties." msgstr "Proverite tsvn:projectlanguage podešavanje. Pogledajte za informacije o podešavanju osobina projekta." #. (para) #: ../source/TortoiseGit_en.xml:691 msgid "If no project language is set, or that language is not installed, try the language corresponding to the Windows locale." msgstr "Ako jezik projekta nije označen, ili taj jezik nije instaliran, probajte jezik koji odgovara Vindouz lokalnom jeziku." #. (para) #: ../source/TortoiseGit_en.xml:697 msgid "If the exact Windows locale doesn't work, try the Base language, eg. de_CH (Swiss-German) falls back to de_DE (German)." msgstr "Ako pravi Vindouz lokalni jezik ne funkcioniše, probajte Osnovni jezik, npr. de_CH (Švajcarska-Nemački) ide na de_DE (Nemački)." #. (para) #: ../source/TortoiseGit_en.xml:705 msgid "If none of the above works, then the default language is English, which is included with the standard installation." msgstr "Ako ništa od navedenog ne radi, tada je uobičajeni jezik Engleski, koji je uključen u standardnu instalaciju." #. (para) #: ../source/TortoiseGit_en.xml:679 msgid "If you install multiple dictionaries, TortoiseGit uses these rules to select which one to use. " msgstr "Ako instalirate više rečnika. TortoiseGit koristi ova pravila da izabere jedan za korišćenje." #. (title) #: ../source/TortoiseGit_en.xml:722 msgid "Basic Concepts" msgstr "Osnovni koncept" #. (primary) #: ../source/TortoiseGit_en.xml:725 msgid "Git book" msgstr "Subverziona knjiga" #. (para) #: ../source/TortoiseGit_en.xml:727 msgid "This chapter is a slightly modified version of the same chapter in the Git book. An online version of the Git book is available here: http://svnbook.red-bean.com/." msgstr "Ovo poglavlje je malo izmenjena verzija istog poglavlja u Subverzionoj knjizi. Onlajn verzija Subverzione knjige je dostupna ovde:http://svnbook.red-bean.com/." #. (para) #: ../source/TortoiseGit_en.xml:735 msgid "This chapter is a short, casual introduction to Git. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Git, and show some simple examples of Git in use." msgstr "Ovo poglavlje je kratak, neobavezan uvod u Subverziju. Ako ste novi u kontroli verzija, ovo poglavlje je sigurno za vas. Počinjemo diskusijom o opštem konceptu kontrole verzija, rad nas vodi u specifične ideje unutar Subverzije, i prikazuje neke jednostavne primere Subverzije pri korišćenju." #. (para) #: ../source/TortoiseGit_en.xml:743 msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Git can manage any sort of file collection - it's not limited to helping computer programmers." msgstr "Uprkos tome što primeri u ovom poglavlju prikazuju ljudske deljive kolekcije izvornog koda programa, imajte na umu da Subverzija može upravljati bilo kojom vrstom kolekcije fajlova - nije ograničena na pomoć komputerskim programerima." #. (title) #. (title) #. (title) #: ../source/TortoiseGit_en.xml:751 #: ../source/TortoiseGit_en.xml:1256 #: ../source/TortoiseGit_en.xml:2944 msgid "The Repository" msgstr "Spremište" #. (primary) #. (primary) #: ../source/TortoiseGit_en.xml:753 #: ../source/TortoiseGit_en.xml:3717 msgid "repository" msgstr "spremište" #. (para) #: ../source/TortoiseGit_en.xml:755 msgid "Git is a centralized system for sharing information. At its core is a repository, which is a central store of data. The repository stores information in the form of a filesystem tree - a typical hierarchy of files and directories. Any number of clients connect to the repository, and then read or write to these files. By writing data, a client makes the information available to others; by reading data, the client receives information from others." msgstr "Subverzija je centralizovan sistem za deljenje informcija. U srži je spremište, koje je centralno stovarište podataka. Spremište smešta informacije u obliku fajlsistem stabla - tipična hijerarhija fajlova i imenika. Bilo koji broj klijenata spaja se na spremište i čita ili upisuje u te fajlove. Upisivanjem podataka klijent omogućava da informacija bude dostupna drugima; čitanjem podataka klijent prima informacije od drugih." #. (title) #: ../source/TortoiseGit_en.xml:767 msgid "A Typical Client/Server System" msgstr "Tipični klijent/server sistem" #. (para) #: ../source/TortoiseGit_en.xml:770 msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository is a kind of file server, but it's not your usual breed. What makes the Git repository special is that it remembers every change ever written to it: every change to every file, and even changes to the directory tree itself, such as the addition, deletion, and rearrangement of files and directories." msgstr "Dakle zašto je ovo interesantno? Zato što je pesma od definicije tipičnog fajl servera. I svakako, spremište je vrsta fajl servera, ali nije to vaš uobičajen soj. Šta čini Subverziono spremište specijalnim je da ono pamti sve izmene ikad upisane u njega: sve izmene svakog fajla, i čak izmene samog stabla imenika, kao što je dodavanje, brisanje, i preuređenje fajlova u imenika." #. (para) #: ../source/TortoiseGit_en.xml:780 msgid "When a client reads data from the repository, it normally sees only the latest version of the filesystem tree. But the client also has the ability to view previous states of the filesystem. For example, a client can ask historical questions like, what did this directory contain last Wednesday?, or who was the last person to change this file, and what changes did they make? These are the sorts of questions that are at the heart of any version control system: systems that are designed to record and track changes to data over time." msgstr "Kada klijent čita podatke iz spremišta, on normalno vidi samo zadnju verziju stabla fajlsistema. Ali klijent takođe ima mogućnost da vidi prethodno stanje fajlsistema. Na primer, klijent može postaviti istorijska pitanja kao, šta je ovaj imenik sadržao prošle srede?, ili koja je poslednja osoba koja je menjala ovaj fajl, i koje izmene je uradila? Ovo je vrsta pitanja koja su srce svakog sistema kontrole verzija: sistema koji su dizajnirani da aktivno beleže i prate izmene podataka." #. (title) #: ../source/TortoiseGit_en.xml:795 msgid "Versioning Models" msgstr "Modeli verzionisanja" #. (para) #: ../source/TortoiseGit_en.xml:796 msgid "All version control systems have to solve the same fundamental problem: how will the system allow users to share information, but prevent them from accidentally stepping on each other's feet? It's all too easy for users to accidentally overwrite each other's changes in the repository." msgstr "Svi sistemi kontrole verzija imaju da reše iste osnovne probleme: kako će sistem omogućiti korisnicima da dele informacije, ali da ih spreči da nehotično koračaju stopama jedni drugih? Veoma je lako da jedni drugima korisnici incidentno prepišu promene u spremištu." #. (title) #: ../source/TortoiseGit_en.xml:805 msgid "The Problem of File-Sharing" msgstr "Problem Fajl-Deljenja" #. (para) #: ../source/TortoiseGit_en.xml:806 msgid "Consider this scenario: suppose we have two co-workers, Harry and Sally. They each decide to edit the same repository file at the same time. If Harry saves his changes to the repository first, then it's possible that (a few moments later) Sally could accidentally overwrite them with her own new version of the file. While Harry's version of the file won't be lost forever (because the system remembers every change), any changes Harry made won't be present in Sally's newer version of the file, because she never saw Harry's changes to begin with. Harry's work is still effectively lost - or at least missing from the latest version of the file - and probably by accident. This is definitely a situation we want to avoid!" msgstr "Zamislimo ovaj scenario: pretpostavimo da imamo dva saradnika, Hari i Sali. Svaki odluči da uredi isti fajl iz spremišta u isto vreme. Ako Hari prvi sačuva svoje izmene u spremište, tada je moguće (nekoliko trenutaka kasnije) da ih Sali nehotice prepiše svojom novom verzijom fajla. Pošto Harijeva verzija fajla neće biti izgubljena zauvek (jer sistem pamti sve promene), sve promene koje je uradio Hari neće biti prisutne u Salinu noviju verziju fajla, jer ona nije videla Harijeve izmene na početku rada. Harijev rad je efektivno izgubljen - ili u najmanjem nedostaje u zadnjoj verziji fajla - i verovatno mimo plana. Ovo je defintivno situacija koju želimo da izbegnemo. " #. (title) #: ../source/TortoiseGit_en.xml:822 msgid "The Problem to Avoid" msgstr "Kako izbeći problem" #. (title) #. (title) #: ../source/TortoiseGit_en.xml:827 #: ../source/TortoiseGit_en.xml:843 msgid "The Lock-Modify-Unlock Solution" msgstr "Zaključaj-Menjaj-Otključaj rešenje" #. (para) #: ../source/TortoiseGit_en.xml:828 msgid "Many version control systems use a lock-modify-unlock model to address this problem, which is a very simple solution. In such a system, the repository allows only one person to change a file at a time. First Harry must lock the file before he can begin making changes to it. Locking a file is a lot like borrowing a book from the library; if Harry has locked a file, then Sally cannot make any changes to it. If she tries to lock the file, the repository will deny the request. All she can do is read the file, and wait for Harry to finish his changes and release his lock. After Harry unlocks the file, his turn is over, and now Sally can take her turn by locking and editing." msgstr "Mnogi sistemi kontrole verzija koriste zaključaj-izmeni-otključaj model da označe ovaj problem, što je veoma jednostavno rešenje. U takvim sistemima, spremište dozvoljava samo jednoj osobi da menja fajl u isto vreme. Prvo Hari mora zaključati fajl pre nego što može da ga menja. Zaključavanje fajla je mnogo slično pozajmljivanju knjige iz biblioteke; ako Hari ima zaključani fajl, onda Sali ne može da napravi bilo kakvu izmenu na njemu. Ako ona pokuša da zaključa fajl spremište će zabraniti zahtev. Sve što može uraditi je da čita fajl i čeka da Hari završi svoje izmene i otključa fajl. Kada Hari otključa fajl, on ga vraća i Sali ga može uzeti zaključavanjem i da ga uređuje. " #. (para) #: ../source/TortoiseGit_en.xml:846 msgid "The problem with the lock-modify-unlock model is that it's a bit restrictive, and often becomes a roadblock for users:" msgstr "Problem sa zaključaj-izmeni-otključaj modelom je da je pomalo restriktiv i često postaje prepreka za korisnike:" #. (para) #: ../source/TortoiseGit_en.xml:853 msgid "Locking may cause administrative problems. Sometimes Harry will lock a file and then forget about it. Meanwhile, because Sally is still waiting to edit the file, her hands are tied. And then Harry goes on vacation. Now Sally has to get an administrator to release Harry's lock. The situation ends up causing a lot of unnecessary delay and wasted time." msgstr "Zaključavanje može da napravi administrativni problem. Ponekad Hari će zaključati fajl i zaboraviti na njega. Međutim, pošto Sali još čeka da uredi fajl, njene ruke se vezane. I onda Hari odlazi na odmor. Sada Sali ima da dobije od Administratora oslobađanje Harijevog zaključavanja. Situacija se završava uzrokujući puno nepotrebnog kašnjenja i izgubljenog vremena." #. (para) #: ../source/TortoiseGit_en.xml:864 msgid "Locking may cause unnecessary serialization. What if Harry is editing the beginning of a text file, and Sally simply wants to edit the end of the same file? These changes don't overlap at all. They could easily edit the file simultaneously, and no great harm would come, assuming the changes were properly merged together. There's no need for them to take turns in this situation." msgstr "Zaključavanje može da prouzrokuje neželjenu serijalizaciju. Šta ako Hari uređuje početak tekst fajla, a Sali jednostavno želi da uredi kraj istog fajla? Ove izmene se uopšte ne preklapaju. Oni mogu lako da uređuju fajl istovremeno, neće doći do velike štete, uzevši da se izmene odgovarajuće ujedine. NJima nije potrebno da se okrenu od ovakve situacije." #. (para) #: ../source/TortoiseGit_en.xml:876 msgid "Locking may create a false sense of security. Pretend that Harry locks and edits file A, while Sally simultaneously locks and edits file B. But suppose that A and B depend on one another, and the changes made to each are semantically incompatible. Suddenly A and B don't work together anymore. The locking system was powerless to prevent the problem - yet it somehow provided a sense of false security. It's easy for Harry and Sally to imagine that by locking files, each is beginning a safe, insulated task, and thus inhibits them from discussing their incompatible changes early on." msgstr "Zaključavanje može da stvori lažni osećaj sigurnosti. Uzmimo da Hari zaključa i uređuje fajl A, dok Sali istovremeno zaključa i uređuje fajl B. Pretpostavimo da A i B zavise jedan od drugog i da izmene urađene na bilo kome semantički nisu kompatibilne. Iznenada A i B ne rade više zajedno. Zaključavajući sistem nema snage da predupredi problem - čak nekako daje osećaj lažne sigurnosti. Lako je da Hari i Sali zamisle to zaključavanjem fajlova, svako počinje siguran, izdvojen zadatak i to ga sprečava da razmatra nekompatibilne izmene učinjene ranije. " #. (title) #. (title) #: ../source/TortoiseGit_en.xml:894 #: ../source/TortoiseGit_en.xml:922 msgid "The Copy-Modify-Merge Solution" msgstr "Kopiraj-Menjaj-Stopi rešenje" #. (para) #: ../source/TortoiseGit_en.xml:895 msgid "Git, CVS, and other version control systems use a copy-modify-merge model as an alternative to locking. In this model, each user's client reads the repository and creates a personal working copy of the file or project. Users then work in parallel, modifying their private copies. Finally, the private copies are merged together into a new, final version. The version control system often assists with the merging, but ultimately a human being is responsible for making it happen correctly." msgstr "Subverzija, CVS i drugi sistemi kontrole verzija koriste kopiraj-menjaj-stopi model kao alternativu zaključavanju. U ovom modelu svaki korisnički klijent čita spremište i kreira ličnu radnu kopiju fajla ili projekta. Korisnici onda rade paralelno, menjajući svoje privatne kopije. Finalno, privatne kopije se spajaju u novu, finalnu verziju. Sistem kontrole verzija često posreduje u spajanju, ali ljudi su odgovorni da učine da sve bude korektno." #. (para) #: ../source/TortoiseGit_en.xml:907 msgid "Here's an example. Say that Harry and Sally each create working copies of the same project, copied from the repository. They work concurrently, and make changes to the same file A within their copies. Sally saves her changes to the repository first. When Harry attempts to save his changes later, the repository informs him that his file A is out-of-date. In other words, that file A in the repository has somehow changed since he last copied it. So Harry asks his client to merge any new changes from the repository into his working copy of file A. Chances are that Sally's changes don't overlap with his own; so once he has both sets of changes integrated, he saves his working copy back to the repository." msgstr "Evo primera. Recimo da Hari i Sali kreiraju radne kopije istog projekta, kopiranjem iz spremišta. Oni rade istovremeno, i prave izmene na istom fajlu A u okviru svojih kopija. Sali sačuva svoje izmene u spremište prva. Kada Hari pokuša da sačuva svoje izmene kasnije, spremište ga informiše da je njegov fajl A zastareo. Drugim rečima, fajl A u spremištu ima nečije izmene od zadnjeg kopiranja. Tako Hari pita svog klijenta da stopi bilo koje nove izmene iz spremišta u njegovu radnu kopiju fajla A. Postoji šansa da Saline izmene ne prekrivaju njegove; tako da će imati oba skupa izmena integrisano, on sačuva svoju radnu kopiju nazad u spremište. " #. (title) #: ../source/TortoiseGit_en.xml:926 msgid "...Copy-Modify-Merge Continued" msgstr "...Kopiraj-Menjaj-Stopi nastavak" #. (primary) #. (primary) #: ../source/TortoiseGit_en.xml:930 #: ../source/TortoiseGit_en.xml:4910 msgid "conflict" msgstr "konflikt" #. (para) #: ../source/TortoiseGit_en.xml:932 msgid "But what if Sally's changes do overlap with Harry's changes? What then? This situation is called a conflict, and it's usually not much of a problem. When Harry asks his client to merge the latest repository changes into his working copy, his copy of file A is somehow flagged as being in a state of conflict: he'll be able to see both sets of conflicting changes, and manually choose between them. Note that software can't automatically resolve conflicts; only humans are capable of understanding and making the necessary intelligent choices. Once Harry has manually resolved the overlapping changes (perhaps by discussing the conflict with Sally!), he can safely save the merged file back to the repository." msgstr "Ali šta ako Saline izmene prekrivaju Harijeve izmene? Šta tada? Ova situacija se zove konflikt, i to obično nije veliki problem. Kada Hari traži od svog klijenta da stopi zadnje izmene u spremištu u njegovu radnu kopiju, njegova kopija fajla A je nekako označena da je u stanju konflikta: on će biti u mogućnosti da vidi oba skupa konfliktnih izmena, i ručno da izabere između njih. Primetimo da softver ne može automatski da reši konflikt; samo ljudi su sposobni da razumeju i urade neophodne inteligentne izbore. Jednom kad Hari ručno reši preklapanje izmena (možda diskusijom konflikta sa Sali!), on može bezbedno da sačuva stopljen fajl nazad u spremište. " #. (para) #: ../source/TortoiseGit_en.xml:947 msgid "The copy-modify-merge model may sound a bit chaotic, but in practice, it runs extremely smoothly. Users can work in parallel, never waiting for one another. When they work on the same files, it turns out that most of their concurrent changes don't overlap at all; conflicts are infrequent. And the amount of time it takes to resolve conflicts is far less than the time lost by a locking system." msgstr "Kopiraj-menjaj-stopi model može da zvuči pomalo haotično, ali u praksi, radi ekstremno glatko. Korisnici mogu da rade paralelno, nikada ne čekaju jedan drugog. Kada rade na istim fajlovima isključeno je da njihove istovremene izmene ne budu upisane; konflikti su retki. I iznos vremena uzet za rešavanje konflikta je manji od vremena izgubljenog zaključavanjem sistema. " #. (para) #: ../source/TortoiseGit_en.xml:956 msgid "In the end, it all comes down to one critical factor: user communication. When users communicate poorly, both syntactic and semantic conflicts increase. No system can force users to communicate perfectly, and no system can detect semantic conflicts. So there's no point in being lulled into a false promise that a locking system will somehow prevent conflicts; in practice, locking seems to inhibit productivity more than anything else." msgstr "Na kraju, sve dolazi u jedan kritičan faktor: korisnička komunikacija. Kada je loša komunikacija između korisnika sintaksni i semantički konflikti rastu. Nema sistema koji će naterati korisnike da kompuniciraju perfektno, i nema sistema koji može da detektuje semantički konflikt. Tako da nije poenta da se bude umiren lažnim obećanjem da sistem zaključavanja nekako predupređuje konflikt; u praksi, zaključavanje izgleda sprečava više produktivnost nego bilo šta drugo." #. (para) #: ../source/TortoiseGit_en.xml:966 msgid "There is one common situation where the lock-modify-unlock model comes out better, and that is where you have unmergeable files. For example if your repository contains some graphic images, and two people change the image at the same time, there is no way for those changes to be merged together. Either Harry or Sally will lose their changes." msgstr "Postoji jedna obična situacija gde zaključaj-menjaj-otključaj model je bolji, i to je gde imate ne stopive fajlove. Na primer ako vaše spremište sadrži neke grafičke slike, i dva čoveka menjaju slike u isto vreme, nema načina da se te izmene spoje zajedno. Ili Hari ili Sali će izgubiti svoje izmene." #. (title) #: ../source/TortoiseGit_en.xml:976 msgid "What does Git Do?" msgstr "Šta Subverzija radi?" #. (para) #: ../source/TortoiseGit_en.xml:977 msgid "Git uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Git also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Git will still provide the features you need." msgstr "Subverzija koristi kopiraj-izmeni-stopi rešenje uobičajeno, i u mnogim slučajevimaovo je sve što vam je potrebno. Međutim, od Verzije 1.2 Subverzija takođe podržava zaključavanje fajlova, tako da ako imate nestopive fajlove, ili ako jednostavno forsirate politiku zaključavanja preko uprave, Subverzija će još omogućavati željene osobine." #. (title) #: ../source/TortoiseGit_en.xml:989 msgid "Git in Action" msgstr "Subverzija u akcija" #. (title) #: ../source/TortoiseGit_en.xml:991 msgid "Working Copies" msgstr "Radna kopija" #. (primary) #: ../source/TortoiseGit_en.xml:993 msgid "working copy" msgstr "radna kopija" #. (para) #: ../source/TortoiseGit_en.xml:995 msgid "You've already read about working copies; now we'll demonstrate how the Git client creates and uses them." msgstr "Već ste čitali o radnoj kopiji; sada ćemo demonstrirati kako je Subverzioni klijent kreira i koristi. " #. (para) #: ../source/TortoiseGit_en.xml:1000 msgid "A Git working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Git will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." msgstr "Subverziona radna kopija je obično stablo imenika u vašem lokalnom sistemu, koje sadrži kolekciju fajlova. Vi možete urediti ove fajlove kako želite, i ako su fajlovi izvornog koda, možete kompajlirati vaš program od njih na uobičajen način. Vaša radna kopija je vaša lična privatna radna površina: Subverzija neće inkorporirati izmene drugih ljudi, niti će uraditi vaše promene dostupne drugima, sve dok joj eksplicitno ne kažete da to uradi. " #. (para) #: ../source/TortoiseGit_en.xml:1010 msgid "After you've made some changes to the files in your working copy and verified that they work properly, Git provides you with commands to publish your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Git provides you with commands to merge those changes into your working directory (by reading from the repository)." msgstr "Kada ste napravili neke izmene u fajlovima u vašoj radnoj kopiji i proverite da to radi ispravno, Subverzija vam omogućava komandama da publikujete vaše izmene drugim ljudima koji rade sa vama na vašem projektu (pisanjem u spremište). Ako drugi ljudi publikuju svoje izmene, Subverzija vam omogućava komandama za spajanje tih izmena u vaš radni imenik (čitanjem iz spremišta)." #. (para) #: ../source/TortoiseGit_en.xml:1020 msgid "A working copy also contains some extra files, created and maintained by Git, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named .svn, also known as the working copy administrative directory. The files in each administrative directory help Git recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." msgstr "Radna kopija takođe sadrži neke ekstra fajlove, kreirane i održavane Subverzijom, dajoj pomognu da izvuče ove komande. Posebno, svaki imenik u vašoj radnoj kopiji sadrži podimenike označene .svn, takođe poznat kao radna kopija administrativni imenik. Fajlovi u svakom administrativnom imeniku pomažu Subverziji da prepozna koji fajlovi sadrže nepublikovane izmene, i koji fajlovi su zastreli u odnosu na rad drugih." #. (para) #: ../source/TortoiseGit_en.xml:1031 msgid "A typical Git repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository." msgstr "Tipično Subverziono spremište često sadrži fajlove (ili izvorni kod) za više projekata; obično, svaki projekat je subimenik u stablu fajlsistema u spremištu. U ovom uređenju korisnička radna kopija obično će korespondirati posebnom podstablu spremišta." #. (para) #: ../source/TortoiseGit_en.xml:1038 msgid "For example, suppose you have a repository that contains two software projects." msgstr "Na primer, pretpostavimo da imate spremište koje sadrži dva sofverska projekta." #. (title) #: ../source/TortoiseGit_en.xml:1043 msgid "The Repository's Filesystem" msgstr "Fajlsistem spremišta" #. (para) #: ../source/TortoiseGit_en.xml:1046 msgid "In other words, the repository's root directory has two subdirectories: paint and calc." msgstr "Drugim rečima, koreini imenik spremišta ima dva podimenika: pejnt i kalk." #. (para) #: ../source/TortoiseGit_en.xml:1051 msgid "To get a working copy, you must check out some subtree of the repository. (The term check out may sound like it has something to do with locking or reserving resources, but it doesn't; it simply creates a private copy of the project for you)." msgstr "Da biste dobili radnu kopiju morate preuzeti neko podstablo spremišta. (Termin preuzeti može zvučati kao nešto što se radi zaključavanjem ili rezervisanjem resursa, ali to nije to; to jednostavno kreira privatnu kopiju projekta za vas)." #. (para) #: ../source/TortoiseGit_en.xml:1058 msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Git can tell that you've changed the file. However, Git does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as committing (or checking in) changes to the repository." msgstr "Pretpostavimo da ste napravili izmene u button.c. Kako .svn imenik pamti datum izmene fajla i originalni sadržaj, Subverzija vam može reći da ste izmenili fajl.Čin publikovanja vaših izmena je najčešće poznat kao urezivanje (ili prijavljivanje) izmena u spremište." #. (para) #: ../source/TortoiseGit_en.xml:1068 msgid "To publish your changes to others, you can use Git's commit command." msgstr "Da bi publikovali vaše izmene drugima, možete koristiti Subverzionu komandu ureži." #. (para) #: ../source/TortoiseGit_en.xml:1072 msgid "Now your changes to button.c have been committed to the repository; if another user checks out a working copy of /calc, they will see your changes in the latest version of the file." msgstr "Sada vaše izmene u button.c su urezane u spremište; ako drugi korisnik proveri radnu kopiju /kalk, videće vaše izmene u zadnjoj verziji fajla." #. (para) #: ../source/TortoiseGit_en.xml:1078 msgid "Suppose you have a collaborator, Sally, who checked out a working copy of /calc at the same time you did. When you commit your change to button.c, Sally's working copy is left unchanged; Git only modifies working copies at the user's request." msgstr "Pretpostavimo da imate saradnika Sali, ko proverava radnu kopiju /kalk u isto vreme kad i vi. Kada urezujete vaše izmene u button.c, Salina radna kopija ostaje nepromenjena; Subverzija menja radnu kopiju samo na zahtev korisnika." #. (para) #: ../source/TortoiseGit_en.xml:1086 msgid "To bring her project up to date, Sally can ask Git to update her working copy, by using the Git update command. This will incorporate your changes into her working copy, as well as any others that have been committed since she checked it out." msgstr "Da bi ažurirala svoj projekat Sali mora pitati Subverzilu da ažurira njenu radnu kopiju korišćrnjem Subverzione komande ažuriraj. Ovo će uključiti vaše izmene u radnu kopiju isto kao što bilo koji drugi koji su urezani od provere." #. (para) #: ../source/TortoiseGit_en.xml:1094 msgid "Note that Sally didn't need to specify which files to update; Git uses the information in the .svn directory, and further information in the repository, to decide which files need to be brought up to date." msgstr "Zabeležite da Sali ne treba da specifira koje fajlove ažurira; Subverzija koristi informacije u .svn imeniku, i dalje informacije u spremištu, da odluči koje fajlove treba ažurirati." #. (title) #: ../source/TortoiseGit_en.xml:1103 msgid "Repository URLs" msgstr "URL spremišta" #. (para) #: ../source/TortoiseGit_en.xml:1104 msgid "Git repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:" msgstr "Subverzionom spremištu može biti pristupljeno kroz mnogo različitih metoda - na lokalnom disku, ili kroz razne mrežne protokole. Mest spremišta, međutim, je uvek na URL. URL šema označava metod pristupa: " #. (title) #: ../source/TortoiseGit_en.xml:1112 msgid "Repository Access URLs" msgstr "URL pristup spremištu" #. (entry) #: ../source/TortoiseGit_en.xml:1118 msgid "Schema" msgstr "Šema" #. (entry) #: ../source/TortoiseGit_en.xml:1119 msgid "Access Method" msgstr "Pristupni metod" #. (literal) #: ../source/TortoiseGit_en.xml:1125 msgid "file://" msgstr "file://" #. (entry) #: ../source/TortoiseGit_en.xml:1127 msgid "Direct repository access on local or network drive." msgstr "Direktni pristup spremištu na lokalnom mrežnom uređaju." #. (literal) #. (literal) #: ../source/TortoiseGit_en.xml:1133 #: ../source/TortoiseGit_en.xml:1144 msgid "http://" msgstr "http://" #. (entry) #: ../source/TortoiseGit_en.xml:1135 msgid "Access via WebDAV protocol to Git-aware Apache server." msgstr "Pristup preko VebDAV protokola za Subverziono poznavanje Apaš servera." #. (literal) #: ../source/TortoiseGit_en.xml:1141 msgid "https://" msgstr "https://" #. (entry) #: ../source/TortoiseGit_en.xml:1143 msgid "Same as , but with SSL encryption." msgstr "Isto kao ,ali sa SSL enskripcijom." #. (literal) #: ../source/TortoiseGit_en.xml:1149 msgid "svn://" msgstr "svn://" #. (literal) #. (literal) #. (primary) #. (primary) #: ../source/TortoiseGit_en.xml:1153 #: ../source/TortoiseGit_en.xml:1162 #: ../source/TortoiseGit_en.xml:2483 #: ../source/TortoiseGit_en.xml:2622 msgid "svnserve" msgstr "svnserve" #. (entry) #: ../source/TortoiseGit_en.xml:1151 msgid "Unauthenticated TCP/IP access via custom protocol to a server." msgstr "Neautentičan TCP/IP pristup preko običnog protokola ka serveru." #. (literal) #: ../source/TortoiseGit_en.xml:1158 msgid "svn+ssh://" msgstr "svn+ssh://" #. (entry) #: ../source/TortoiseGit_en.xml:1160 msgid "authenticated, encrypted TCP/IP access via custom protocol to a server." msgstr "autentičan, šifriran TCP/IP pristup preko običnog protokola ka serveru." #. (para) #: ../source/TortoiseGit_en.xml:1168 msgid "For the most part, Git's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The file:// access method is normally used for local access, although it can be used with UNC paths to a networked host. The URL therefore takes the form file://hostname/path/to/repos. For the local machine, the hostname portion of the URL is required to be either absent or localhost. For this reason, local paths normally appear with three slashes, file:///path/to/repos." msgstr "Za mnoge delove Subverzioni URLovi koriste standardnu sintaksu dozvoljavajući serverskim imenima brojevima portova da budu specificirani kao deo URLa. file:// metod pristupa se normalno koristi za lokalni pristup, takođe može se koristiti sa UNC putnjom do mrežnog domaćina. URL dakle uzima oblik file://hostname/path/to/repos. Za lokalnu mašinu hostname deo URL se zahteva da nije prisutno ili da je localhost. Iz ovog razloga lokalna putanja se normalno javlja sa tri kose crte file:///path/to/repos." #. (para) #: ../source/TortoiseGit_en.xml:1181 msgid "Also, users of the file:// scheme on Windows platforms will need to use an unofficially standard syntax for accessing repositories that are on the same machine, but on a different drive than the client's current working drive. Either of the two following URL path syntaxes will work where X is the drive on which the repository resides:" msgstr "Takođe korisnici file:// šeme na Vindouz platformama treba da koriste neoficijalnu standardnu sintaksu za pristup spremištu koja su na istoj mašini, ali na različitim uređajima od onog gde je klijentov radni uređaj. Svaka od sledeće dve sintakse URL putanja će raditi gde je X drajv na kome spremište obitava." #. (screen) #: ../source/TortoiseGit_en.xml:1191 #, no-wrap msgid "" "\n" "file:///X:/path/to/repos\n" "...\n" "file:///X|/path/to/repos\n" "...\n" msgstr "" "\n" "file:///X:/path/to/repos\n" "...\n" "file:///X|/path/to/repos\n" "...\n" #. (para) #: ../source/TortoiseGit_en.xml:1197 msgid "Note that a URL uses ordinary slashes even though the native (non-URL) form of a path on Windows uses backslashes." msgstr "Primetimo da URL koristi obične kose crte čak i kad prirodni (ne URL) oblik putanje na Vindouzu koristi obrnute kose crte." #. (para) #: ../source/TortoiseGit_en.xml:1201 msgid "You can safely access a FSFS repository via a network share, but you cannot access a BDB repository in this way." msgstr "Možete bezbedno pristupiti FSFS spremištu preko mrežne podele, ali vi ne možete pristupiti BDB spremištu na ovaj način." #. (para) #. (para) #: ../source/TortoiseGit_en.xml:1207 #: ../source/TortoiseGit_en.xml:2609 msgid "Do not create or access a Berkeley DB repository on a network share. It cannot exist on a remote filesystem. Not even if you have the network drive mapped to a drive letter. If you attempt to use Berkeley DB on a network share, the results are unpredictable - you may see mysterious errors right away, or it may be months before you discover that your repository database is subtly corrupted." msgstr "Ne kreirajte Berkli DB spremište na mrežnom deljenom prostoru. To ne može postojati na udaljenom fajlsistemu. Čak ni ako imate mrežni drajv označen slovom drajva. Ako pokušate da koristite Berkli DB na mrežnoj podeli rezultati su nepredvidljivi - možete videti misteriozne greške ili će proći meseci dok ne ustanovite da vaša baza podataka spremišta sa puno grešaka." #. (title) #: ../source/TortoiseGit_en.xml:1219 msgid "Revisions" msgstr "Revizije" #. (primary) #. (primary) #: ../source/TortoiseGit_en.xml:1221 #: ../source/TortoiseGit_en.xml:9724 msgid "revision" msgstr "revizija" #. (para) #: ../source/TortoiseGit_en.xml:1223 msgid "A svn commit operation can publish changes to any number of files and directories as a single atomic transaction. In your working copy, you can change files' contents, create, delete, rename and copy files and directories, and then commit the complete set of changes as a unit." msgstr "Operacija svn ureži publikuje izmene bilo kog broja fajlova i imenika kao jednu atomik transakciju. U vašoj radnoj kopiji možete menjati sadržaj fajlova, kreirati, brisati, preimenovati i kopirati fajlove i imenike i onda urežete ukupan skup izmena kao jedinicu." #. (para) #: ../source/TortoiseGit_en.xml:1231 msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Git retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." msgstr "U spremištu savako urezivanje se trtira kao atomik transakcija: ili se urežu sve promene ili nijedna. Subverzija čuva ovu atomičnost u slučaju pucanja programa ili sistema, mrežnih problema i drugih akcija korisnika." #. (para) #: ../source/TortoiseGit_en.xml:1238 msgid "Each time the repository accepts a commit, this creates a new state of the filesystem tree, called a revision. Each revision is assigned a unique natural number, one greater than the number of the previous revision. The initial revision of a freshly created repository is numbered zero, and consists of nothing but an empty root directory." msgstr "Svaki put kada spremište pristupi urezivanju to kreiira novo stanje stabla fajlsistema nazvanog revisija. Svaka revizija se označava jedinstvenim prirodnim brojem koji je za jedan veći od broja prethodne revizije.Početna revizija sveže kreiranog spremišta označena je nulom i ne sadrži ništa osim praznog korenog imenika." #. (para) #: ../source/TortoiseGit_en.xml:1247 msgid "A nice way to visualize the repository is as a series of trees. Imagine an array of revision numbers, starting at 0, stretching from left to right. Each revision number has a filesystem tree hanging below it, and each tree is a snapshot of the way the repository looked after each commit." msgstr "Lep način da se vizualizuje spremište je serija stabala. Zamislimo oblast revizionih brojeva, počevši od nule, razvučenih s leva u desno. Svaki revizioni broj ima fajlsistem stablo visi ispod njega i svako stablo je naznaka kako spremište izgleda posle urezivanja." #. (title) #: ../source/TortoiseGit_en.xml:1260 msgid "Global Revision Numbers" msgstr "Globalni revizioni brojevi" #. (para) #: ../source/TortoiseGit_en.xml:1261 msgid "Unlike those of many other version control systems, Git's revision numbers apply to entire trees, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Git user talks about ``revision 5 of foo.c'', they really mean ``foo.c as it appears in revision 5.'' Notice that in general, revisions N and M of a file do not necessarily differ!" msgstr "Drugačije nego kod većine drugih sistema kontrole verzija, Subverzioni revizioni brojevi se pojavljuju kao cela stabla, a ne individualni fajlovi. Svaki revizioni broj selektuje celo stablo, partikularno stanje spremišta posle nekog urezivanja izmena. Drugi način razmišljanja o tome je da revizija N pretstavlja stanje fajlsistema spremišta posle Ntog urezivanja. Kada korisnik Subverzije govori o ``revisija 5 od foo.c'', on stvarno misli ``foo.c kako se javlja u reviziji 5.\" Primetimo da uopšte revizije N i M fajla nisu obavezno različite. " #. (para) #: ../source/TortoiseGit_en.xml:1276 msgid "It's important to note that working copies do not always correspond to any single revision in the repository; they may contain files from several different revisions. For example, suppose you check out a working copy from a repository whose most recent revision is 4:" msgstr "Važno je primetiti da radna kopija ne korespondira uvek bilo kojoj pojedinačnoj reviziji u spremištu; ona može sadržati fajlove iz više različitih revizija. Na primer, pretpostavimo da preuzimate radnu kopiju iz spremišta čija je najskorija revizija 4:" #. (screen) #: ../source/TortoiseGit_en.xml:1283 #, no-wrap msgid "" "\n" "calc/Makefile:4\n" " integer.c:4\n" " button.c:4\n" msgstr "" "\n" "kalk/Makefile:4\n" " integer.c:4\n" " button.c:4\n" #. (para) #: ../source/TortoiseGit_en.xml:1288 msgid "At the moment, this working directory corresponds exactly to revision 4 in the repository. However, suppose you make a change to button.c, and commit that change. Assuming no other commits have taken place, your commit will create revision 5 of the repository, and your working copy will now look like this:" msgstr "Trenutno ovaj radni imenik odgovara tačno reviziji 4 u spremištu. Međutim, pretpostavimo da izmenite button.c, i urežete izmene. Uzmimo da nije bilo drugih urezivanja, vaše urezivanje kreira reviziju 5 spremišta i vaša radna kopija sada izgleda ovako:" #. (screen) #: ../source/TortoiseGit_en.xml:1296 #, no-wrap msgid "" "\n" "calc/Makefile:4\n" " integer.c:4\n" " button.c:5\n" msgstr "" "\n" "kalk/Makefile:4\n" " integer.c:4\n" " button.c:5\n" #. (para) #: ../source/TortoiseGit_en.xml:1301 msgid "Suppose that, at this point, Sally commits a change to integer.c, creating revision 6. If you use svn update to bring your working copy up to date, then it will look like this:" msgstr "Pretpostavimo to, u tom trenutku, Saki urezuje izmene integer.c, kreirajući reviziju 6. Ako koristite svn ažuriraj da dovedete vašu radnu kopiju u ažurno stanje to će izgledati ovako:" #. (screen) #: ../source/TortoiseGit_en.xml:1307 #, no-wrap msgid "" "\n" "calc/Makefile:6\n" " integer.c:6\n" " button.c:6\n" msgstr "" "\n" "kalk/Makefile:6\n" " integer.c:6\n" " button.c:6\n" #. (para) #: ../source/TortoiseGit_en.xml:1312 msgid "Sally's changes to integer.c will appear in your working copy, and your change will still be present in button.c. In this example, the text of Makefile is identical in revisions 4, 5, and 6, but Git will mark your working copy of Makefile with revision 6 to indicate that it is still current. So, after you do a clean update at the top of your working copy, it will generally correspond to exactly one revision in the repository." msgstr "Saine izmene integer.c se pojavljuju u vašoj radnoj kopiji i vaše izmene su još prisutne u button.c. U ovom primeru, tekst u Makefile je identičan u revizijama 4,5 i 6, ali Subverzija će označiti vašu radnu kopiju Makefile revizijom 6 da indicira da je još tekuća. Tako, posle urađenog čistog ažuriranja na vrh vaše radne kopije ona će generalno korespondirati tačno jednoj reviziji u spremištu." #. (title) #: ../source/TortoiseGit_en.xml:1325 msgid "How Working Copies Track the Repository" msgstr "Kako radna kopija prati spremište" #. (para) #: ../source/TortoiseGit_en.xml:1326 msgid "For each file in a working directory, Git records two essential pieces of information in the .svn/ administrative area:" msgstr "Za svaki fajl u radnom imeniku Subverzija upisuje dva važna komada informacija u .svn/ administarativnu oblast:" #. (para) #: ../source/TortoiseGit_en.xml:1332 msgid "what revision your working file is based on (this is called the file's working revision), and" msgstr "na koju reviziju je vaša radna kopija zasnovana )to se zove fajlova radna revizija), i" #. (para) #: ../source/TortoiseGit_en.xml:1339 msgid "a timestamp recording when the local copy was last updated by the repository." msgstr "vremenski marker zapisan kada se lokalna kopija zadnji put ažurira u spremištu." #. (para) #: ../source/TortoiseGit_en.xml:1345 msgid "Given this information, by talking to the repository, Git can tell which of the following four states a working file is in:" msgstr "Dajući ove informacije, govoreći spremištu, Subverzija može reći koje od sledećih četiri statusa ima radni fajl:" #. (term) #: ../source/TortoiseGit_en.xml:1352 msgid "Unchanged, and current" msgstr "Neizmenjen i tekući" #. (para) #: ../source/TortoiseGit_en.xml:1354 msgid "The file is unchanged in the working directory, and no changes to that file have been committed to the repository since its working revision. A commit of the file will do nothing, and an update of the file will do nothing." msgstr "Fajl je neizmenjen u radnom imeniku, i nema izmena tog fajla pri urezivanju u spremište od njegove radne revizije. Urezivanje fajla ne radi ništa, i ažuriranje fajla ne radi ništa." #. (term) #: ../source/TortoiseGit_en.xml:1365 msgid "Locally changed, and current" msgstr "Lokalno izmenjen i tekući" #. (para) #: ../source/TortoiseGit_en.xml:1367 msgid "The file has been changed in the working directory, and no changes to that file have been committed to the repository since its base revision. There are local changes that have not been committed to the repository, thus a commit of the file will succeed in publishing your changes, and an update of the file will do nothing." msgstr "Fajl je izmenjen u radnom imeniku i izmene nisu urezane u spremište od osnovne rebžvizije. Postoje lokalne izmene koje još nisu urezane u spremište, tako urezivanje fajla će pratiti publikovanje vaših izmena u spremište, a ažuriranje fajla neće uraditi ništa." #. (term) #: ../source/TortoiseGit_en.xml:1379 msgid "Unchanged, and out-of-date" msgstr "Nepromenjen i zastareo" #. (para) #: ../source/TortoiseGit_en.xml:1381 msgid "The file has not been changed in the working directory, but it has been changed in the repository. The file should eventually be updated, to make it current with the public revision. A commit of the file will do nothing, and an update of the file will fold the latest changes into your working copy." msgstr "Fajl nije izmenjen u radnom imeniku ali je izmenjen u spremištu. Fajl bi trebalo da bude ažuriran da se učini savremen sa javnom revizijom. Urezivanje fajla ne radi ništa, a ažuriranje fajla uvodi zadnje izmene u vašu radnu kopiju." #. (term) #: ../source/TortoiseGit_en.xml:1393 msgid "Locally changed, and out-of-date" msgstr "Lokalno izmenjen i zastareo" #. (para) #: ../source/TortoiseGit_en.xml:1395 msgid "The file has been changed both in the working directory, and in the repository. A commit of the file will fail with an out-of-date error. The file should be updated first; an update command will attempt to merge the public changes with the local changes. If Git can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." msgstr "Fajl je izmenjen u oba slučaja i u radnom imeniku i u spremištu. Urezivanje fajla biće neuspešno sa greškom zastareo. Fajl se mora najpre ažurirai; sa ažuriraj komandom pokušaće se spajanje javnih izmena sa lokalnim izmenama. Ako Subverzija ne može potpuno da stopi na razuman način automatski, ona ostavlja korisniku da razreši konflikt. " #. (title) #: ../source/TortoiseGit_en.xml:1412 msgid "Summary" msgstr "Zaključak" #. (para) #: ../source/TortoiseGit_en.xml:1413 msgid "We've covered a number of fundamental Git concepts in this chapter:" msgstr "Mi smo ovde pokrili određeni broj osnovnih Subverzionih koncepata:" #. (para) #: ../source/TortoiseGit_en.xml:1419 msgid "We've introduced the notions of the central repository, the client working copy, and the array of repository revision trees." msgstr "Uveli smo označavanje centralnog spremišta, klijentove radne kopije, i oblast revizionog stabla spremišta." #. (para) #: ../source/TortoiseGit_en.xml:1425 msgid "We've seen some simple examples of how two collaborators can use Git to publish and receive changes from one another, using the 'copy-modify-merge' model." msgstr "Vidli smo neke proste primere kako saradnici mogu da koriste Subverziju da publikuju i prime izmene od drugih, koristeći 'kopiraj-menjaj-stopi' model." #. (para) #: ../source/TortoiseGit_en.xml:1432 msgid "We've talked a bit about the way Git tracks and manages information in a working copy." msgstr "Govorili smo o načinu kako Subverzija prati i upravlja informacijama u radnoj kopiji." #. (title) #: ../source/TortoiseGit_en.xml:1445 msgid "Setting Up A Server" msgstr "Podešavanje servera" #. (para) #: ../source/TortoiseGit_en.xml:1447 msgid "To use TortoiseGit (or any other Git client), you need a place where your repositories are located. You can either store your repositories locally and access them using the file:// protocol or you can place them on a server and access them with the http:// or svn:// protocols. The two server protocols can also be encrypted. You use https:// or svn+ssh://. This chapter shows you step by step on how you can set up such a server on a Windows machine." msgstr "Da koristite TortoiseGit (ili bilo koji drugi Subverzioni klijent), potrebno vam je mesto gde je locirano vaše spremište. Možete uskladištiti vaše spremište lokalno i pristupati mu koristeći file:// protokol ili ga smestiti na serveu i pristupati mu sa http:// ili svn:// protokolima. Dva server protokola mogu, takođe, biti šifrovana. Koristite https:// ili svn+ssh://. Ovo poglavlje prikazuje korak po korak kako podešavate takav server na Vindouz mašini. " #. (para) #: ../source/TortoiseGit_en.xml:1458 msgid "More detailed information on the Git server options, and how to choose the best architecture for your situation, can be found in the Git book under Server Configuration." msgstr "Detaljnije informacije o opcijama Subverzionog servera i kako izabrati najbolju arhitekturu za vašu situaciju, može se naći u knjizi Subverzije pod Server konfiguracija." #. (para) #: ../source/TortoiseGit_en.xml:1466 msgid "If you don't have a server and you work alone then local repositories are probably your best choice. You can skip this chapter and go directly to ." msgstr "Ako nemate server i radite sami tada lokalno spremište je vaš najbolji izbor. Možete preskočiti ovo poglavlje i ići pravo na ." #. (para) #: ../source/TortoiseGit_en.xml:1471 msgid "If you were thinking about setting up a multi-user repository on a network share, think again. Read to find out why we think this is a bad idea." msgstr "Ako razmišljate da podesite višekorisničko spremište na mrežnom deljenom prostoru, razmislite još jednom. Pročitajte da nađete zašto mi mislimo da je to loša ideja." #. (title) #: ../source/TortoiseGit_en.xml:1480 msgid "Apache Based Server" msgstr "Apaš zasnovan server" #. (primary) #: ../source/TortoiseGit_en.xml:1484 msgid "Apache" msgstr "Apaš" #. (para) #: ../source/TortoiseGit_en.xml:1486 msgid "The most flexible of all possible server setups for Git is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" msgstr "Najfleksibilniji od svih mogućih server podešavanja za Subverziju je Apaš zasnovani server. Mada je malo komplikovaniji za podešavanje on pruža pogodnosti koje drugi serveri nemaju:" #. (primary) #. (term) #: ../source/TortoiseGit_en.xml:1492 #: ../source/TortoiseGit_en.xml:1496 msgid "WebDAV" msgstr "VebDAV" #. (para) #: ../source/TortoiseGit_en.xml:1498 msgid "The Apache based Git server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a Web folder in the Windows explorer and then access it like any other folder in the file system." msgstr "Apaš zasnovan Subverzioni server koristi VebDAV protokol koji je dobro podržan sa mnogo drugih programa. Mogli biste npr. postaviti spremište kao Veb imenik/quote> u Vindouz eksploreru i da mu pristupate kao svakom drugom imeniku fajl sistema." #. (term) #: ../source/TortoiseGit_en.xml:1509 msgid "Browsing The Repository" msgstr "Pretraživanje spremišta" #. (para) #: ../source/TortoiseGit_en.xml:1511 msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Git client installed. This gives access to your data to a much wider circle of users." msgstr "Možete dovesti vaš pretraživač na URL spremišta i pretraživati njegov sadržaj bez instaliranog Subverzionog klijenta. Ovo daje pristup vašim podacima mnogo širem krugu korisnika." #. (term) #. (title) #: ../source/TortoiseGit_en.xml:1521 #: ../source/TortoiseGit_en.xml:3646 msgid "Authentication" msgstr "Autentikacija" #. (para) #: ../source/TortoiseGit_en.xml:1523 msgid "You can use any authentication mechanism Apache supports, including SSPI and LDAP." msgstr "Možete koristiti mehanizam autentikacije podrške Apašu, uključujući SSPI i LDAP." #. (term) #: ../source/TortoiseGit_en.xml:1530 msgid "Security" msgstr "Sigurnost" #. (para) #: ../source/TortoiseGit_en.xml:1532 msgid "Since Apache is very stable and secure, you automatically get the same security for your repository. This includes SSL encryption." msgstr "Kako je Apaš veoma stabilan i siguran, vi automatski dobijate istu sigurnost za spremište. Ovo obuhvata SSP šifrovanje." #. (title) #: ../source/TortoiseGit_en.xml:1542 msgid "Installing Apache" msgstr "Instaliranje Apaša" #. (para) #: ../source/TortoiseGit_en.xml:1547 msgid "Please note that Windows XP without the service pack 1 will lead to bogus network data and could therefore corrupt your repository!" msgstr "Molim vas imajte u vidu da Vindous XP bez servis paketa 1 dovodi do veštačkih mrežnih podataka tako da će pokvariti spremište." #. (para) #: ../source/TortoiseGit_en.xml:1555 msgid "Download the latest version of the Apache web server from http://httpd.apache.org/download.cgi. Make sure that you download the version 2.2.x - the version 1.3.xx won't work!" msgstr "Skinite zadnju verziju Apaš veb servera sa http://httpd.apache.org/download.cgi.Budite da skidate verziju 2.2.x - verzija 1.3.xx ne radi!" #. (para) #: ../source/TortoiseGit_en.xml:1564 msgid "The msi installer for Apache can be found by clicking on other files, then browse to binaries/win32. You may want to choose the msi file apache-2.2.x-win32-x86-openssl-0.9.x.msi (the one that includes OpenSSL)." msgstr "Msi instalacija za Apaš može se naći klikom na ostali fajlovi , zatim pretražite do binariešwin32.Možda biste želeli da izaberete msi fajl apache-2.2.x-win32-x86-openssl-0.9.x.msi (onaj koji obuhvata OpenSSL)." #. (para) #: ../source/TortoiseGit_en.xml:1572 msgid "Once you have the Apache2 installer you can double click on it and it will guide you through the installation process. Make sure that you enter the server-URL correctly (if you don't have a DNS name for your server just enter the IP-address). I recommend to install Apache for All Users, on Port 80, as a Service. Note: if you already have IIS or any other program running which listens on port 80 the installation might fail. If that happens, go to the programs directory, \\Apache Group\\Apache2\\conf and locate the file httpd.conf. Edit that file so that Listen 80 is changed to a free port, e.g. Listen 81. Then restart the installation - this time it should finish without problems." msgstr "Jednom kada imate Apaš2 instaliran možete dvostruko kliknuti na njega i on će vas voditi kroz instalacioni proces. Budite sigurni da unesete server-URL korektno (ako nemate DNS ime vašeg servera samo upišite IP-adresu). Preporučujem da instalirate Apaš za sve korisnike, na Portu 80,kao Servis . Pažnja: ako već imate IIS ili neki drugi program koji radi i čita na portu 80 instalacija može biti neuspešna. Ako se to desi idite na programski imenik \\Apache Group\\Apache2\\conf i nađite fajl httpd.conf. Uredite taj fajl tako da Listen 80 bude izmenjeno na slobodan port, npr. Listen 81. Zatim restartujte instalaciju - ovog puta će završiti bez problema." #. (para) #: ../source/TortoiseGit_en.xml:1594 msgid "Now test if the Apache web server is running correctly by pointing your web browser to http://localhost/ - a preconfigured Website should show up." msgstr "Sada testirajte da li Apaš veb server radi ispravno upravljajući veb pretraživač na http://localhost/ - prekonfigurisan vebsajt treba da bude prikazan." #. (para) #: ../source/TortoiseGit_en.xml:1603 msgid "If you decide to install Apache as a service, be warned that by default it will run as the local system account. It would be a more secure practice for you to create a separate account for Apache to run as." msgstr "Ako odlučite da instalirate Apaš kao servis, znajte da tada uobičajeno radi kao sistem lokalnog rčuna. Bila bi sigurnija praksa za vas da kreirate poseban račun za rad kao Apaš." #. (para) #: ../source/TortoiseGit_en.xml:1609 msgid "Make sure that the account on the server that Apache is running as has an explicit entry in the repository directory's access control list (right-click directory | properties | security), with full control. Otherwise, users will not be able to commit their changes." msgstr "Budite sigurni da taj račun na serveru gde radi Apaš ima eksplicitan ulaz pristupu imenika kontrolne liste spremišta (desni klik imenik | osobine | sigurnost), sa punom kontrolom. Drugim rečima, korisnik neće biti sposoban da ureže svoje izmene." #. (para) #: ../source/TortoiseGit_en.xml:1615 msgid "Even if Apache runs as local system, you still need such an entry (which will be the SYSTEM account in this case)." msgstr "Čak i ako Apaš radi kao lokalni sistem, vi još imate potrebu za takvim ulazom (koja bi imala SISTEM račun u ovom slučaju)." #. (para) #: ../source/TortoiseGit_en.xml:1619 msgid "If Apache does not have this permission set up, your users will get Access denied error messages, which show up in the Apache error log as error 500." msgstr "Ako Apaš nema podešenu ovu dozvolu, vaši korisnici će dobiti Pristup zabranjen poruku greške, koja je prikazana u Apaš dnevniku kao greška 500." #. (para) #: ../source/TortoiseGit_en.xml:1543 msgid "The first thing you need before installing Apache is a computer with Windows 2000, Windows XP+SP1, Windows 2003, Vista or Server 2008. " msgstr "Prva svar koja vam je potrebna pre instaliranja Apaša je kompjuter sa Vindouz 2000, Vindouz XP+SP1, Vindouz 2003, Vista ili Server 2008." #. (title) #: ../source/TortoiseGit_en.xml:1628 msgid "Installing Git" msgstr "Instaliranje Subverzije" #. (para) #: ../source/TortoiseGit_en.xml:1632 msgid "Download the latest version of the Git Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." msgstr "Skinite zadnju verziju Subverzije Vin32 binarije za Apaš. Budite sigurni da ste dobili ispravnu verziju za integraciju sa vašom verzijom Apaša, u suprotnom će te dobiti čudne poruke greške kada probate sa restartom. Ako imate Apaš 2.2.x idite na http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100." #. (para) #: ../source/TortoiseGit_en.xml:1644 msgid "Run the Git installer and follow the instructions. If the Git installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps." msgstr "Pokrenite Subverzionu instalaciju i pratite instrukcije. Ako instalacija Subverzije prepozna da ste instalirali Apaš onda je u redu. Ako ne nađe Apaš server morate uraditi neke dodatne korake." #. (primary) #. (primary) #: ../source/TortoiseGit_en.xml:1654 #: ../source/TortoiseGit_en.xml:1982 msgid "mod_authz_svn" msgstr "mod_authz_svn" #. (para) #: ../source/TortoiseGit_en.xml:1656 msgid "Using the windows explorer, go to the installation directory of Git (usually c:\\program files\\Git) and find the files /httpd/mod_dav_svn.so and mod_authz_svn.so. Copy these files to the Apache modules directory (usually c:\\program files\\apache group\\apache2\\modules )." msgstr "Koristeći vindouz pretraživač idite na instalacioni imenik Subverzije (obično c:\\program files\\Git) i nađite fajlove /httpd/mod_dav_svn.so i mod_authz_svn.so. Kopirajte ove fajlove u Apaš imenik modula (obično c:\\program files\\apache group\\apache2\\modules )." #. (para) #: ../source/TortoiseGit_en.xml:1669 msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Git installation directory to the Apache bin directory." msgstr "Kopirajte fajl /bin/libdb*.dll i /bin/intl3_svn.dll iz Subverzijinog instalacionog imenika u Apaš bin imenik." #. (para) #: ../source/TortoiseGit_en.xml:1677 msgid "Edit Apache's configuration file (usually C:\\Program Files\\Apache Group\\Apache2\\conf\\httpd.conf) with a text editor such as Notepad and make the following changes:" msgstr "Uredite Apaš konfiguracioni fajl (obično C:\\Program Files\\Apache Group\\Apache2\\conf\\httpd.conf) pomoću tekst uređivača kao što je Notepad i uradite sledeće izmene:" #. (para) #: ../source/TortoiseGit_en.xml:1683 msgid "" "Uncomment (remove the '#' mark) the following lines: \n" "#LoadModule dav_fs_module modules/mod_dav_fs.so\n" "#LoadModule dav_module modules/mod_dav.so\n" " Add the following two lines to the end of the LoadModule section. \n" "LoadModule dav_svn_module modules/mod_dav_svn.so\n" "LoadModule authz_svn_module modules/mod_authz_svn.so\n" "" msgstr "" "Otkomentirajte (uklonite '# znak) sledećim linijama:\n" "#LoadModule dav_fs_module modules/mod_dav_fs.so\n" "#LoadModule dav_module modules/mod_dav.so\n" " Add the following two lines to the end of the LoadModule section. \n" "LoadModule dav_svn_module modules/mod_dav_svn.so\n" "LoadModule authz_svn_module modules/mod_authz_svn.so\n" "" #. (title) #. (term) #: ../source/TortoiseGit_en.xml:1702 #: ../source/TortoiseGit_en.xml:12531 msgid "Configuration" msgstr "Konfiguracija" #. (para) #: ../source/TortoiseGit_en.xml:1713 msgid "" "At the end of the config file add the following lines: \n" "<Location /svn>\n" " DAV svn\n" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" " AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" " This configures Apache so that all your Git repositories are physically located below D:\\SVN. The repositories are served to the outside world from the URL: http://MyServer/svn/ . Access is restricted to known users/passwords listed in the passwd file." msgstr "" "Na kraj konfig fajla dodajte sledeće linije:\n" "<Location /svn>\n" " DAV svn\n" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" " AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" " Ovo konfiguriše Apaš tako da Subverzijino spremište je fizički locirano pod D:\\SVN. Spremišta za ostali svet opslužuje URL: http://MyServer/svn/. Pristup je ograničen na poznavanje korisnik /lozinka dato u passwd fajlu." #. (para) #: ../source/TortoiseGit_en.xml:1740 msgid "" "To create the passwd file, open the command prompt (DOS-Box) again, change to the apache2 folder (usually c:\\program files\\apache group\\apache2) and create the file by entering \n" "bin\\htpasswd -c passwd <username>\n" " This will create a file with the name passwd which is used for authentication. Additional users can be added with \n" "bin\\htpasswd passwd <username>\n" "" msgstr "" "Da biste kreirali passwd fajl, otvorite komandnu liniju (DOS-Boks) ponovo, izmenite u apache2 imenik (obično c:\\program files\\apache group\\apache2) i kreirajte fajl unošenjem \n" "bin\\htpasswd -c passwd <username>\n" " Ovo će kreirati fajl sa imenom passwd koji se koristi za autentikaciju. Dodatni korisnici mogu biti dodati sa \n" "bin\\htpasswd passwd <username>\n" "" #. (para) #: ../source/TortoiseGit_en.xml:1759 msgid "Restart the Apache service again." msgstr "Restrtujte Apaš server ponovo." #. (para) #: ../source/TortoiseGit_en.xml:1764 msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Git repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository." msgstr "Upravite vaš pretraživač na http://MyServer/svn/MyNewRepository (gde je MyNewRepository ime Subverzionog spremišta koje ste ranije kreirali). Ako je sve dobro prošlo bićete upitani za korisničko ime i lozinku, zatim možete videti sadržaj spremišta." #. (para) #: ../source/TortoiseGit_en.xml:1703 msgid "Now you have set up Apache and Git, but Apache doesn't know how to handle Git clients like TortoiseGit yet. To get Apache to know which URL will be used for Git repositories you have to edit the Apache configuration file (usually located in c:\\program files\\apache group\\apache2\\conf\\httpd.conf) with any text editor you like (e.g. Notepad): " msgstr "Sada možete podesiti Apaš i Subverziju, ali Apaš još ne zna kako da opsluži Subverzionog klijenta kao što je TortoiseGit. Da bi Apaš znao koji URL treba koristiti za Subverziono spremište morate da uredite Apaš konfiguracioni fajl )obično na lokaciji c:\\program files\\apache group\\apache2\\conf\\httpd.conf) bilo kojim uređivačem teksta koji volite (npr. Notepad): " #. (primary) #: ../source/TortoiseGit_en.xml:1777 msgid "SVNPath" msgstr "SVNPutanja" #. (primary) #. (literal) #. (primary) #: ../source/TortoiseGit_en.xml:1780 #: ../source/TortoiseGit_en.xml:1815 #: ../source/TortoiseGit_en.xml:1950 msgid "SVNParentPath" msgstr "SVNPredakPutanja" #. (title) #: ../source/TortoiseGit_en.xml:1785 msgid "Apache httpd.conf Settings" msgstr "Apaš httpd.conf podešavanje" #. (entry) #: ../source/TortoiseGit_en.xml:1791 msgid "Setting" msgstr "Podešavanje" #. (entry) #: ../source/TortoiseGit_en.xml:1792 msgid "Explanation" msgstr "Objašnjenje" #. (systemitem) #: ../source/TortoiseGit_en.xml:1800 msgid "http://MyServer/svn/" msgstr "http://MyServer/svn/" #. (entry) #: ../source/TortoiseGit_en.xml:1798 msgid "means that the Git repositories are available from the URL " msgstr "znači da je Subverziono spremište dostupno sa URL " #. (entry) #: ../source/TortoiseGit_en.xml:1805 msgid "tells Apache which module will be responsible to serve that URL - in this case the Git module." msgstr "kaže Apašu koji modul je odgovoran da opsluži taj URL - u ovom slučaju Subverzioni modul." #. (entry) #: ../source/TortoiseGit_en.xml:1812 msgid "For Git version 1.3 and higher, this directive enables listing all the available repositories under ." msgstr "Za Subverziju 1.3 i više, ova direktiva omgućava listanje svih raspoloživih spremišta pod ." #. (filename) #: ../source/TortoiseGit_en.xml:1822 msgid "D:\\SVN" msgstr "D:\\SVN" #. (entry) #: ../source/TortoiseGit_en.xml:1820 msgid "tells Git to look for repositories below " msgstr "kaže Subverziji da pogleda spremište ispod " #. (entry) #: ../source/TortoiseGit_en.xml:1827 msgid "Used to make the browsing with a web browser prettier." msgstr "Korišćen da fino pretražuje sa veb pretraživačem." #. (entry) #: ../source/TortoiseGit_en.xml:1834 msgid "is to activate basic authentication, i.e. Username/password" msgstr "da aktivira osnovnu autentifikaciju, npr. korisničkoime/lozinka" #. (entry) #: ../source/TortoiseGit_en.xml:1841 msgid "is used as an information whenever an authentication dialog pops up to tell the user what the authentication is for" msgstr "korišćen kao informacija kadgod se pojavi autentifikacioni dijalog da kaže korisniku zašto je autentifikacija" #. (entry) #: ../source/TortoiseGit_en.xml:1848 msgid "specifies which password file to use for authentication" msgstr "određuje koji fajl lozinki koristiti za autentifikaciju" #. (entry) #: ../source/TortoiseGit_en.xml:1854 msgid "Location of the Access file for paths inside a Git repository" msgstr "Lokacija fajla računa za putanje unutar Subverzionog spremišta" #. (entry) #: ../source/TortoiseGit_en.xml:1861 msgid "specifies that only users who entered a correct username/password are allowed to access the URL" msgstr "određuje da samo korisnici koji unesu korektan ime/lozinka mogu da pristupe URL" #. (para) #: ../source/TortoiseGit_en.xml:1873 msgid "" "If you want your repository to have read access for everyone but write access only for specific users you can change the line \n" "Require valid-user\n" " to \n" "<LimitExcept GET PROPFIND OPTIONS REPORT>\n" "Require valid-user\n" "</LimitExcept>\n" "" msgstr "" "Ako želite da vaše spremište ima pristup za čitanje za svakog ali pristup za upisivanje samo za određene korisnike morate izmeniti liniju \n" "Require valid-user\n" " to \n" "<LimitExcept GET PROPFIND OPTIONS REPORT>\n" "Require valid-user\n" "</LimitExcept>\n" "" #. (para) #: ../source/TortoiseGit_en.xml:1888 msgid "" "Using a passwd file limits and grants access to all of your repositories as a unit. If you want more control over which users have access to each folder inside a repository you can uncomment the line \n" "#AuthzSVNAccessFile svnaccessfile\n" " and create a Git access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Git's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Git access file. Note that paths are specified either as repos:path or simply path. If you don't specify a particular repository, that access rule will apply to all repositories under SVNParentPath. The format of the authorization-policy file used by mod_authz_svn is described in " msgstr "" "Korišćenje passwd fajla ograničava i garantuje pristup svim vašim spremištima kao jedinicama. Ako želite više kontrole na to koji korisnici imaju pristup svakom imeniku unutar spremišta možete otkomentirati liniju \n" "#AuthzSVNAccessFile svnaccessfile\n" " i kreirati Subverzioni fajl pristupa. Apaš će sigurno učiniti da samo valjani korisnici mogu da pristupe vašoj /svn lokaciji, i proslediće korisničko ime Subverzionom AuthzSVNAccessFile modulu tako da će se pojačati granularniji pristup zasnovan na pravilima izlistanim u Subverzionom fajlu pristupa. Primetite da su putanje specificirane ili kaorepos:path ili jednostavno path. Ako ne specificirate posebno spremište, tada će se pristupna pravila primenjivati na sva spremišta pod SVNParentPath. Format fajla autorizacione-polise korišćen od mod_authz_svn opisan je na " #. (para) #: ../source/TortoiseGit_en.xml:1915 msgid "" "To make browsing the repository with a web browser 'prettier', uncomment the line \n" "#SVNIndexXSLT \"/svnindex.xsl\"\n" " and put the files svnindex.xsl, svnindex.css and menucheckout.ico in your document root directory (usually C:/Program Files/Apache Group/Apache2/htdocs). The directory is set with the DocumentRoot directive in your Apache config file." msgstr "" "Da učinite pretraživanje spremišta veb brozerom 'finije', otkomentirajte liniju \n" "#SVNIndexXSLT \"/svnindex.xsl\"\n" " i stavite fajlve svnindex.xsl, svnindex.css i menucheckout.ico u vaš koreni imenik dokumenata (obično C:/Program Files/Apache Group/Apache2/htdocs). Imenik je podešen sa DocumentRoot direktivom u Apaš konfiguracionom fajlu." #. (para) #: ../source/TortoiseGit_en.xml:1928 msgid "You can get those three files directly from our source repository at http://TortoiseGit.tigris.org/svn/TortoiseGit/trunk/contrib/other/svnindex. ( explains how to access the TortoiseGit source repository)." msgstr "Možete uzeti ova stabla fajlova direktno sa našeg izvorno spremišta na http://TortoiseGit.tigris.org/svn/TortoiseGit/trunk/contrib/other/svnindex. ( objašnjava kako pristupiti TortoiseGit spremištu izvora)." #. (para) #: ../source/TortoiseGit_en.xml:1936 msgid "The XSL file from the TortoiseGit repository has a nice gimmick: if you browse the repository with your web browser, then every folder in your repository has an icon on the right shown. If you click on that icon, the TortoiseGit checkout dialog is started for this URL." msgstr "XSL fajl iz TortoiseGit spremišta ima fin trik; ako pretražujete spremište vašim veb pretraživačem svaki imenik u vašem spremištu ima ikonu prikazanu s desna. Ako kliknete na tu ikonu TortoiseGit pokreće dijalog preuzimanja za taj URL." #. (para) #: ../source/TortoiseGit_en.xml:1782 msgid "A short explanation of what you just entered: But that's just an example. There are many, many more possibilities of what you can do with the Apache web server. " msgstr "Kratko objašnjenje šta ste upravo uneli: Ali to je samo jedan primer. Ima mnogo, mnogo više mogućnosti šta sve možete učiniti sa Apaš veb serverom. " #. (title) #: ../source/TortoiseGit_en.xml:1948 msgid "Multiple Repositories" msgstr "Višestruka spremišta" #. (primary) #: ../source/TortoiseGit_en.xml:1953 msgid "Index of projects" msgstr "Indeks projekta" #. (para) #: ../source/TortoiseGit_en.xml:1955 msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Git repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command TortoiseGitCreate repository here... and a new project has a home..." msgstr "Ako ste koristili SVNPredakPutanja direktivu zatim vi niste menjali Apaš kofig fajl svaki put kada ste dodavali novo Subverziono spremište. Jednostavno kreirajte novo spremište pod istom lkacijom kao prvo spremište i vi ste završili! U mojoj kompaniji ja imam direktan pristup specifičnom imeniku na serveru preko SMB (normalan vindouz pristup fajlovima). Tako sam samo kreirao novi imenik tamo, pokrenuo TortoiseGit komandu TortoiseGitCreate repository here... i novi projekat je dobio dom..." #. (para) #: ../source/TortoiseGit_en.xml:1969 msgid "If you are using Git 1.3 or later, you can use the SVNListParentPath on directive to allow Apache to produce a listing of all available projects if you point your browser at the parent path rather than at a specific repository." msgstr "Ako koristite Subverziju 1.3 ili kasniju, morate koristiti SVNListajPredakPutanju na direktivu da omogućite Apašu da da listing svih dostupnih projekata ako upravite vaš pretraživač na predačku putanju pre nego na posebno spremište. " #. (title) #: ../source/TortoiseGit_en.xml:1977 msgid "Path-Based Authorization" msgstr "Autorizacija zavisna od putanje" #. (primary) #: ../source/TortoiseGit_en.xml:1979 msgid "Authorization" msgstr "Autorizacija" #. (para) #: ../source/TortoiseGit_en.xml:1984 msgid "The mod_authz_svn module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Git 1.3 it is available with svnserve as well." msgstr "Modul mod_authz_svn omogućava fino-zrnastu kontrolu na dozvolama zasnovanog pristupa korisničkih imena i putanja spremišta. Ovo je omogućeno Apaš serverom i od Subverzije 1.3 moguće je sa svnserv." #. (para) #: ../source/TortoiseGit_en.xml:1990 msgid "" "An example file would look like this: \n" "[groups]\n" "admin = john, kate\n" "devteam1 = john, rachel, sally\n" "devteam2 = kate, peter, mark\n" "docs = bob, jane, mike\n" "training = zak\n" "# Default access rule for ALL repositories\n" "# Everyone can read, admins can write, Dan German is excluded.\n" "[/]\n" "* = r\n" "@admin = rw\n" "dangerman =\n" "# Allow developers complete access to their project repos\n" "[proj1:/]\n" "@devteam1 = rw\n" "[proj2:/]\n" "@devteam2 = rw\n" "[bigproj:/]\n" "@devteam1 = rw\n" "@devteam2 = rw\n" "trevor = rw\n" "# Give the doc people write access to all the docs folders\n" "[/trunk/doc]\n" "@docs = rw\n" "# Give trainees write access in the training repository only\n" "[TrainingRepos:/]\n" "@training = rw\n" "" msgstr "" "Primer bi izgledao ovakos: \n" "[groups]\n" "admin = john, kate\n" "devteam1 = john, rachel, sally\n" "devteam2 = kate, peter, mark\n" "docs = bob, jane, mike\n" "training = zak\n" "# Default access rule for ALL repositories\n" "# Everyone can read, admins can write, Dan German is excluded.\n" "[/]\n" "* = r\n" "@admin = rw\n" "dangerman =\n" "# Allow developers complete access to their project repos\n" "[proj1:/]\n" "@devteam1 = rw\n" "[proj2:/]\n" "@devteam2 = rw\n" "[bigproj:/]\n" "@devteam1 = rw\n" "@devteam2 = rw\n" "trevor = rw\n" "# Give the doc people write access to all the docs folders\n" "[/trunk/doc]\n" "@docs = rw\n" "# Give trainees write access in the training repository only\n" "[TrainingRepos:/]\n" "@training = rw\n" "" #. (para) #: ../source/TortoiseGit_en.xml:2022 msgid "Note that checking every path can be an expensive operation, particularly in the case of the revision log. The server checks every changed path in each revision and checks it for readability, which can be time-consuming on revisions which affect large numbers of files." msgstr "Primetimo da provera svake putanje može biti skupa operacija, posebno u slučaju dnevnika revizija. Server proverava svaku promenjenu putanju u svakoj reviziji i proverava da li je čitljiva, što može biti vremenski opterećujuće na revizijama koje obuhvataju veliki broj fajlova." #. (para) #: ../source/TortoiseGit_en.xml:2029 msgid "Authentication and authorization are separate processes. If a user wants to gain access to a repository path, she has to meet both, the usual authentication requirements and the authorization requirements of the access file." msgstr "Autentifikacija i autorizacija su zasebni procesi. Ako korisnik želi da otvori pristup u putanju spremišta, mora se sresti sa oba, zahtevima obične autentifikacije i zahtevima autorizacije pristupa fajlu." #. (title) #: ../source/TortoiseGit_en.xml:2037 msgid "Authentication With a Windows Domain" msgstr "Autentifikacija sa Vindouz domenom" #. (primary) #: ../source/TortoiseGit_en.xml:2039 msgid "Windows domain" msgstr "Vindouz domen" #. (primary) #: ../source/TortoiseGit_en.xml:2042 msgid "domaincontroller" msgstr "domenkontrolor" #. (para) #: ../source/TortoiseGit_en.xml:2044 msgid "As you might have noticed you need to make a username/password entry in the passwd file for each user separately. And if (for security reasons) you want your users to periodically change their passwords you have to make the change manually." msgstr "Kao što možete primetiti vama je potrebno da napravite korisnik/lozinka ulaz u passwd fajl za svakog korisnika posebno. I ako (zbog sigurnosti) želite da vaši korisnici povremeno menjaju lozinke imate da uradite izmene ručno." #. (para) #: ../source/TortoiseGit_en.xml:2051 msgid "But there's a solution for that problem - at least if you're accessing the repository from inside a LAN with a windows domain controller: mod_auth_sspi!" msgstr "Ali ima rešenja za taj problem - ako pristupate spremištu unutar LAN sa Vindouz domejn kontrolerom: mod_auth_sspi!" #. (primary) #: ../source/TortoiseGit_en.xml:2057 msgid "SSPI" msgstr "SSPI" #. (primary) #: ../source/TortoiseGit_en.xml:2060 msgid "NTLM" msgstr "NTLM" #. (para) #: ../source/TortoiseGit_en.xml:2062 msgid "The original SSPI module was offered by Syneapps including source code. But the development for it has been stopped. But don't despair, the community has picked it up and improved it. It has a new home on SourceForge." msgstr "Originalni SSPI modul je ponuđen od Sinepsa uključujući i izvorni kod. Ali razvoj je zaustavljen. Ali ne očajavajte, zajednica će ga podići i poboljšati. On ima novi dom ulink url=\"http://sourceforge.net/projects/mod-auth-sspi/\">SourceForge." #. (para) #: ../source/TortoiseGit_en.xml:2073 msgid "Download the module which matches your apache version, then copy the file mod_auth_sspi.so into the Apache modules folder." msgstr "Skinite modul koji hvata vašu apaš verziju, zatim kopirajte fajl mod_auth_sspi.so u Apaš modul imenik." #. (para) #: ../source/TortoiseGit_en.xml:2080 msgid "" "Edit the Apache config file: add the line \n" "LoadModule sspi_auth_module modules/mod_auth_sspi.so\n" " to the LoadModule section. Make sure you insert this line before the line \n" "LoadModule auth_module modules/mod_auth.so\n" "" msgstr "" "Uredite Apaš konfig fajl: dodajte liniju \n" "LoadModule sspi_auth_module modules/mod_auth_sspi.so\n" " u LoadModule delu. Budite sigurni da ste ubacili ovu liniju pre linije \n" "LoadModule auth_module modules/mod_auth.so\n" "" #. (para) #: ../source/TortoiseGit_en.xml:2093 msgid "" "To make the Git location use this type of authentication you have to change the line \n" "AuthType Basic\n" " to \n" "AuthType SSPI\n" " also you need to add \n" "SSPIAuth On\n" "SSPIAuthoritative On\n" "SSPIDomain <domaincontroller>\n" "SSPIOmitDomain on\n" "SSPIUsernameCase lower\n" "SSPIPerRequestAuth on\n" "SSPIOfferBasic On\n" " within the <Location /svn> block. If you don't have a domain controller, leave the name of the domain control as <domaincontroller>." msgstr "" "Da napravite Sbverzionu lokaciju koristite ovaj tip autentikacije koju imate da izmenite liniju \n" "AuthType Basic\n" " to \n" "AuthType SSPI\n" " also you need to add \n" "SSPIAuth On\n" "SSPIAuthoritative On\n" "SSPIDomain <domaincontroller>\n" "SSPIOmitDomain on\n" "SSPIUsernameCase lower\n" "SSPIPerRequestAuth on\n" "SSPIOfferBasic On\n" " sa <Location /svn> blok. Ako nemate kontrolor domena, ostavite ime kontrole domena kao<domaincontroller>." #. (para) #: ../source/TortoiseGit_en.xml:2119 msgid "Note that if you are authenticating using SSPI, then you don't need the AuthUserFile line to define a password file any more. Apache authenticates your username and password against your windows domain instead. You will need to update the users list in your svnaccessfile to reference DOMAIN\\username as well." msgstr "Primetite da ako ste autentikovani korišćenjem SSPI, tada vam više uopšte nije potrebna AuthUserFile linija da definiše fajl lozinke. Apaš umesto toga autentfiikuje vaše korisničko ime i lozinku preko vindouz domena. Potrebno vam je da ažurirate listu korisnika u vašem svnaccessfile ka referenci DOMAIN\\imekorisnika." #. (para) #: ../source/TortoiseGit_en.xml:2129 msgid "The SSPI authentication is only enabled for SSL secured connections (https). If you're only using normal http connections to your server, it won't work." msgstr "SPI autentifikacija je omogućena samo za SSL sigurne konekcije (https). Ako koristite normalnu http konekciju ka vašem serveru, to neće raditi." #. (para) #: ../source/TortoiseGit_en.xml:2134 msgid "To enable SSL on your server, see the chapter: " msgstr "Da omogućite SSL na vašem serveru, vidite poglavlje: " #. (para) #: ../source/TortoiseGit_en.xml:2140 msgid "Git AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." msgstr "Subverzioni AuthzSVNAccessFile fajlovi su osetljivi na veličinu slova u imenima korisnika (JUser je različito odjuser)." #. (para) #: ../source/TortoiseGit_en.xml:2145 msgid "In Microsoft's world, Windows domains and user names are not case sensitive. Even so, some network administrators like to create user accounts in CamelCase (e.g. JUser)." msgstr "U Mikrosoftovom svetu, Vindouz domeni i korisnička imena nisu osetljivi na veličinu slova. Čak su i neki mrežni administratori voleli da kreiraju korisničke naloge u CamelCase (npr. JUser)." #. (para) #: ../source/TortoiseGit_en.xml:2150 msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Git in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with." msgstr "Ova razlika vas može ugristi kada koristite SSPI autentifikaciju kao vindouz domen i korisničko ime prođe u Subverziju u istom obliku kako ga je korisnik otkucao u promptu. Internet Eksplorer često propušta korisničko ime ka Apašu automatski koristeći bilo koju veičinu slova bez obzira kako je račun ispisan." #. (para) #: ../source/TortoiseGit_en.xml:2158 msgid "The end result is that you may need at least two entries in your AuthzSVNAccessFile for each user -- a lowercase entry and an entry in the same case that Internet Explorer passes to Apache. You will also need to train your users to also type in their credentials using lower case when accessing repositories via TortoiseGit." msgstr "Krajnji rezultat je da vam možda treba najmanje dva ulaza u vaš AuthzSVNAccessFile za svakog korisnika -- ulaz sa malim slovima i ulaz isti onom kako Internet Eksplorer prosleđuje ka Apašu. Vama će takođe trebati da izvežbate sebe da kucate njihove kredibilitete koristeći mala slova kada pristupate spremištu preko TortoseSVN. " #. (para) #: ../source/TortoiseGit_en.xml:2166 msgid "Apache's Error and Access logs are your best friend in deciphering problems such as these as they will help you determine the username string passed onto Git's AuthzSVNAccessFile module. You may need to experiment with the exact format of the user string in the svnaccessfile (e.g. DOMAIN\\user vs. DOMAIN//user) in order to get everything working." msgstr "Apašev dnevnik grešaka i pristupa je vaš najbolji prijatelj pri dešifrovanju problema kao što su oni koji vam pomažu da otkrijete string korisničkog imena u svnaccessfile (npr. DOMAIN\\user prema DOMAIN//user) da bi dobili da sve radi." #. (title) #: ../source/TortoiseGit_en.xml:2180 msgid "Multiple Authentication Sources" msgstr "Višestruki autentifikacioni izvori" #. (primary) #: ../source/TortoiseGit_en.xml:2182 msgid "Multiple authentication" msgstr "Višestruke autentifikacije" #. (para) #: ../source/TortoiseGit_en.xml:2184 msgid "It is also possible to have more than one authentication source for your Git repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password." msgstr "Moguće je imati više od jednog autentifikacionog izvora za Subverziono spremište. Da se to uradi potrebno je napraviti svaki autentifikacioni tip neautoritativan tako da Apaš proverava višestruke izvore da bi dohvatio korisnik/lozinka." #. (para) #: ../source/TortoiseGit_en.xml:2190 msgid "A common scenario is to use both Windows domain authentication and a passwd file, so that you can provide SVN access to users who don't have a Windows domain login." msgstr "Zajednički scenario je da se koristi oboje, Vindouz domen autentikacija i passwd fajl, tako možete omogućiti SVN pristup ka korisnicima koji nemaju pristup Vindouz domenu." #. (para) #: ../source/TortoiseGit_en.xml:2197 msgid "" "To enable both Windows domain and passwd file authentication, add the following entries within the <Location> block of your Apache config file: \n" "AuthBasicAuthoritative Off\n" "SSPIAuthoritative Off\n" "" msgstr "" "Da se omogući oba, Vindouz domen i passwd fajl autentifikacija, dodajte sledeće ulaze u okviru <Location> bloka vašrg Apaš konfig fajla: \n" "AuthBasicAuthoritative Off\n" "SSPIAuthoritative Off\n" "" #. (para) #: ../source/TortoiseGit_en.xml:2208 msgid "" "Here is an example of the full Apache configuration for combined Windows domain and passwd file authentication: \n" "<Location /svn>\n" " DAV svn\n" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" " AuthName \"Git repositories\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" " AuthType SSPI\n" " SSPIAuth On\n" " SSPIAuthoritative Off\n" " SSPIDomain <domaincontroller>\n" " SSPIOfferBasic On\n" "\n" "# Htpasswd Logins.\n" " AuthType Basic\n" " AuthBasicAuthoritative Off\n" " AuthUserFile passwd\n" "\n" " Require valid-user\n" "</Location>\n" "" msgstr "" "Ovde je jedan primer pune Apaš konfiguracije za kombinovane Vindouz domene i passwd fajl autentifikaciju: \n" "<Location /svn>\n" " DAV svn\n" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" " AuthName \"Git repositories\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# NT Domain Logins.\n" " AuthType SSPI\n" " SSPIAuth On\n" " SSPIAuthoritative Off\n" " SSPIDomain <domaincontroller>\n" " SSPIOfferBasic On\n" "\n" "# Htpasswd Logins.\n" " AuthType Basic\n" " AuthBasicAuthoritative Off\n" " AuthUserFile passwd\n" "\n" " Require valid-user\n" "</Location>\n" "" #. (title) #: ../source/TortoiseGit_en.xml:2238 msgid "Securing the server with SSL" msgstr "Osiguranje servera sa SSL" #. (primary) #: ../source/TortoiseGit_en.xml:2240 msgid "SSL" msgstr "SSL" #. (para) #: ../source/TortoiseGit_en.xml:2242 msgid "Even though Apache 2.2.x has OpenSSL support, it is not activated by default. You need to activate this manually." msgstr "Bez obzira ako Apaš 2.2.x ima OpenSSL podršku, to nije obično aktivirano. Treba da to aktivirate ručno." #. (para) #: ../source/TortoiseGit_en.xml:2248 msgid "" "In the apache config file, uncomment the lines: \n" "#LoadModule ssl_module modules/mod_ssl.so\n" " and at the bottom \n" "#Include conf/extra/httpd-ssl.conf\n" " then change the line (on one line) \n" "SSLMutex \"file:C:/Program Files/Apache Software Foundation/\\\n" "Apache2.2/logs/ssl_mutex\"\n" " to \n" "SSLMutex default\n" "" msgstr "" "U apaš konfig fajlu, otkomentiraj linije: \n" "#LoadModule ssl_module modules/mod_ssl.so\n" " and at the bottom \n" "#Include conf/extra/httpd-ssl.conf\n" " then change the line (on one line) \n" "SSLMutex \"file:C:/Program Files/Apache Software Foundation/\\\n" "Apache2.2/logs/ssl_mutex\"\n" " to \n" "SSLMutex default\n" "" #. (para) #: ../source/TortoiseGit_en.xml:2270 msgid "" "Next you need to create an SSL certificate. To do that open a command prompt (DOS-Box) and change to the Apache folder (e.g. C:\\program files\\apache group\\apache2) and type the following command: \n" "bin\\openssl req -config conf\\openssl.cnf -new -out my-server.csr\n" " You will be asked for a passphrase. Please don't use simple words but whole sentences, e.g. a part of a poem. The longer the phrase the better. Also you have to enter the URL of your server. All other questions are optional but we recommend you fill those in too." msgstr "" "Sledeći put treba da kreirati SSL sertifikat. Da to uradite otvorite komandnu liniju (DOS-Boks) i pređite u Apaš imenik (npr. C:\\program files\\apache group\\apache2) i ukucajte sledeću komandu: \n" "bin\\openssl req -config conf\\openssl.cnf -new -out my-server.csr\n" " Bićete upitani za pasfrazu. Molim vas nemojte koristiti jednostavne reči već celu rečenicu, npr. deo poeme. Duža fraza je bolja. Takođe imate da uđete u URL vašeg servera. Sva ostala pitanja su neobavezna ali mi preporučujemo da ih sve popunite." #. (para) #: ../source/TortoiseGit_en.xml:2285 msgid "" "Normally the privkey.pem file is created automatically, but if it isn't you need to type this command to generate it: \n" "bin\\openssl genrsa -out conf\\privkey.pem 2048\n" "" msgstr "" "Normalno privkey.pem fajl je kreiran automatski, ali ako nije treba da otkucate ovu komandu da ga generišete: \n" "bin\\openssl genrsa -out conf\\privkey.pem 2048\n" "" #. (para) #: ../source/TortoiseGit_en.xml:2293 msgid "" "Next type the commands \n" "bin\\openssl rsa -in conf\\privkey.pem -out conf\\server.key\n" " and (on one line) \n" "bin\\openssl req -new -key conf\\server.key -out conf\\server.csr \\\n" "-config conf\\openssl.cnf\n" " and then (on one line) \n" "bin\\openssl x509 -in conf\\server.csr -out conf\\server.crt\n" " -req -signkey conf\\server.key -days 4000\n" " This will create a certificate which will expire in 4000 days. And finally enter (on one line): \n" "bin\\openssl x509 -in conf\\server.cert -out conf\\server.der.crt\n" " -outform DER\n" " These commands created some files in the Apache conf folder (server.der.crt, server.csr, server.key, .rnd, privkey.pem, server.cert)." msgstr "" "Zatim otkucajte komande \n" "bin\\openssl rsa -in conf\\privkey.pem -out conf\\server.key\n" " and (on one line) \n" "bin\\openssl req -new -key conf\\server.key -out conf\\server.csr \\\n" "-config conf\\openssl.cnf\n" " and then (on one line) \n" "bin\\openssl x509 -in conf\\server.csr -out conf\\server.crt\n" " -req -signkey conf\\server.key -days 4000\n" " This will create a certificate which will expire in 4000 days. And finally enter (on one line): \n" "bin\\openssl x509 -in conf\\server.cert -out conf\\server.der.crt\n" " -outform DER\n" " Ove komande su kreirale neke fajlove u Apaš konf imenik (server.der.crt, server.csr, server.key, .rnd, privkey.pem, server.cert)." #. (para) #: ../source/TortoiseGit_en.xml:2325 msgid "Restart the Apache service." msgstr "Restartujte Apaš servis." #. (para) #: ../source/TortoiseGit_en.xml:2330 msgid "Point your browser to https://servername/svn/project ..." msgstr "Upravite pretraživač ka https://servername/svn/project ..." #. (title) #: ../source/TortoiseGit_en.xml:2338 msgid "SSL and Internet Explorer" msgstr "SSL i Internet Eksplorer" #. (para) #: ../source/TortoiseGit_en.xml:2339 msgid "If you're securing your server with SSL and use authentication against a windows domain you will encounter that browsing the repository with the Internet Explorer doesn't work anymore. Don't worry - this is only the Internet Explorer not able to authenticate. Other browsers don't have that problem and TortoiseGit and any other Git client are still able to authenticate." msgstr "Ako osigurate vaš server sa SSL i koristite autentifikaciju prema Vindouz domenu vi ćete naći da pretraživanje spremišta Internet Eksplorerom uopšte ne radi. Ne brinite - to samo Internet Eksplorer nije sposoban da autentifikuje. Drugi pretraživači nemaju taj problem i TortoiseGit i bilo koji drugi Subverzioni klijent još može da autentifikuje." #. (para) #: ../source/TortoiseGit_en.xml:2353 msgid "define a separate <Location /path> directive in the Apache config file, and add the SSPIBasicPreferred On. This will allow IE to authenticate again, but other browsers and Git won't be able to authenticate against that location." msgstr "definišite odvojenu <Location /path> direktivu u Apaš konfig fajlu, i dodajte SSPIBasicPreferred On. Ovo će omogućiti IE da autentifikuje opet, ali drugi pretraživači i Subverzija nisu sposobni da autentifikuju prema lokaciji." #. (para) #: ../source/TortoiseGit_en.xml:2363 msgid "Offer browsing with unencrypted authentication (without SSL) too. Strangely IE doesn't have any problems with authenticating if the connection is not secured with SSL." msgstr "Ponudite pretraživanje sa nešifriranom autentifikacijom (bez SSL) takođe. IE nema bilo koje probleme sa autentifikacijom ako veza nije osigurana sa SSL." #. (para) #: ../source/TortoiseGit_en.xml:2371 msgid "" "In the SSL \"standard\" setup there's often the following statement in Apache's virtual SSL host: \n" "SetEnvIf User-Agent \".*MSIE.*\" \\\n" " nokeepalive ssl-unclean-shutdown \\\n" " downgrade-1.0 force-response-1.0\n" " There are (were?) good reasons for this configuration, see http://www.modssl.org/docs/2.8/ssl_faq.html#ToC49 But if you want NTLM authentication you have to use keepalive. If You uncomment the whole SetEnvIf you should be able to authenticate IE with windows authentication over SSL against the Apache on Win32 with included mod_auth_sspi." msgstr "" "U SSL \"standardno\" podešavanje ima često sledeću naredbu na Apaš virtualnom SSL domaćinu: \n" "SetEnvIf User-Agent \".*MSIE.*\" \\\n" " nokeepalive ssl-unclean-shutdown \\\n" " downgrade-1.0 force-response-1.0\n" " Ima (gde?)dobrih razloga za ovu konfiguraciju, vidite http://www.modssl.org/docs/2.8/ssl_faq.html#ToC49 Ali ako želite NTLM autentifikaciju imate da koristitekeepalive. Ako Vi otkomentirate celu SetEnvIf trebalo bi da možete da autentifikujete IE sa vindouz autentifikacijom preko SSL prema Apašu na Vin32 uključivši mod_auth_ssp." #. (para) #: ../source/TortoiseGit_en.xml:2348 msgid "If you still want to use IE to browse the repository you can either: " msgstr "Ako još uvek želite da koristite IE za pretraživanje spremišta možete ili: " #. (title) #: ../source/TortoiseGit_en.xml:2394 msgid "Forcing SSL access" msgstr "Forsiranje SSL pristupa" #. (para) #: ../source/TortoiseGit_en.xml:2395 msgid "When you've set up SSL to make your repository more secure, you might want to disable the normal access via non-SSL (http) and only allow https access. To do this, you have to add another directive to the Git <Location> block: SSLRequireSSL." msgstr "Kada se podesi SSP da učini spremište sigurnim, možete želeti da onemogućiti normalni pristup preko non-SSL (http) i dozvoljava samo https pristup. Da se to uradi, treba dodati još jednu direktivu u Subverziju <Location> block: SSLRequireSSL." #. (para) #: ../source/TortoiseGit_en.xml:2402 msgid "" "An example <Location> block would look like this: \n" "<Location /svn>\n" " DAV svn\n" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" " AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" "" msgstr "" "Primer <Location> blok će izgledati kao ovo: \n" "<Location /svn>\n" " DAV svn\n" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" " AuthName \"Git repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" "" #. (title) #: ../source/TortoiseGit_en.xml:2420 msgid "Using client certificates with virtual SSL hosts" msgstr "Korišćenje klijent sertifikata sa virtualnim SSL domaćinima." #. (para) #: ../source/TortoiseGit_en.xml:2421 msgid "Sent to the TortoiseGit mailing list by Nigel Green. Thanks!" msgstr "Poslato TortoiseGit poštanskoj listi od Nigel Grina. Hvala!" #. (para) #: ../source/TortoiseGit_en.xml:2424 msgid "In some server configurations you may need to setup a single server containing 2 virtual SSL hosts: The first one for public web access, with no requirement for a client certificate. The second one to be secure with a required client certificate, running a Git server." msgstr "U nekim serverskim konfiguracijama treba da podesite pojednačni server koji sadrži 2 virtualna SSL domaćina: Prvi za publik veb pristup, bez zahteva za klijentske sertifikate. Drugi da bude siguran sa traženjem sertifikata klijenta, izvršavajući Subverzioni server." #. (para) #: ../source/TortoiseGit_en.xml:2430 msgid "Adding an SSLVerifyClient Optional directive to the per-server section of the Apache configuration (i.e. outside of any VirtualHost and Directory blocks) forces Apache to request a client Certificate in the initial SSL handshake. Due to a bug in mod_ssl it is essential that the certificate is requested at this point as it does not work if the SSL connection is re-negotiated." msgstr "Dodavanje SSLPriveraKlijenta Opciono direktivu u per-server deo Apaš konfiguraciju (tj. izvan VirtualniDomaćin i Imenik blokovi) forsira Apaš da zahteva klijentov Sertifikat u početnom SSL rukovanju. U toku baga u mod_ssl važno je da zahtev za sertifikatom u toj tački ne radi ako se SSL konekcija ponovo pregovara." #. (para) #: ../source/TortoiseGit_en.xml:2440 msgid "" "The solution is to add the following directive to the virtual host directory that you want to lock down for Git: \n" "SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " This directive grants access to the directory only if a client certificate was received and verified successfully." msgstr "" "Rešenje je da se doda sledeća direktiva virtuelnom imeniku domaćina koji žwželite da zaključate za Subverziju: \n" "SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " Ova direktiva garantuje pristup imeniku samo ako je primljen klijentov sertifikat i zadovoljavajuće verikovan. " #. (para) #: ../source/TortoiseGit_en.xml:2449 msgid "" "To summarise, the relevant lines of the Apache configuration are: \n" "SSLVerifyClient Optional\n" "\n" "### Virtual host configuration for the PUBLIC host \n" "### (not requiring a certificate)\n" "\n" "<VirtualHost 127.0.0.1:443>\n" " <Directory \"pathtopublicfileroot\">\n" " </Directory>\n" "</VirtualHost>\n" "\n" "### Virtual host configuration for Git \n" "### (requiring a client certificate)\n" "<VirtualHost 127.0.0.1:443>\n" " <Directory \"Git host root path\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" " <Location /svn>\n" " DAV svn\n" " SVNParentPath /pathtorepository\n" " </Location>\n" "</VirtualHost>\n" "" msgstr "" "Da sumiramo, relevantne linije Apaš konfiguracij e su: \n" "SSLVerifyClient Optional\n" "\n" "### Virtual host configuration for the PUBLIC host \n" "### (not requiring a certificate)\n" "\n" "<VirtualHost 127.0.0.1:443>\n" " <Directory \"pathtopublicfileroot\">\n" " </Directory>\n" "</VirtualHost>\n" "\n" "### Virtual host configuration for Git \n" "### (requiring a client certificate)\n" "<VirtualHost 127.0.0.1:443>\n" " <Directory \"Git host root path\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" " <Location /svn>\n" " DAV svn\n" " SVNParentPath /pathtorepository\n" " </Location>\n" "</VirtualHost>\n" "" #. (title) #: ../source/TortoiseGit_en.xml:2479 msgid "Svnserve Based Server" msgstr "Svnserv zasnovan server" #. (para) #: ../source/TortoiseGit_en.xml:2485 msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Git includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." msgstr "Mogu se javiti situacije gde nije mogućw da se koristi Apaš kao server. Srećom, Subverzija uključuje Svnserv - jednostavan samostalan server koji koristi običan protokol preko redovne TCP/IP veze." #. (para) #: ../source/TortoiseGit_en.xml:2491 msgid "In most cases svnserve is easier to setup and runs faster than the Apache based server. And now that SASL support is included it is easy to secure as well." msgstr "U većini slučajeva svnserv je lakše podesiti i radi brže od Apaš zasnovanom serveru. I sada ta SASL podrška je dobro uključena da lako zaštiti." #. (title) #: ../source/TortoiseGit_en.xml:2498 msgid "Installing svnserve" msgstr "Istaliranje svnserva" #. (para) #: ../source/TortoiseGit_en.xml:2502 msgid "Get the latest version of Git from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/Git. This installer will setup svnserve as a Windows service, and also includes some of the tools you need if you are going to use SASL for security." msgstr "Uzmite zadnju verziju Subverije sa http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91. Alternativno uzmite upakovanu instalaciju od KolabNeta sa http://www.collab.net/downloads/Git. Ova instalacija će podesiti svnserv kao Vindouz servis, takđe uključuje neke alate koji su vam potrebni ako nameravate da koristite SASL za sigurnost." #. (para) #: ../source/TortoiseGit_en.xml:2516 msgid "If you already have a version of Git installed, and svnserve is running, you will need to stop it before continuing." msgstr "Ako već imate verziju Subverzije i pokrenut je svnserv, trebaće da ga zaustavite pre nego nastavite." #. (para) #: ../source/TortoiseGit_en.xml:2522 msgid "Run the Git installer. If you run the installer on your server (recommended) you can skip step 4." msgstr "Pokrenite Subverzionu instalaciju. Ako radite instalaciju na vašem serveru (preporučljivo) preskočite korak 4." #. (para) #: ../source/TortoiseGit_en.xml:2528 msgid "Open the windows-explorer, go to the installation directory of Git (usually C:\\Program Files\\Git) and in the bin directory, find the files svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - copy these files, or just copy all of the bin directory, into a directory on your server e.g. c:\\svnserve" msgstr "Otvorite vindouz-eksplorer, idite na instalacioni direktorijum Subverzije (obično C:\\Program Files\\Git) i na < filename>bin imenik, nađite fajlove svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll and ssleay32.dll - kopirajte ove falove, ili samo kopirajte sve iz bin imenika, u imenik na vašem serveru npr. c:\\svnserve" #. (title) #: ../source/TortoiseGit_en.xml:2550 msgid "Running svnserve" msgstr "Pokretanje svnserva" #. (para) #: ../source/TortoiseGit_en.xml:2551 msgid "" "Now that svnserve is installed, you need it running on your server. The simplest approach is to run the following from a DOS shell or create a windows shortcut: \n" "svnserve.exe --daemon\n" " svnserve will now start waiting for incoming requests on port 3690. The --daemon switch tells svnserve to run as a daemon process, so it will always exist until it is manually terminated." msgstr "" "Sada je svnserv instaliran, treba da ga pokrenete na vašem serveru. Jednostavan pristup je da pokrenete sedeće iz DOS školjke ili kreirate vindouz prečicu: \n" "svnserve.exe --daemon\n" " svnserv će sada krenuti čekajući na dolazni zahtev na portu 3690. Prekidač --daemon kaže svnservu da radi kao daemon proces, tako da će uvek postojati sve dok se ručno ne zaustavi." #. (para) #: ../source/TortoiseGit_en.xml:2562 msgid "If you have not yet created a repository, follow the instructions given with the Apache server setup ." msgstr "Ako koš niste kreirali spremište, pratite instrukcije koje vam daje Apaš server podešavanje ." #. (para) #: ../source/TortoiseGit_en.xml:2567 msgid "To test that svnserve is working, use TortoiseGitRepo-Browser to view a repository." msgstr "Da bi testirali da li svnserv radi koristite TortoiseGitRepo-Pretraživač da vidite spremište." #. (para) #: ../source/TortoiseGit_en.xml:2575 msgid "" "Assuming your repository is located in c:\\repos\\TestRepo, and your server is called localhost, enter: \n" "svn://localhost/repos/TestRepo\n" " when prompted by the repo browser." msgstr "" "Pretpostavljajući da je vaše spremište smešteno na c:\\repos\\TestRepo, i da se vaš server zove localhost, unesite: \n" "svn://localhost/repos/TestRepo\n" " kada vas upita repo pretraživač." #. (para) #: ../source/TortoiseGit_en.xml:2584 msgid "" "You can also increase security and save time entering URLs with svnserve by using the --root switch to set the root location and restrict access to a specified directory on the server: \n" "svnserve.exe --daemon --root drive:\\path\\to\\repository\\root\n" " Using the previous test as a guide, svnserve would now run as: \n" "svnserve.exe --daemon --root c:\\repos\n" " And in TortoiseGit our repo-browser URL is now shortened to: \n" "svn://localhost/TestRepo\n" " Note that the --root switch is also needed if your repository is located on a different partition or drive than the location of svnserve on your server." msgstr "" "Takođe možete povećati sigurnost i uštedeti vreme unoseći URL sa svnservom koristeći --root prekidač da podesite lokaciju korena i ograničite pristup specificiranim imenicima na serveru: \n" "svnserve.exe --daemon --root drive:\\path\\to\\repository\\root\n" " Using the previous test as a guide, svnserve would now run as: \n" "svnserve.exe --daemon --root c:\\repos\n" " And in TortoiseGit our repo-browser URL is now shortened to: \n" "svn://localhost/TestRepo\n" " Primetimo da --root prekidač je takođe potreban ako je spremište locirano na različitoj particiji drajva u odnosu na lokaciju svnserva na vašem serveru." #. (para) #: ../source/TortoiseGit_en.xml:2603 msgid "Svnserve will service any number of repositories. Just locate them somewhere below the root folder you just defined, and access them using a URL relative to that root." msgstr "Sbnserv će opsluživati bilo koji broj spremišta. Samo ih locirajte negde ispod korenog imenika koji ste upravo definisali, i pristupite im koristeći URL relativan na taj koren." #. (title) #: ../source/TortoiseGit_en.xml:2620 msgid "Run svnserve as a Service" msgstr "Pokretanje svnserva kao Servis" #. (para) #: ../source/TortoiseGit_en.xml:2624 msgid "Running svnserve as a user is usually not the best way. It means always having a user logged in on your server, and remembering to restart it after a reboot. A better way is to run svnserve as a windows service. Starting with Git 1.4, svnserve can be installed as a native windows service." msgstr "Pokretanje svnserva kao korisnik nije najbolji način. To znači da ima korisnik koji je uvek upisan na vašem serveru i pamti se da se restartuje posle ponovnog pokretanja. Bolji način je da pokrenete svnserv kao vindouz servis. Počevši od Subverzije 1.4, svnserv se može instalirati kao prirodni vindouz servis." #. (para) #: ../source/TortoiseGit_en.xml:2631 msgid "" "To install svnserve as a native windows service, execute the following command all on one line to create a service which is automatically started when windows starts. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" " --root c:\\repos\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: \n" "sc create svnserve binpath= \"\n" " \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" " --service --root c:\\repos\" displayname= \"Git\" \n" " depend= tcpip start= auto\n" " You can also add a description after creating the service. This will show up in the Windows Services Manager. \n" "sc description svnserve \"Git server (svnserve)\"\n" "" msgstr "" "Da bi se instalirao svnserv kao prirodni vindouz servis izvršite sledeću komandu, celu na jednoj liniji, da kreirate servis koji automatski kreće kad vindouz krene. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" " --root c:\\repos\" displayname= \"Git\" depend= tcpip \n" " start= auto\n" " If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: \n" "sc create svnserve binpath= \"\n" " \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n" " --service --root c:\\repos\" displayname= \"Git\" \n" " depend= tcpip start= auto\n" " You can also add a description after creating the service. This will show up in the Windows Services Manager. \n" "sc description svnserve \"Git server (svnserve)\"\n" "" #. (para) #: ../source/TortoiseGit_en.xml:2654 msgid "Note the rather unusual command line format used by sc. In the key= value pairs there must be no space between the key and the = but there must be a space before the value." msgstr "Primetimo nepoželjan format komandne linije koji koristi sc. U ključ= vrednost parovima nesme biti razmak između ključa i = ali mora biti razmaka pre vrednosti." #. (para) #: ../source/TortoiseGit_en.xml:2661 msgid "" "Microsoft now recommend services to be run as under either the Local Service or Network Service account. Refer to The Services and Service Accounts Security Planning Guide. To create the service under the Local Service account, append the following to the example above. \n" "obj= \"NT AUTHORITY\\LocalService\"\n" " Note that you would have to give the Local Service account appropriate rights to both Git and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"." msgstr "" "Mikrosoft sada preporučuje servise da rade pod ili LokalServis ili MrežniServis nalog. Uporedite sa Servisi i Servis nalog sigurnost vodič planiranja . Da bi se kreirao servis pod Lokal Servis nalogom, dodajte sledeće gornjem primeru. \n" "obj= \"NT AUTHORITY\\LocalService\"\n" " Primetimo da imate dati Lokal Servis nalogu odgovarajuća prava za Subverziju i spremišta, isto kao svim aplikacijama koje se koriste kao zakačive skripte. Grupa za ovu izradu zove se \"LOKALNI SERVIS\"." #. (para) #: ../source/TortoiseGit_en.xml:2678 msgid "Once you have installed the service, you need to go to the services manager to start it (this time only; it will start automatically when the server reboots)." msgstr "Jednom kada instalirate servise treba da odete na servis menadžer da ga pokrenete (samo tada, on će se pokrenuti automatski kada se servis ponovo pokreće)." #. (para) #: ../source/TortoiseGit_en.xml:2683 msgid "For more detailed information, refer to Windows Service Support for Svnserve." msgstr "Za informacije sa više detalja konsultujte Vindouz servis podršku za Svnserv." #. (para) #: ../source/TortoiseGit_en.xml:2689 msgid "" "If you installed an earlier version of svnserve using the SVNService wrapper, and you now want to use the native support instead, you will need to unregister the wrapper as a service (remember to stop the service first!). Simply use the command \n" "svnservice -remove\n" " to remove the service registry entry." msgstr "" "Ako ste instalirali raniju verziju svnserva koristeći SVNServis omotač i sada želite da koristite prirdnu podršku umesto njega, potrebno je da odregistrujete omotač kao servis (setite se da prvo zaustavite servis!). Jednostavno koristite komandu \n" "svnservice -remove\n" " da uklonite ulaz u servis registar." #. (title) #: ../source/TortoiseGit_en.xml:2703 msgid "Basic Authentication with svnserve" msgstr "Osnovna autentifikacija sa svnserv" #. (para) #: ../source/TortoiseGit_en.xml:2704 msgid "The default svnserve setup provides anonymous read-only access. This means that you can use an svn:// URL to checkout and update, or use the repo-browser in TortoiseGit to view the repository, but you won't be able to commit any changes." msgstr "Uobičajeno podešavanje svnserva omogućava anonimni pristup samo čitanje. Ovo znači da možete koristiti svn:// URL da preuzmete i ažurirate ili koristite repo-pretraživač u TortoiseGit da vidite spremište, ali ne možete urezivati bilo kakve izmene." #. (para) #: ../source/TortoiseGit_en.xml:2710 msgid "To enable write access to a repository, you need to edit the conf/svnserve.conf file in your repository directory. This file controls the configuration of the svnserve daemon, and also contains useful documentation." msgstr "Da bi omogućili pristup upisivanju u spremište, potrebno je da uredite conf/svnserve.conf fajl u imeniku spremišta. Ovaj fajl kontroliše konfiguraciju svnserv domena, takođe sadrži korisnu dokumentaciju." #. (para) #: ../source/TortoiseGit_en.xml:2716 msgid "" "You can enable anonymous write access by simply setting: \n" "[general]\n" "anon-access = write\n" " However, you will not know who has made changes to a repository, as the svn:author property will be empty. You will also be unable to control who makes changes to a repository. This is a somewhat risky setup!" msgstr "" "Možete omogućiti anonimni pristup upisivanju jednostavnim podešavanjem: \n" "[general]\n" "anon-access = write\n" " Ipak, nećete znati ko je napravio promene u spremištu kako je svn:author deo prazan. Vi ćete, takođe, biti nesposobni da kontrolišete ko je napravio izmene u spremištu. Ovo je ipak rizično podešavanje!" #. (para) #: ../source/TortoiseGit_en.xml:2727 msgid "" "One way to overcome this is to create a password database: \n" "[general]\n" "anon-access = none\n" "auth-access = write\n" "password-db = userfile\n" " Where userfile is a file which exists in the same directory as svnserve.conf. This file can live elsewhere in your file system (useful for when you have multiple repositories which require the same access rights) and may be referenced using an absolute path, or a path relative to the conf directory. If you include a path, it must be written /the/unix/way. Using \\ or drive letters will not work. The userfile should have a structure of: \n" "[users]\n" "username = password\n" "...\n" " This example would deny all access for unauthenticated (anonymous) users, and give read-write access to users listed in userfile." msgstr "" "Jedan način da se prevaziđe ovo je kreiranje baza lozinki: \n" "[general]\n" "anon-access = none\n" "auth-access = write\n" "password-db = userfile\n" " Where userfile is a file which exists in the same directory as svnserve.conf. This file can live elsewhere in your file system (useful for when you have multiple repositories which require the same access rights) and may be referenced using an absolute path, or a path relative to the conf directory. If you include a path, it must be written /the/unix/way. Using \\ or drive letters will not work. The userfile should have a structure of: \n" "[users]\n" "username = password\n" "...\n" " Ovaj primertreba da zabrani sve neautentifikovane (anonimne) korisnike i da ćitanje-upis pristup korisnicima izlistanim u userfile." #. (para) #: ../source/TortoiseGit_en.xml:2755 msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Git book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" msgstr "Ako održavate više spremišta koristeći istu bazu lozinki, korišćenje autentifikacione oblasti olakšće život korisnicima, kako TortoiseGit kešira vašu akreditaciju vi ćete je uraditi samo jedanput. Više informacija se može naći u Subverzionoj knjizi, specijalno u delu Kreirajte 'users' fajl i oblast i Klient Kredencials Kešing" #. (title) #: ../source/TortoiseGit_en.xml:2773 msgid "Better Security with SASL" msgstr "Bolja sigurnost sa SASL" #. (primary) #: ../source/TortoiseGit_en.xml:2775 msgid "SASL" msgstr "SASL" #. (title) #: ../source/TortoiseGit_en.xml:2778 msgid "What is SASL?" msgstr "Šta je SASL?" #. (para) #: ../source/TortoiseGit_en.xml:2779 msgid "The Cyrus Simple Authentication and Security Layer is open source software written by Carnegie Mellon University. It adds generic authentication and encryption capabilities to any network protocol, and as of Git 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library." msgstr "Cirus jednostavna autentifikacija i sigurnosni sloj je softver otvorenog koda napisan na Karnegi Melon univerzitetu. On dodaje srodnu autentifikaciju i mogućnosti šifriranja svakom mrežnom protokolu i od Subverzije 1.5 i dalje, oba, svnserv i TortoiseGit klijenti znaju kako da koriste ovu biblioteku. " #. (para) #: ../source/TortoiseGit_en.xml:2787 msgid "For a more complete discussion of the options available, you should look at the Git book in the section Using svnserve with SASL. If you are just looking for a simple way to set up secure authentication and encryption on a Windows server, so that your repository can be accessed safely over the big bad Internet, read on." msgstr "Za kompletniju diskusiju dostupnih opcija treba pogledati Subverzionu knjigu u delu Koristeći svnserv sa SASL . Ako ste samo potražili lak način da podesite sigurnu autentifikaciju i šifriranje na Vindouz serveru vašem spremištu će se pristupati preko velikog lošeg Internet čitanja." #. (title) #: ../source/TortoiseGit_en.xml:2800 msgid "SASL Authentication" msgstr "SASL autentifikacija" #. (para) #: ../source/TortoiseGit_en.xml:2801 msgid "" "To activate specific SASL mechanisms on the server, you'll need to do three things. First, create a [sasl] section in your repository's svnserve.conf file, with this key-value pair: \n" "use-sasl = true\n" "" msgstr "" "Da aktivirate specifične SASL mehanizme na serveru potrebne su vam tri stvari. Najpre kreirajte [sasl] sekciju u fajlu spremišta svnserve.conf, sa ovim ključ-vrednost parovima: \n" "use-sasl = true\n" "" #. (para) #: ../source/TortoiseGit_en.xml:2810 msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where Git is installed." msgstr "Drugo, kreirajte fajl koji se zove svn.conf na konvencionalnu lokaciju - tipično u imeniku gde je subverzija instalirana." #. (para) #: ../source/TortoiseGit_en.xml:2815 msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] and place two new string values inside it: SearchPath set to the directory path containing the sasl*.dll plug-ins (normally in the Git install directory), and ConfFile set to the directory containing the svn.conf file. If you used the CollabNet installer, these registry keys will already have been created for you." msgstr "Treće, kreirajte dva nova registar ulaza da kažete SASL gde da nađe potrebne stvarčice. Kreirajte registar ključ pod imenom [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library] i stavite dva nova stringa unutar njega: SearchPath podesite na putanju imenika koji sadrži sasl*.dll plagin (normalno u Subverzioni instalacioni imenik), i ConfFile podešen na imenik koji sadži svn.conf fajl. Ako koristite KolabNet instalator, ovi registar ključevi će biti već kreirani za vas." #. (para) #: ../source/TortoiseGit_en.xml:2827 msgid "" "Edit the svn.conf file to contain the following: \n" "pwcheck_method: auxprop\n" "auxprop_plugin: sasldb\n" "mech_list: DIGEST-MD5\n" "sasldb_path: C:\\TortoiseGit\\sasldb\n" " The last line shows the location of the authentication database, which is a file called sasldb. This could go anywhere, but a convenient choice is the repository parent path. Make sure that the svnserve service has read access to this file." msgstr "" "Uredite svn.conf fajl da sadrži sledeće: \n" "pwcheck_method: auxprop\n" "auxprop_plugin: sasldb\n" "mech_list: DIGEST-MD5\n" "sasldb_path: C:\\TortoiseGit\\sasldb\n" " Poslednja linija prikazuje lokaciju autentifikacione baze podataka, koja je fajl pod imenom sasldb. To može biti bilo gde, ali uobičajen izbor je predačka putanja spremišta. Osigurajte da svnser servis ima čitajući pristup ovom fajlu." #. (para) #: ../source/TortoiseGit_en.xml:2842 msgid "If svnserve was already running, you will need to restart it to ensure it reads the updated configuration." msgstr "Ako snserv već radi potrebno je da ga restartujete da se osigura da pročita ažuriranu konfihuraciju." #. (para) #: ../source/TortoiseGit_en.xml:2846 msgid "" "Now that everything is set up, all you need to do is create some users and passwords. To do this you need the saslpasswd2 program. If you used the CollabNet installer, that program will be in the install directory. Use a command something like this: \n" "saslpasswd2 -c -f C:\\TortoiseGit\\sasldb -u realm username\n" " The -f switch gives the database location, realm must be the same as the value you defined in your repository's svnserve.conf file, and username is exactly what you expect it to be. Note that the realm is not allowed to contain space characters." msgstr "" "Sada je sve podešeno, sve što vam je potrebno je da kreirate korisnike i lozinke. Da biste to uradili potreban vam je saslpasswd2 progran. Ako koristite KolabNet instalaciju taj program će biti u instalacionom imeniku. Koristite komandu nešto kao ovo: \n" "saslpasswd2 -c -f C:\\TortoiseGit\\sasldb -u realm username\n" " Prekidač -f daje lokaciju baze podataka, oblast mora da bude ista kao vrednost koju ste definisali u svnserve.conf fajlu spremišta, a korisnikovo ime je tačno ono koje očekujete da bude. Primetimo da oblast ne dozvoljava da sadrži karakter razmak." #. (para) #: ../source/TortoiseGit_en.xml:2861 msgid "You can list the usernames stored in the database using the sasldblistusers2 program." msgstr "Možete listati imena korisnika stavljene u bazu podataka koristeći sasldblistusers2 program." #. (title) #: ../source/TortoiseGit_en.xml:2867 msgid "SASL Encryption" msgstr "SASL šifrovanje" #. (para) #: ../source/TortoiseGit_en.xml:2868 msgid "" "To enable or disable different levels of encryption, you can set two values in your repository's svnserve.conf file: \n" "[sasl]\n" "use-sasl = true\n" "min-encryption = 128\n" "max-encryption = 256\n" "" msgstr "" "Da se omoguće ili onemoguće različiti nivoi šifrovanja možete podesiti dve vrednosti u svnserve.conf fajlu spremišta: \n" "[sasl]\n" "use-sasl = true\n" "min-encryption = 128\n" "max-encryption = 256\n" "" #. (para) #: ../source/TortoiseGit_en.xml:2879 msgid "The min-encryption and max-encryption variables control the level of encryption demanded by the server. To disable encryption completely, set both values to 0. To enable simple checksumming of data (i.e., prevent tampering and guarantee data integrity without encryption), set both values to 1. If you wish to allow (but not require) encryption, set the minimum value to 0, and the maximum value to some bit-length. To require encryption unconditionally, set both values to numbers greater than 1. In our previous example, we require clients to do at least 128-bit encryption, but no more than 256-bit encryption." msgstr "Min-encryption i max-encryption promenljive kontrolišu nivo šifrovanja koje zahteva server. Da se potpuno onemogući šifrovanje postavite obe vrednosti na 0. Da se omogući sumaprovere podataka (npr. predupredi mešanje i garantovati integritet podataka bez šifrovanja), postavite obe vrednosti na 1. Ako želite da dopustite (ali ne zahtevate) šifrovanje, postavite minimalnu vrednost na 0, i maksimalnu vrednost na neku dužinu bitova. Za bezuslovno zahtevanje šifrovanja postavite be vrednosti na vrednost veću od 1. U našem prethodnom primeru zahtevamo da klijenti rade 128-bitno šifrovanje, ali ne više od 256-bitnog šifrovanja." #. (title) #: ../source/TortoiseGit_en.xml:2896 msgid "Authentication with svn+ssh" msgstr "Autentifikacija sa svn+ssh" #. (para) #: ../source/TortoiseGit_en.xml:2897 msgid "Another way to authenticate users with a svnserve based server is to use a secure shell (SSH) to tunnel requests through. It is not as simple to set up as SASL, but it may be useful is some cases." msgstr "Drugi način autentifikacije korisnika pomoću svnserva zasnovanog servera je korišćenje sigurnosnu ljusku (SSH) da se provuče zahtev. To nije jednostavno da se podesi kao SASL, ali može biti korisno u nekim slučajevima." #. (para) #: ../source/TortoiseGit_en.xml:2903 msgid "With this approach, svnserve is not run as a daemon process, rather, the secure shell starts svnserve for you, running it as the SSH authenticated user. To enable this, you need a secure shell daemon on your server." msgstr "Evo to g pristupa, svnserv ne radi kao skriveni proces, radije, sigurnosna ljuska pokreće svnserv za vas, pokrećući ga kao SSH autentifikovanog korisnika. Da se to omogući potreban je skrivena sigurnosna ljuska na serveru." #. (para) #: ../source/TortoiseGit_en.xml:2909 msgid "A basic method for setting up your server is given in . You can find other SSH topics within the FAQ by searching for SSH." msgstr "Osnovni metod podešavanja vašeg servera dat je u . Možete naći druge SSH teme u okviru FAK tražeći SSH." #. (para) #: ../source/TortoiseGit_en.xml:2915 msgid "Further information about svnserve can be found in the Version Control with Git." msgstr "Dalje informacije o svnservu mogu se naći na Version Control with Git." #. (title) #: ../source/TortoiseGit_en.xml:2923 msgid "Path-based Authorization with svnserve" msgstr "Putanjom-zasnovana autorizacija sa svnservom." #. (para) #: ../source/TortoiseGit_en.xml:2924 msgid "" "Starting with Git 1.3, svnserve supports the same mod_authz_svn path-based authorization scheme that is available with the Apache server. You need to edit the conf/svnserve.conf file in your repository directory and add a line referring to your authorization file. \n" "[general]\n" "authz-db = authz\n" " Here, authz is a file you create to define the access permissions. You can use a separate file for each repository, or you can use the same file for several repositories. Read for a description of the file format." msgstr "" "Počevši od Subverzije 1.3, svnserv podržava isti mod_authz_svn putanjom-zasnovanu autorizacionu šemu koja je omogućena Apaš serverom. Potrebno je da uredite conf/svnserve.conf fajl u imeniku spremišta i dodate liniju koja se poziva na autorizacioni fajl. \n" "[general]\n" "authz-db = authz\n" " Ovde, authz je fajl koji ste kreirali da definišete pristupne dozvole. Možete koristiti poseban fajl za svako spremište, ili možete koristiti isti fajl za više spremišta. Pročitajte za opis formata fajla." #. (para) #: ../source/TortoiseGit_en.xml:2946 msgid "No matter which protocol you use to access your repositories, you always need to create at least one repository. This can either be done with the Git command line client or with TortoiseGit." msgstr "Nije bitno koji protokol koristite da pristupite spremištu, uvek vam je potrebno da kreirate bar jedno spremište. Ovo može biti urađeno Subverzionom komandnom linijom ili klijentom sa TortoiseGit." #. (para) #: ../source/TortoiseGit_en.xml:2951 msgid "If you haven't created a Git repository yet, it's time to do that now." msgstr "Ako još niste kreirali Subverziono spremište, vreme je da to uradite sada." #. (title) #: ../source/TortoiseGit_en.xml:2959 msgid "Repository Creation" msgstr "Kreiranje spremišta" #. (primary) #: ../source/TortoiseGit_en.xml:2961 msgid "create repository" msgstr "kreiraj spremište" #. (para) #: ../source/TortoiseGit_en.xml:2963 msgid "You can create a repository with the FSFS backend or with the older Berkeley Database (BDB) format. The FSFS format is generally faster and easier to administer, and it works on network shares and Windows 98 without problems. The BDB format was once considered more stable simply because it has been in use for longer, but since FSFS has now been in use in the field for several years, that argument is now rather weak. Read Choosing a Data Store in the Git book for more information." msgstr "Možete kreirati spremište sa FSFS kraj ili stari Berkli baza podataka (BDB) format. FSFS format je generalno brži i lakši za administraciju, radi na mrežnom deljenom prostoru i Vindouz 98 bez problema. BDB format je zamišljen mnogo stabilnijim jednostavno zato što se duže koristi, ali od kako je FSFS u upotrebi nekoliko godina taj argument je sve slabiji. Pročitajte Izbor smeštanja podataka u Subverzionoj knjizi za više informacija." #. (title) #: ../source/TortoiseGit_en.xml:2978 msgid "Creating a Repository with the Command Line Client" msgstr "Kreiranje spremišta klijentom komandne linije" #. (primary) #. (primary) #: ../source/TortoiseGit_en.xml:2980 #: ../source/TortoiseGit_en.xml:3021 msgid "Create" msgstr "Kreiranje" #. (secondary) #: ../source/TortoiseGit_en.xml:2981 msgid "Command Line Client" msgstr "Klijent komandne linije" #. (para) #: ../source/TortoiseGit_en.xml:2985 msgid "Create an empty folder with the name SVN (e.g. D:\\SVN\\), which is used as root for all your repositories." msgstr "Kreirajte prazan imenik sa imenom SVN (npr. D:\\SVN\\), koji se koristi kao koren za sva spremišta." #. (para) #: ../source/TortoiseGit_en.xml:2992 msgid "Create another folder MyNewRepository inside D:\\SVN\\." msgstr "Kreirajte drugi imenik MyNewRepository unutar D:\\SVN\\." #. (para) #: ../source/TortoiseGit_en.xml:2999 msgid "" "Open the command prompt (or DOS-Box), change into D:\\SVN\\ and type \n" "svnadmin create --fs-type bdb MyNewRepository\n" " or \n" "svnadmin create --fs-type fsfs MyNewRepository\n" "" msgstr "" "Otvorite komandni prompt (ili DOS -boks), pređite u D:\\SVN\\ and type \n" "svnadmin create --fs-type bdb MyNewRepository\n" " or \n" "svnadmin create --fs-type fsfs MyNewRepository\n" "" #. (para) #: ../source/TortoiseGit_en.xml:3012 msgid "Now you've got a new repository located at D:\\SVN\\MyNewRepository." msgstr "Sada imate spremište u D:\\SVN\\MyNewRepository." #. (title) #: ../source/TortoiseGit_en.xml:3019 msgid "Creating The Repository With TortoiseGit" msgstr "Kreiranje spremišta sa TortoiseGit" #. (title) #: ../source/TortoiseGit_en.xml:3026 msgid "The TortoiseGit menu for unversioned folders" msgstr "TortoiseGit meni za neverzionisani imenik" #. (para) #: ../source/TortoiseGit_en.xml:3031 msgid "Open the windows explorer" msgstr "Otvorite vindouz pretraživač" #. (para) #: ../source/TortoiseGit_en.xml:3036 msgid "Create a new folder and name it e.g. SVNRepository" msgstr "Kreirajte novi imenik i nazovite ga npr. SVNRepository" #. (para) #: ../source/TortoiseGit_en.xml:3042 msgid "Right-click on the newly created folder and select TortoiseGitCreate Repository here...." msgstr "Desni-klik na novo kreirani imenik i izaberite TortoiseGitKreirajte spremište ovde...." #. (para) #: ../source/TortoiseGit_en.xml:3050 msgid "A repository is then created inside the new folder. Don't edit those files yourself!!!. If you get any errors make sure that the folder is empty and not write protected." msgstr "Spremište će biti kreirano unutar novog imenika. Nemojte uređivati te fajlove sami!!!. Ako dobijete bilo kakvu grešku osigurajte da imenik bude prazan i nije zaštićen od upisivanja." #. (para) #: ../source/TortoiseGit_en.xml:3059 msgid "TortoiseGit no longer offers the option to create BDB repositories, although you can still use the command line client to create them. FSFS repositories are generally easier for you to maintain, and also makes it easier for us to maintain TortoiseGit due to compatibility issues between the different BDB versions." msgstr "TortoiseGit više ne nudi opciju da se kreira BDB spremište, ali još možete koristiti klijenta komandne linije da ga kreirate. FSFS spremišta su generalno jednostavnija za rukovanje i nama lakša da održavamo TortoiseGit preko kompatibilnih problema između raznih BDB verzja." #. (para) #: ../source/TortoiseGit_en.xml:3066 msgid "Future versions of TortoiseGit will not support file:// access to BDB repositories due to these compatibility issues, although it will of course always support this repository format when accessed via a server through the svn://, http:// or https:// protocols. For this reason, we strongly recommend that any new repository which must be accessed using file:// protocol is created as FSFS." msgstr "Buduće verzije TortoiseGit neće podržati file:// pristup BDB spremištima zbog kompatibilnih problema, ali će svakako uvek podržavati taj format spremišta kada se pristupa preko servera kroz svn://, http:// ili https:// protokole. Iz tog razloga čvrsto preporučujemo da svako novo spremište kojem se mora pristupati koristeći file:// protokol bude kreirano kao FSFS." #. (para) #: ../source/TortoiseGit_en.xml:3078 msgid "Of course we also recommend that you don't use file:// access at all, apart from local testing purposes. Using a server is more secure and more reliable for all but single-developer use." msgstr "Svakako takođe preporuujemo da ne koristite file:// pristuo uopšte, čak ni iz lokalnih potreba testiranja. Korišćenje servera je mnogo sigurnije i mnogo pouzdanije za sve osim u korišćenju pojedinca." #. (title) #: ../source/TortoiseGit_en.xml:3087 msgid "Local Access to the Repository" msgstr "Lokalni pristup spremištu" #. (primary) #: ../source/TortoiseGit_en.xml:3089 msgid "Access" msgstr "Pristup" #. (primary) #: ../source/TortoiseGit_en.xml:3092 msgid "UNC paths" msgstr "UNC putanja" #. (para) #: ../source/TortoiseGit_en.xml:3094 msgid "To access your local repository you need the path to that folder. Just remember that Git expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." msgstr "Da se pristupi lokalnom spremištu potrbna je putanja do tog imenika. Setimo se da Subverzija očekuje sve putanje spremišta u obliku file:///C:/SVNRepository/. Zapazimo korišćenje pravih kosih crta u celoj putanji." #. (para) #: ../source/TortoiseGit_en.xml:3100 msgid "To access a repository located on a network share you can either use drive mapping, or you can use the UNC path. For UNC paths, the form is file://ServerName/path/to/repos/. Note that there are only 2 leading slashes here." msgstr "Da bi se pristupilo spremištu na mrežnom deljenju i možete koristiti ili mapiranje drajva, ili koristiti UNC putanju. Za UNC putanje oblik je file://ServerName/path/to/repoš. Primetimo da ovde imamo 2 vodeće kose crte." #. (para) #: ../source/TortoiseGit_en.xml:3107 msgid "Prior to SVN 1.2, UNC paths had to be given in the more obscure form file:///\\ServerName/path/to/repos. This form is still supported, but not recommended." msgstr "Pre SVN 1.2, UNC putanje su bile date u čudnijem obliku systemitem class=\"url\">file:///\\ServerName/path/to/repos. Ovaj oblik se još podržava, ali se ne preporučuje." #. (para) #: ../source/TortoiseGit_en.xml:3114 msgid "Do not create or access a Berkeley DB repository on a network share. It cannot exist on a remote file system. Not even if you have the network drive mapped to a drive letter. If you attempt to use Berkeley DB on a network share, the results are unpredictable - you may see mysterious errors right away, or it may be months before you discover that your repository database is subtly corrupted." msgstr "Ne treba kreirati ili pristupati Berkli DB spremištu na mrežni deljeni prostor. To ne može postojati na udaljenom fajl sistemu. Niti čak ako imate mrežni drajv mapiran slovom drajva. Ako pokušate da koristite Berkli DB na mrežnoj izmeni, rezultat je nepredvidljiv - možete videti misteriozne greške trenutno, ili mogu proći meseci pre nego otkrijete da je vaša baza podataka spremišta neznatno pokvarena." #. (title) #: ../source/TortoiseGit_en.xml:3125 msgid "Accessing a Repository on a Network Share" msgstr "Pristupanje spremištu na mrežnom deljenom prostoru" #. (primary) #: ../source/TortoiseGit_en.xml:3127 msgid "Network share" msgstr "Mrežni deljeni prostor" #. (para) #: ../source/TortoiseGit_en.xml:3129 msgid "Although in theory it is possible to put a FSFS repository on a network share and have multiple users access it using file:// protocol, this is most definitely not recommended. In fact we would strongly discourage it, and do not support such use." msgstr "Takođe je poznato u teoriji da je moguće staviti FSFS spremište na mrežnom deljenom prostoru i imati višestruki korisnički pristup koristeći file:// protokol, ovo se definitivno ne preporučuje. U stvari možemo čvrsto obeshrabriti to, i ne podržati takvo korišćenje." #. (para) #: ../source/TortoiseGit_en.xml:3136 msgid "Firstly you are giving every user direct write access to the repository, so any user could accidentally delete the entire repository or make it unusable in some other way." msgstr "Najpre dajete svakom korisniku direktno pravo upisa u spremište, tako da bilo koji korisnik može slučajno obrisati celo spremište ili ga učiniti nekorisnim na neki drugi način." #. (para) #: ../source/TortoiseGit_en.xml:3141 msgid "Secondly not all network file sharing protocols support the locking that Git requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time." msgstr "Drugo, neće svi protokoli za mrežni deljeni prostor podržavatizaključavanje koje zahteva Subverzija, tako da možete naći vaše spremište pokvareno. To se ne mora desiti odmah, ali jednog dana dva korisnika mogu pokušati da pristupe spremištu u isto vreme. " #. (para) #: ../source/TortoiseGit_en.xml:3147 msgid "Thirdly the file permissions have to be set just so. You may just about get away with it on a native Windows share, but SAMBA is particularly difficult." msgstr "Treće, fajl dozvole mogu biti tako podešene. Možete otići na prirodni Vindouz deljeni prostor, ali SAMBA je posebno teška." #. (para) #: ../source/TortoiseGit_en.xml:3152 msgid "file:// access is intended for local, single-user access only, particularly testing and debugging. When you want to share the repository you really need to set up a proper server, and it is not nearly as difficult as you might think. Read for guidelines on choosing and setting up a server." msgstr "file:// pristup je planiran za lokalni, samo jedan-korisnik pristup, partikularno testiranje i debagovanje. Kada želite deljenje spremišta vi stvarno treba da podesite odgovarajući server, i to nije skoro tako teško kako se može pomisliti. Pročitajte za vodič kako izabrati i podesiti server." #. (title) #: ../source/TortoiseGit_en.xml:3162 msgid "Repository Layout" msgstr "Izgled spremišta" #. (para) #: ../source/TortoiseGit_en.xml:3163 msgid "Before you import your data into the repository you should first think about how you want to organize your data. If you use one of the recommended layouts you will later have it much easier." msgstr "Pre nego uvezete vaše podatke u spremište morate najpre razmisliti kako želite da organizujete podatke. Ako koristite neki od preporučenih iugleda kasnije će vam biti lakše." #. (para) #: ../source/TortoiseGit_en.xml:3169 msgid "There are some standard, recommended ways to organize a repository. Most people create a trunk directory to hold the main line of development, a branches directory to contain branch copies, and a tags directory to contain tag copies. If a repository holds only one project, then often people create these top-level directories:" msgstr "Postoje neki standardni, preporučljivi načini organizovanja spremišta. Većina ljudi kreira deblo imenik da čuva glavnu liniju razvoja, grane imenik da čuva kopije grana, i znake imenik da drži kopije oznaka. Ako spremište sadrži samo jedan projekat, tada ljudi često kreiraju vršni imenik:" #. (screen) #: ../source/TortoiseGit_en.xml:3178 #, no-wrap msgid "" "\n" "/trunk\n" "/branches\n" "/tags\n" msgstr "" "\n" "/trunk\n" "/branches\n" "/tags\n" #. (para) #: ../source/TortoiseGit_en.xml:3183 msgid "If a repository contains multiple projects, people often index their layout by branch:" msgstr "Ako spremište sadrži više projekata, ljudi čest indeksiraju njhov izgled granama:" #. (screen) #: ../source/TortoiseGit_en.xml:3187 #, no-wrap msgid "" "\n" "/trunk/paint\n" "/trunk/calc\n" "/branches/paint\n" "/branches/calc\n" "/tags/paint\n" "/tags/calc\n" msgstr "" "\n" "/trunk/paint\n" "/trunk/calc\n" "/branchešpaint\n" "/branchešcalc\n" "/tagšpaint\n" "/tagšcalc\n" #. (para) #: ../source/TortoiseGit_en.xml:3195 msgid "...or by project:" msgstr "...ili projektom:" #. (screen) #: ../source/TortoiseGit_en.xml:3198 #, no-wrap msgid "" "\n" "/paint/trunk\n" "/paint/branches\n" "/paint/tags\n" "/calc/trunk\n" "/calc/branches\n" "/calc/tags\n" msgstr "" "\n" "/paint/trunk\n" "/paint/branches\n" "/paint/tags\n" "/calčtrunk\n" "/calčbranches\n" "/calčtags\n" #. (para) #: ../source/TortoiseGit_en.xml:3206 msgid "Indexing by project makes sense if the projects are not closely related and each one is checked out individually. For related projects where you may want to check out all projects in one go, or where the projects are all tied together in a single distribution package, it is often better to index by branch. This way you have only one trunk to checkout, and the relationships between the sub-projects is more easily visible." msgstr "Indeksiranje pomoću projekata je osetljiv na to da li su projekti blisko uporedivi i da li se svaki može individualno preuzeti. Za uporedive projekte gde možete preuzetii sve projekte ođednom, ili gde su svi projekti vezani zajedno u jedan distribucioni paket, često je bolje indeksiranje grana. U ovom slučaju vam je potrebno jedno deblo za preuzimanje i povezanost između sub-projekata je mnogo lakše vidljiva." #. (para) #: ../source/TortoiseGit_en.xml:3214 msgid "If you adopt a top level /trunk /tags /branches approach, there is nothing to say that you have to copy the entire trunk for every branch and tag, and in some ways this structure offers the most flexibility." msgstr "Ako usvojimo vršni nivo /trunk /tags /branches pristup, nije ništa reći da imate kopirati celo deblo za svaku granu i znak, i u neki put ova struktura nudi najveću flksibilnost." #. (para) #: ../source/TortoiseGit_en.xml:3220 msgid "For unrelated projects you may prefer to use separate repositories. When you commit changes, it is the revision number of the whole repository which changes, not the revision number of the project. Having 2 unrelated projects share a repository can mean large gaps in the revision numbers. The Git and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." msgstr "Za projekte koji nisu povezani možete više voleti da koristite odvojena spremišta. Kada urezujete izmene, revizioni broj celog spremišta se menja, ne revizioni broj projekta. Ako imate 2 nezavisna projekta deljenje spremišta može značiti velike praznine u revizionim brojevima. Subverzija i TortoiseGit projekti se pojavljuju na istim adresama domaćina, ali su sasvim nezavisna spremišta omogućavajući nezavisan razvoj i nema kofuzije oko razvojnih brojeva." #. (para) #: ../source/TortoiseGit_en.xml:3230 msgid "Of course, you're free to ignore these common layouts. You can create any sort of variation, whatever works best for you or your team. Remember that whatever you choose, it's not a permanent commitment. You can reorganize your repository at any time. Because branches and tags are ordinary directories, TortoiseGit can move or rename them however you wish." msgstr "Svakako, slobodni ste da zanemarite ovaj zajednički izgled. Možete kreirati bilo koju vrstu varijacija, što god radi bolje za vaš tim. Setite se da što god izaberete to nije stalno urezivanje. Vi možete reorganizovati vaše spremište bilo kada. Pošto su grane i oznake pravi imenici TortoiseGit ih može pomerati i preimenovati kad god želite." #. (para) #: ../source/TortoiseGit_en.xml:3238 msgid "Switching from one layout to another is just a matter of issuing a series of server-side moves; If you don't like the way things are organized in the repository, just juggle the directories around." msgstr "Prebacivanje sa jednog izgleda na drugi je tek stvar emitovanja serije pomeranja sa serverske strane; Ako ne volite način na koji su stvari organizovane u spremištu, malo žonglirajte okolnim imenicima." #. (para) #: ../source/TortoiseGit_en.xml:3255 msgid "create a new empty folder on your hard drive" msgstr "kreirajte prazan imenik na vašem čvrstom disku" #. (para) #: ../source/TortoiseGit_en.xml:3260 msgid "create your desired top-level folder structure inside that folder - don't put any files in it yet!" msgstr "kreirajte željeni vršni-nivo imenik strukturu unutar tog imenika - nemojte stavljati nijedan fajl još!" #. (para) #: ../source/TortoiseGit_en.xml:3266 msgid "import this structure into the repository via a right click on the folder and selecting TortoiseGitImport... This will import your temp folder into the repository root to create the basic repository layout." msgstr "uveite ovu strukturu u spremište preko desni klik na imenik i izborom TortoiseGitUvezi... Ovo će uvesti vaš privremeni imenik u koren spremišta da kreira osnovni izgled spremišta." #. (para) #: ../source/TortoiseGit_en.xml:3244 msgid "So if you haven't already created a basic folder structure inside your repository you should do that now. There are two ways to achieve this. If you simply want to create a /trunk /tags /branches structure, you can use the repository browser to create the three folders (in three separate commits). If you want to create a deeper hierarchy then it is simpler to create a folder structure on disk first and import it in a single commit, like this: " msgstr "Tako, ako niste već kreirali strukturu osnovnog imenika unutar vašeg spremišta treba to da uradite sada. Postoje dva načina da se to postigne. Ako jednostavno želite da kreirate /trunk /tags /branches strukturu možete koristiti pretraživač spremišta da kreirate ta tri imenika (u tri posebna urezivanja). Ako želite da kreirate dublju hijerarhiju tada je to slično najpre kreiranju strukture imenika na disku i njen uvoz pri jedinstvenom urezivanju kao ovo: " #. (para) #: ../source/TortoiseGit_en.xml:3281 msgid "" "Note that the name of the folder you are importing does not appear in the repository, only its contents. For example, create the following folder structure: \n" "C:\\Temp\\New\\trunk\n" "C:\\Temp\\New\\branches\n" "C:\\Temp\\New\\tags\n" " Import C:\\Temp\\New into the repository root, which will then look like this: \n" "/trunk\n" "/branches\n" "/tags\n" "" msgstr "" "Primetimo da ime imenika koji uvozite ne pojavljuje se u spremištu, samo sadržaj. Na primer, kreirajte sledeće strukture imenika:\n" "C:\\Temp\\New\\trunk\n" "C:\\Temp\\New\\branches\n" "C:\\Temp\\New\\tags\n" " Uvezite C:\\Temp\\New u koren spremišts, koje će sada izgledati kao:\n" "/trunk\n" "/branches\n" "/tags\n" "" #. (title) #: ../source/TortoiseGit_en.xml:3301 msgid "Repository Backup" msgstr "Osiguranje spremišta" #. (primary) #: ../source/TortoiseGit_en.xml:3303 msgid "backup" msgstr "osiguranje" #. (para) #: ../source/TortoiseGit_en.xml:3305 msgid "Whichever type of repository you use, it is vitally important that you maintain regular backups, and that you verify the backup. If the server fails, you may be able to access a recent version of your files, but without the repository all your history is lost forever." msgstr "Koji god tip spremišta da koristite, izuzetno je važno da održavate regularno osiguranje, i da proverite osiguranje. Ako server padne vi ste možda sposobni da pristupite zadnjoj verziji vaših fajlova, ali bez spremišta sva istorja je izgubljena zauvek." #. (para) #: ../source/TortoiseGit_en.xml:3312 msgid "The simplest (but not recommended) way is just to copy the repository folder onto the backup medium. However, you have to be absolutely sure that no process is accessing the data. In this context, access means any access at all. A BDB repository is written to even when the operation only appears to require reading, such as getting status. If your repository is accessed at all during the copy, (web browser left open, WebSVN, etc.) the backup will be worthless." msgstr "Jednostavan (ali nepreporučljiv) način je da se samo kopira imenik spremišta na medijum osiguranja. Međutim, potrebno je da budete apsolutno sigurni da ni jedan proces ne pristupa podacima. U ovom kontekstu, pristup znači svaki pristup uopšte. BDB spremište je upisano čak i kad se operacija pojavi da zahteva čitanje kao uzimanje statusa. Ako je vašem spremištu pristupljeno u toku kopiranja, (veb pretraživač ostaje otvoren, VepSVN, itd.) osiguranje će biti bezvredno. " #. (para) #: ../source/TortoiseGit_en.xml:3322 msgid "" "The recommended method is to run \n" "svnadmin hotcopy path/to/repository path/to/backup --clean-logs\n" " to create a copy of your repository in a safe manner. Then backup the copy. The --clean-logs option is not required, but removes any redundant log files when you backup a BDB repository, which may save some space." msgstr "" "Preporučljiv metod je da se pokrene \n" "svnadmin hotcopy path/to/repository path/to/backup --clean-logs\n" " da se kreira kopija vašeg spremišta na bezbedan način. Zatim se pravi kopija osiguranja. Opcija --clean-logs nije potrebna, ali uklanja redundantne fajlove dnevnika kada osiguravate BDB spremišta, što štedi nešto prostora." #. (para) #: ../source/TortoiseGit_en.xml:3332 msgid "The svnadmin tool is installed automatically when you install the Git command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the .zip version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Git command line client from http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." msgstr "Alat svnadmin je instaliran automatski kada instalirate Subverzionog klijenta komandne linije. Ako instalirate alat komandne linije na Vindouz PC, najbolji način je da skinete Vindouz instoler verziju. Ona je efikasnije komprimovana nego .zip verzija, tako da je skidanje manje, i ono vodi brigu da podesi putanju za vas. Možete skibuti zadnju verziju Subverzionog klijenta komandne linije sa http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91." #. (title) #: ../source/TortoiseGit_en.xml:3347 msgid "Server side hook scripts" msgstr "Zakačive skripte sa serverske strane" #. (primary) #: ../source/TortoiseGit_en.xml:3349 msgid "hooks" msgstr "zakačaljke" #. (primary) #. (primary) #: ../source/TortoiseGit_en.xml:3352 #: ../source/TortoiseGit_en.xml:12152 msgid "hook scripts" msgstr "zakačive skripte" #. (primary) #: ../source/TortoiseGit_en.xml:3355 msgid "server side hook scripts" msgstr "zakačive skripte sa serverske strane" #. (para) #: ../source/TortoiseGit_en.xml:3357 msgid "A hook script is a program triggered by some repository event, such as the creation of a new revision or the modification of an unversioned property. Each hook is handed enough information to tell what that event is, what target(s) it's operating on, and the username of the person who triggered the event. Depending on the hook's output or return status, the hook program may continue the action, stop it, or suspend it in some way. Please refer to the chapter on Hook Scripts in the Git Book for full details about the hooks which are implemented." msgstr "Zakačive skripte su programi okidane nekim događajem iz spremišta, kao što je kreiranje nove revizije ili izmena neverzionirane osobine. Svaka zakačaljka je rukovođena sa dovoljno informacija da kže koji događaj se desio, koji okidač(i) je pokrenuo i korisničko ime osobe koja je okinula događaj. U zavisnosti od izlaza zakačaljke ili povratnog statusa, zakačiv program može nastaviti akciju, zaistaviti je, ili suspendovati na neki način. Molim vas da pogledate poglavlje Zakačive skripte u Subverzionoj knjizi za pune detalje o zakačaljkama koje su implementirane." #. (para) #: ../source/TortoiseGit_en.xml:3372 msgid "These hook scripts are executed by the server that hosts the repository. TortoiseGit also allows you to configure client side hook scripts that are executed locally upon certain events. See for more information." msgstr "Ovi zakačivi skriptovi su izvršeni na serveru koji ugošćava spremište. TortoiseGit takođe omogućava da konfigurišete klijent stranu zakačivih skripti gde se očekuju lokalno pod nekim događajima. Vidite xref linkend=\"tsvn-dug-settings-hooks\"/> za više informacija." #. (para) #: ../source/TortoiseGit_en.xml:3378 msgid "" "Sample hook scripts can be found in the hooks directory of the repository. These sample scripts are suitable for Unix/Linux servers but need to be modified if your server is Windows based. The hook can be a batch file or an executable. The sample below shows a batch file which might be used to implement a pre-revprop-change hook. \n" "rem Only allow log messages to be changed.\n" "if \"%4\" == \"svn:log\" exit 0\n" "echo Property '%4' cannot be changed >&2\n" "exit 1\n" " Note that anything sent to stdout is discarded. if you want a message to appear in the Commit Reject dialog you must send it to stderr. In a batch file this is achieved using >&2" msgstr "" "Jednostavne zakačive skripte mogu se naći u zakačaljke> imeniku spremišta. Ove jednostavne skripte su pogodne za UnikšLinuks servere ali traže izmene ako je server zasnovan na Vindouzu. Zakačke mogu biti grupni fajl ili izvršilac. Uzorak ispod pokazuje grupni fajl koji se može koristiti da se primeni kao pre-revprop-izmena zakačaljka.\n" "rem Only allow log messages to be changed.\n" "if \"%4\" == \"svn:log\" exit 0\n" "echo Property '%4' cannot be changed >&2\n" "exit 1\n" " Primetimo sve poslato na stdout se odbacuje ako želite poruku da se pojavi u Ureži Odbaci dijalogu morate je poslati na stderr. U grupnom fajlu to se postiže korišćenjem >&2" #. (title) #: ../source/TortoiseGit_en.xml:3398 msgid "Checkout Links" msgstr "Veze preuzimanja" #. (primary) #: ../source/TortoiseGit_en.xml:3400 msgid "checkout link" msgstr "veza preuzimanja" #. (primary) #: ../source/TortoiseGit_en.xml:3403 msgid "TortoiseGit link" msgstr "TortoiseGit veza" #. (primary) #: ../source/TortoiseGit_en.xml:3406 msgid "link" msgstr "veza" #. (primary) #: ../source/TortoiseGit_en.xml:3409 msgid "website" msgstr "vebsajt" #. (para) #: ../source/TortoiseGit_en.xml:3411 msgid "If you want to make your Git repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a checkout link for other TortoiseGit users." msgstr "Ako želite učiniti vaše Subverziono spremište dostupno drugima morate uključiti vezu ka njemu od vašeg vebsajta. Jedan način da se to uradi mnogo pristupčnije je da se uključi veza preuzimanja za druge TortoiseGit korisnike." #. (para) #: ../source/TortoiseGit_en.xml:3417 msgid "When you install TortoiseGit, it registers a new tsvn: protocol. When a TortoiseGit user clicks on such a link, the checkout dialog will open automatically with the repository URL already filled in." msgstr "Kada instalirate TortoiseGit on registruje novi tsvn: protokol. Kada TortoiseGit korisnik klikne na takvu vezu, dijalog preuzimanja se automatski otvara sa URLom spremišta već upisanim." #. (programlisting) #: ../source/TortoiseGit_en.xml:3426 #, no-wrap msgid "" "\n" "<a href=\"tsvn:http://project.domain.org/svn/trunk\">\n" "</a>\n" msgstr "" "\n" "<a href=\"tsvn:http://project.domain.org/svn/trunk\">\n" "</a>\n" #. (para) #: ../source/TortoiseGit_en.xml:3423 msgid "To include such a link in your own html page, you need to add code which looks something like this: " msgstr "Da unesete takvu vezu u vašu html stranicu potrebno vam je da dodate kod koji izgleda nešto kao ovo: " #. (programlisting) #: ../source/TortoiseGit_en.xml:3438 #, no-wrap msgid "" "\n" "<a href=\"tsvn:http://project.domain.org/svn/trunk\">\n" "<img src=TortoiseCheckout.png></a>\n" msgstr "" "\n" "<a href=\"tsvn:http://project.domain.org/svn/trunk\">\n" "<img src=TortoiseCheckout.png></a>\n" #. (para) #: ../source/TortoiseGit_en.xml:3431 msgid "Of course it would look even better if you included a suitable picture. You can use the TortoiseGit logo or you can provide your own image. " msgstr "Svakako to će izgledati čak bolje ako uključite odgovarajuću sliku. Možete koristiti TortoiseGit logo ili možete nabaviti svoju sopstvenu sliku. " #. (programlisting) #: ../source/TortoiseGit_en.xml:3445 #, no-wrap msgid "" "\n" "<a href=\"tsvn:http://project.domain.org/svn/trunk?100\">\n" "</a>\n" msgstr "" "\n" "<a href=\"tsvn:http://project.domain.org/svn/trunk?100\">\n" "</a>\n" #. (para) #: ../source/TortoiseGit_en.xml:3443 msgid "You can also make the link point to a specific revision, for example " msgstr "Takođe možete napraviti vezu ka specijalnoj reviziji, na primer " #. (title) #: ../source/TortoiseGit_en.xml:3453 msgid "Daily Use Guide" msgstr "Vodič dnevnog korišćenja" #. (para) #: ../source/TortoiseGit_en.xml:3457 msgid "This document describes day to day usage of the TortoiseGit client. It is not an introduction to version control systems, and not an introduction to Git (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it." msgstr "Ovaj dokument opisuje korišćenje dan za danom klijenta TortoiseGit. To nije uvod u sistem kontrole verzija, i nije uvod u Subverziju (SV). To je više kao mesto gde se možete vratiti tamo gde približno znate šta želite da uradite, ali ne razumete kako da to uradite." #. (para) #: ../source/TortoiseGit_en.xml:3465 msgid "If you need an introduction to version control with Git, then we recommend you read the fantastic book: Version Control with Git." msgstr "Ako želite uvod u kontrolu verzija sa Subverzijom, preporučujemo vam da pročitate fantastičnu knjigu: Kontrola verzija sa Subverzijom." #. (para) #: ../source/TortoiseGit_en.xml:3472 msgid "This document is also a work in progress, just as TortoiseGit and Git are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time." msgstr "Ovaj dokument je takođe u radu, kao i TortoiseGit to je i Subverzija. Ako nađete neku grešku, molim vas pošaljite je na poštansku listu da možemo ažurirati dokumentaciju. Neke slike ekrana u Vodiču dnevnog korišćenja (VDK) možda ne odražavaju tekuće stanje softvera. Molim vas da nam oprostite. Mi radimo na TortoiseGit u svoje slobodno vreme." #. (para) #: ../source/TortoiseGit_en.xml:3484 msgid "You should have installed TortoiseGit already." msgstr "Trebalo bi da već imate instaliran TortoiseGit." #. (para) #: ../source/TortoiseGit_en.xml:3489 msgid "You should be familiar with version control systems." msgstr "Trebalo bi da ste familijarni sa sistemom kontrole verzija." #. (para) #: ../source/TortoiseGit_en.xml:3494 msgid "You should know the basics of Git." msgstr "Trebalo bi da znate osnove Subverzije." #. (para) #: ../source/TortoiseGit_en.xml:3499 msgid "You should have set up a server and/or have access to a Git repository." msgstr "Trebalo bi da imate podešen server i-ili da imate pristup Subverzionom spremištu." #. (para) #: ../source/TortoiseGit_en.xml:3480 msgid "In order to get the most out of the Daily Use Guide: " msgstr "Da bi dobili najviše od Vodiča dnevnog korišćenja: " #. (title) #: ../source/TortoiseGit_en.xml:3510 msgid "Getting Started" msgstr "Krenimo od početka" #. (title) #. (title) #. (title) #: ../source/TortoiseGit_en.xml:3512 #: ../source/TortoiseGit_en.xml:5033 #: ../source/TortoiseGit_en.xml:15282 msgid "Icon Overlays" msgstr "Prekrivne ikone" #. (title) #. (title) #: ../source/TortoiseGit_en.xml:3515 #: ../source/TortoiseGit_en.xml:5042 msgid "Explorer showing icon overlays" msgstr "Pretraživač prikazuje prekrivne ikone" #. (para) #: ../source/TortoiseGit_en.xml:3513 msgid " One of the most visible features of TortoiseGit is the icon overlays which appear on files in your working copy. These show you at a glance which of your files have been modified. Refer to to find out what the different overlays represent." msgstr " Jedna od najvidljivijih osobina TortoiseGit su prekrivne ikone koje se pojavljuju na fajlovima u vašoj radnoj kopiji. One vam pokazuju, savršeno, koji je od vaših fajlova izmenjen. Uporedite sa da nađete šta različiti prekrivači pokazuju." #. (title) #: ../source/TortoiseGit_en.xml:3526 msgid "Context Menus" msgstr "Kontekst meniji:" #. (primary) #: ../source/TortoiseGit_en.xml:3528 msgid "context menu" msgstr "kontekst meni" #. (primary) #: ../source/TortoiseGit_en.xml:3531 msgid "right-click" msgstr "desni-klik" #. (title) #: ../source/TortoiseGit_en.xml:3535 msgid "Context menu for a directory under version control" msgstr "Kontekst meni za imenik pod kontrolom verzija" #. (para) #: ../source/TortoiseGit_en.xml:3533 msgid " All TortoiseGit commands are invoked from the context menu of the windows explorer. Most are directly visible, when you right click on a file or folder. The commands that are available depend on whether the file or folder or its parent folder is under version control or not. You can also see the TortoiseGit menu as part of the Explorer file menu." msgstr " Sve TortoiseGit komande se pozivaju iz kontekst menija vindouz eksplorera. Većina je direktno vidljiva kada uradite desni klik na fajl ili imenik. Koje su komande dostupne zavisi od toga da li je fajl ili imenik ili njihov predački imenik pod kontrolom verzija ili nije. Možete, takođe, videtu stablo TortoiseGit menija kao deo Eksplorer fajl menija." #. (para) #: ../source/TortoiseGit_en.xml:3545 msgid "Some commands which are very rarely used are only available in the extended context menu. To bring up the extended context menu, hold down the Shift key when you right-click." msgstr "Neke komande koje se veoma retko koriste su dostupne samo u proširenom kontekst meniju. Da pozovete prošireni kontekst meni držite Šift taster kada uradite desni-klik." #. (title) #: ../source/TortoiseGit_en.xml:3554 msgid "Explorer file menu for a shortcut in a versioned folder" msgstr "Eksplorer fajl meni za skraćenice u verzionisanom imeniku" #. (para) #: ../source/TortoiseGit_en.xml:3551 msgid "In some cases you may see several TortoiseGit entries. This is not a bug! This example is for an unversioned shortcut within a versioned folder, and in the Explorer file menu there are three entries for TortoiseGit. One is for the folder, one for the shortcut itself, and the third for the object the shortcut is pointing to. To help you distinguish between them, the icons have an indicator in the lower right corner to show whether the menu entry is for a file, a folder, a shortcut or for multiple selected items." msgstr "U nekim slučajevima možete videti više TortoiseGit ulaza. To nije bag! Ovaj primer je za neverzionisane skraćenice u okviru verzionisanog imenika, i u Eksplorer fajl meniju postoji stablo ulaz za TortoiseGit. Jedno je za imenik, jedno za same skraćenice, i treće za objekte na koje pokazuju skraćenice. Da bismo vam pomogli da ih razlikujete, ikone imaju indikator u donjem desnom uglu koji pokazuje da li je meni ulaz za fajl, skraćenicu ili višestruko selektovane stavke. " #. (para) #: ../source/TortoiseGit_en.xml:3565 msgid "If you are using Windows 2000 you will find that the context menus are shown as plain text, without the menu icons shown above. We are aware that this was working in previous versions, but Microsoft has changed the way its icon handlers work for Vista, requiring us to use a different display method which unfortunately does not work on Windows 2000." msgstr "Ako koristite Vindouz 2000 naćićete da je kontekst meni prikazan kao potpuni tekst, bez ikona menija prikazanih iznad. Mi smo upoznati da je tako radilo u prethodnoj verziji, ali Mikrosoft je izmenio način rukovanja ikonama za Vistu, što od nas zahteva da koristimo različit način prikazivanja koji, na nesreću, ne radi na Vindouzu 2000." #. (title) #. (title) #: ../source/TortoiseGit_en.xml:3574 #: ../source/TortoiseGit_en.xml:4505 msgid "Drag and Drop" msgstr "Vuci baci" #. (primary) #: ../source/TortoiseGit_en.xml:3576 msgid "drag handler" msgstr "vuvi rukovalac" #. (primary) #: ../source/TortoiseGit_en.xml:3579 msgid "drag-n-drop" msgstr "vuci-i-baci" #. (primary) #: ../source/TortoiseGit_en.xml:3582 msgid "right drag" msgstr "desni vuci" #. (title) #. (title) #: ../source/TortoiseGit_en.xml:3586 #: ../source/TortoiseGit_en.xml:6840 msgid "Right drag menu for a directory under version control" msgstr "Desni vuci meni za imenike pod kontrolom verzija" #. (para) #: ../source/TortoiseGit_en.xml:3584 msgid " Other commands are available as drag handlers, when you right drag files or folders to a new location inside working copies or when you right drag a non-versioned file or folder into a directory which is under version control." msgstr " Druge komande su dostupne kao vučni rukovaoci, kada desni vuci fajlova i imenika na novu lokaciju unutar radne kopije ili kada action>desni vuci neverzionisan fajl ili imenik u imenik koji je pod kontrolom verzija." #. (title) #: ../source/TortoiseGit_en.xml:3596 msgid "Common Shortcuts" msgstr "Zajedničke skraćenice" #. (term) #: ../source/TortoiseGit_en.xml:3603 msgid "F1" msgstr "F1" #. (para) #: ../source/TortoiseGit_en.xml:3605 msgid "Help, of course." msgstr "Po,oć, svakako." #. (term) #: ../source/TortoiseGit_en.xml:3611 msgid "F5" msgstr "F5" #. (para) #: ../source/TortoiseGit_en.xml:3613 msgid "Refresh the current view. This is perhaps the single most useful one-key command. For example ... In Explorer this will refresh the icon overlays on your working copy. In the commit dialog it will re-scan the working copy to see what may need to be committed. In the Revision Log dialog it will contact the repository again to check for more recent changes." msgstr "Osvežite tekući izgled. Ovo je možda jedna najkorisnija jedan-taster komanda. Na primer... U Eksploreru ovo će osvežiti prekrivačke ikone u vašoj radnoj kopiji. U dijalogu narezivanja to će re-skenirati radnu kopiju da vidi šta treba da bude urezano. U dijalogu Dnevnika revizija kontaktiraće još jednom spremište da proveri najskorije izmene." #. (term) #: ../source/TortoiseGit_en.xml:3625 msgid "Ctrl-A" msgstr "Ctrl-A" #. (para) #: ../source/TortoiseGit_en.xml:3627 msgid "Select all. This can be used if you get an error message and want to copy and paste into an email. Use Ctrl-A to select the error message and then ..." msgstr "Izaberite sve. Ovo može biti korisno ako dobijete poruku greške i želite da kopirate i nalepite u e-poštu. Koristite Ctrl-A da izaberete poruku greške i onda ..." #. (term) #: ../source/TortoiseGit_en.xml:3635 msgid "Ctrl-C" msgstr "Ctrl-C" #. (para) #: ../source/TortoiseGit_en.xml:3637 msgid "... Copy the selected text." msgstr "... Kopira izabrani tekst." #. (para) #: ../source/TortoiseGit_en.xml:3597 msgid "Some common operations have well-known Windows shortcuts, but do not appear on buttons or in menus. If you can't work out how to do something obvious, like refreshing a view, check here. " msgstr "Neke zajedničke operacije imaju dobro poznate Vindouz skraćenice, ali se ne pojavljuju na digmićima ili u menijima. Ako ne možete pronaći kako da uradite nešto očigledno, kao što je osvežavanje izgleda, proverite ovde. " #. (primary) #: ../source/TortoiseGit_en.xml:3648 msgid "authentication" msgstr "autentikacija" #. (title) #: ../source/TortoiseGit_en.xml:3654 msgid "Authentication Dialog" msgstr "Autentifikacioni dijalog" #. (para) #: ../source/TortoiseGit_en.xml:3662 msgid "svn.simple contains credentials for basic authentication (username/password)." msgstr "svn.simple sadrži akreditaciju osnove autentifikacije (korisnik/lozinka)." #. (para) #: ../source/TortoiseGit_en.xml:3668 msgid "svn.ssl.server contains SSL server certificates." msgstr "svn.ssl.server sadrži SSL sertifikate servera." #. (para) #: ../source/TortoiseGit_en.xml:3674 msgid "svn.username contains credentials for username-only authentication (no password needed)." msgstr "svn.username sadrži akreditaciju autentifikacje samo za korsničko ime (lozinka nije potrebna)." #. (para) #: ../source/TortoiseGit_en.xml:3650 msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. Enter your username and password. The checkbox will make TortoiseGit store the credentials in Git's default directory: %APPDATA%\\Git\\auth in three subdirectories: " msgstr "Ako je spremište kome pokušavate da pristupite zaštićeno lozinkom, autentifikacioni dijalog će vam biti prikazan. Unesite korisničko ime i lozinku. Boks prove će učiniti da TortoiseGit smesti akreditaciju u Subverzionom uobičajenom imeniku: %APPDATA%\\Git\\auth u stablu subimenika: " #. (para) #: ../source/TortoiseGit_en.xml:3681 msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Git auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to ." msgstr "Ako želite da obrišete autentifikacioni keš za sve servere, možete to uraditi od Zapamćeni podaci strane TortoiseGit dijaloga podešavanja.To dugme će očistiti sve autentifikacione keširane podatke iz Subverzionog auth imenika, kao i bilo koji autentifikacioni podatak smešten u registru od ranijih verzija TortoiseGit. Uporedite sa ." #. (para) #: ../source/TortoiseGit_en.xml:3690 msgid "For more information on how to set up your server for authentication and access control, refer to " msgstr "Za više informacija kako da se podesi vaš server za autentifikaciju i kontrolu pristupa, pogledaj u " #. (title) #: ../source/TortoiseGit_en.xml:3697 msgid "Maximizing Windows" msgstr "Maksimiranje Vindouza" #. (primary) #: ../source/TortoiseGit_en.xml:3699 msgid "maximize" msgstr "maksimiziranje" #. (para) #: ../source/TortoiseGit_en.xml:3701 msgid "Many of TortoiseGit's dialogs have a lot of information to display, but it is often useful to maximize only the height, or only the width, rather than maximizing to fill the screen. As a convenience, there are shortcuts for this on the Maximize button. Use the middle mouse button to maximize vertically, and right mouse to maximize horizontally." msgstr "Mnogi od TortoiseGit dijaloga imaju puno informacija da prikažu, ali je često korisno da se maksimizira samo visina, ili samo širina, radije nego da se maksimizira na ceo ekran. Konvencionalno, postoje skraćenice za ovo na Maksimiziraj dugme. Koristi srednj dugme miša da se maksimizira vertikalno, i desni miš da se maksimizira horizontalno." #. (title) #: ../source/TortoiseGit_en.xml:3712 msgid "Importing Data Into A Repository" msgstr "Uvoz podataka u spremište" #. (primary) #: ../source/TortoiseGit_en.xml:3714 msgid "import" msgstr "uvezi" #. (primary) #: ../source/TortoiseGit_en.xml:3720 msgid "add files to repository" msgstr "dodavanje fajlova u spremište" #. (title) #. (entry) #. (title) #. (glossterm) #: ../source/TortoiseGit_en.xml:3724 #: ../source/TortoiseGit_en.xml:14051 #: ../source/TortoiseGit_en.xml:15213 #: ../source/TortoiseGit_en.xml:15980 msgid "Import" msgstr "Uvezi" #. (primary) #: ../source/TortoiseGit_en.xml:3726 msgid "temporary files" msgstr "privremeni fajlovi" #. (para) #: ../source/TortoiseGit_en.xml:3728 msgid "If you are importing into an existing repository which already contains some projects, then the repository structure will already have been decided. If are importing data into a new repository then it is worth taking the time to think about how it will be organised. Read for further advice." msgstr "Ako uvozite u postojeće spremište koje već sadrži neke projekte, tada bi trebalo da su strukture spremišta već određene. Ako uvozite podatke u novo spremište vredi potrošiti vreme na razmišljanju o tome kako bi ga trebalo organizovati. Pročitajte za dalje savete." #. (para) #: ../source/TortoiseGit_en.xml:3742 msgid "There is no way to select files and folders to include, aside from using the global ignore settings." msgstr "Nema načina da se izaberu fajlovi i imenici za uključivanje pored korišćenja globalnog podešavanja zanemarivanja." #. (para) #: ../source/TortoiseGit_en.xml:3748 msgid "The folder imported does not become a working copy. You have to do a checkout to copy the files back from the server." msgstr "Uvezeni folder ne postaje radna kopija. Imate da uradite preuzimanje da kopirate fajlove nazad sa servera." #. (para) #: ../source/TortoiseGit_en.xml:3754 msgid "It is easy to import to the wrong folder level in the repository." msgstr "Lako je uvesti u loš nivo imenika u spremištu." #. (para) #: ../source/TortoiseGit_en.xml:3736 msgid "This section describes the Git import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in . But since you are here, this is how the basic import works ..." msgstr "Ovaj deo opisuje Subverzionu komandu uvoza, koja je dizajnirana za uvoz hijerarhiju imenika u spremište u jednom opaljenju. Bez obzira što to završava posao to ima više grešaka: Iz ovih razloga preporučujemo da ne koristite komandu uvoza uopšte već radije pratite dvostepen metod opisan u . Ali pošto ste ovda, evo kako osnovni uvoz radi ..." #. (para) #: ../source/TortoiseGit_en.xml:3768 msgid "Remove all files which are not needed to build the project (temporary files, files which are generated by a compiler e.g. *.obj, compiled binaries, ...)" msgstr "Izbacite sve fajlove koji nisu potrebni za gradnju projekta (privremeni fajlovi, koje generiše kompajler npr. *.obj, kompajlirane binarije, ...)" #. (para) #: ../source/TortoiseGit_en.xml:3776 msgid "Organize the files in folders and sub-folders. Although it is possible to rename/move files later it is highly recommended to get your project's structure straight before importing!" msgstr "Organizujte fajlove u imenike i podimenike. Takođe je moguće preimenovanje/pomeranje fajlova kasnije jako je preporučljivo da dobijete pravu strukturu projekta pre uvoza!" #. (para) #: ../source/TortoiseGit_en.xml:3764 msgid "Before you import your project into a repository you should: " msgstr "Pre nego što uvezete vaš projekat u spremište potrebno je da: " #. (title) #: ../source/TortoiseGit_en.xml:3796 msgid "The Import dialog" msgstr "Uvozni dijalog" #. (para) #: ../source/TortoiseGit_en.xml:3785 msgid "Now select the top-level folder of your project directory structure in the windows explorer and right click to open the context menu. Select the command TortoiseGitImport... which brings up a dialog box: " msgstr "Sada izaberite imenik vršnog nivoa vaše strukture imenika projekta u vindouz eksploreru i desni klik da se otvori kontekstni meni. Izabeite komandu TortoiseGitUvoz... koja donosi dijalog boks:" #. (para) #: ../source/TortoiseGit_en.xml:3800 msgid "" "In this dialog you have to enter the URL of the repository location where you want to import your project. It is very important to realise that the local folder you are importing does not itself appear in the repository, only its content. For example if you have a structure: \n" "C:\\Projects\\Widget\\source\n" "C:\\Projects\\Widget\\doc\n" "C:\\Projects\\Widget\\images\n" " and you import C:\\Projects\\Widget into http://mydomain.com/svn/trunk then you may be surprised to find that your subdirectories go straight into trunk rather than being in a Widget subdirectory. You need to specify the subdirectory as part of the URL, http://mydomain.com/svn/trunk/Widget-X. Note that the import command will automatically create subdirectories within the repository if they do not exist." msgstr "" "U ovom dijalogu imate da unesete URL lokacije spremišta gde želite da uvezete vaš projekat. Veoma je važno da vodite računa da lokalni imenik koji uvozite se ne pojavljuje sam u spremištu, samo njegov sadržaj. Na primer ako imate strukturu: \n" "C:\\Projects\\Widget\\source\n" "C:\\Projects\\Widget\\doc\n" "C:\\Projects\\Widget\\images\n" "i unesete C:\\Projects\\Widget u http://mydomain.com/svn/trunk bićete iznenađeni kad uvidite da vaši podimenici idu utrunk radije nego da budu u Widget podimenik. Potrebno je da secificirate podimenik kao deo URL, http://mydomain.com/svn/trunk/Widget-X. Primetimo uvozna komanda će automatski kreirati podimenik unutar spremišta ako on ne postoji.." #. (para) #: ../source/TortoiseGit_en.xml:3821 msgid "The import message is used as a log message." msgstr "Uvozna poruka se koristi kao poruka dnevnika." #. (para) #: ../source/TortoiseGit_en.xml:3824 msgid "By default, files and folders which match the global-ignore patterns are not imported. To override this behaviour you can use the Include ignored files checkbox. Refer to for more information on setting a global ignore pattern." msgstr "Uobičajeno, fajlovi i imenici koji hvataju globalno-zanemariv model nisu uvezeni. Da se premosti ovakvo ponašanje možete koristiti Uključiti zanemarene fajlove čekboks. Konsultujte za više informacija o podešavanju globalnog modela izbegavanja." #. (para) #: ../source/TortoiseGit_en.xml:3831 msgid "As soon as you press OK TortoiseGit imports the complete directory tree including all files into the repository. The project is now stored in the repository under version control. Please note that the folder you imported is NOT under version control! To get a version-controlled working copy you need to do a Checkout of the version you just imported. Or read on to find out how to import a folder in place." msgstr "Ćim pritisnete OK TortoiseGit uvozi kompletno stablo imenika uključujući sve fajlove u spremište. Projekat je sada smeten u spremište pod kontrolom verzija. Molim vas primetite to da imenik koji ste uvezli NIJE pod kontrolom verzija! Da dobijete verzijom kontrolisanu radnu kopiju potrebno je da uradite Preuzimanje verzije koju ste upravo uvezli. Ili da pročitate kako uvesti imenik na mesto. " #. (title) #: ../source/TortoiseGit_en.xml:3843 msgid "Import in Place" msgstr "Uvoz na mesto" #. (primary) #: ../source/TortoiseGit_en.xml:3845 msgid "import in place" msgstr "uvoz na mesto" #. (para) #: ../source/TortoiseGit_en.xml:3852 msgid "Use the repository browser to create a new project folder directly in the repository." msgstr "Koristite pretraživač spremišta da kreirate novi imenik projekta direktno u spremištu." #. (para) #: ../source/TortoiseGit_en.xml:3858 msgid "Checkout the new folder over the top of the folder you want to import. You will get a warning that the local folder is not empty. Now you have a versioned top level folder with unversioned content." msgstr "Preuzmite novi imenik preko vrha imenika koji želite da uvezete. Dobićete upozorenje da lokalni imenik nije prazan. Sada imate verzionisani imenik vršnog nivoa sa neverzionisanim sadržajem." #. (para) #: ../source/TortoiseGit_en.xml:3865 msgid "Use TortoiseGitAdd... on this versioned folder to add some or all of the content. You can add and remove files, set svn:ignore properties on folders and make any other changes you need to." msgstr "Koristite TortoiseGitDodaj... na ovaj verzionisani imenik da dodate deo ili ceo sadržaj. Možete dodati i izbaciti fajlove, postaviti svn:zanemari osobine imenika i uraditi druge izmene koje su vam potrebne. " #. (para) #: ../source/TortoiseGit_en.xml:3877 msgid "Commit the top level folder, and you have a new versioned tree, and a local working copy, created from your existing folder." msgstr "Urežite imenik vršnog nivoa, i imate novo verzionisano stablo i lokalnu radnu kopiju, kreiranu od postojećeg imenika." #. (para) #: ../source/TortoiseGit_en.xml:3847 msgid "Assuming you already have a repository, and you want to add a new folder structure to it, just follow these steps: " msgstr "Uzmimo da već imate spremište i želite da dodate novu strukturu imenika u njega, samo pratite ove korake: " #. (title) #: ../source/TortoiseGit_en.xml:3886 msgid "Special Files" msgstr "Specijalni fajlovi" #. (primary) #: ../source/TortoiseGit_en.xml:3888 msgid "special files" msgstr "specijalni fajlovi" #. (para) #: ../source/TortoiseGit_en.xml:3890 msgid "Sometimes you need to have a file under version control which contains user specific data. That means you have a file which every developer/user needs to modify to suit his/her local setup. But versioning such a file is difficult because every user would commit his/her changes every time to the repository." msgstr "Ponekad vam je potrebno da imate fajl pod kontrolom verzija koji sadrži podatke specifične za korisnika. To znači da imate fajl koji svaki kreator/korisnik želi da menja da prati njegovo/njeno lokalno podešavanje. Ali verzionisanjem takvog fajla je teško jed svski korisnik želi da ureže njegove/njene izmene svaki put u spremište." #. (para) #: ../source/TortoiseGit_en.xml:3897 msgid "In such cases we suggest to use template files. You create a file which contains all the data your developers will need, add that file to version control and let the developers check this file out. Then, each developer has to make a copy of that file and rename that copy. After that, modifying the copy is not a problem anymore." msgstr "U takvim slučajevima sugeriramo da se koristi templejt fajlovi. Kreirajte fajl koji sadrži sve podatke koji su potrebni razvojnom timu, dodajte taj fajl u kontrolu verzija i pustite da ljudi iz razvojnog tima provere ovaj fajl. Zatim, svaki čovek iz razvojnog tima je napravio kopiju tog fajla i preimenovao tu kopiju. Posle toga izmene kopija nisu više problem." #. (para) #: ../source/TortoiseGit_en.xml:3905 msgid "As an example, you can have a look at TortoiseGit's build script. It calls a file named TortoiseVars.bat which doesn't exist in the repository. Only the file TortoiseVars.tmpl. TortoiseVars.tmpl is the template file which every developer has to create a copy from and rename that file to TortoiseVars.bat. Inside that file, we added comments so that the users will see which lines they have to edit and change according to their local setup to get it working." msgstr "Kao primer možete pogledati TortoiseGit skript za izgradnju. On poziva fajl koji se zove filename>TortoiseVars.bat koji ne postoji u spremištu. Samo fajl TortoiseVars.tmpl. TortoiseVars.tmpl je šablon fajl koji svaki učesnik razvoja ima da kopira i preimenuje taj fajl u filename>TortoiseVars.bat. Unutar tog fajla dodajemo komentare tako da korisnik može da vidi koje linije treba da uredi i izmeni prema svom lokalnom podešavanju da bi to radilo." #. (para) #: ../source/TortoiseGit_en.xml:3916 msgid "So as not to disturb the users, we also added the file TortoiseVars.bat to the ignore list of its parent folder, i.e. we've set the Git property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." msgstr "Da ne bi uznemiravali korisnike takođe dodamo fajl TortoiseVars.bat listi zanemarenih predačkog imenika, tj. mi smo podesili Subverzionu osobinu svn:zanemari da uključi to ime fajla. Na taj način on se neće pokazati neverzionisanim kod svakog urezivanja." #. (title) #: ../source/TortoiseGit_en.xml:3925 msgid "Referenced Projects" msgstr "Referentni projekti" #. (primary) #: ../source/TortoiseGit_en.xml:3927 msgid "external repositories" msgstr "spoljašnje spremište" #. (primary) #. (primary) #: ../source/TortoiseGit_en.xml:3930 #: ../source/TortoiseGit_en.xml:13633 msgid "externals" msgstr "spoljašnji" #. (para) #: ../source/TortoiseGit_en.xml:3932 msgid "Sometimes it is useful to construct a working copy that is made out of a number of different checkouts. For example, you may want different subdirectories to come from different locations in a repository, or perhaps from different repositories altogether. If you want every user to have the same layout, you can define the svn:externals properties." msgstr "Ponekad je korisno da se konsultuje radna kopija koja je napravljena od brojnih različitih preuzimanja. Na primer, možete želeti različite podimenike da dođu sa različitih lokacija u spremište, ili možda kompletno iz različitih spremišta. Ako želite da svaki korisnik ima isti izgled možete definisati svn:spoljašne osobine." #. (para) #: ../source/TortoiseGit_en.xml:3940 msgid "" "Let's say you check out a working copy of /project1 to D:\\dev\\project1. Select the folder D:\\dev\\project1, right click and choose Windows MenuProperties from the context menu. The Properties Dialog comes up. Then go to the Git tab. There, you can set properties. Click Add.... Select the svn:externals property from the combobox and write in the edit box the repository URL in the format name url or if you want to specify a particular revision, name -rREV url You can add multiple external projects, 1 per line. Note that URLs must be properly escaped or they will not work. For example you must replace each space with %20. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on D:\\dev\\project1: \n" "sounds http://sounds.red-bean.com/repos\n" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" " Now click Set and commit your changes. When you (or any other user) update your working copy, Git will create a sub-folder D:\\dev\\project1\\sounds and checkout the sounds project, another sub-folder D:\\dev\\project1\\quick graphs containing the graphics project, and finally a nested sub-folder D:\\dev\\project1\\skins\\toolkit containing revision 21 of the skin-maker project." msgstr "" "Recimo da ste preuzeli radnu kopiju od /project1 do D:\\dev\\project1. Izaberite imenik D:\\dev\\project1, desni klik i izaberite Vindouz MeniOsobine iz kontekst menija. Osobine dijalog dolazi. Zatim idite na tab Subverzija. Tamo možete podesiti osobine. Kliknite Dodaj.... Izaberite svn:spoljašnje osobine u komboboksu i napišite URL spremišta u formatu ime url ili ako želite da specificirate partikularnu reviziju, ime -rREV url Mžete dodati višestruke spoljašnje projekte, 1 po liniji. Primetimo da taj URL mora biti odgovarajuće popunjen kosim crtama ili to neće raditi. Na primer morate zameniti svaki razmak sa %20. Primetimo da nije moguće koristiti imena imenika sa razmacima u njima. Pretpostavimo da imate podešene ove osobine na D:\\dev\\project1: \n" "sounds http://sounds.red-bean.com/repos\n" "quick_graphs http://graphics.red-bean.com/repos/fast%20graphics\n" "skins/toolkit -r21 http://svn.red-bean.com/repos/skin-maker\n" "Sada klik na Podesi i urežite izmene. Kada vi (ili bilo koji drugi korisnik) ažurira vašu radnu kopiju, Subverzija će kreirati podimenik D:\\dev\\project1\\sounds i proveriti sounds projekat, sledeći podimenik D:\\dev\\project1\\quick graphs koji sadrži grafički projekat, i na kraju ugnježdeni podimenik D:\\dev\\project1\\skins\\toolkit koji sadrži reviziju 21 skin-maker projekta." #. (para) #: ../source/TortoiseGit_en.xml:3980 msgid "You should strongly consider using explicit revision numbers in all of your externals definitions, as described above. Doing so means that you get to decide when to pull down a different snapshot of external information, and exactly which snapshot to pull. Besides the common sense aspect of not being surprised by changes to third-party repositories that you might not have any control over, using explicit revision numbers also means that as you backdate your working copy to a previous revision, your externals definitions will also revert to the way they looked in that previous revision, which in turn means that the external working copies will be updated to match they way they looked back when your repository was at that previous revision. For software projects, this could be the difference between a successful and a failed build of an older snapshot of your complex code base." msgstr "Treba čvrsto osmisliti korišćenje spoljašnjih revizionih brojeva u svim vašim spoljašnjim definicijama, kako je opisano gore. Radeći tako znači da odlučujete da spustite različite slike spoljašnjih informacija, i tačno koju sliku izvući. Pored zajedničkog osećaja šta nas ne iznenađuje promenama u spremištima treće strane to je da može da nemate nikakakvu kontrolu na njima, koristeći eksplicitno revizione brojeve takođe znači da ste unazad datirali vašu radnu kopiju kao prethodnu reviziju, vaše spoljne definicije su takođe vraćene na način kako su izgledale u prethodnoj reviziji, koja znači to da će se spoljašnja radna kopija ažurirati da uhvati način kako one izgledaju nazad kada je spremište bili u prethodnoj reviziji. Za softverske projekte, moglo bi biti razlika između uspešne i neuspešne gradnje stare slike složene kodne osnove. " #. (para) #. (para) #: ../source/TortoiseGit_en.xml:3999 #: ../source/TortoiseGit_en.xml:13665 msgid "If the external project is in the same repository, any changes you make there there will be included in the commit list when you commit your main project." msgstr "Ako je spoljašnji projekat u istom spremištu, bilo koja izmena koju napravite tamo biće uključena u listu za urezivanje kada urezujete glavni projekat." #. (para) #. (para) #: ../source/TortoiseGit_en.xml:4004 #: ../source/TortoiseGit_en.xml:13670 msgid "If the external project is in a different repository, any changes you make to the external project will be notified when you commit the main project, but you have to commit those external changes separately." msgstr "Ako je spoljašnji projekat u različitom spremištu, bilo koje izmene koje napravite u spoljašnjem projektu biće označene kada urezujete glavni projekat, ali morate urezati te spoljašnje izmene izdvojeno." #. (para) #: ../source/TortoiseGit_en.xml:4010 msgid "If you use absolute URLs in svn:externals definitions and you have to relocate your working copy (i.e., if the URL of your repository changes), then your externals won't change and might not work anymore." msgstr "Ako koristite apsolutne URLove u svn:spoljašnje definicije i imate da relocirate vašu radnu kopiju (npr. ako je URL vašeg spremišta izmenjen), tada vaši eksternali se ne mogu izmeniti niti uopšte raditi." #. (para) #: ../source/TortoiseGit_en.xml:4016 msgid "To avoid such problems, Git clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at http://example.com/svn/repos-1 and another at http://example.com/svn/repos-2. We have a checkout of http://example.com/svn/repos-1/project/trunk into C:\\Working and the svn:externals property is set on trunk." msgstr "Da se izbegnu takvi problemi Subverzioni klijenti od verzije 1.5 podržavaju relativne spoljašnje URLove. Četiri različita metoda specificiranja relativnih URLova je podržano. U sledećem primerima uzmimo da imamo dva spremišta: jedno na systemitem class=\"url\">http://example.com/svn/repos-1 i drugo na http://example.com/svn/repos-2. Preuzeli smo http://example.com/svn/repos-1/project/trunku C:\\Working i svn:spoljašnje osobine su podešene na deblo." #. (term) #: ../source/TortoiseGit_en.xml:4031 msgid "Relative to parent directory" msgstr "Relativno na predački imenik" #. (para) #: ../source/TortoiseGit_en.xml:4033 msgid "" "These URLs always begin with the string ../ for example: \n" "../../widgets/foo common/foo-widget\n" " This will extract http://example.com/svn/repos-1/widgets/foo into C:\\Working\\common\\foo-widget." msgstr "" "Ovi URLovi uvek počinju stringom ../ na primer: \n" "../../widgets/foo common/foo-widget\n" " Ovo treba da ekstrahuje http://example.com/svn/repos-1/widgets/foo u C:\\Working\\common\\foo-widget." #. (para) #: ../source/TortoiseGit_en.xml:4044 msgid "Note that the URL is relative to the URL of the directory with the svn:externals property, not to the directory where the external is written to disk." msgstr "Primetimo da je URL relativno u odnosu na URL imenika sa svn:spoljašnje osobine, nije ka imeniku gde su spoljšnje osobine upisane na disku. " #. (term) #: ../source/TortoiseGit_en.xml:4052 msgid "Relative to repository root" msgstr "Relativno na koren spremišta" #. (para) #: ../source/TortoiseGit_en.xml:4054 msgid "" "These URLs always begin with the string ^/ for example: \n" "^/widgets/foo common/foo-widget\n" " This will extract http://example.com/svn/repos-1/widgets/foo into C:\\Working\\common\\foo-widget." msgstr "" "Ovi URLovi uvek počinju stringom ^/ na primer: \n" "^/widgets/foo common/foo-widget\n" " Ovo će izdvojiti http://example.com/svn/repos-1/widgets/foo u C:\\Working\\common\\foo-widget." #. (para) #: ../source/TortoiseGit_en.xml:4065 msgid "" "You can easily refer to other repositories with the same SVNParentPath (a common directory holding several repositories). For example: \n" "^/../repos-2/hammers/claw common/claw-hammer\n" " This will extract http://example.com/svn/repos-2/hammers/claw into C:\\Working\\common\\claw-hammer." msgstr "" "Možete se lako pozvati na drugo spremište sa istim SVNPredakPutanja (zajednički imenik koji drži više spremišta). Na primer: \n" "^/../repos-2/hammers/claw common/claw-hammer\n" " Ovo će izdvojiti http://example.com/svn/repos-2/hammers/claw u C:\\Working\\common\\claw-hammer." #. (term) #: ../source/TortoiseGit_en.xml:4080 msgid "Relative to scheme" msgstr "Relativno na šemu" #. (para) #: ../source/TortoiseGit_en.xml:4082 msgid "" "URLs beginning with the string // copy only the scheme part of the URL. This is useful when the same hostname must the accessed with different schemes depending upon network location; e.g. clients in the intranet use http:// while external clients use svn+ssh://. For example: \n" "//example.com/svn/repos-1/widgets/foo common/foo-widget\n" " This will extract http://example.com/svn/repos-1/widgets/foo or svn+ssh://example.com/svn/repos-1/widgets/foo depending on which method was used to checkout C:\\Working." msgstr "" "URL koji počinje stringom // kopira samo deo šeme URLa. Ovo je korisno kada se mora pristupiti domćinu istog imena sa različitim šemama u zavisnosti od mrežne lokacije; npr. klijenti na intranetu koriste http:// dok spoljšnji klijenti koriste svn+ssh://. Na primer: \n" "//example.com/svn/repos-1/widgets/foo common/foo-widget\n" " Ovo će izdvojiti http://example.com/svn/repos-1/widgets/foo ili svn+ssh://example.com/svn/repos-1/widgets/foo u zavisnosti koji metod je korišćen za preuzimanje C:\\Working." #. (term) #: ../source/TortoiseGit_en.xml:4102 msgid "Relative to the server's hostname" msgstr "Relativno do serverovog imena domaćina" #. (para) #: ../source/TortoiseGit_en.xml:4104 msgid "" "URLs beginning with the string / copy the scheme and the hostname part of the URL, for example: \n" "/svn/repos-1/widgets/foo common/foo-widget\n" " This will extract http://example.com/svn/repos-1/widgets/foo into C:\\Working\\common\\foo-widget. But if you checkout your working copy from another server at svn+ssh://another.mirror.net/svn/repos-1/project1/trunk then the external reference will extract svn+ssh://another.mirror.net/svn/repos-1/widgets/foo." msgstr "" "URL koji počinju stringom / kopiraju šemu i deo sa imenom domaćina URLa, na primer: \n" "/svn/repos-1/widgets/foo common/foo-widget\n" " Ovo će izdvojiti http://example.com/svn/repos-1/widgets/foo u C:\\Working\\common\\foo-widget. Ali ako preuzmete vašu radni kopiju sa drugog servera na systemitem class=\"url\">svn+ssh://another.mirror.net/svn/repos-1/project1/trunk tada će spoljašnje reference izdvojiti svn+ssh://another.mirror.net/svn/repos-1/widgets/foo." #. (para) #: ../source/TortoiseGit_en.xml:4122 msgid "If you need more information how TortoiseGit handles Properties read ." msgstr "Ako vam treba više informacija kako TortoiseGit rukuje sa Osobinama pročitajte ." #. (para) #: ../source/TortoiseGit_en.xml:4126 msgid "To find out about different methods of accessing common sub-projects read ." msgstr "Da biste našli više o raznim metodama pristupa zajedničkim podprojektima čitajte ." #. (title) #: ../source/TortoiseGit_en.xml:4133 msgid "Checking Out A Working Copy" msgstr "Provera radne kopije" #. (primary) #: ../source/TortoiseGit_en.xml:4135 msgid "checkout" msgstr "preuzmi" #. (primary) #: ../source/TortoiseGit_en.xml:4138 msgid "create working copy" msgstr "kreiranje radne kopije" #. (para) #: ../source/TortoiseGit_en.xml:4141 msgid "To obtain a working copy you need to do a checkout from a repository." msgstr "Da biste dobili tadnu kopiju potrebno je da uradite preuzimanje iz spremišta." #. (title) #: ../source/TortoiseGit_en.xml:4155 msgid "The Checkout dialog" msgstr "Preuzimanje dijalog" #. (para) #: ../source/TortoiseGit_en.xml:4145 msgid "Select a directory in windows explorer where you want to place your working copy. Right click to pop up the context menu and select the command TortoiseGitCheckout..., which brings up the following dialog box: If you enter a folder name that does not yet exist, then a directory with that name is created." msgstr "Iyaberi imenik u vindouz eksploreru gde želite smestiti vašu radnu kopiju. Desni klik da se pojavi kontekst meni i izaberite komandu TortoiseGitPreuzmi..., koja daje sledeći dijalog boks: Ako unesete ime imenika koje još ne postoji, tada će imenik tog imena biti kreiran." #. (title) #: ../source/TortoiseGit_en.xml:4162 msgid "Checkout Depth" msgstr "Preuzimanje dubina" #. (term) #: ../source/TortoiseGit_en.xml:4170 msgid "Fully recursive" msgstr "Potpuno rekurzivan" #. (para) #: ../source/TortoiseGit_en.xml:4172 msgid "Checkout the entire tree, including all child folders and sub-folders." msgstr "Preuzimanje celog stabla uključujući i potomačke imenike i podimenike." #. (term) #: ../source/TortoiseGit_en.xml:4179 msgid "Immediate children, including folders" msgstr "Neposredni potomak, uključujući imenike" #. (para) #: ../source/TortoiseGit_en.xml:4181 msgid "Checkout the specified directory, including all files and child folders, but do not populate the child folders." msgstr "Preuzimanje specificiranog imenika, uključujući sve fajlove i potomačke imenike, ali ne naseljavati potomačke imenike." #. (term) #: ../source/TortoiseGit_en.xml:4188 msgid "Only file children" msgstr "Samo fajlovi potomci" #. (para) #: ../source/TortoiseGit_en.xml:4190 msgid "Checkout the specified directory, including all files but do not checkout any child folders." msgstr "Preuzimanje specificiranih imenika, uključujući sve fajlove ali ne preuzimati bilo koji potomački imenik." #. (term) #: ../source/TortoiseGit_en.xml:4197 msgid "Only this item" msgstr "Samo ova stavka" #. (para) #: ../source/TortoiseGit_en.xml:4199 msgid "Checkout the directory only. Do not populate it with files or child folders." msgstr "Preuzimanje samo imenika. Ne naseljavti ga fajlovima ili potomačkim imenicima." #. (term) #. (term) #. (listitem) #: ../source/TortoiseGit_en.xml:4206 #: ../source/TortoiseGit_en.xml:8130 #: ../source/TortoiseGit_en.xml:15132 msgid "Working copy" msgstr "Radna kopija" #. (para) #: ../source/TortoiseGit_en.xml:4208 msgid "Retain the depth specified in the working copy. This option is not used in the checkout dialog, but it is the default in all other dialogs which have a depth setting." msgstr "Zadržati dubinu specificiranu u radnoj kopiji. Ova opcija se ne koristi u dijalogu preuzimanja, ali je uobičajena u svim ostalim dijalozima koji imahu podešavanje dubine." #. (para) #: ../source/TortoiseGit_en.xml:4163 msgid "You can choose the depth you want to checkout, which allows you to specify the depth of recursion into child folders. If you want just a few sections of a large tree, You can checkout the top level folder only, then update selected folders recursively. " msgstr "Možete izabrati dubinu koju želite pri pruzimanju, što vam omogućuje da specificirate dubinu rekurzije u potomačkim imenicima. Ako želite samo nekoliko delova velikog stabla, možete preuzeti samo imenik vršnog nivoa, zatim ažurirajte imenike rekurzivno. " #. (para) #: ../source/TortoiseGit_en.xml:4218 msgid "If you check out a sparse working copy (i.e., by choosing something other than fully recursive for the checkout depth), you can fetch additional sub-folders by using the repository browser () or the check for modifications dialog ()." msgstr "Ako preuzmete praznu radnu kopiju (tj. izborom nečeg drgog nego potpuno rekurzivno za dubinu preuzimanja), možete dostići dodatne subimenike koristeći pretraživač spremišta ( ili dijalog za proveru izmena ()." #. (para) #: ../source/TortoiseGit_en.xml:4225 msgid "In the repository browser, Right click on the checked out folder, then use TortoiseGitRepo-Browser to bring up the repository browser. Find the sub-folder you would like to add to your working copy, then use Context menuUpdate item to revision... That menu will only be visible if the selected item does not exist yet in your working copy, but the parent item does exist." msgstr "U pretraživaču spremišta, Desni klik na preuzeti imenik, zatim koristite TortoiseGitRepo-Pretrživač da pozovete pretraživač spremišta. Nađite subimenik koji želite da dodate vašoj radnoj kopiji, zatim koristite Kontekst meni Ažuriraj stavku po reviziji...Taj meni biće vidljiv samo ako izabrana stavka još ne postoji u vašoj radnoj kopiji, ali predačka stavka postoji. " #. (para) #: ../source/TortoiseGit_en.xml:4241 msgid "In the check for modifications dialog, first click on the button Check repository. The dialog will show all the files and folders which are in the repository but which you have not checked out as remotely added. Right click on the folder(s) you would like to add to your working copy, then use Context menuUpdate." msgstr "U dijalogu porovere modifikacija, najpre kliknite na dugme Proveri spremište. Dijalog će pokazati sve fajlove i imenike koji su u spremištu ali ih nisu preuzeti kao daljinski dodati. Desni klikna imenik(e) koje želite dodati vašoj radnoj kopiji, zatim koristite Kontekst meniAžuriraj." #. (para) #: ../source/TortoiseGit_en.xml:4253 msgid "This feature is very useful when you only want to checkout parts of a large tree, but you want the convenience of updating a single working copy. Suppose you have a large tree which has sub-folders Project01 to Project99, and you only want to checkout Project03, Project25 and Project76/SubProj. Use these steps:" msgstr "Ova osobina je veoma korisna kada samo želite da preuzmete dao velikog stabla, ali želite konvenciju ažuriranja pojedinačne radne kopije. Pretpostavimo da imate veliko stablo koje ima sub-imenike Project01 do Project99, i želite da preuzmete Project03, Project25 i Project76/SubProj. Koristite ove korake:" #. (para) #: ../source/TortoiseGit_en.xml:4266 msgid "Checkout the parent folder with depth Only this item You now have an empty top level folder." msgstr "Preuzmite predački imenik sa dubinom Samo ova stavka Sada imate prazan vršni imenik." #. (para) #: ../source/TortoiseGit_en.xml:4273 msgid "Select the new folder and use TortoiseGitRepo browser to display the repository content." msgstr "Izaberite novi imenik i koristite TortoiseGitRepo pretraživač da prikažete sadržaj spremišta." #. (para) #: ../source/TortoiseGit_en.xml:4283 msgid "Right click on Project03 and Context menuUpdate item to revision.... Keep the default settings and click on OK. You now have that folder fully populated." msgstr "Desni klik na Project03i Kontekst meniAžuriraj stavku do revizije....Čuvajte uobičajeno podešavanje i kliknite na OK. Vi sada imate imenik potpuno popunjen." #. (para) #: ../source/TortoiseGit_en.xml:4293 msgid "Repeat the same process for Project25." msgstr "Ponovite isti proces za Project25." #. (para) #: ../source/TortoiseGit_en.xml:4298 msgid "Navigate to Project76/SubProj and do the same. This time note that the Project76 folder has no content except for SubProj, which itself is fully populated. Git has created the intermediate folders for you without populating them." msgstr "Upravite se ka Project76/SubProj i uradite isto. Ovog puta primetimo da Project76 imenik nema sadržaj osim za SubProj, koji je sam potpuno poppunjen. Subverzija je kreirala prelazne imenike za vas ne popunjavajući ih." #. (title) #: ../source/TortoiseGit_en.xml:4308 msgid "Working copy depth cannot be reduced" msgstr "Dubina radne kopije ne može da se umanji" #. (para) #: ../source/TortoiseGit_en.xml:4309 msgid "Once you have checked out a working copy to a particular depth you can increase that depth later to get more content. However you cannot reduce the depth again to remove content. That feature may be added in a later version of Git." msgstr "Kada jednom preuzmete radnu kopiju do određene dubine možete povećati dubinu kasnije da dođete do više sadržaja. međutim ne možete redukovati dubinu da izbacite sadržaj. Ova osobina će biti dodata u kasnijim verzijama Subverzije." #. (title) #: ../source/TortoiseGit_en.xml:4317 msgid "Using an older server" msgstr "Korišćenje starijeg servera" #. (para) #: ../source/TortoiseGit_en.xml:4318 msgid "Pre-1.5 servers do not understand the working copy depth request, so they cannot always deal with requests efficiently. The command will still work, but an older server may send all the data, leaving the client to filter out what is not required, which may mean a lot of network traffic. If possible you should upgrade your server to 1.5." msgstr "Pre-1.5 serveri ne razumeju zahtev za dubinom radne kopije, tako da oni uopšte ne mogu da rade efikasno sa tim zahtevima. Komanda će još raditi ali stari server može slati sve podatekeostavljajući klojentu da filtrira ono što nije potrebno, što može biti veći deo mrežnog saobraćaja. Ako je moguće treba da dogradite server na 1.5." #. (para) #: ../source/TortoiseGit_en.xml:4328 msgid "If the project contains references to external projects which you do not want checked out at the same time, use the Omit externals checkbox." msgstr "Ako projekat sadrži reference ka eksternim projektima koje ne želite da preuzmete u isto vreme, koristite Izostaviti eksterne čekboks." #. (para) #: ../source/TortoiseGit_en.xml:4334 msgid "If Omit externals is checked, or if you wish to increase the depth value, you will have to perform updates to your working copy using TortoiseGitUpdate to Revision... instead of TortoiseGitUpdate. The standard update will include all externals and keep the existing depth." msgstr "Ako Izostaviti eksterne je označeno, ili ako želite da povećate vrednost dubine, imaćete da uradite ažuriranje vaše radne kopije koristeći TortoiseGitAžuriraj do Revizije... umesto TortoiseGitAžuriraj. " #. (para) #: ../source/TortoiseGit_en.xml:4350 msgid "It is recommended that you check out only the trunk part of the directory tree, or lower. If you specify the parent path of the directory tree in the URL then you might end up with a full hard disk since you will get a copy of the entire repository tree including every branch and tag of your project!" msgstr "Preporučuje se da preuzmete samo samo trunk deo stabla imenika, ili niže. Ako odredite predačku putanju stabla imenika u URL tada možete završiti sa punim hard diskom jer dobijate kopiju celog stabla spremišta uključujući svaku granu i znak vašeg projekta!" #. (title) #: ../source/TortoiseGit_en.xml:4358 msgid "Exporting" msgstr "Izvoz" #. (para) #: ../source/TortoiseGit_en.xml:4359 msgid "Sometimes you may want to create a local copy without any of those .svn directories, e.g. to create a zipped tarball of your source. Read to find out how to do that." msgstr "Ponekad možete želeti da napravite lokalnu kopiju bez bilo kakvog .svn imenika, tj. da napravite komprimovanu datoteku sorsa. Pročitajte da nađete kako da to uradite." #. (title) #: ../source/TortoiseGit_en.xml:4368 msgid "Committing Your Changes To The Repository" msgstr "Urezivanje vaših izmena u spremište" #. (primary) #: ../source/TortoiseGit_en.xml:4370 msgid "commit" msgstr "ureži" #. (primary) #: ../source/TortoiseGit_en.xml:4373 msgid "send changes" msgstr "slanje izmena" #. (primary) #: ../source/TortoiseGit_en.xml:4376 msgid "check in" msgstr "prijavljivanje" #. (para) #: ../source/TortoiseGit_en.xml:4379 msgid "Sending the changes you made to your working copy is known as committing the changes. But before you commit you have to make sure that your working copy is up to date. You can either use TortoiseGitUpdate directly. Or you can use TortoiseGitCheck for Modifications first, to see which files have changed locally or on the server." msgstr "Slanjem izmena koje ste uradili u vašu radnu kopiju poznato je kao urezivanje izmena. Ali pre nego što urezujete treba da budete sigurni da je radna kopija ažurirana. Možete ili koristiti TortoiseGitAžuriraj direktno. Ili možete koristiti TortoiseGitProvera Izmena najpre, da vidite koji su fajlovi izmenjeni lokalno ili na serveru." #. (title) #: ../source/TortoiseGit_en.xml:4396 msgid "The Commit Dialog" msgstr "Urezivanje dijalog" #. (title) #: ../source/TortoiseGit_en.xml:4406 msgid "The Commit dialog" msgstr "rezivanje dijalog" #. (para) #: ../source/TortoiseGit_en.xml:4397 msgid "If your working copy is up to date and there are no conflicts, you are ready to commit your changes. Select any file and/or folders you want to commit, then TortoiseGitCommit.... " msgstr "Ako je vaša radna kopija ažurirana i nema konflikta, vi ste spremni da urežete vaše izmene. Izaberite bilo koji fajl/ili imenike koje želiti da urežete, tada TortoiseGitUreži.... " #. (para) #: ../source/TortoiseGit_en.xml:4410 msgid "The commit dialog will show you every changed file, including added, deleted and unversioned files. If you don't want a changed file to be committed, just uncheck that file. If you want to include an unversioned file, just check that file to add it to the commit." msgstr "Dijalog urezivanja će vam pokazati svaki izmnjeni fajl, uključujući dodate, neverzionisane fajlove. Ako ne želite da izmenjeni fajlovi budu urezani, samo otčekirjte te fajlove. Ako želite da uključite neverzionisani fajl, samo čekirajte taj fajl da ga dodate u urezivanje." #. (para) #. (para) #: ../source/TortoiseGit_en.xml:4417 #: ../source/TortoiseGit_en.xml:5264 msgid "Items which have been switched to a different repository path are also indicated using an (s) marker. You may have switched something while working on a branch and forgotten to switch back to trunk. This is your warning sign!" msgstr "Stavke koje su prebačene u različite putanje spremišta takođe su označene korišćenjem (s) markera. Možete prebaciti nešto dok radite na grani i da to zaboravite da vratite u deblo. Ovo je vaš upozoravajući znak!" #. (title) #: ../source/TortoiseGit_en.xml:4424 msgid "Commit files or folders?" msgstr "Urezivanje fajlova ili imenika?" #. (para) #: ../source/TortoiseGit_en.xml:4425 msgid "When you commit files, the commit dialog shows only the files you have selected. When you commit a folder the commit dialog will select the changed files automatically. If you forget about a new file you created, committing the folder will find it anyway. Committing a folder does not mean that every file gets marked as changed; It just makes your life easier by doing more work for you." msgstr "Kada urezujete fajlove, dijalog urezivanja prikazuje samo fajlove koje ste izabrali. kada urezujete imenik dijalog urezivanja će izabrati izmenjene fajlove automatski. Ako zaboravite novi fajl koji ste kreirali, urezivanje imenika će ga naći u svakom slučaju. Urezivanje imenika ne znači da je svaki fajl označen kao izabran; To samo čini vaš život lakšim radeći više posla za vas." #. (para) #: ../source/TortoiseGit_en.xml:4435 msgid "If you have modified files which have been included from a different repository using svn:externals, those changes cannot be included in the same atomic commit. A warning symbol below the file list tells you if this has happened, and the tooltip explains that those external files have to be committed separately." msgstr "Ako imate izmnjene fajlove koji su uključeni iz raznih spremišta korišćenjem svn:externals, ove izmene ne mogu biti uključene u istom atomik urezivanju. Simbol upozorenja ispod liste fajlova kaže vam ako se to desilo, i alatoznaka objašnjava da se ti eksterni fajlovi imaju urezati odvojeno." #. (title) #: ../source/TortoiseGit_en.xml:4443 msgid "Many unversioned files in the commit dialog" msgstr "Mnogo neverzionisanih fahlova u dialogu urezivanja" #. (para) #: ../source/TortoiseGit_en.xml:4450 msgid "add the file (or a wildcard extension) to the list of files to exclude on the settings page. This will affect every working copy you have." msgstr "dodajte fajl (ili vilkard proširenje) listi fajlova za isključenje na stranici podešavanja. Ovo će uticati na svaku radnu kopiju koju imate. " #. (para) #: ../source/TortoiseGit_en.xml:4457 msgid "add the file to the svn:ignore list using TortoiseGitAdd to ignore list This will only affect the directory on which you set the svn:ignore property. Using the SVN Property Dialog, you can alter the svn:ignore property for a directory." msgstr "dodajte fajl u svn:ignore listu koristeći TortoiseGitDodajte listi izbegavanja Ovo će uticati samo na imenik na koji ste podesili svn:ignore. Koristeći SVN Dijalog Osobina, možete zameniti svn:ignore osobine imenika." #. (para) #: ../source/TortoiseGit_en.xml:4444 msgid "If you think that the commit dialog shows you too many unversioned (e.g. compiler generated or editor backup) files, there are several ways to handle this. You can: Read for more information." msgstr "Ako mislite da dijalog urezivanja prikazuje suviše mnogo neverzionisanih (tj. koje generiše kompajler ili osiguanje uređivača) fajlova, postoji više načina da se to opsluži. Možete: Pročitajte za više informacija." #. (para) #: ../source/TortoiseGit_en.xml:4474 msgid "Double clicking on any modified file in the commit dialog will launch the external diff tool to show your changes. The context menu will give you more options, as shown in the screenshot. You can also drag files from here into another application such as a text editor or an IDE." msgstr "Dvostruku klik na bilo koji izmenjen fajl u dijalogu urezivanja lansiraće spoljašnji diff alat da prikaže vaše izmene. Kontekst meni će vam dati više mogućnosti, kao što je prikazano na snimku. Takođe možete vući fajlove odavde u drugu aplikaciju kao što je uređivač teksta ili IDE ." #. (para) #: ../source/TortoiseGit_en.xml:4481 msgid "You can select or deselect items by clicking on the checkbox to the left of the item. For directories you can use Shift-select to make the action recursive." msgstr "Možete poništiti izbor stavki klikom na čekbokslevo od stavke. Za imenike možete koristiti Šift-select da učinite akciju rekurzivno." #. (para) #: ../source/TortoiseGit_en.xml:4486 msgid "The columns displayed in the bottom pane are customizable. If you right click on any column header you will see a context menu allowing you to select which columns are displayed. You can also change column width by using the drag handle which appears when you move the mouse over a column boundary. These customizations are preserved, so you will see the same headings next time." msgstr "Kolone prikazane u donjem panelu su prilagodljive. Ako uradite desni klik na bilo koje zaglavlje kolone videćete kontekst meni koji vam dozvoljava da izaberete koja kolona će se prikazati. Možete i izmeniti širinu kolone koristeći vučnu traku koja se pojavljuje kada pomerate miša preko ivice kolone. Prilagođenja su sačuvana tako da možete videti ista zaglavlja sledeći put." #. (para) #: ../source/TortoiseGit_en.xml:4495 msgid "By default when you commit changes, any locks that you hold on files are released automatically after the commit succeeds. If you want to keep those locks, make sure the Keep locks checkbox is checked. The default state of this checkbox is taken from the no_unlock option in the Git configuration file. Read for information on how to edit the Git configuration file." msgstr "Uobičajeno je da kada se urezuju izmene, svako zaključavanje koje držite na fajlovima se automatski otključava posle zadovoljavajućeg urezivanja. Ako želite da zadržite zaključavanje budite sigurni da je Čuvaj zaključavanje čekboks je čekiran. Uobičajeno stanje ovog čekboksa uzet je iz no_unlock opcije u Subverzionom konfiguracionom fajlu. Pročitajte za informacije kako urediti Subverzioni konfiguracioni fajl." #. (para) #: ../source/TortoiseGit_en.xml:4506 msgid "You can drag files into the commit dialog from elsewhere, so long as the working copies are checked out from the same repository. For example, you may have a huge working copy with several explorer windows open to look at distant folders of the hierarchy. If you want to avoid committing from the top level folder (with a lengthy folder crawl to check for changes) you can open the commit dialog for one folder and drag in items from the other windows to include within the same atomic commit." msgstr "Možete dovući fajlove u dijalog urezivanja od bilo gde, sve dok vaša radna kopija je preuzeta iz istog spremišta. Na primer, možete imati ogromnu radnu kopiju sa više eksplorer prozora otvorenih na raznim imenicima hijerarhije. Ako želite da izbegnete urezivanje sa vršnog imenika (sa dužim puzačem imenika za proveru izmena) možete otvoriti dijalog urezivanja za jedan imenik i vući stavku iz drugog prozora da se uključi u okviru istog atomik urezivanja." #. (para) #: ../source/TortoiseGit_en.xml:4516 msgid "You can drag unversioned files which reside within a working copy into the commit dialog, and they will be SVN added automatically." msgstr "Možete vu-i neverzionisane fajlove obitavaju u okviru radne kopije u dijalogu urezivanja, i oni će biti SVN dodati automatski." #. (title) #. (title) #: ../source/TortoiseGit_en.xml:4522 #: ../source/TortoiseGit_en.xml:5336 msgid "Repairing External Renames" msgstr "Popravka spoljašnjih preimenovanja" #. (para) #. (para) #: ../source/TortoiseGit_en.xml:4523 #: ../source/TortoiseGit_en.xml:5337 msgid "Sometimes files get renamed outside of Git, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Git about the connection. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." msgstr "Ponekad se fajlovi preimenuju van Subverzije, i oni su prikazani u listi fajlova kao fajl koji nedostaje ili neverzionisani fajl. Da bi izbegli gubljenje istorije potrebno je notirati Subverziji o vezi. Jednostavno izaberite obe stavri, staro ime (nedostajuće) i novo ime (neverzionisano) koristi Kontekst MeniPopravi Pomeranje da se upare dva fajla kao preimenovanje." #. (title) #. (title) #: ../source/TortoiseGit_en.xml:4538 #: ../source/TortoiseGit_en.xml:5382 msgid "Change Lists" msgstr "Liste izmena" #. (para) #: ../source/TortoiseGit_en.xml:4539 msgid "The commit dialog supports Git's changelist feature to help with grouping related files together. Find out about this feature in ." msgstr "Dijalog urezivanja podržava Subverzijinu listu izmena osobine da pomogne grupisanjem odgovarjućih fajlova zajedno. Nađite o ovim osobinama na ." #. (title) #: ../source/TortoiseGit_en.xml:4546 msgid "Excluding Items from the Commit List" msgstr "Isključivanje stavki iz liste za urezivanje" #. (para) #: ../source/TortoiseGit_en.xml:4547 msgid "Sometimes you have versioned files that change frequently but that you really don't want to commit. Sometimes this indicates a flaw in your build process - why are those files versioned? should you be using template files? But occasionally it is inevitable. A classic reason is that your IDE changes a timestamp in the project file every time you build. The project file has to be versioned as it includes all the build settings, but it doesn't need to be committed just because the timestamp changed." msgstr "Ponekad imate verzionisane fajlove koji se često menjaju koji vi zaista ne želite urezati. Ponekad ovo ukazuje na protok u vašem procesu gradnje - zašto su ti fajlovi verzionisani? da li biste trebali koristiti model fajlove? Ali srećom to je neizbežno. Klasičan rezon je da vaš IDE menja vremenske markere u projekt fajlu svaki put kad gradite. Fajl projekta treba da bude verzionisan je uključuje sva podešavanja za gradnju, ali on ne treba da bude urezan baš zbog toga što su vremenski markeri promenjeni." #. (para) #: ../source/TortoiseGit_en.xml:4557 msgid "To help out in awkward cases like this, we have reserved a changelist called ignore-on-commit. Any file added to this changelist will automatically be unchecked in the commit dialog. You can still commit changes, but you have to select it manually in the commit dialog." msgstr "Da bi se pomoglo u uznemiravajućim situacijama kao što je ova, imamo rezervisanu listu izmena nazvanu ignore-on-commit. Bilo koji fajl dodat ovoj listi izmena biće automatski otčekiran u dijalogu urezivanja.Još uvek možete urezati izmene, ali imate da izaberete ručno u dijalogu urezivanja." #. (title) #: ../source/TortoiseGit_en.xml:4566 msgid "Commit Log Messages" msgstr "Urezivanje dnevnika poruka" #. (para) #: ../source/TortoiseGit_en.xml:4567 msgid "Be sure to enter a log message which describes the changes you are committing. This will help you to see what happened and when, as you browse through the project log messages at a later date. The message can be as long or as brief as you like; many projects have guidelines for what should be included, the language to use, and sometimes even a strict format." msgstr "Budite sigurni da unesete dnevnik poruka koji opisuje izmene koje urezujete. Ovo će vam pomoći da vidite šta se dešava i kada, ako pretražite projektov dnevnik poruka kasnije. Poruka može biti toliko duga ili kratka koliko želite; mnogi projekti imaju uvodne linije o tome šta treba uključiti, jezik koji koristiti, ponekad i strogi format." #. (para) #: ../source/TortoiseGit_en.xml:4575 msgid "You can apply simple formatting to your log messages using a convention similar to that used within emails. To apply styling to text, use *text* for bold, _text_ for underlining, and ^text^ for italics." msgstr "Možete primeniti jednostavno formatiranje dnevnika poruka koristeći konvenciju sličnu onoj koja se koristi u okviru elektronske pošte. Da bi se primenilo stilisanje teksta, koristite *tekst* za masna slova, _tekst_ za podv učeno, i ^tekst^ za italik. " #. (title) #: ../source/TortoiseGit_en.xml:4585 msgid "The Commit Dialog Spellchecker" msgstr "Provera pravopisa dijaloga urezivanja" #. (para) #: ../source/TortoiseGit_en.xml:4583 msgid " TortoiseGit includes a spellchecker to help you get your log messages right. This will highlight any mis-spelled words. Use the context menu to access the suggested corrections. Of course, it doesn't know every technical term that you do, so correctly spelt words will sometimes show up as errors. But don't worry. You can just add them to your personal dictionary using the context menu." msgstr " TortoiseGit uključuje proveru pravopisa da vam pomogne da dobijete ispravan dnevnik poruka. On će osvetliti sve loše-napisane reči. Koristite kontekst meni da pristupite sugerisanim korekcijama. Svakako, on ne zna svaki tehnički termin koji date, tako da korektno napisane reči ponekad prikazuje kao sa greškom. Ali ne brinite. Treba samo da ih dodate u vaš lični rečnik koristeći kontekst meni." #. (para) #: ../source/TortoiseGit_en.xml:4595 msgid "The log message window also includes a filename and function auto-completion facility. This uses regular expressions to extract class and function names from the (text) files you are committing, as well as the filenames themselves. If a word you are typing matches anything in the list (after you have typed at least 3 characters, or pressed Ctrl+Space), a drop-down appears allowing you to select the full name. The regular expressions supplied with TortoiseGit are held in the TortoiseGit installation bin folder. You can also define your own regexes and store them in %APPDATA%\\TortoiseGit\\autolist.txt. Of course your private autolist will not be overwritten when you update your installation of TortoiseGit. If you are unfamiliar with regular expressions, take a look at the introduction at http://en.wikipedia.org/wiki/Regular_expression, and the online documentation and tutorial at http://www.regular-expressions.info/." msgstr "Prozor dnevnika poruka takođe obuhvata fajlime i funkciju lakog autokompletiranja. To koristi regularne izraze da izdvoji klase i imena funkcija iz (tekst) fajlova koje urezujete, kao i sama fajlimena. Ako reč koju kucate hvata bil šta na listi (posle kucanja najmanje 3 karaktera, ili pritiskom na Ctrl-Razmak), javlja se padajući meni koji vam dozvoljava da izaberete puno ime. Regularni izrazi su obezbeđeni iz TortoiseGit su sadržani u TortoiseGit instalacionom bin imeniku. Možete takođe definisati regularne izraze i sačuvati ih u %APPDATA%\\TortoiseGit\\autolist.txt.Svakako , vaša privatna autolista neće biti prepisana kada ažurirate vašu instalaciju TortoiseGit. Ako niste familijarni sa regularnim izrazima, bacite pogled na uvod u http://en.wikipedia.org/wiki/Regular_expression, i onlajn dokumentaciju i tutorijale na http://www.regular-expressions.info/." #. (para) #: ../source/TortoiseGit_en.xml:4616 msgid "You can re-use previously entered log messages. Just click on Recent messages to view a list of the last few messages you entered for this working copy. The number of stored messages can be customized in the TortoiseGit settings dialog." msgstr "Možete ponovo koristiti prethodno unete poruke dnevnika. Samo kliknite na Skore poruke da vidite listu zadnjih nekoliko poruka koje ste uneli za ovu radnu kopiju. Broj sačuvanih poruka može biti podešen u TortoiseGit dijalogu podešavanja. " #. (para) #: ../source/TortoiseGit_en.xml:4622 msgid "You can clear all stored commit messages from the Saved data page of TortoiseGit's settings, or you can clear individual messages from within the Recent messages dialog using the Delete key." msgstr "Možete obrisati sve sačuvane poruke od Sačuvani podaci strane TortoiseGit podešavanja, ili možete obrisati pojedine poruke u okviru dijaloga Nedavne poruke koristeći Briši taster." #. (para) #: ../source/TortoiseGit_en.xml:4628 msgid "If you want to include the checked paths in your log message, you can use the command Context MenuPaste filename list in the edit control." msgstr "Ako želite da uključite proverene putanje u vašem dnevniku poruka, možete koristiti komandu Kontekst MeniNalepi listu imena fajlova u edit kontroli." #. (para) #: ../source/TortoiseGit_en.xml:4637 msgid "Another way to insert the paths into the log message is to simply drag the files from the file list onto the edit control." msgstr "Drugi način da se unese putanja u dnevnik poruka da se jednostavno vuku fajlovi iz liste fajlova u edit kontrolu." #. (title) #: ../source/TortoiseGit_en.xml:4642 msgid "Special Folder Properties" msgstr "Specijalni imenik osobina" #. (para) #: ../source/TortoiseGit_en.xml:4643 msgid "There are several special folder properties which can be used to help give more control over the formatting of commit log messages and the language used by the spellchecker module. Read for further information." msgstr "Ima nekoliko specijalnih osobina imenika koje mogu biti korišćene da pomognu davanje više kontrole preko formatiranja dnevnika poruka i jezik korišćen modulom za proveru pravopisa. Čitajte za dalje informacije." #. (title) #: ../source/TortoiseGit_en.xml:4651 msgid "Integration with Bug Tracking Tools" msgstr "Integracija sa alatom za praćenje bagova" #. (para) #: ../source/TortoiseGit_en.xml:4652 msgid "If you have activated the bug tracking system, you can set one or more Issues in the Bug-ID / Issue-Nr: text box. Multiple issues should be comma separated. Alternatively, if you are using regex-based bug tracking support, just add your issue references as part of the log message. Learn more in ." msgstr "Ako ste aktivirali sistem praćenja bagova, možete podesiti jedan ili više Problema u Bug-ID / Issue-Nr: tekst boksu. Višestruki problemi treba da budu odvojeni zarezom.Alternativno, ako koristite regeks-zasnovana podrška tragača bagova, samo dodajte vaš problem reference kao deo dnevnika poruka. Pročitajte više u ." #. (title) #: ../source/TortoiseGit_en.xml:4663 msgid "Commit Progress" msgstr "Napredovanje urezivanja" #. (title) #: ../source/TortoiseGit_en.xml:4668 msgid "The Progress dialog showing a commit in progress" msgstr "Progres dijalog koji prikazije napredovanje urezivanja" #. (para) #: ../source/TortoiseGit_en.xml:4664 msgid "After pressing OK, a dialog appears displaying the progress of the commit. " msgstr "Posle pritiskanja OK, pojavljuje se dijalog koji prikazuje napredovanje urezivanja. " #. (term) #. (term) #: ../source/TortoiseGit_en.xml:4677 #: ../source/TortoiseGit_en.xml:5202 msgid "Blue" msgstr "Plavi" #. (para) #: ../source/TortoiseGit_en.xml:4679 msgid "Committing a modification." msgstr "Urezivanje izmene." #. (term) #. (term) #. (term) #: ../source/TortoiseGit_en.xml:4685 #: ../source/TortoiseGit_en.xml:4752 #: ../source/TortoiseGit_en.xml:5210 msgid "Purple" msgstr "Purpuran" #. (para) #: ../source/TortoiseGit_en.xml:4687 msgid "Committing a new addition." msgstr "Urezivanje novih dodavanja" #. (term) #. (term) #. (term) #: ../source/TortoiseGit_en.xml:4693 #: ../source/TortoiseGit_en.xml:4760 #: ../source/TortoiseGit_en.xml:5222 msgid "Dark red" msgstr "Tamno crven" #. (para) #: ../source/TortoiseGit_en.xml:4695 msgid "Committing a deletion or a replacement." msgstr "Urezivanje brisanja ili zamena" #. (term) #. (term) #. (term) #: ../source/TortoiseGit_en.xml:4701 #: ../source/TortoiseGit_en.xml:4787 #: ../source/TortoiseGit_en.xml:5250 msgid "Black" msgstr "Crn" #. (para) #: ../source/TortoiseGit_en.xml:4703 msgid "All other items." msgstr "Sve druge stavke" #. (para) #: ../source/TortoiseGit_en.xml:4672 msgid "The progress dialog uses colour coding to highlight different commit actions " msgstr "Progres dijalogkoristi kodiranje bojama da osvetli različite akcije urezivanja " #. (para) #. (para) #. (para) #: ../source/TortoiseGit_en.xml:4710 #: ../source/TortoiseGit_en.xml:4797 #: ../source/TortoiseGit_en.xml:5259 msgid "This is the default colour scheme, but you can customise those colours using the settings dialog. Read for more information." msgstr "Ovo je uobičajena šema boja, ali možete prilagoditi ove boje koristeći dijalog podešavanja. Čitajte za više informacije." #. (title) #: ../source/TortoiseGit_en.xml:4718 msgid "Update Your Working Copy With Changes From Others" msgstr "Ađurirajte vašu radnu kopiju izmenama drugih" #. (primary) #. (primary) #: ../source/TortoiseGit_en.xml:4720 #: ../source/TortoiseGit_en.xml:13392 msgid "update" msgstr "ažuriraj" #. (primary) #: ../source/TortoiseGit_en.xml:4723 msgid "fetch changes" msgstr "naći izmene" #. (title) #: ../source/TortoiseGit_en.xml:4727 msgid "Progress dialog showing finished update" msgstr "Progres dijalog koji pokazuje završeno ažuriranje" #. (para) #: ../source/TortoiseGit_en.xml:4725 msgid " Periodically, you should ensure that changes done by others get incorporated in your local working copy. The process of getting changes from the server to your local copy is known as updating. Updating may be done on single files, a set of selected files, or recursively on entire directory hierarchies. To update, select the files and/or directories you want, right click and select TortoiseGitUpdate in the explorer context menu. A window will pop up displaying the progress of the update as it runs. Changes done by others will be merged into your files, keeping any changes you may have done to the same files. The repository is not affected by an update." msgstr " Periodično, morate omogućiti da izmene koje su drugi uradili budu inkorporirane u vašu lokalnu radnu kopiju. Proces dobijanje izmena od servera u vašu lokalnu kopiju poznato kao ažuriranje. desni klik i izaberite TortoiseGitAžuriraj u kontekst meniju pretraživača. Jedan prozor će iskočiti da prikaže napredovanje ažuriranja dok radi. ne utiče na ažuriranje." #. (para) #: ../source/TortoiseGit_en.xml:4754 msgid "New item added to your WC." msgstr "Novq stavka dodata u vašu RK" #. (para) #: ../source/TortoiseGit_en.xml:4762 msgid "Redundant item deleted from your WC, or missing item replaced in your WC." msgstr "Redundantne stavke obrisane iz vaše RK, ili nedostajuće stavke zamenjene u vašoj RK." #. (term) #. (term) #: ../source/TortoiseGit_en.xml:4769 #: ../source/TortoiseGit_en.xml:5230 msgid "Green" msgstr "Zelen" #. (para) #: ../source/TortoiseGit_en.xml:4771 msgid "Changes from repository successfully merged with your local changes." msgstr "Izmene iz spremišta sukcesifno su stopljene sa vašim lokalnim izmenama." #. (term) #. (term) #: ../source/TortoiseGit_en.xml:4778 #: ../source/TortoiseGit_en.xml:5240 msgid "Bright red" msgstr "Svetlo crvena" #. (para) #: ../source/TortoiseGit_en.xml:4780 msgid "Changes from repository merged with local changes, resulting in conflicts which you need to resolve." msgstr "Izmene iz spremišta stopljeni sa lokalnim imenama, rezultovane u konfliktima koje treba da rešiti." #. (para) #: ../source/TortoiseGit_en.xml:4789 msgid "Unchanged item in your WC updated with newer version from the repository." msgstr "Neizmenjena stavka u vašoj RK ažuriran sa novom verzijom iz spremišta." #. (para) #: ../source/TortoiseGit_en.xml:4747 msgid "The progress dialog uses colour coding to highlight different update actions " msgstr "Progres dijalog koristi bpje kodirane da posvetli različite ažurirane akcije " #. (para) #: ../source/TortoiseGit_en.xml:4802 msgid "If you get any conflicts during an update (this can happen if others changed the same lines in the same file as you did and those changes don't match) then the dialog shows those conflicts in red. You can double click on these lines to start the external merge tool to resolve the conflicts." msgstr "Ako dobijete bilo koje konflikte u toku ažuriranja (to se može desiti ako su drugi izmenili iste linije u istom fajlu koje ste i vi izmenili i te izmene se ne mogu spariti) tada dijalog prikazuje ove konflikte crveno. Možete uraditi dvostruki klik na ove linije da pokrenete spoljašnji alat za stapanje da se razreše konflikti. " #. (para) #: ../source/TortoiseGit_en.xml:4809 msgid "When the update is complete, the progress dialog shows a summary of the number of items updated, added, removed, conflicted, etc. below the file list. This summary information can be copied to the clipboard using Ctrl+C." msgstr "Kada je ažuriranje kompletno, progres dijalog prikazuje ukupnost brojnih stavki ažuriranih, dodatih, uklonjenih, konfliktnih, itd. ispod fajl liste. Ukupna informacija se može kopirati u klipbord koristeći Ctrl+C." #. (para) #: ../source/TortoiseGit_en.xml:4816 msgid "The standard Update command has no options and just updates your working copy to the HEAD revision of the repository, which is the most common use case. If you want more control over the update process, you should use TortoiseGitUpdate to Revision... instead. This allows you to update your working copy to a specific revision, not only to the most recent one. Suppose your working copy is at revision 100, but you want it to reflect the state which it had in revision 50 - then simply update to revision 50. In the same dialog you can also choose the depth at which to update the current folder. The terms used are described in . The default depth is Working copy, which preserves the existing depth setting. You can also choose whether to ignore any external projects in the update (i.e. projects referenced using svn:externals)." msgstr "Standardna Ažuriraj komanda nema opcije i samo ažurira vašu radnu kopiju do GLAVNE revizije spremišta, što je najčešći slučaj korišćenja. Ako želite više kontrole procesa ažuriranja, potrebno je da koristite TortoiseGitAžuriraj u Reviziju... umesto. Ovo omogućava da se ažurira vaša radna kopija do specificirane revizije, ne samo do najskoriju. Pretpostavimo da vaša radna kopija je u reviziji 100, ali vi želite da reflektujete stanje koje je bilo u reviziji 50 - tada jednostavno ažurirajte u reviziju 50. U istom dijalogu možete takođe izabrati dubinu do koje ažurirati tekući imenik. Termini koji su korišćeni opisani su u . Uobičajena dubina je Radna kopija, koja čuva postojeće podešavanje dubine. Možete takođe izabrati da li zanemariti spoljašnje projekte pri ažuriranju (tj. projek se referira koristeći svn:externals)." #. (para) #: ../source/TortoiseGit_en.xml:4838 msgid "If you update a file or folder to a specific revision, you should not make changes to those files. You will get out of date error messages when you try to commit them! If you want to undo changes to a file and start afresh from an earlier revision, you can rollback to a previous revision from the revision log dialog. Take a look at for further instructions, and alternative methods." msgstr "Ako ažurirate fajl ili imenik sa specifičnom revizijom, ne treba da pravite izmene tih fajlova. Dobićete zastarelo poruku o grešci kada pokušate da ih urežete! Ako želite da vratite izmene fakla i ponovo počnete od ranije revizije, možete se vratiti na prethodnu reviziju iz dijaloga revizionog dnevnika. Bacite pogled na za dalje instrukcije, i alternativne metode." #. (para) #: ../source/TortoiseGit_en.xml:4848 msgid "Update to Revision can occasionally be useful to see what your project looked like at some earlier point in its history. But in general, updating individual files to an earlier revision is not a good idea as it leaves your working copy in an inconsistent state. If the file you are updating has changed name, you may even find that the file just disappears from your working copy because no file of that name existed in the earlier revision. If you simply want a local copy of an old version of a file it is better to use the Context MenuSave revision to... command from the log dialog for that file." msgstr "Ažuriraj sa Revizijom može srećom da bude korisno da vidite na šta je vaš projekat ličio u nekom ranijem trenutku njegove istorije. Alu uopšteno, ažuriranjem pojedinih fajlova sa ranijom revizijom ije dobra ideja jer ostavlja vašu radnu kopiju u nekonzistentno stanje. Ako je fajl koji ažurirate promenio ime, možete čak naći da je fajl tek nestao iz vaše radne kopije jer nema fajla tog imena da postoji u ranijoj reviziji. Ako jednostavno želite lokalnu kopiju stare verzije fajla bolje je da koristite Kontekst MeniSačuvaj reviziju u... iz dijaloga dnevnika tog fajla." #. (title) #: ../source/TortoiseGit_en.xml:4867 msgid "Multiple Files/Folders" msgstr "Višestruki fajlovi/imenici" #. (para) #: ../source/TortoiseGit_en.xml:4868 msgid "If you select multiple files and folders in the explorer and then select Update, all of those files/folders are updated one by one. TortoiseGit makes sure that all files/folders which are from the same repository are updated to the exact same revision! Even if between those updates another commit occurred." msgstr "Ako izaberete više fajlova i imenika u pretraživaču i tada izaberete Ažuriraj, svi ovi fajlovi/imenici se ažuriraju jedan po jedan. TortoiseGit osigurava da ti svi fajlovi/imenici, koji su iz istog spremišta, su ažurirani sa upravo istom revizijom! Čak ako između ovih ažuriranja dođe do drugog urezivanja." #. (title) #: ../source/TortoiseGit_en.xml:4880 msgid "Local File Already Exists" msgstr "Lokalni fajl već postoji" #. (para) #: ../source/TortoiseGit_en.xml:4881 msgid "Sometimes when you try to update, the update fails with a message to say that there is already a local file of the same name. This typically happens when Git tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Git will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file." msgstr "Ponekad dok pokušavate da ažurirate, ažuriranje ne uspe sa porukom koja kaže da već postoji fajl sa istim imenom u vašem radnom imeniku. Subverzija nikada neće preklopiti neverzionisani fajl - on može sadržati nešto na čemu radite, što slučajno ima isto ime koje je drugi čovek iz razvoja uzeo za svoj novo urezani fajl." #. (para) #: ../source/TortoiseGit_en.xml:4890 msgid "If you get this error message, the solution is simply to rename the local unversioned file. After completing the update, you can check whether the renamed file is still needed." msgstr "Ako dobijete ovu poruku ogrešci, rešenje je da jednostavno preimenujete lokalni neverzionisani fajl. Posle kompletiranja ažuriranja možete proveriti da li je preimenovan fajl još potreban." #. (para) #: ../source/TortoiseGit_en.xml:4895 msgid "If you keep getting error messages, use TortoiseGitCheck for Modifications instead to list all the problem files. That way you can deal with them all at once." msgstr "Ako čuvate dobijene greške, koristite TortoiseGitProveri Modifikacije umesto da listate problem fajlove. Na taj način radite sa svima njima odjednom." #. (title) #: ../source/TortoiseGit_en.xml:4908 msgid "Resolving Conflicts" msgstr "Rešavanje konflikta" #. (primary) #: ../source/TortoiseGit_en.xml:4913 msgid "resolve" msgstr "reši" #. (term) #: ../source/TortoiseGit_en.xml:4936 msgid "filename.ext.mine" msgstr "filename.ext.mine" #. (para) #: ../source/TortoiseGit_en.xml:4938 msgid "This is your file as it existed in your working copy before you updated your working copy - that is, without conflict markers. This file has your latest changes in it and nothing else." msgstr "Ovo je vaš fajl kako je postojao u vašoj radnoj kopiji pre nego ste ažurirali vašu radnu kopiju - to je, bez konfliktnih markera. Ovaj fajl ima vaše poslednje izmene u njemu i ništa više." #. (term) #: ../source/TortoiseGit_en.xml:4947 msgid "filename.ext.rOLDREV" msgstr "filename.ext.rOLDREV" #. (para) #: ../source/TortoiseGit_en.xml:4949 msgid "This is the file that was the BASE revision before you updated your working copy. That is, it the file that you checked out before you made your latest edits." msgstr "Ovo je fajl koji je bio u OSNOVNOJ reviziji pre nego ste ažurirali radnu kopiju. Dakle, taj fajl koji ste preuzeli pre nego ste uradili vaše zadnje uređenje." #. (term) #: ../source/TortoiseGit_en.xml:4958 msgid "filename.ext.rNEWREV" msgstr "filename.ext.rNEWREV" #. (para) #: ../source/TortoiseGit_en.xml:4960 msgid "This is the file that your Git client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." msgstr "ovo je fajl koji je vaš Subverzioni klijent upravo primio sa servera kada ste ažurirali vašu radnu kopiju. Ovaj fajl odgovara GLAVNOJ reviziji spremišta." #. (para) #: ../source/TortoiseGit_en.xml:4915 msgid "" "Once in a while, you will get a conflict when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Git knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <<<<<<<. The conflicting area is marked like this: \n" "<<<<<<< filename\n" " your changes\n" "=======\n" " code merged from repository\n" ">>>>>>> revision\n" " Also, for every conflicted file Git places three additional files in your directory: " msgstr "" "Jednom ćete dobiti konflikt dok ažurirate vaše fajlove iz spremišta. Konflikt se javlja kada dva ili više ljudi izmene isto nekoliko linija fajla. Kako Subverzija nezna ništa o vašem projektu, ona ostavlja rešavanje konflikta ljudima. Kadgod se konflikt iznese treba da otvorite fajl u pitanju i potražite linije koje počinju stringom <<<<<<<. Konfliktna oblast je markirana kao ovo: \n" "<<<<<<< filename\n" " your changes\n" "=======\n" " code merged from repository\n" ">>>>>>> revision\n" " Takođe, za svaki konfliktni fajl Subverzija stavlja tri dodatna fajla u vaš imenik: " #. (para) #: ../source/TortoiseGit_en.xml:4970 msgid "You can either launch an external merge tool / conflict editor with TortoiseGitEdit Conflicts or you can use any other editor to manually resolve the conflict. You should decide what the code should look like, do the necessary changes and save the file." msgstr "Možete ili lansirati spoljašnji alat za stapanje / konflikt uređivač sa TortoiseGitUredi Konflikte ili možete koristiti bilo koji uređivač da ručno rešite konflikt. Treba odlučiti kako kod treba da izgleda, uradite neophodne izmene i sačuvajte fajl." #. (para) #: ../source/TortoiseGit_en.xml:4981 msgid "Afterwards execute the command TortoiseGitResolved and commit your modifications to the repository. Please note that the Resolve command does not really resolve the conflict. It just removes the filename.ext.mine and filename.ext.r* files, to allow you to commit your changes." msgstr "Posle izvršenja komande TortoiseGitRešen i urežite vaše izmene u spremište. Molim primetite da komanda Reši ne rešava stvarno konflikte. Ona samo uklanja filename.ext.mine i filename.ext.r* fajlovi, da vam omogući da urežete vaše izmene." #. (para) #: ../source/TortoiseGit_en.xml:4994 msgid "If you have conflicts with binary files, Git does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have filename.ext.r* files. If you want to discard your changes and keep the repository version, just use the Revert command. If you want to keep your version and overwrite the repository version, use the Resolved command, then commit your version." msgstr "Ako imate konflikt sa binarnim fajlovima, Subverzija ne pokušava da stopi same fajlove. Lokalni fajl ostaje neizmenjen (tačno kao što ste ga izmenili) i vi imate filename.ext.r* fajlove. Ako želite da odbacite svoje izmene i zadržite verziju iz spremišta, samo iskoristite komandu Vrati. Ako želite da zadržite vašu verziju i da prepišete verziju spremišta, koristite komandu Reši, i urežite svoju verziju." #. (para) #: ../source/TortoiseGit_en.xml:5004 msgid "You can use the Resolved command for multiple files if you right click on the parent folder and select TortoiseGitResolved... This will bring up a dialog listing all conflicted files in that folder, and you can select which ones to mark as resolved." msgstr "Možete koristiti komandu Rešen za više fajlova sa desnim klikom na predački imenik i izborom TortoiseGitRešen... Ovo će dovesti dijalog listing svih konfliktnih fajlova u tom imeniku, i možete izabrati koji da markirate rešenim." #. (title) #: ../source/TortoiseGit_en.xml:5017 msgid "Getting Status Information" msgstr "Dobijanje status informacija" #. (primary) #. (primary) #: ../source/TortoiseGit_en.xml:5019 #: ../source/TortoiseGit_en.xml:5168 msgid "status" msgstr "status" #. (primary) #: ../source/TortoiseGit_en.xml:5022 msgid "view changes" msgstr "izmene izgleda" #. (primary) #: ../source/TortoiseGit_en.xml:5025 msgid "working copy status" msgstr "status radne kopije" #. (para) #: ../source/TortoiseGit_en.xml:5027 msgid "While you are working on your working copy you often need to know which files you have changed/added/removed or renamed, or even which files got changed and committed by others." msgstr "Dok vi radite na svojoj radnoj kopiji često vam treba da znate koje fajlove ste izmenili/dodali/uklonili ili preimenovali, ili čak koji fajlovi su izmenjeni i urezani od drugih. " #. (primary) #. (primary) #: ../source/TortoiseGit_en.xml:5035 #: ../source/TortoiseGit_en.xml:15287 msgid "overlays" msgstr "prekrivači" #. (primary) #: ../source/TortoiseGit_en.xml:5038 msgid "icons" msgstr "ikone" #. (para) #: ../source/TortoiseGit_en.xml:5046 msgid "Now that you have checked out a working copy from a Git repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Git status of the file the overlay icon is different." msgstr "Sada imate da preuzmete radnu kopiju iz Subverzionog spremišta možete videti svoje fajlove u vindouz eksploreru sa izmenjenim ikonama. Ovo je rezon zašto TortoiseGit tako popularan. TortoiseGit dodaje takozvane prekrivne ikone za svaku fajl ikonu koja prekriva originalnu ikonu fajla. Zavisno o Subverzionom stanju fajl prekrivna ikona se razlikuje." #. (para) #: ../source/TortoiseGit_en.xml:5054 msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Git status is normal." msgstr " Sveže preuzeta radna kopija ima zelen čekmarku kao prekrivač. To znači da je Subverzioni status normalan." #. (para) #: ../source/TortoiseGit_en.xml:5059 msgid " As soon as you start editing a file, the status changes to modified and the icon overlay then changes to a red exclamation mark. That way you can easily see which files were changed since you last updated your working copy and need to be committed." msgstr " Čim počnete uređenje fajla, status se menja u modifikovan i prekrivač ikone se menja u crveni uzvičnik marker. Tada možete lako videti koji fajlovi su izmenjeni od zadnjeg ažuriranja vaše radne kopije i treba da bude urezana." #. (para) #: ../source/TortoiseGit_en.xml:5067 msgid " If during an update a conflict occurs then the icon changes to a yellow exclamation mark." msgstr " Ako se tokom ažuriranja konflikta javi da se ikona izmeni u žuti uzvičnik marku." #. (para) #: ../source/TortoiseGit_en.xml:5072 msgid " If you have set the svn:needs-lock property on a file, Git makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file." msgstr " Ako ste podesili svn:needs-lock osobine fajla, Subverzija čini fajl samo za čitanje dok zaključate fajl. Takvi fajlovi imaju ovaj prekrivač da označi da ste otključali najpre pre nego uređujete fajl." #. (para) #: ../source/TortoiseGit_en.xml:5079 msgid " If you hold a lock on a file, and the Git status is normal, this icon overlay reminds you that you should release the lock if you are not using it to allow others to commit their changes to the file." msgstr " Ako držite zakčan fajl i Subverzioni status je normalan, ovaj prekrivač ikona vas podseća da treba otključati fajl ako ga ne koristite da omogućite drugim korisnicima da urezuju svoje izmene u taj fajl." #. (para) #: ../source/TortoiseGit_en.xml:5086 msgid " This icon shows you that some files or folders inside the current folder have been scheduled to be deleted from version control or a file under version control is missing in a folder." msgstr " Ova ikona pokazuje da su neki fajlovi i imenici unutar tekućeg imenika bili predviđeni da budu obrisani iz verzije kontrole ili fajl pod kontrolom verzija nedostaje u imeniku." #. (para) #: ../source/TortoiseGit_en.xml:5092 msgid " The plus sign tells you that a file or folder has been scheduled to be added to version control." msgstr " Znak plus vam kaže da taj fajl ili imenik je predviđen da bude dodat kontroli verzija." #. (para) #: ../source/TortoiseGit_en.xml:5097 msgid " The bar sign tells you that a file or folder is ignored for version control purposes. This overlay is optional." msgstr " Uspravna crta vam kaže da fajl i imnik je zanemaren u svrhu kontrole verzija. Ovaj prekrivač je opcionalni." #. (para) #: ../source/TortoiseGit_en.xml:5103 msgid " This icon shows files and folders which are not under version control, but have not been ignored. This overlay is optional." msgstr " Ova ikona prikazuje fajlove i imenike koji nisu pod kontrolom verzija, ali nisu zanemareni. Ovaj prekrivač je opcionalni." #. (para) #: ../source/TortoiseGit_en.xml:5109 msgid "In fact, you may find that not all of these icons are used on your system. This is because the number of overlays allowed by Windows is very limited and if you are also using an old version of TortoiseCVS, then there are not enough overlay slots available. TortoiseGit tries to be a Good Citizen (TM) and limits its use of overlays to give other apps a chance too." msgstr "U stvari, možete naći da da nisu sve od ovih ikona korišćene u vašem sistemu. To je zato što broj prekrivača koje dozvoljava Windows je veoma ograničen i ako i koristite staru verziju TortoiseCVS, tada nema dovoljno mogućih prekrivajućih pozicija. TortoiseGit pokušava da bude Dobar Građanin (TM) i ograničava njeno korišćenje prekrivača da takođe da drugim aplikacijama šansu." #. (para) #: ../source/TortoiseGit_en.xml:5117 msgid "Now that there are more Tortoise clients around (TortoiseCVS, TortoiseHG, ...) the icon limit becomes a real problem. To work around this, the TortoiseGit project introduced a common shared icon set, loaded as a DLL, which can be used by all Tortoise clients. Check with your client provider to see if this has been integrated yet :-)" msgstr "Sada ima više Tortoise klijenta okolo (TortoiseCVS, TortoiseHG, ...) granice ikona postaju pravi problem. Za rad na ovome TortoiseGit projekat je uveo zajedničke deljiv skup ikona, unete kao DLL, koji se može koristiti sa svim Tortoise klijentima. Proverite sa dobavljačima klijenata da vidite da li su već integrisani :-) " #. (para) #: ../source/TortoiseGit_en.xml:5124 msgid "For a description of how icon overlays correspond to Git status and other technical details, read ." msgstr "Za opis kako ikone prekrivači odgovaraju Subverzionom statusu i ostale tehničke detalje pročitaj ." #. (title) #: ../source/TortoiseGit_en.xml:5131 msgid "TortoiseGit Columns In Windows Explorer" msgstr "TortoiseGit kolumne u vindouz eksploreru" #. (primary) #: ../source/TortoiseGit_en.xml:5133 msgid "Explorer Columns" msgstr "Eksplorer kolumne" #. (para) #: ../source/TortoiseGit_en.xml:5135 msgid "The same information which is available from the icon overlays (and much more) can be displayed as additional columns in Windows Explorer's Details View." msgstr "Iste informacije su dostupne od ikona prekrivača (i mnogo više) može biti prikazano kao dodatna kolona u Windows Explorer-ovom Detaljnom Pogledu." #. (para) #: ../source/TortoiseGit_en.xml:5140 msgid "Simply right click on one of the headings of a column, choose More... from the context menu displayed. A dialog will appear where you can specify the columns and their order, which is displayed in the Detailed View. Scroll down until the entries starting with SVN come into view. Check the ones you would like to have displayed and close the dialog by pressing OK. The columns will be appended to the right of those currently displayed. You can reorder them by drag and drop, or resize them, so that they fit your needs." msgstr "Jednostavni desni klik na jedno od naslova kolona, izaberite Više... iz prikazanog kontekst menija. Dijalog će se pojaviti gde specificirate kolonu i njen red koji je prikazan u Detaljni Pogled. Premotaj do ulaza sa SVN koje dođe pod oko. Proveri to što ste želeli prikazati i zatvorite dijalog pritiskom na OK.Kolone će se dodati desno od one koja je prikazana trenutno. Možete preurediti ih vučenjem i bacanjem, ili promenom njihove veličine, tako da to popunjava vaše potrebe." #. (para) #: ../source/TortoiseGit_en.xml:5152 msgid "The additional columns in the Windows Explorer are not available on Vista, since Microsoft decided to not allow such columns for all files anymore but only for specific file types." msgstr "Dodatne kolone u Windows Explorernisu dostupne u Vista, kako je Microsoft odlučio da ne dozvoli takve kolone za sve fajlove samo za specifične tipove fajlova." #. (para) #: ../source/TortoiseGit_en.xml:5158 msgid "If you want the current layout to be displayed in all your working copies, you may want to make this the default view." msgstr "Ako želite tekući izgled da bude prikazan u vašoj radnoj kopiji, možete učiniti to uobičajenim pogledom." #. (title) #: ../source/TortoiseGit_en.xml:5166 msgid "Local and Remote Status" msgstr "Lokalni i daljinski status" #. (primary) #: ../source/TortoiseGit_en.xml:5171 msgid "modifications" msgstr "izmene" #. (title) #. (title) #: ../source/TortoiseGit_en.xml:5175 #: ../source/TortoiseGit_en.xml:14979 msgid "Check for Modifications" msgstr "Provera izmena" #. (para) #: ../source/TortoiseGit_en.xml:5173 msgid " It's often very useful to know which files you have changed and also which files got changed and committed by others. That's where the command TortoiseGitCheck For Modifications... comes in handy. This dialog will show you every file that has changed in any way in your working copy, as well as any unversioned files you may have." msgstr " To je često jako korisno znati koje fajlove ste menjali i takođe koji fajlovi su izmenjeni i urezani od drugih. To je gde komanda TortoiseGitProveri Modifikacije... dolazi ručno. Ovaj dijalog će vam pokazati svaki fajl koji se izmenio na bilo koji način u vašoj radnoj kopiji, kao i bilo koje neverzionisane fajlove koje možete imati." #. (para) #: ../source/TortoiseGit_en.xml:5190 msgid "If you click on the Check Repository then you can also look for changes in the repository. That way you can check before an update if there's a possible conflict. You can also update selected files from the repository without updating the whole folder." msgstr "Ako kliknetet na Proveri Spremište tada možete pogledati izmene u spremištu. Na taj način možete proveriti pre ažuriranja ako ima mogučih konflikta. Takođe možete ažurirati izabrane fajlove iz spremišta bez ažuriranja celog imenika." #. (para) #: ../source/TortoiseGit_en.xml:5204 msgid "Locally modified items." msgstr "Lokalno imenjene stavke." #. (para) #: ../source/TortoiseGit_en.xml:5212 msgid "Added items. Items which have been added with history have a + sign in the Text status column, and a tooltip shows where the item was copied from." msgstr "Dodate stavke. Stavke koje su dodate sa istorijom ima jedan + znak u Tekst status koloni, i alattip prikazuje odakle su stavke kopirane." #. (para) #: ../source/TortoiseGit_en.xml:5224 msgid "Deleted or missing items." msgstr "Obrisane ili nedostajuće stavke." #. (para) #: ../source/TortoiseGit_en.xml:5232 msgid "Items modified locally and in the repository. The changes will be merged on update. These may produce conflicts on update." msgstr "Stavke izmenjene lokalno i u spremištu. Izmene će biti stopljeni pri ažuriranju. Ovi mogu proizvesti konflikte pri ažuriranju." #. (para) #: ../source/TortoiseGit_en.xml:5242 msgid "Items modified locally and deleted in repository, or modified in repository and deleted locally. These will produce conflicts on update." msgstr "Stavke izmenjene lokalno i izbrisane u spremištu, ili izmenjene u spremištu i obrisane lokalno. Ovo će proizvesti konflikte pri ažuriranju." #. (para) #: ../source/TortoiseGit_en.xml:5252 msgid "Unchanged and unversioned items." msgstr "Nepromenjen i neverzionisane stavke." #. (para) #: ../source/TortoiseGit_en.xml:5198 msgid "The dialog uses colour coding to highlight the status. " msgstr "Dijalog koristi kolor kodiranje da osvetli satus. " #. (para) #: ../source/TortoiseGit_en.xml:5270 msgid "From the context menu of the dialog you can show a diff of the changes. Check the local changes you made using Context MenuCompare with Base. Check the changes in the repository made by others using Context MenuShow Differences as Unified Diff." msgstr "Iz kontekst menija dijaloga možete prikazati razlike izmena. Provera lokalnih izmena vi uradite korišćenjem Kontekst MeniUporedi sa Osnovom. Proverite izmene u spremištu koje su uradili drugi koristeći Kontekst MeniPrikaži Razlike kao Ujedinjene Razlike." #. (para) #: ../source/TortoiseGit_en.xml:5283 msgid "You can also revert changes in individual files. If you have deleted a file accidentally, it will show up as Missing and you can use Revert to recover it." msgstr "Takođe možete vratiti izmene u individualnim fajlovima. Ako slučajno obrišete fajl, to će biti prikazano kao Nedostaje i možete koristiti Vrati da se to pokrije." #. (para) #: ../source/TortoiseGit_en.xml:5288 msgid "Unversioned and ignored files can be sent to the recycle bin from here using Context MenuDelete. If you want to delete files permanently (bypassing the recycle bin) hold the Shift key while clicking on Delete." msgstr "Neverzionisani i zanemareni fajlovi mogu biti poslati korpu za otpatke koristeći Kontekst MeniObriši. Ako želiti da obrišete fajlove za stalno (premošćavanjem korpe za otpatke) držite Šifttaster dok kliknete na Obriši." #. (para) #: ../source/TortoiseGit_en.xml:5297 msgid "If you want to examine a file in detail, you can drag it from here into another application such as a text editor or IDE." msgstr "Ako želite da pregledate detaljno fajl, možete ga povući odavde u drugu aplikaciju kao što je uređivač teksta ili IDE." #. (para) #: ../source/TortoiseGit_en.xml:5301 msgid "The columns are customizable. If you right click on any column header you will see a context menu allowing you to select which columns are displayed. You can also change column width by using the drag handle which appears when you move the mouse over a column boundary. These customizations are preserved, so you will see the same headings next time." msgstr "Kolone su podesive. Ako uradite desni klik na bilo koje zaglavlje kolone videćete kontekst meni koji vam omogućava da izaberete koje kolone će biti prikazane. Takođe možete izmeniti kolone koristeći vučnu ručicu koja se pojavljuje kada pomerate miša preko granica kolona. Ova podešavanja su sačuvana, tako da ćete videti ista zaglavlja sledeći put." #. (para) #: ../source/TortoiseGit_en.xml:5310 msgid "If you are working on several unrelated tasks at once, you can also group files together into changelists. Read for more information." msgstr "Ako radite na više nezavisnih zadataka odjednom, možete takođe grupirati fajlove zajedno u listu izmena. Pročitajte za više informacija." #. (para) #: ../source/TortoiseGit_en.xml:5315 msgid "At the bottom of the dialog you can see a summary of the range of repository revisions in use in your working copy. These are the commit revisions, not the update revisions; they represent the range of revisions where these files were last committed, not the revisions to which they have been updated. Note that the revision range shown applies only to the items displayed, not to the entire working copy. If you want to see that information for the whole working copy you must check the Show unmodified files checkbox." msgstr "Na dnu dijaloga možete videti zbir opsega revizija spremišta u vašoj radnoj kopiji. Ovo su urezane revizije, nisu ažurirane revizije; one predstavljaju opseg revizija gde su ovi fajlovi zadnji urezani, ne revizije koje su ažurirane. Primetimo da je prikazani opseg revizija primenjen samo na prikazanim stavkama, ne na celu radni kopiju. Ako želite da vidite te informacije za celu radnu kopiju morate proveriti Prikaži nemodifikovane fajlove čekboks." #. (para) #: ../source/TortoiseGit_en.xml:5326 msgid "If you want a flat view of your working copy, i.e. showing all files and folders at every level of the folder hierarchy, then the Check for Modifications dialog is the easiest way to achieve that. Just check the Show unmodified files checkbox to show all files in your working copy." msgstr "Ako želite jasan pregled radne kopije, tj. prikazujući sve fajlove na svakom nivou hijerarhije imenika, onda Proveri Modifikacije dijalog je najlakši način da se to dostigne. Samo proverite Prikaži nemodifikovane fajlove čekboks da prikažetefajlove u vašoj radnoj kopiji." #. (title) #: ../source/TortoiseGit_en.xml:5352 msgid "Viewing Diffs" msgstr "Pregled Razl" #. (primary) #: ../source/TortoiseGit_en.xml:5354 msgid "diffing" msgstr "razlikovanje" #. (para) #: ../source/TortoiseGit_en.xml:5356 msgid "Often you want to look inside your files, to have a look at what you've changed. You can accomplish this by selecting a file which has changed, and selecting Diff from TortoiseGit's context menu. This starts the external diff-viewer, which will then compare the current file with the pristine copy (BASE revision), which was stored after the last checkout or update." msgstr "Često želite da pogledate unutar vaših fajlova da vidite šta ste menjali. Možete izvršiti ovo izborom fajla koji je izmenjen i izborom Diff iz TortoiseGit-ov kontekst meni. Ovo pokreće spoljašnji diff-pregledač, koji će uporediti tekući fajl sa čistom kopijom (OSNOVNA revizija), što je sačuvano posle zadnjeg preuzimanja ili ažuriranja. " #. (para) #: ../source/TortoiseGit_en.xml:5366 msgid "Even when not inside a working copy or when you have multiple versions of the file lying around, you can still display diffs:" msgstr "Čak i kad nij unutar radne kopije ili kada imate više verzija fajla koji leže okolo, možete još uvek prikazati razlike:" #. (para) #: ../source/TortoiseGit_en.xml:5370 msgid "Select the two files you want to compare in explorer (e.g. using Ctrl and the mouse) and choose Diff from TortoiseGit's context menu. The file clicked last (the one with the focus, i.e. the dotted rectangle) will be regarded as the later one." msgstr "Izaberite dva fajla koja želite da uporedite u eksploreru (npr. koristeći Ctrl i miš) i izaberite Diff iz TortoiseGit.ovog kontekstnog menija. Fajl na koji je poslednji put kliknuto (onaj koji je u fokusu, tj. tačkasti pravougaonik) biće pregledan kao kasniji." #. (primary) #: ../source/TortoiseGit_en.xml:5384 msgid "changelist" msgstr "popis izmena" #. (para) #: ../source/TortoiseGit_en.xml:5386 msgid "In an ideal world, you only ever work on one thing at a time, and your working copy contains only one set of logical changes. OK, back to reality. It often happens that you have to work on several unrelated tasks at once, and when you look in the commit dialog, all the changes are mixed in together. The changelist feature helps you group files together, making it easier to see what you are doing. Of course this can only work if the changes do not overlap. If two different tasks affect the same file, there is no way to separate the changes." msgstr "U idealnom svetu, vi uvek radite samo na jednoj stvari u vremenu, i vaša radna kopija sadrži samo jedan skup logičnih izmena. OK, vratimo se realnosti. To se često dešava da imate da radite na više nezavisnih zadataka odjednom, i kada pogledate u dijalog urezivanja, sve izmene su pomešane zajedno. Osobina lista izmena pomaže vam da grupišete fajlove zajedno, čineći to lakim da se vidi šta radite. Naravno ovo se može raditi samo ako izmene nisu preklopljene. Ako dva različita posla dotiču isti fajl, nema načina da izdvojite izmene." #. (para) #: ../source/TortoiseGit_en.xml:5397 msgid "The changelist feature in TortoiseGit is only available in Windows XP and later, as it depends on a shell capability which is not present in Windows 2000. Sorry, but Win2K is really quite old now, so please don't complain." msgstr "Osobina liste izmena u TortoiseGit su dostupne samo u Windows XP i kasnije, kako to zavisi u mogućnostima školjke, koje nisu prisutne u Windows 2000. Izvinite, ali Win2K je zaista sasvim star sada, tako molimo ne žalite se." #. (para) #: ../source/TortoiseGit_en.xml:5404 msgid "You can see changelists in several places, but the most important ones are the commit dialog and the check-for-modifications dialog. Let's start in the check-for-modifications dialog after you have worked on several features and many files. When you first open the dialog, all the changed files are listed together. Suppose you now want to organise things and group those files according to feature." msgstr "Možete videti listu promena na više mesta, ali najvažnije je dijalog urezivanja i proveri-za-izmene dijalogu. Počnimo u proveri-za-izmene dijalogu posle vašeg rada na više osobina i više fajlova. Kada prvi put otvorite dijalog svi izmenjeni fajlovi su izlistani zajedno. Pretpostavimo da želite organizovati stvari i grupisati te fajlove saglano sa osobinama." #. (para) #: ../source/TortoiseGit_en.xml:5412 msgid "Select one or more files and use Context MenuMove to changelist to add an item to a changelist. Initially there will be no changelists, so the first time you do this you will create a new changelist. Give it name which describes what you are using it for, and click OK. The dialog will now change to show groups of items." msgstr "Izaberite jedan ili više fajlova i koristite Kontekst MeniPomeri u listu izmena da dodate stavku u listu izmena. Početno nema liste izmena tako da najpre treba kreirati novu listu izmena. Dajte joj ime koje opisuje za šta ćete je koristiti i kliknite OK.Dijalog se menja da pokaže grupe stavki." #. (para) #: ../source/TortoiseGit_en.xml:5424 msgid "Once you have created a changelist you can drag and drop items into it, either from another changelist, or from Windows Explorer. Dragging from Explorer can be useful as it allows you to add items to a changelist before the file is modified. You could do that from the check-for-modifications dialog, but only by displaying all unmodified files." msgstr "Kada jednom kreirate listu izmena možete vući i baciti stavke u nju, ili iz druge liste izmena, ili iz Windows Explorer. Vučenjem iz Eksplorera može biti korisno ako vam dozvoljava da dodate stavke u listu izmena u listu izmena pre nego je fajl izmenjen. Mogli ste to uraditi iz proveri-za-izmene dijaloga, ali samo prikazivanjem sve neizmenjene fajlove." #. (title) #: ../source/TortoiseGit_en.xml:5433 msgid "Commit dialog with Changelists" msgstr "Dijalog urezivanja sa listom promena" #. (para) #: ../source/TortoiseGit_en.xml:5431 msgid " In the commit dialog you can see those same files, grouped by changelist. Apart from giving an immediate visual indication of groupings, you can also use the group headings to select which files to commit." msgstr " U dijalogu urezivanja možete videti ove iste fajlove, grupisane listom izmena. Osim što daje trenutnu vizuelnu indikaciju grupisanja, možete koristiti grupna zaglavlja da izaberete koji fajl urezati." #. (para) #: ../source/TortoiseGit_en.xml:5440 msgid "On XP, there is a context menu when you right click on a group heading which gives you the choice to check or uncheck all group entries. On Vista however the context menu is not necessary. Click on the group header to select all entries, then check one of the selected entries to check all." msgstr "Na XP, postoji kontekst meni kada uradite desni klik na grupno zaglavlje koje vam daje izbor da čekirate ili otčekirate sve grupne ulaze. Na Visti međutim, kontekst meni nije neophodan. Kliknite na grupno zaglavlje da izaberete ulaze, zatim čekirajte izabrane ulaze da čekirate sve." #. (para) #: ../source/TortoiseGit_en.xml:5446 msgid "TortoiseGit reserves one changelist name for its own use, namely ignore-on-commit. This is used to mark versioned files which you almost never want to commit even though they have local changes. This feature is described in ." msgstr "TortoiseGit rezerviše jedno ime liste izmena za sopstveno korišćenje, imenom zanemari-pri-urezivanju. Ovo se koristi da se označe verzionisani fajlovi koji skoro nikad ne želite da urežete čak i kada imaju lokalne izmene. Osobina je opisana u ." #. (para) #: ../source/TortoiseGit_en.xml:5452 msgid "When you commit files belonging to a changelist then normally you would expect that the changelist membership is no longer needed. So by default, files are removed from changelists automatically on commit. If you wish to retain the file in its changelist, use the Keep changelists checkbox at the bottom of the commit dialog." msgstr "Kada urezujete fajlove koji pripadaju listi izmena normalno je da očekujete da članovi liste izmena nisu više potrebni. Tako se uobičajeno fajlovi uklone iz liste izmena automatski pri urezivanju. Ako želite zadržati fajl u listi izmena, koristite Čuvaj liste izmena čekboks na dnu dijaloga urezivanja." #. (para) #: ../source/TortoiseGit_en.xml:5460 msgid "Changelists are purely a local client feature. Creating and removing changelists will not affect the repository, nor anyone else's working copy. They are simply a convenient way for you to organise your files." msgstr "Lista izmena je čista mogućnost lokalnog klijenta. kreiranjem i uklanjanjem lista izmena ne utiče na spremište, niti na bilo koju radnu kopiju. Ona je jednostavno uobičajeni način da organizujete vaše fajlove." #. (title) #: ../source/TortoiseGit_en.xml:5468 msgid "Revision Log Dialog" msgstr "Revizioni dijalog dnevnika" #. (primary) #: ../source/TortoiseGit_en.xml:5470 msgid "log" msgstr "dnevnik" #. (primary) #: ../source/TortoiseGit_en.xml:5473 msgid "history" msgstr "istorija" #. (primary) #: ../source/TortoiseGit_en.xml:5476 msgid "commit messages" msgstr "poruke urezivanja" #. (primary) #: ../source/TortoiseGit_en.xml:5479 msgid "log messages" msgstr "poruke dnevnika" #. (para) #: ../source/TortoiseGit_en.xml:5482 msgid "For every change you make and commit, you should provide a log message for that change. That way you can later find out what changes you made and why, and you have a detailed log for your development process." msgstr "Za svaku izmenu koju uradite i urežete, možete omogućiti dnevnik poruka za te izmene. Na taj način možete kasnije naći koje izmene ste uradili i zašto, i imate detaljan dnevnik za vaš razvojni proces." #. (para) #: ../source/TortoiseGit_en.xml:5494 msgid "The top pane shows a list of revisions where changes to the file/folder have been committed. This summary includes the date and time, the person who committed the revision and the start of the log message." msgstr "Gornji panel prikazuje listu revizija gde su izmene fajla/imenika urezane. Rezultat obuhvata datum i vreme, ličnost koja urezuje reviziju i počinje dnevnik poruka." #. (para) #: ../source/TortoiseGit_en.xml:5500 msgid "Lines shown in blue indicate that something has been copied to this development line (perhaps from a branch)." msgstr "Linije prikazane plavo označavaju nešto što je kopirano u ovoj razvojnoj liniji (verovatno iz grane)." #. (para) #: ../source/TortoiseGit_en.xml:5506 msgid "The middle pane shows the full log message for the selected revision." msgstr "Srednji panel prikazuje pun dnevnik poruka za izabranu reviziju." #. (para) #: ../source/TortoiseGit_en.xml:5512 msgid "The bottom pane shows a list of all files and folders that were changed as part of the selected revision." msgstr "Donji panel prikazuje listu fajlova i imenika koji su izmenjeni kao deo izabrane revizije." #. (para) #: ../source/TortoiseGit_en.xml:5488 msgid "The Revision Log Dialog retrieves all those log messages and shows them to you. The display is divided into 3 panes. But it does much more than that - it provides context menu commands which you can use to get even more information about the project history." msgstr "Dnevnik Revizija Dijalog obnavlja dnevnik poruka i prikazuje vam ga. Displej je podeljen u 3 panela, Ali to je mnogo više od toga - to omogućava komandama kontekst menija koje možete koristiti da dobijete čak više informacija o istoriji projekta." #. (title) #: ../source/TortoiseGit_en.xml:5523 msgid "Invoking the Revision Log Dialog" msgstr "Pozivanje na dijalog dnevnika revizija" #. (title) #: ../source/TortoiseGit_en.xml:5526 msgid "The Revision Log Dialog" msgstr "Dijalog dnevnika revizija" #. (para) #: ../source/TortoiseGit_en.xml:5532 msgid "From the TortoiseGit context submenu" msgstr "Iz TortoiseGit kontekst submeni" #. (para) #: ../source/TortoiseGit_en.xml:5537 msgid "From the property page" msgstr "Iz vlasničkih listova" #. (para) #: ../source/TortoiseGit_en.xml:5542 msgid "From the Progress dialog after an update has finished. Then the Log dialog only shows those revisions which were changed since your last update" msgstr "Iz Progresa dijaloga kada je ažuriranje završeno. Tada Dnevnik dijalog samo prikazuje te revizije koje su bile izmenjene od vašeg zadnjeg ažuriranja." #. (para) #: ../source/TortoiseGit_en.xml:5524 msgid " There are several places from where you can show the Log dialog: " msgstr " Ima više mesta odakle možete prikazati Dnevnik dijalog: " #. (title) #: ../source/TortoiseGit_en.xml:5552 msgid "Revision Log Actions" msgstr "Akcije dnevnika revizija" #. (para) #: ../source/TortoiseGit_en.xml:5553 msgid "The top pane has an Actions column containing icons that summarize what has been done in that revision. There are four different icons, each shown in its own column." msgstr "Gornji panel ima Akcije kolonu koja sadrži ikone koje sumiraju šta je dato u reviziji. Ima četiri različitih ikona svaka prikazana u njenoj sopstvenoj koloni." #. (para) #: ../source/TortoiseGit_en.xml:5558 msgid " If a revision modified a file or directory, the modified icon is shown in the first column." msgstr " Ako revizija menja fajl ili imenik, izmenjen ikona je prikazana u prvoj koloni." #. (para) #: ../source/TortoiseGit_en.xml:5563 msgid " If a revision added a file or directory, the added icon is shown in the second column." msgstr " Ako revizija doda fajl ili imenik, dodat ikona je prikazana u drugoj koloni." #. (para) #: ../source/TortoiseGit_en.xml:5568 msgid " If a revision deleted a file or directory, the deleted icon is shown in the third column." msgstr " Ako revizija briše fajl ili imenik, obrisan ikona je prikazana u trećoj koloni." #. (para) #: ../source/TortoiseGit_en.xml:5573 msgid " If a revision replaced a file or directory, the replaced icon is shown in the fourth column." msgstr "Ako je revizija premestila fajl ili imenik, premešten ikona je prikazana u četvrtoj koloni." #. (title) #: ../source/TortoiseGit_en.xml:5580 msgid "Getting Additional Information" msgstr "Dobijanje dodatnih informacija" #. (title) #: ../source/TortoiseGit_en.xml:5583 msgid "The Revision Log Dialog Top Pane with Context Menu" msgstr "Gornji panel kontekstnog menija dnevnika dijaloga revizija" #. (para) #: ../source/TortoiseGit_en.xml:5592 msgid "Compare the selected revision with your working copy. The default Diff-Tool is TortoiseMerge which is supplied with TortoiseGit. If the log dialog is for a folder, this will show you a list of changed files, and allow you to review the changes made to each file individually." msgstr "Uporedite izabranu reviziju sa vašom radnom kopijom. Uobičajeni Diff-alat je TortoiseMerge koji ide uz TortoiseGit. Ako je dijalog dnevnika za imenike, ovo će prikazati listu izmenjenih fajlova, i omogućavaju vam da pregledate izmene učinjene u svakom fajlu individualno." #. (para) #: ../source/TortoiseGit_en.xml:5602 msgid "View the changes made in the selected revision as a Unified-Diff file (GNU patch format). This shows only the differences with a few lines of context. It is harder to read than a visual file compare, but will show all file changes together in a compact format." msgstr "Pregled izmena urađenih u izabranoj reviziji kao Unified-Diff fajl (GNU format zakrpa9. Ovo prikazuje samo razlike između nekih linija sadržaja. To je teže za čitanje od vizuelnog poređenja fajlova, ali će prikazati sve izmene zajedno u kompaktnom obliku. " #. (para) #: ../source/TortoiseGit_en.xml:5611 msgid "Compare the selected revision with the previous revision. This works in a similar manner to comparing with your working copy." msgstr "Upoređuje izabranu reviziju sa prethodnom revizijom. Ovo radi na sličan način pri poređenju vaše radne kopije." #. (para) #: ../source/TortoiseGit_en.xml:5618 msgid "Blame the selected revision, and the file in your working BASE and compare the blame reports using a visual diff tool. Read for more detail. (files only)." msgstr "Okrivljuje izabranu reviziju i fajl u vašoj radnoj OSNOVI i poredi izveštaj okrivljavanja koristeći vizualni diff alat. Pročitajte za više detalja. (samo fajlovi)." #. (para) #: ../source/TortoiseGit_en.xml:5626 msgid "Blame the selected revision, and the previous revision, and compare the results using a visual diff tool. (folders only)." msgstr "Okrivite izabranu reviziju i prethodnu reviziju i uporedite rezultat koristeći vizualni diff alat. (samo imenici)." #. (para) #: ../source/TortoiseGit_en.xml:5633 msgid "Save the selected revision to a file so you have an older version of that file. (files only)." msgstr "Sačuvajte izabranu reviziju u fajl tako da imate stariju verziju tog fajla. (samo fajlovi)." #. (para) #: ../source/TortoiseGit_en.xml:5639 msgid "Open the selected file, either with the default viewer for that file type, or with a program you choose. (files only)." msgstr "Otvora izabrani fajl, ili sa podrazumevanim prikazivačem tog tipa fajlova ili sa programom koji ste izabrali. (samo fajlovi)." #. (para) #: ../source/TortoiseGit_en.xml:5645 msgid "Blame the file up to the selected revision. (files only)." msgstr "Krivac za fajl do izabrane revizije. (samo fajlovi)." #. (para) #: ../source/TortoiseGit_en.xml:5650 msgid "Open the repository browser to examine the selected file or folder in the repository as it was at the selected revision." msgstr "Otvara pretraživač spremišta da pregleda izabrane fajlove u spremištu kakvi su bili u izabranoj reviziji." #. (para) #: ../source/TortoiseGit_en.xml:5656 msgid "Create a branch/tag from a selected revision. This is useful e.g. if you forgot to create a tag and already committed some changes which weren't supposed to get into that release." msgstr "Kreira grana/znak iz izabrane revizije. Ovo je korisno npr. ako zaboravite da kreirate znak i već ste urezali neke izmene koje nisu bile pretpostavljene da dođu u tu realizaciju." #. (para) #: ../source/TortoiseGit_en.xml:5664 msgid "Update your working copy to the selected revision. Useful if you want to have your working copy reflect a time in the past. It is best to update a whole directory in your working copy, not just one file, otherwise your working copy will be inconsistent and you will be unable to commit any changes." msgstr "Ažurirajte vašu radnu kopiju na izabranu reviziju. Korisno ako želite da vaša radna kopija odslikava prošlo vreme. Najbolje je ažurirati ceo imenik u vašoj radnoj kopiji, ne samo jedan fajl, inače će vaša radna kopija postati nekonzistentna i nećete biti sposobni da urežete bilo koju izmenu. " #. (para) #: ../source/TortoiseGit_en.xml:5674 msgid "Revert changes from which were made in the selected revision. The changes are reverted in your working copy so this operation does not affect the repository at all! Note that this will undo the changes made in that revision only. It does not replace your working copy with the entire file at the earlier revision. This is very useful for undoing an earlier change when other unrelated changes have been made since. If you have made local changes, this command will merge these changes into your working copy." msgstr "Vraća izmene od kojih je urađena u izabranoj reviziji. Izmene su vraćene u vašu radnu kopiju tako da ta operacija ne menja spremište uopšte! Primetimo da će to poništiti izmene urađene samo u toj reviziji. To ne menja vašu radnu kopiju celim fajlom u ranijoj reviziji. Ovo je jako korisno poništavanje ranijih izmena kada druge su već urađene druge nezavisne izmene. Ako uradite lokalne izmene ova komanda će stopiti te izmene u vašoj radnoj kopiji." #. (para) #: ../source/TortoiseGit_en.xml:5688 msgid "Revert to an earlier revision. If you have made several changes, and then decide that you really want to go back to how things were in revision N, this is the command you need. Again, the changes are reverted in your working copy so this operation does not affect the repository until you commit the changes. Note that this will undo all changes made after the selected revision, replacing the file/folder with the earlier version. If you have made local changes, this command will merge these changes into your working copy." msgstr "Vraća u raniju reviziju. Ako ste uradili više izmena, i tada odlučili to da zaista želite da vratite kako su stvari bile u reviziji N, ova komanda vam je potrebna. Ponovo, izmene su vraćene u vašu radnu kopiju tako da ova operacija ne menja spremište dok urezujete izmene. Primetite da će ovo poništiti sve izmene urađene posle izbora revizije, zamena fajl/imenik sa ranijom verzijom. Ako ste uradili lokalne izmene ova komanda će stopiti ove izmene u vašu radnu kopiju." #. (para) #: ../source/TortoiseGit_en.xml:5702 msgid "Merge the selected revision(s) into a different working copy. A folder selection dialog allows you to choose the working copy to merge into, but after that there is no confirmation dialog, nor any opportunity to try a dry run. It is a good idea to merge into an unmodified working copy so that you can revert the changes if it doesn't work out! This is a useful feature if you want to merge selected revisions from one branch to another." msgstr "Stapa izabranu reviziju(e) u različite radne kopije. Dijalog izbora imenika dozvoljava vam da izaberete radnu kopiju u koju stapate, ali posle toga nema dijaloga potvrde, niti bilo kakvo suprotstavljanje da počnete čist rad. Dobra je ideja stopiti u nemodifikovanu radnu kopiju tako da možete vratiti izmene ako to ne radi!Ovo je korisna osobina ako želite da stopite izabranu reviziju iz jedne grane u drugu." #. (para) #: ../source/TortoiseGit_en.xml:5714 msgid "Make a fresh checkout of the selected folder at the selected revision. This brings up a dialog for you to confirm the URL and revision, and select a location for the checkout." msgstr "Uradite sveže preuzimanje izabranog imenika u izabranoj reviziji. To izbacuje dijalog za vas da se potvrdi URL i revizija, i izabere lokacija za preuzimanje." #. (para) #: ../source/TortoiseGit_en.xml:5721 msgid "Export the selected file/folder at the selected revision. This brings up a dialog for you to confirm the URL and revision, and select a location for the export." msgstr "Izvoz izabranog fajla/imenika u izabranoj reviziji. To izbacuje dijalog za vas da potvrdite URL i reviziju, i izbor lokaciju za izvoz." #. (para) #: ../source/TortoiseGit_en.xml:5728 msgid "Edit the log message or author attached to a previous commit. Read to find out how this works." msgstr "Uređuje dnevnik poruka ili autora spojenih prethodnim urezivanjem. Pročitajte da nađete kako to radi." #. (para) #: ../source/TortoiseGit_en.xml:5735 msgid "Copy the log details of the selected revisions to the clipboard. This will copy the revision number, author, date, log message and the list of changed items for each revision." msgstr "Kopira detalje dnevnika o izabranim revizijama za klipbord. Ovo će kopirati revizioni broj, autora, datum, dnevnik poruka i listu izmenjenih stavki za svaku reviziju." #. (para) #: ../source/TortoiseGit_en.xml:5742 msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Git (shown in the bottom pane). The search is not case sensitive." msgstr "Pretražuje dnevnik poruka za tekst koji ste uneli. To pretražuje dnevnik poruka koje ste uneli i takođe zbirnu akciju kreiranu Subverzijom (prikazan u donjem panelu). Pretraživanje ne zavisi od veličine slova." #. (para) #: ../source/TortoiseGit_en.xml:5581 msgid " The top pane of the Log dialog has a context menu that allows you to access much more information. Some of these menu entries appear only when the log is shown for a file, and some only when the log is shown for a folder. " msgstr " gornjem panel dijaloga Dnevnika ima kontekst meni koji omogućava da pristupite ka mnogo više informacija. Neke od tih ulaza menija pojavljuju se samo kada je dnevnik prikazan za fajl, a neki samo kada je dnevnik prikazan za imenik. " #. (title) #: ../source/TortoiseGit_en.xml:5753 msgid "Top Pane Context Menu for 2 Selected Revisions" msgstr "Gornji panel kontekstnog menija za 2 izabrane revizije" #. (para) #: ../source/TortoiseGit_en.xml:5761 msgid "Compare the two selected revisions using a visual difference tool. The default Diff-Tool is TortoiseMerge which is supplied with TortoiseGit." msgstr "Upoređuje dve izabrane revizije koristeći vizuelni alat razlike. Podrazumevan Diff-Alat je TortoiseMerge koji ide uz TortoiseGit." #. (para) #: ../source/TortoiseGit_en.xml:5766 msgid "If you select this option for a folder, a further dialog pops up listing the changed files and offering you further diff options. Read more about the Compare Revisions dialog in ." msgstr "Ako izaberete opciju za imenik, sledeći dijalog izbaci listing izmenjenih fajlova i dozvoljava vam dalje diff opcije. Pročitajte više o Dijalogu Poređenja Revizija u ." #. (para) #: ../source/TortoiseGit_en.xml:5774 msgid "Blame the two revisions and compare the blame reports using a visual difference tool. Read for more detail." msgstr "Okrivljuje dve revizije i poredi izveštaj okrivljavanja koristeći vizuelni alat razlika. Pročitajte za više detalja." #. (para) #: ../source/TortoiseGit_en.xml:5781 msgid "View the differences between the two selected revisions as a Unified-Diff file. This works for files and folders." msgstr "Pregleda razlike između dve izabrane revizije kao Ujedinjen-Diff fajl. To radi za fajlve i imenike." #. (para) #: ../source/TortoiseGit_en.xml:5787 msgid "Copy log messages to clipboard as described above." msgstr "Kopiranje dnevnika poruka u klipbord kako je opisano iznad." #. (para) #: ../source/TortoiseGit_en.xml:5792 msgid "Search log messages as described above." msgstr "Traženje poruka dnevnika kako je opisano iznad." #. (para) #: ../source/TortoiseGit_en.xml:5751 msgid " If you select two revisions at once (using the usual Ctrl-modifier), the context menu changes and gives you fewer options: " msgstr " Ako izaberete dve revizije odjednom (koristeći uobičajen Ctrl-modifikator), kontekst meni se menja i daje vam manje opcija: " #. (para) #: ../source/TortoiseGit_en.xml:5798 msgid "If you select two or more revisions (using the usual Ctrl or Shift modifiers), the context menu will include an entry to Revert all changes which were made in the selected revisions. This is the easiest way to rollback a group of revisions in one go." msgstr "Ako izaberete dve ili više revizija (koristeći obično Ctrlili Shift modifikator), kontekst meni će uneti ulaz da Vrati sve izmene koje su urađene u izabranoj reviziji. Ovo je najlakši način za vraćanje grupe revizija u jednom potezu." #. (para) #: ../source/TortoiseGit_en.xml:5805 msgid "You can also choose to merge the selected revisions to another working copy, as described above." msgstr "Možete takođe izabrati da stopite izabrane revizije u drugu radnu kopiju, kako je gore opisano." #. (title) #: ../source/TortoiseGit_en.xml:5811 msgid "The Log Dialog Bottom Pane with Context Menu" msgstr "Dijalog dnevnika donji panel sa kontekstnim menijem" #. (para) #: ../source/TortoiseGit_en.xml:5817 msgid "Show changes made in the selected revision for the selected file. This context menu is only available for files shown as modified." msgstr "Prikazivanje izmena u izabranoj reviziji za izabrani fajl. ovaj kontekst meni je dostupan samo za fajlove prikazane kao izmenjeni." #. (para) #: ../source/TortoiseGit_en.xml:5824 msgid "Blame the selected revision and the previous revision for the selected file, and compare the blame reports using a visual diff tool. Read for more detail." msgstr "Okrivljavanje izabrane revizije i prethodne revizije za izabrane fajlove, i poređenje izveštaja okrivljavanja koristeći vizualni alat razlike. Pročitajte za više detalja." #. (para) #. (para) #: ../source/TortoiseGit_en.xml:5832 #: ../source/TortoiseGit_en.xml:9559 msgid "Open the selected file, either with the default viewer for that file type, or with a program you choose." msgstr "Otvara izabrani fajl, ili sa podrazumevanim pregedačem tog tipa fajlova, ili sa programom koji izaberete." #. (para) #: ../source/TortoiseGit_en.xml:5838 msgid "Revert the changes made to the selected file in that revision." msgstr "Vratiti izmene učinjene izabranim fajlovima u toj reviziji." #. (para) #: ../source/TortoiseGit_en.xml:5843 msgid "View the Git properties for the selected item." msgstr "Vidi Subverzijine osobine za izabranu stavku." #. (para) #: ../source/TortoiseGit_en.xml:5848 msgid "Show the revision log for the selected single file." msgstr "Prikazuje revizioni dnevnik za izabrane pojedinačne fajlove." #. (para) #: ../source/TortoiseGit_en.xml:5853 msgid "Save the selected revision to a file so you have an older version of that file." msgstr "Sačuvati izabranu reviziju fajla tako da imate staru verziju tog fajla." #. (para) #: ../source/TortoiseGit_en.xml:5809 msgid " The bottom pane of the Log dialog also has a context menu that allows you to " msgstr " Donji panel Dnevnik dijalga takođe ima kontekst meni koji vam omogućava da " #. (para) #: ../source/TortoiseGit_en.xml:5861 msgid "You may notice that sometimes we refer to changes and other times to differences. What's the difference?" msgstr "Možete zapaziti da ponekad govorimo o izmenama a drugi put o razlikama. U čemu je razlika?" #. (para) #: ../source/TortoiseGit_en.xml:5865 msgid "Git uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. Done in r1234 means that the changes committed in r1234 implement feature X. To make it clearer which sense is being used, we use two different terms." msgstr "Subverzija koristi revizione brojeve da označi 2 različite stvari. Revizija generalno predstavlja stanje spremišta u vremenskom trenutku, ali može takođe, biti korišćena da predstavi skup izmena koji je kreirala ta revizija, npr. quote>Dato u r1234 znači da su izmene urezane u r1234 implementiraju osobinu X. Da se to učini jasnim koji osećaj je korišćen, koristimo dva različita termina." #. (para) #: ../source/TortoiseGit_en.xml:5874 msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Git terms this is diff -r M:N." msgstr "Ako izabrete dve revizije N i M, kontekst meni će ponuditi da prikaže razlike između te dve revizije. U Subverzijinim terminima to je diff -r M:N." #. (para) #: ../source/TortoiseGit_en.xml:5880 msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Git terms this is diff -r N-1:N or diff -c N." msgstr "Ako izaberete pojedinačnu reviziju N, kontekst meni će ponuditi da prikaže izmene napravljene u toj reviziji. U Subverzijinim terminima to je diff -r N-1:N ili diff -c N." #. (para) #: ../source/TortoiseGit_en.xml:5886 msgid "The bottom pane shows the files changed in all selected revisions, so the context menu always offers to show changes." msgstr "Donji panel prikazuje fajlove izmenjene u svim izabranim revizijama, tako kontekst meni uvek dozvoljava prikazivanje izmen." #. (title) #: ../source/TortoiseGit_en.xml:5893 msgid "Getting more log messages" msgstr "Dobijanje više poruka dnevnika" #. (para) #: ../source/TortoiseGit_en.xml:5899 msgid "For a large repository there may be hundreds or even thousands of changes and fetching them all could take a long time. Normally you are only interested in the more recent changes. By default, the number of log messages fetched is limited to 100, but you can change this value in TortoiseGitSettings ()," msgstr "Za ogromna spremišta može biti stotine ili čak hiljade izmena i sve ih pronaći može uzeti mnogo vremena. Normalno, vas interesuju samo najskorije izmene. Podrazmeva se da broj donetih poruka dnevnika ograničen je na 100, ali možete promeniti ovu vrednost u menuchoice>TortoiseGitPodešavanja ()," #. (para) #: ../source/TortoiseGit_en.xml:5914 msgid "When the Stop on copy/rename box is checked, Show Log will stop at the point that the selected file or folder was copied from somewhere else within the repository. This can be useful when looking at branches (or tags) as it stops at the root of that branch, and gives a quick indication of changes made in that branch only." msgstr "Kada je Stani na kopiraj/preimenj boks čekiran, Prikaži Dnevnik će stati u tačku gde je izabrani fajl ili imenik kopiran od negde u okviru spremišta. Ovo može biti korisno kada tražimo grane (ili značke) kako su stale u korenu te grane, i daje brz pokazatelj izmena učinjenih samo u toj grani. " #. (para) #: ../source/TortoiseGit_en.xml:5923 msgid "Normally you will want to leave this option unchecked. TortoiseGit remembers the state of the checkbox, so it will respect your preference." msgstr "Normalno vi želite da ostavite opcije nečekirane. TortoiseGit pamti stanje čekboksa, tako će on poštovati vaše preference." #. (para) #: ../source/TortoiseGit_en.xml:5928 msgid "When the Show Log dialog is invoked from within the Merge dialog, the box is always checked by default. This is because merging is most often looking at changes on branches, and going back beyond the root of the branch does not make sense in that instance." msgstr "Kada je Prikaži Dnevnik dijalog pozvan u okviru Stopi dijaloga, boks je uvek čekirana kao podrazumevano. To je zbog toga što stapanje najčešće gleda u izmene na granama, i vraćanje ispod korena grane ne čini mišta u tom slučaju. " #. (para) #: ../source/TortoiseGit_en.xml:5935 msgid "Note that Git currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked." msgstr "Primetimo da Subverzija tekuće postavlja preimenovanje kao kopiraj/briši par, tako preimenovanje fajla ili imenika će takođe, uzrokovati zaustavljanje displeja dnevnika ako je ova opcija čekirana." #. (para) #: ../source/TortoiseGit_en.xml:5894 msgid "The Log dialog does not always show all changes ever made for a number of reasons: " msgstr "Dnevnik dijalog ne prikazuje uvek sve izmene ikad urađene iz brojnih razloga: " #. (para) #: ../source/TortoiseGit_en.xml:5944 msgid "If you want to see more log messages, click the Next 100 to retrieve the next 100 log messages. You can repeat this as many times as needed." msgstr "Ako želite da vidite više poruka dnevnika, kliknite Sledećih 100 da vratite sledećih 100 poruka dnevnika. Možete ponoviti ovo toliko puta koliko želite." #. (para) #: ../source/TortoiseGit_en.xml:5949 msgid "Next to this button there is a multi-function button which remembers the last option you used it for. Click on the arrow to see the other options offered." msgstr "Sledeće do ovog dugmeta je multi-funkciono dugme koje pamti zadnje opcije za koje ste ga koristili. Kliknite na strelicu da vidite druge opcije koje su ponuđene." #. (para) #: ../source/TortoiseGit_en.xml:5954 msgid "Use Show Range ... if you want to view a specific range of revisions. A dialog will then prompt you to enter the start and end revision." msgstr "Koristite Prikaži Opseg ... ako želite da vidite specifičan opseg revizija. Dijalog će vas onda pitati da unesete početnu i krajnju reviziju." #. (para) #: ../source/TortoiseGit_en.xml:5959 msgid "Use Show All if you want to see all log messages from HEAD right back to revision 1." msgstr "Koristite Prikaži sve ako želite da vidite ceo dnevnik poruka iz GLAVNE nazad do revizije 1." #. (title) #: ../source/TortoiseGit_en.xml:5965 msgid "Current Working Copy Revision" msgstr "Tekuća Revizija Radne Kopije" #. (para) #: ../source/TortoiseGit_en.xml:5966 msgid "Because the log dialog shows you the log from HEAD, not from the current working copy revision, it often happens that there are log messages shown for content which has not yet been updated in your working copy. To help make this clearer, the commit message which corresponds to the revision you have in your working copy is shown in bold." msgstr "Zato što dnevnik dijalog prikazuje dnevnik od GLAVNE, ne od tekuće revizije radne kopije, to se često dešava tamo gde je dnevnik poruka prikazan za sadržaj koji još nije ažuriran u vašoj radnoj kopiji. Pomoć to čini jasnijim, poruka urezivanja koja odgovara reviziji koju imate u vašoj radnoj kopiji prikazana je masnim slovima." #. (para) #: ../source/TortoiseGit_en.xml:5974 msgid "By default this only works for files. This is because the update revision for a folder may not correspond to the update revision of its content, and the only way to find the effective update revision for the folder is to crawl the working copy. This can be a slow operation for large working copies so if you want to enable this feature you must create a DWORD registry key with value 1 at HKCU\\Software\\TortoiseGit\\RecursiveLogRev." msgstr "Uobičajeno ovo samo radi za fajlove. To je zato što ažurirana revizija za imenike ne odgovara ažuriranoj reviziji njenog sadržaja, i jedini je način da se nađe efektivno ažurirana revizija za imenik je puzanje kroz radnu kopiju. Ovo može biti spora operacija za velike radne kopije tako da ako želite da omogućite ovu osobinu morate kreirati DWORDključ registra sa vrednošću 1 u HKCU\\Software\\TortoiseGit\\RecursiveLogRev." #. (title) #: ../source/TortoiseGit_en.xml:5986 msgid "Merge Tracking Features" msgstr "Spajanje osobina praćenja" #. (primary) #: ../source/TortoiseGit_en.xml:5988 msgid "merge tracking log" msgstr "dnevnik spajanja praćenja" #. (para) #: ../source/TortoiseGit_en.xml:5990 msgid "Git 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development." msgstr "Subverzija 1.5 i kasnije čuvaju svedočanstvo o stapanju koristeći osobine. Ovo nam omogućava da dobijemo detaljniju istoriju stopljenih izmena. Na primer, ako razvijate nove osobine na grani i zatim stopite tu granu nazad u deblo, dalji razvoj će pokazati u dnevniku debla pojednačno urezivanje za stapanje, čak i ako možda ima 1000 urezivanja u toku razvoja grane." #. (title) #: ../source/TortoiseGit_en.xml:5999 msgid "The Log Dialog Showing Merge Tracking Revisions" msgstr "Dijalog dnevnika koji prikazuje spajanje praćenja revizija" #. (para) #: ../source/TortoiseGit_en.xml:6002 msgid "If you want to see the detail of which revisions were merged as part of that commit, use the Include merged revisions checkbox. This will fetch the log messages again, but will also interleave the log messages from revisions which were merged. Merged revisions are shown in grey because they represent changes made on a different part of the tree." msgstr "Ako želite da vidite detalje koje revizije su stopljene kao deo tog urezivanja, koristite Uključene stopljene revizije čekboks. To će ponovo naći dnevnik poruka, ali će takođe ubaciti dnevnik poruka iz revizija koje su stopljene. Stopljene revizije su prikazane sivo jer prikazuju izmene učinjene na različitim delovima stabla." #. (para) #: ../source/TortoiseGit_en.xml:6010 msgid "Of course, merging is never simple! During feature development on the branch there will probably be occasional merges back from trunk to keep the branch in sync with the main line code. So the merge history of the branch will also include another layer of merge history. These different layers are shown in the log dialog using indentation levels." msgstr "Svakako, stapanje nikad nije jednostavno! U toku daljeg razvoja na grani verovatno će biti slučajnih stapanja nazad iz debla da se sačuva grana i sinkronizuje sa glavnom linijom koda. Tako da istorija stapanja grane takođe uključuje sledeći sloj istorije stapanja. Ovi različiti slojevi su prikazani u dijalogu dnevnika koristeći nivoe uvlačenja." #. (title) #: ../source/TortoiseGit_en.xml:6020 msgid "Changing the Log Message and Author" msgstr "Izmena poruka dnevnika i autora" #. (primary) #: ../source/TortoiseGit_en.xml:6022 msgid "edit log/author" msgstr "uredi dnevnik/autor" #. (para) #: ../source/TortoiseGit_en.xml:6024 msgid "Sometimes you might want to change a log message you once entered, maybe because there's a spelling error in it or you want to improve the message or change it for other reasons. Or you want to change the author of the commit because you forgot to set up authentication or..." msgstr "Ponekad možete poželeti da izmenite dnevnik poruku koju ste nekad uneli, možda zato što je sintksna greška u njoj ili želite da poboljšate poruku ili je izmenite iz drugih razloga. Ili želite da izmenite autora urezivanja jer ste zaboravili da podesite autentifikaciju ili..." #. (para) #: ../source/TortoiseGit_en.xml:6031 msgid "Git lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on Hook Scripts in the Git Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." msgstr "Subvezija vam dopušta da menjate dnevnik poruku i autora revizije kad god želite. Ali kako takve izmene ne mogu biti poništene (te izmene nisu verzionisane) ova osobina je podrazumevano onemogućena. Da se uradi ovaj posao, morate podesiti pre-revprop-izmene zakačaljku. Molim pogledajte poglavlje na Hook Scripts u Subverzionoj Knjizi za detalje kako da se to uradi. Pročitajte da nađete neke dalje beleške o primeni zakačaljki na Windows mašini." #. (para) #: ../source/TortoiseGit_en.xml:6044 msgid "Once you've set up your server with the required hooks, you can change both author and log message of any revision, using the context menu from the top pane of the Log dialog. You can also edit a log message using the context menu for the middle pane." msgstr "Kada jedanput podesite svoj server sa željenim zakačaljkama, možete menjati autora i dnevnik poruku bilo koje revizije, koristeći kontekst meni iz gornjeg panela Dnevnik dijaloga. Možete takođe uređivati dnevnik poruku koristeći kontekst meni iz srednjeg panela." #. (para) #: ../source/TortoiseGit_en.xml:6051 msgid "Because Git's revision properties are not versioned, making modifications to such a property (for example, the svn:log commit message property) will overwrite the previous value of that property forever." msgstr "Pošto Subverzione revizione osobine nisu verzionisane, pravljenjem izmena u tim osobinama (na primer, svn:log poruka urezivanja osobina) će prekriti prethodnu vrednost osobine zauvek." #. (title) #: ../source/TortoiseGit_en.xml:6061 msgid "Filtering Log Messages" msgstr "Filriranje dnevnika poruka" #. (primary) #: ../source/TortoiseGit_en.xml:6063 msgid "filter" msgstr "filter" #. (para) #: ../source/TortoiseGit_en.xml:6065 msgid "If you want to restrict the log messages to show only those you are interested in rather than scrolling through a list of hundreds, you can use the filter controls at the top of the Log Dialog. The start and end date controls allow you to restrict the output to a known date range. The search box allows you to show only messages which contain a particular phrase." msgstr "Ako želite da ograničite dnevnik poruke da prikazuju samo ono što vas interesuje pre nego da premotavate listu od stotinu, možete koristiti filter kontrolu na vrhu Dnevnik Dijaloga. Početak i kraj datum kontrolišu da vam dozvole da ograničite izlaz na poznat opseg datuma. Boks pretraživanja vam omogućava da prikažete samo poruke koje sadrže pojedine fraze." #. (para) #: ../source/TortoiseGit_en.xml:6074 msgid "Click on the search icon to select which information you want to search in, and to choose regex mode. Normally you will only need a simple text search, but if you need to more flexible search terms, you can use regular expressions. If you hover the mouse over the box, a tooltip will give hints on how to use the regex functions. You can also find online documentation and a tutorial at http://www.regular-expressions.info/. The filter works by checking whether your filter string matches the log entries, and then only those entries which match the filter string are shown." msgstr "Kliknite na ikonu pretraživanja da izaberete koje informacije želite da tražite, i izaberite regex mod. Normalno je da vam samo treba jednostavno pretraživanje teksta, ali ako vam treba fleksibilnije pretraživanje možete koristiti regularne izraze. Ako lebdite mišem preko boksa, alatsavet će vam dati napomenu kako da koristite regeks funkcije. Možete takođe naći onlajn dokumentaciju i tutorijal na http://www.regular-expressions.info/. Filter radi tako što proveri dali vaš filter string nalazi dnevnik ulaze, i zatim samo one ulaze koji nalaze filter string koji je prikazan." #. (para) #: ../source/TortoiseGit_en.xml:6089 msgid "To make the filter show all log entries that do not match the filter string, start the string with an exclamation mark ('!'). For example, a filter string !username will only show those entries which were not committed by username." msgstr "Da se napravi filter prikažite sve dnevnik ulaze i zatim nemojte naći filter string, počnite string znakom uzvika ('!'). Na primer, filter string !username će prikazati one ulaze koji nisu urezani sa username." #. (para) #: ../source/TortoiseGit_en.xml:6095 msgid "Note that these filters act on the messages already retrieved. They do not control downloading of messages from the repository." msgstr "Primetiom da ovi filtri deluju na poruke već obnovljene. Oni ne kontrolišu skidanje poruka iz spremišta." #. (para) #: ../source/TortoiseGit_en.xml:6099 msgid "You can also filter the path names in the bottom pane using the Hide unrelated changed paths checkbox. Related paths are those which contain the path used to display the log. If you fetch the log for a folder, that means anything in that folder or below it. For a file it means just that one file. The checkbox is tristate: you can show all paths, grey out the unrelated ones, or hide the unrelated paths completely." msgstr "Možete takođe filtrirati imena putanja u donjem panelu koristeći Sakri nepovezane izmenjene putanje čekboks. Povezane putanje su one koje sadrže putanju korišćenu da prikaže dnevnik. Ako nađete dnevnik za imenik, to znači da je bilo šta u tom imeniku ili ispod njega. Za fajl znači samo da je to jedan fajl. Čekboks je tristanje: možete prikazati sve putanje, osenčati nepovezane, ili potpuno sakriti nepovezane putanje." #. (para) #: ../source/TortoiseGit_en.xml:6108 msgid "Sometimes your working practices will require log messages to follow a particular format, which means that the text describing the changes is not visible in the abbreviated summary shown in the top pane. The property tsvn:logsummary can be used to extract a portion of the log message to be shown in the top pane. Read to find out how to use this property." msgstr "Ponekad će vaša radna praksa zahtevati da dnevnik poruke prate poseban format, što znači da tekst koji opisuje izmene nije vidljiv u skraćenom sažetku prikazanom u gornjem panelu. Osobina tsvn:logsummary se može koristiti da izdvoji deo dnevnik poruke da bude prikazan na vršnom panelu. Pročitajte da nađete kako da koristite ovu osobinu." #. (title) #: ../source/TortoiseGit_en.xml:6118 msgid "No Log Formatting from Repository Browser" msgstr "Nema Dnevnika Formatiranja iz Pretraživača Spremišta" #. (para) #: ../source/TortoiseGit_en.xml:6119 msgid "Because the formatting depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." msgstr "Zato što formatiranje zavisi od pristupa subverzionim podešavanjima, vi samo vidite rezultate kada koristite preuzimanje radne kopije. Dobavljanje osobina daljinski je sporo, tako ne možete videti ovu osobinu u akciji repo pretraživača." #. (title) #: ../source/TortoiseGit_en.xml:6129 msgid "Statistical Information" msgstr "Statističke informacije" #. (primary) #: ../source/TortoiseGit_en.xml:6131 msgid "statistics" msgstr "statistika" #. (para) #: ../source/TortoiseGit_en.xml:6133 msgid "The Statistics button brings up a box showing some interesting information about the revisions shown in the Log dialog. This shows how many authors have been at work, how many commits they have made, progress by week, and much more. Now you can see at a glance who has been working hardest and who is slacking ;-)" msgstr "Statistika dugme dovlači boks koji prikazuje neke interesantne informacije o revizijama prikazanaim u Dnevnik dijalogu. Ovo prikazuje koliko autora je radilo, koliko urezivanja je urađeno, nedeljni napredak, i još mnogo šta. Sada možete videti jasno ko radi naporno i ko zabušava ;-)" #. (title) #: ../source/TortoiseGit_en.xml:6142 msgid "Statistics Page" msgstr "Statističke stranice" #. (para) #: ../source/TortoiseGit_en.xml:6143 msgid "This page gives you all the numbers you can think of, in particular the period and number of revisions covered, and some min/max/average values." msgstr "Ova strana vam daje sve brojeve o kojima možete razmišljati, posebno period i broj revizija koje su pokrivene i neke min/maks/srednje vrednosti." #. (title) #: ../source/TortoiseGit_en.xml:6150 msgid "Commits by Author Page" msgstr "Urezivanje po autorskom listu" #. (title) #: ../source/TortoiseGit_en.xml:6153 msgid "Commits-by-Author Histogram" msgstr "Urezivanje-po-autorskom histogramu" #. (title) #: ../source/TortoiseGit_en.xml:6160 msgid "Commits-by-Author Pie Chart" msgstr "Ureuivanje-po-autorskom pita dijagramu" #. (para) #: ../source/TortoiseGit_en.xml:6151 msgid " This graph shows you which authors have been active on the project as a simple histogram, stacked histogram or pie chart. " msgstr " Ovaj graf prikazuje koji autori su aktivni na projektu pomoću jednostavnog histograma, stek histograma ili pita dijagrama. " #. (para) #: ../source/TortoiseGit_en.xml:6164 msgid "Where there are a few major authors and many minor contributors, the number of tiny segments can make the graph more difficult to read. The slider at the bottom allows you to set a threshold (as a percentage of total commits) below which any activity is grouped into an Others category." msgstr "Tamo gde je malo glavnih autora i mnogo sporednih pomoćnika, broj tankih segmenata čini graf teškim za čitanje. Klizač na dnu omogućava vam da podesite prag (kao procenat ukupnog urezivanja) ispod koga je bilo koja aktivnost grupisana u kategoriju Drugi." #. (title) #: ../source/TortoiseGit_en.xml:6173 msgid "Commits by date Page" msgstr "Urezivanje po podacima lista" #. (title) #: ../source/TortoiseGit_en.xml:6176 msgid "Commits-by-date Graph" msgstr "Urezivanje-po-podacima grafa" #. (para) #: ../source/TortoiseGit_en.xml:6174 msgid " This page gives you a graphical representation of project activity in terms of number of commits and author. This gives some idea of when a project is being worked on, and who was working at which time." msgstr " Ova strana vam daje grafički prikaz aktivnosti projekta u terminima broja urezivanja i autor. To daje neke ideje o tome kada je projekat rađen i ko je radio u koje vreme." #. (para) #: ../source/TortoiseGit_en.xml:6184 msgid "When there are several authors, you will get many lines on the graph. There are two views available here: normal, where each author's activity is relative to the base line, and stacked, where each author's activity is relative to the line underneath. The latter option avoids the lines crossing over, which can make the graph easier to read, but less easy to see one author's output." msgstr "Kada postoji više autora, dobićete mnogo linija na grafu. Postoji dva moguća pogleda ovde: normalan, gde svaka autorska aktivnost je relativna na osnovnu liniju, i stekovana, gde je svaka autorska aktivnost relativna na liniju ispod. Kasnije opcije izbegavaju linije koje se presecaju preko grafa što čini graf lakšim za čitanje ali manje lak da se vidi izlaz za jednog autora." #. (para) #: ../source/TortoiseGit_en.xml:6194 msgid "By default the analysis is case-sensitive, so users PeterEgan and PeteRegan are treated as different authors. However, in many cases user names are not case-sensitive, and are sometimes entered inconsistently, so you may want DavidMorgan and davidmorgan to be treated as the same person. Use the Authors case insensitive checkbox to control how this is handled." msgstr "Uobičajeno je da je analiza zavisna od veličine slova tako da korisnici PeterEgen i PeteRegen se tretiraju kao različiti autori. Međutim, u mnogim slučajevima imena korisnika nisu zavisna od veličine slova, i ponekad se unose nekonzistentno, tako da možete poželeti da DavidMorgan i davidmorgan budu tretirani kao ista osoba. Koristite Autori nezavisni od veličine slova čekboks da kontrolišete kako se ovim rukuje." #. (para) #: ../source/TortoiseGit_en.xml:6204 msgid "Note that the statistics cover the same period as the Log dialog. If that is only displaying one revision then the statistics will not tell you very much." msgstr "Primetimo da statistika pokriva isti period kao i Dnevnik dijalog. Ako on prikazuje samo jednu reviziju tada statistika vam neće reći mnogo." #. (title) #: ../source/TortoiseGit_en.xml:6212 msgid "Offline Mode" msgstr "Isključen mod" #. (para) #: ../source/TortoiseGit_en.xml:6213 msgid "If the server is not reachable, and you have log caching enabled you can use the log dialog and revision graph in offline mode. This uses data from the cache, which allows you to continue working although the information may not be up-to-date or even complete." msgstr "Ako server nije dostupan, i imate omogućeno keširanje dnevnika možete koristiti dnevnik dijalog i revizioni graf u isključenom modu. Ovo koristi podatke iz keša, koji dopuštaju da nastavite sa radom mada informacije nisu ažurne ili su nekompletne." #. (title) #. (title) #: ../source/TortoiseGit_en.xml:6221 #: ../source/TortoiseGit_en.xml:9976 msgid "Refreshing the View" msgstr "Osvežavanje izgleda" #. (para) #: ../source/TortoiseGit_en.xml:6222 msgid "If you want to check the server again for newer log messages, you can simply refresh the view using F5. If you are using the log cache (enabled by default), this will check the repository for newer messages and fetch only the new ones. If the log cache was in offline mode, this will also attempt to go back online." msgstr "Ako želite da proverite server ponovo za nove dnevnik poruke, možete jednostavno da osvežite pregled koristeći F5. Ako koristite dnevnik keš (omogućen uobičajeno), to će proveriti spremište za nove poruke i naći će samo nove. Ako je dnevnik keš bio u isključenom modu, to će dovesti do njegovog uključenja." #. (para) #: ../source/TortoiseGit_en.xml:6230 msgid "If you are using the log cache and you think the message content or author may have changed, you can use Shift-F5 or Ctrl-F5 to re-fetch the displayed messages from the server and update the log cache. Note that this only affects messages currently shown and does not invalidate the entire cache for that repository." msgstr "Ako koristite dnevnik keš i smatrate da je sadržaj poruke ili autor možda izmenjen, možete koristiti Shift-F5 or Ctrl-F5 da ponovo nađete prikazane poruke sa servera i ažurirate dnevnik keš. Primetimo da to utiče samo na trenutno prikazane poruke i ne čini neispravnim ceo keš za to spremište." #. (title) #: ../source/TortoiseGit_en.xml:6241 msgid "Viewing Differences" msgstr "Pregled razlika" #. (primary) #. (primary) #: ../source/TortoiseGit_en.xml:6243 #: ../source/TortoiseGit_en.xml:9150 msgid "diff" msgstr "razl" #. (primary) #: ../source/TortoiseGit_en.xml:6246 msgid "compare" msgstr "poređenje" #. (para) #: ../source/TortoiseGit_en.xml:6248 msgid "One of the commonest requirements in project development is to see what has changed. You might want to look at the differences between two revisions of the same file, or the differences between two separate files. TortoiseGit provides a built-in tool named TortoiseMerge for viewing differences of text files. For viewing differences of image files, TortoiseGit also has a tool named TortoiseIDiff. Of course, you can use your own favourite diff program if you like." msgstr "Jedan od najčešćih zahteva u razvoju projekta je da se vidi šta je izmenjeno. Možete želeti da vidite razlike između dve revizije istog fajla, ili razlike između dva posbna fajla. TortoiseGit ima ugrađen alat zvani TortoiseMerge za pregledanje razlika tekst fajlova. Da bi se pregledale razlike fajlova slika, TortoiseGit takođe ima alat koji se zove TortoiseIDiff. svakako, možete koristiti vaš favorit diff program ako želite." #. (title) #: ../source/TortoiseGit_en.xml:6262 msgid "File Differences" msgstr "Fajl razlike" #. (term) #: ../source/TortoiseGit_en.xml:6265 msgid "Local changes" msgstr "Lokalne izmene" #. (para) #: ../source/TortoiseGit_en.xml:6267 msgid "If you want to see what changes you have made in your working copy, just use the explorer context menu and select TortoiseGitDiff." msgstr "Ako želite da vidite koje izmene ste vi uradili u vašoj radnoj kopiji, samo koristite eksplorerov kontekst meni i izaberite TortoiseGitDiff." #. (term) #: ../source/TortoiseGit_en.xml:6279 msgid "Difference to another branch/tag" msgstr "Razlike ka sledećoj grana-znak" #. (para) #: ../source/TortoiseGit_en.xml:6281 msgid "If you want to see what has changed on trunk (if you are working on a branch) or on a specific branch (if you are working on trunk), you can use the explorer context menu. Just hold down the Shift key while you right click on the file. Then select TortoiseGitDiff with URL. In the following dialog, specify the URL in the repository with which you want to compare your local file to." msgstr "Ako želite da vidite šta je izmenjeno na deblu (ako radite na grani) ili na specifičnoj grani (ako radite na deblu), možete koristiti eksplorer kontekst meni. Samo držite Shift taster dok uradite desni klik na fajl. Tada izaberite TortoiseGitDiff sa URL. U sledećem dijalogu specificirajte URL u spremištu sa kojim hoćete da poredite vaš lokalni fajl. " #. (para) #: ../source/TortoiseGit_en.xml:6294 msgid "You can also use the repository browser and select two trees to diff, perhaps two tags, or a branch/tag and trunk. The context menu there allows you to compare them using Compare revisions. Read more in ." msgstr "Možete takođe koristiti pretraživač spremišta i izabrati dva stabla za diff, možda dve značke, ili granu/značku i deblo. Kontekst meni omogućava vam da ih poredite koristeći Poredi revizije. Pročitajte više u ." #. (term) #: ../source/TortoiseGit_en.xml:6304 msgid "Difference from a previous revision" msgstr "Razlike od prethodne revizije" #. (para) #: ../source/TortoiseGit_en.xml:6306 msgid "If you want to see the difference between a particular revision and your working copy, use the Revision Log dialog, select the revision of interest, then select Compare with working copy from the context menu." msgstr "Ako želite da vidite razlike između posebne revizije i vaše radne kopije, oristite Revizioni Dnevnik dijalog, izaberite reviziju koja vas interesuje, zatim izaberite Uporedite sa radnom kopijom iz kontekst menija." #. (para) #: ../source/TortoiseGit_en.xml:6313 msgid "If you want to see the difference between the last committed revision and your working copy, assuming that the working copy hasn't been modified, just right click on the file. Then select TortoiseGitDiff with previous version. This will perform a diff between the revision before the last-commit-date (as recorded in your working copy) and the working BASE. This shows you the last change made to that file to bring it to the state you now see in your working copy. It will not show changes newer than your working copy." msgstr "Ako želite da vidite razlike između zadnje urezane revizije i vaše radne kopije, uzimajući da radna kopija nije izmenjena, samo uradite desni klik na fajl. Zatim izaberite TortoiseGitDiff sa prethodnom verzijom. Ovo će omogućiti diff između revizije pre zadnjeg -urezivanja-datuma (kako je zapisana u vašoj radnoj kopiji= i radne OSNOVE. Ovo vam prikazuje zadnje izmene tog fajla koje su dovele do stanja koje sada vidite u vašoj radnoj kopiji. To će prikazati izmene novije od vaše radne kopije." #. (term) #: ../source/TortoiseGit_en.xml:6330 msgid "Difference between two previous revisions" msgstr "Razlike između dve prethodne revizije" #. (para) #: ../source/TortoiseGit_en.xml:6332 msgid "If you want to see the difference between two revisions which are already committed, use the Revision Log dialog and select the two revisions you want to compare (using the usual Ctrl-modifier). Then select Compare revisions from the context menu." msgstr "Ako želite da vidite razlike između dve revizije koje su već urezane, koristite Revizioni Dnevnik i izaberite dve revizije koje želite da poredite koristeći uobičajen Ctrl-modifikator). Zatim izaberite Poredi revizije iz kontekst menija." #. (para) #: ../source/TortoiseGit_en.xml:6340 msgid "If you did this from the revision log for a folder, a Compare Revisions dialog appears, showing a list of changed files in that folder. Read more in ." msgstr "Ako ovo uradite iz revizionog dnevnika za imenike, Poređenje Revizija dijalog se pojavljuje, prikazujući listu izmenjenih fajlova u tom imeniku. Pročitajte više u ." #. (term) #: ../source/TortoiseGit_en.xml:6349 msgid "All changes made in a commit" msgstr "Izmene učinjene pri urezivanju" #. (para) #: ../source/TortoiseGit_en.xml:6351 msgid "If you want to see the changes made to all files in a particular revision in one view, you can use Unified-Diff output (GNU patch format). This shows only the differences with a few lines of context. It is harder to read than a visual file compare, but will show all the changes together. From the Revision Log dialog select the revision of interest, then select Show Differences as Unified-Diff from the context menu." msgstr "Ako želite da vidite izmene napravljene na svim fajlovima u pojedinoj reviziji u jednom pregledu, možete koristiti Ujedinjen-Diff izlaz (GNU format zakrpa). Ovo prikazuje samo razlike nekoliko linija u sadržaju. Teže je čitati nego vizuelno poređenje fajla, ali će prikazati sve izmene zajedno. Iz Revizioni Dnevnik dijaloga izaberite reviziju koja vas interesuje, zatim izaberite Prikaži Razlike kao Ujedinjeni-Diff iz kontekst menija." #. (term) #: ../source/TortoiseGit_en.xml:6365 msgid "Difference between files" msgstr "Razlike između fajlova" #. (para) #: ../source/TortoiseGit_en.xml:6367 msgid "If you want to see the differences between two different files, you can do that directly in explorer by selecting both files (using the usual Ctrl-modifier). Then from the explorer context menu select TortoiseGitDiff." msgstr "Ako želite da vidite razlike između dva različita fajla, možete to uraditi direktno u pretraživaču izboromoba fajla (koristeći običan Ctrl-modifikator). Zatim iz pretraživačevog kontekst menija izaberite TortoiseGitDiff." #. (term) #: ../source/TortoiseGit_en.xml:6380 msgid "Difference between WC file/folder and a URL" msgstr "Razlike između RK fajl/imenik i URL" #. (para) #: ../source/TortoiseGit_en.xml:6382 msgid "If you want to see the differences between a file in your working copy, and a file in any Git repository, you can do that directly in explorer by selecting the file then holding down the Shift key whilst right clicking to obtain the context menu. Select TortoiseGitDiff with URL. You can do the same thing for a working copy folder. TortoiseMerge shows these differences in the same way as it shows a patch file - a list of changed files which you can view one at a time." msgstr "Ako želite da vidite razlike između fajla u vašoj radnoj kopiji, i fajl u bilo kojem Subverzionom spremištu, možete to uraditi direktno u pretraživaču izborom fajla zatim držeći Shift taster dok desnim klikom dobijete kontekst meni. Izaberite TortoiseGitDiff sa URL. Možete uraditi istu stvar za imenik radne kopije. TortoiseMerge prikazuje ove razlike na isti način kao što je prikazano u fajlu zakrpe - lista izmenjenih fajlova koje možete pregledati jedan po jedan." #. (term) #: ../source/TortoiseGit_en.xml:6400 msgid "Difference with blame information" msgstr "Razlike sa krivac informacijama" #. (para) #: ../source/TortoiseGit_en.xml:6402 msgid "If you want to see not only the differences but also the author, revision and date that changes were made, you can combine the diff and blame reports from within the revision log dialog. Read for more detail." msgstr "Ako želite da vidite ne samo razlike već i autore, revizija i datum gde su izmene izvršene, možete kombinovati diff i okrivi izveštaje u okviru revizionog dnevnik dijaloga. Pročitajte za više detalja." #. (term) #: ../source/TortoiseGit_en.xml:6411 msgid "Difference between folders" msgstr "Razlike između imenika" #. (para) #: ../source/TortoiseGit_en.xml:6413 msgid "The built-in tools supplied with TortoiseGit do not support viewing differences between directory hierarchies. But if you have an external tool which does support that feature, you can use that instead. In we tell you about some tools which we have used." msgstr "Ugrađeni alat koji daje TortoiseGit ne podržava viđene razlike između hijerarhije imenika. Alo ako imate spoljašnji alat koji podržava te osobine možete ga koristiti umesto toga. U mi vam kažemo o nekim alatima koji su korišćeni." #. (para) #: ../source/TortoiseGit_en.xml:6423 msgid "If you have configured a third party diff tool, you can use Shift when selecting the Diff command to use the alternate tool. Read to find out about configuring other diff tools." msgstr "Ako ste konfigurisali diff alat treće strane, možete koristiti Shift kada izaberete Diff komandu da koristite alternativni alat. Pročitajte da nađete o konfiguraciji drugih diff alata." #. (title) #: ../source/TortoiseGit_en.xml:6432 msgid "Line-end and Whitespace Options" msgstr "Kraj-reda i razmak opcije" #. (para) #: ../source/TortoiseGit_en.xml:6433 msgid "Sometimes in the life of a project you might change the line endings from CRLF to LF, or you may change the indentation of a section. Unfortunately this will mark a large number of lines as changed, even though there is no change to the meaning of the code. The options here will help to manage these changes when it comes to comparing and applying differences. You will see these settings in the Merge and Blame dialogs, as well as in the settings for TortoiseMerge." msgstr "Ponekad u životu projekta možete izmeniti završetak linija od CRLF u LF, ili možete izmeniti uvlačenje paragrafa. Na nesreću ovo će označiti veliki broj linija kao izmenjene, čak i kad nema izmena značajnog koda. Opcije će ovde pomoći da se upravlja ovim izmenama kada one dođu da se uporede i primene razlike. Možete videti ova podešavanja u Stopi i Okrivi dijalozima, isto kao i u podešavanju TortoiseMerge." #. (para) #: ../source/TortoiseGit_en.xml:6444 msgid "Ignore line endings excludes changes which are due solely to difference in line-end style." msgstr "Zanemari završetak linija izbacuje izmene koje su samo zbog razlika u stilu završetka linija. " #. (para) #: ../source/TortoiseGit_en.xml:6448 msgid "Compare whitespaces includes all changes in indentation and inline whitespace as added/removed lines." msgstr "Poređenje belihpolja uključuje sve izmene u uvlačenju i unutar linije belapolja kao dodate/uklonjene linije." #. (para) #: ../source/TortoiseGit_en.xml:6453 msgid "Ignore whitespace changes excludes 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 "Zanemari izmene belihpolja isključuje izmene koje su samo zbog izmena u iznosu ili tipu belihpolja, npr. izmenom uvlačenja ili izmenom tabova ili razmaka. Dodavanjem belih polja gde nisu bila ranije, ili uklanjanjem belihpolja potpuno je još uvek prikazano kao promena." #. (para) #: ../source/TortoiseGit_en.xml:6461 msgid "Ignore all whitespaces excludes all whitespace-only changes." msgstr "Zanemari sva belapolja isključuje sva samo-belapolja izmene." #. (para) #: ../source/TortoiseGit_en.xml:6465 msgid "Naturally, any line with changed content is always included in the diff." msgstr "Prirodno, svaka linija sa izmenjenim sadržajem uvek je uključena u diff." #. (title) #: ../source/TortoiseGit_en.xml:6471 msgid "Comparing Folders" msgstr "Poređenje imenika" #. (primary) #: ../source/TortoiseGit_en.xml:6473 msgid "compare revisions" msgstr "uporedi revizije" #. (primary) #: ../source/TortoiseGit_en.xml:6476 msgid "export changes" msgstr "izvoz izmena" #. (title) #: ../source/TortoiseGit_en.xml:6480 msgid "The Compare Revisions Dialog" msgstr "Poređenje revizionija dijalog" #. (para) #: ../source/TortoiseGit_en.xml:6478 msgid " When you select two trees within the repository browser, or when you select two revisions of a folder in the log dialog, you can Context menuCompare revisions." msgstr " Kada izaberete dva stabla u okviru pretraživača spremišta, ili kada izaberete dve revizije imenika u dnevnik dijalogu, možete Kontekst meniPoredi Revizije." #. (para) #: ../source/TortoiseGit_en.xml:6490 msgid "This dialog shows a list of all files which have changed and allows you to compare or blame them individually using context menu." msgstr "Ovaj dijalog prikazuje listu fajlova koji su izmenjeni i dozvoljava vam da uporedite ili okrivite njih pojedinačno koristeći kontekst meni." #. (para) #: ../source/TortoiseGit_en.xml:6494 msgid "You can also export the list of changed files to a text file, or you can export the changed files themselves to a folder. This operation works on the selected files only, so you need to select the files of interest - usually that means all of them." msgstr "Možete takođe izvesti listu izmenjenih fajlova u tekst fajl, ili možete izvesti izmenjene fajlove u imenik. Ova operacija radi samo na izabranim fajlovima, tako da vam treba da izaberete fajlove od interesa - obično to znači sve njih." #. (para) #: ../source/TortoiseGit_en.xml:6500 msgid "If you want to export the list of files and the actions (modified, added, deleted) as well, you can do that using the keyboard shortcuts Ctrl-A to select all entries and Ctrl-C to copy the detailed list to the clipboard." msgstr "Ako želite da izvezete listu fajlova i akciju (izmenjen,dodat,obrisan) takođe, možete to uraditi koristeći skraćenicu tastature Ctrl-A da izaberete sve ulaze i Ctrl-C da kopirate detaljnu listu u klipbord." #. (para) #: ../source/TortoiseGit_en.xml:6506 msgid "The button at the top allows you to change the direction of comparison. You can show the changes need to get from A to B, or if you prefer, from B to A." msgstr "Dugme na vrhu omogućava da izmenite pravac poređenja. Možete prikazati izmene potrebne da uzmete od A do B, ili ako više volite, od B do A." #. (para) #: ../source/TortoiseGit_en.xml:6511 msgid "The buttons with the revision numbers on can be used to change to a different revision range. When you change the range, the list of items which differ between the two revisions will be updated automatically." msgstr "Dugmići sa revizionim brojevima na sebi mogu se koristiti za izmene za različite revizione opsege. Kada izmenite opseg, lista stavki koja pravi razliku između dve revizije biće ažurirana automatski. " #. (para) #: ../source/TortoiseGit_en.xml:6516 msgid "If the list of filenames is very long, you can use the search box to reduce the list to filenames containing specific text. Note that a simple text search is used, so if you want to restrict the list to C source files you should enter .c rather than *.c." msgstr "Ako je lista fajlimena veoma duga, možete koristiti traži boks da redukujete listu fajlimena koja sadrže specifičan tekst. Primetimo da se koristi jednostavno pretraživanje teksta, zako da ako želite da redukujete listu na C izvorne fajlove morate uneti .c pre nego *.c." #. (title) #: ../source/TortoiseGit_en.xml:6525 msgid "Diffing Images Using TortoiseIDiff" msgstr "Razl slika koristeći TortozDif" #. (primary) #: ../source/TortoiseGit_en.xml:6527 msgid "image diff" msgstr "slika razl" #. (primary) #: ../source/TortoiseGit_en.xml:6530 msgid "TortoiseIDiff" msgstr "TortozIDiff" #. (para) #: ../source/TortoiseGit_en.xml:6532 msgid "There are many tools available for diffing text files, including our own TortoiseMerge, but we often find ourselves wanting to see how an image file has changed too. That's why we created TortoiseIDiff." msgstr "Postoji mnogo alata dostupnih za razlikovanje tekst fajlova, uključujući naš TortoiseMerge, ali mi često nalazimo sebe da želimo takođe da vidimo kako kako se fajl slike izmenio. To je zašto smo kreirali TortoiseIDiff. " #. (title) #: ../source/TortoiseGit_en.xml:6539 msgid "The image difference viewer" msgstr "Pregledač razlika slika" #. (para) #: ../source/TortoiseGit_en.xml:6537 msgid "TortoiseGitDiff for any of the common image file formats will start TortoiseIDiff to show image differences. By default the images are displayed side-by-side but you can use the View menu or toolbar to switch to a top-bottom view instead, or if you prefer, you can overlay the images and pretend you are using a lightbox." msgstr "TortoiseGitDiff za svaki od čestih fajl formata slike će startovati TortoiseIDiff da prikaže razlike u slici. Uobičajeno slike se prikazuju strana-po-stranu ali možete koristiti Pregled meni ili alatpult da pređete na vrh-dno pregled umesto toga, ili ako više volite, možete preklopiti slike i pretpostaviti da koristite lajtboks." #. (para) #: ../source/TortoiseGit_en.xml:6552 msgid "Naturally you can also zoom in and out and pan around the image. You can also pan the image simply by left-dragging it. If you select the Link images together option, then the pan controls (scrollbars, mousewheel) on both images are linked." msgstr "Prirodno je da možete povećati ili smanjiti ili kružiti oko slike. Možete prikazati sliku u panelu jednostavnim levim-vučenjem. Ako izaberete Veži slike zajedno opciju, zatim otvorite panel kontrolu (skrolpult, mištočkić) na obe vezane slike." #. (para) #: ../source/TortoiseGit_en.xml:6558 msgid "An image info box shows details about the image file, such as the size in pixels, resolution and colour depth. If this box gets in the way, use ViewImage Info to hide it. You can get the same information in a tooltip if you hover the mouse over the image title bar." msgstr "Info boks slike prikazuje detalje fajla slike, kao što su veličina u pikselima, rezolucija i dubina boja. Ako se ovaj boks dobije koristite PregledInfo Slikeda ga sakrijete. Možete dobiti iste informacije u alatsavetu ako letite mišem preko pulta naslova slike." #. (para) #: ../source/TortoiseGit_en.xml:6570 msgid "When the images are overlaid, the relative intensity of the images (alpha blend) is controlled by a slider control at the left side. You can click anywhere in the slider to set the blend directly, or you can drag the slider to change the blend interactively. Ctrl+Shift-Wheel to change the blend." msgstr "Kada su slike prekrivene, relativni intezitet slike (alfa mešavina) se kontroliše klizačem sa leve strane. Možete kliknuti bilo gde na klizaču da se podesi mešavina direktno, ili možete vući klizač da promenite mešavinu interaktivno. Ctrl+Shift-Wheel da izmenite mešavinu." #. (para) #: ../source/TortoiseGit_en.xml:6577 msgid "The button above the slider toggles between two preset blends, indicated by the markers on either side of the blend slider. By default one is at the top and the other at the bottom, so the toggle button just switches between one image and the other. You can move the markers to choose the two blend values that the toggle button will use." msgstr "Dugme iznad klizača prebacuje između dve prepodešene mešavine, indicirane markerima na svakoj strani klizača mešavine. Uobičajeno je jedan na vrhu dok je drugi na dnu tako da dugme za prebacivanje samo preklapa između jedne i druge slike. Možete pomeriti markere da izaberete vrednosti dve smeše gde će se dugme za pribacivanje koristiti." #. (para) #: ../source/TortoiseGit_en.xml:6584 msgid "Sometimes you want to see a difference rather than a blend. You might have the image files for two revisions of a printed circuit board and want to see which tracks have changed. If you disable alpha blend mode, the difference will be shown as an XOR of the pixel colour values. Unchanged areas will be plain white and changes will be coloured." msgstr "Ponekad želite da vidite razlike pre nego smešu. Možete imati fajlove slike iz dve revizije ploče štampanog kola i želeti da vidite koje su trake promenjene. Ako onemogućite mod alfa smeše razlika će biti prikazana kao XOR vrednosto boje piksela. Nepromenjene površine biće potpuno bele a izmene će biti obojene." #. (title) #: ../source/TortoiseGit_en.xml:6594 msgid "External Diff/Merge Tools" msgstr "Spoljašnji Razl/Stopi alat" #. (primary) #: ../source/TortoiseGit_en.xml:6596 msgid "diff tools" msgstr "razl alat" #. (primary) #: ../source/TortoiseGit_en.xml:6599 msgid "merge tools" msgstr "alat spajanja" #. (para) #: ../source/TortoiseGit_en.xml:6601 msgid "If the tools we provide don't do what you need, try one of the many open-source or commercial programs available. Everyone has their own favourites, and this list is by no means complete, but here are a few that you might consider:" msgstr "Ako alat kojim smo se snabdeli ne radi o što nam treb, treba probati jedan od mnogih programa otvorenog koda ili komercijalnih koji su dostupni. Svako ima svoje favorite i ta lista izgleda da nije kompletna, ali evo šta treba razmotriti:" #. (term) #: ../source/TortoiseGit_en.xml:6609 msgid "WinMerge" msgstr "VinMerdž" #. (para) #: ../source/TortoiseGit_en.xml:6611 msgid "WinMerge is a great open-source diff tool which can also handle directories." msgstr "WinMerge je veliki diff alat otvorenog koda koji takođe opslužje imenike." #. (term) #: ../source/TortoiseGit_en.xml:6621 msgid "Perforce Merge" msgstr "Nasilno spajanje" #. (para) #: ../source/TortoiseGit_en.xml:6623 msgid "Perforce is a commercial RCS, but you can download the diff/merge tool for free. Get more information from Perforce." msgstr "Perforce je komercijalni RCS, ali možete skinuti diff/stopi alat besplatno. Uzmite više informacija sa Perforce." #. (term) #: ../source/TortoiseGit_en.xml:6633 msgid "KDiff3" msgstr "KDiff3" #. (para) #: ../source/TortoiseGit_en.xml:6635 msgid "KDiff3 is a free diff tool which can also handle directories. You can download it from here." msgstr "KDiff3 je besplatan diff alat koji takođe može da opslužuje imenike. Možete ga skihuti sa here." #. (term) #: ../source/TortoiseGit_en.xml:6645 msgid "ExamDiff" msgstr "EgzamDif" #. (para) #: ../source/TortoiseGit_en.xml:6647 msgid "ExamDiff Standard is freeware. It can handle files but not directories. ExamDiff Pro is shareware and adds a number of goodies including directory diff and editing capability. In both flavours, version 3.2 and above can handle unicode. You can download them from PrestoSoft." msgstr "EgzamDiff Standard je slobodan. Može raditi sa fajlovima ali ne sa imenicima. EgzamDiff Pro je šerver i dodaje brojne pogodnosti uključujući diff imenika i mogćnosti uređenja. U oba slučaja, verzija 3.2 i iznad koriste junikod. Možete ih skinuti sa PrestoSoft." #. (term) #: ../source/TortoiseGit_en.xml:6662 msgid "Beyond Compare" msgstr "Posle upoređenja" #. (para) #: ../source/TortoiseGit_en.xml:6664 msgid "Similar to ExamDiff Pro, this is an excellent shareware diff tool which can handle directory diffs and unicode. Download it from Scooter Software." msgstr "Sličan EgzamDiff Pro, ovo je je izvanredan šerver diff alat koji radi sa diff imenika i junikodom. Skinite ga sa Scooter Software." #. (term) #: ../source/TortoiseGit_en.xml:6675 msgid "Araxis Merge" msgstr "Araksovo spajanje" #. (para) #: ../source/TortoiseGit_en.xml:6677 msgid "Araxis Merge is a useful commercial tool for diff and merging both files and folders. It does three-way comparison in merges and has synchronization links to use if you've changed the order of functions. Download it from Araxis." msgstr "Araksis Merge je koristan komercijalni alat za diff i stapanje fajlova i imenika. On radi trostruko poređenje u stapanju i ima sinhronizacionu vezu za korišćenje ako ste izmenili red funkcija. Skinite ga sa Araxis." #. (term) #: ../source/TortoiseGit_en.xml:6689 msgid "SciTE" msgstr "SciTE" #. (para) #: ../source/TortoiseGit_en.xml:6691 msgid "This text editor includes syntax colouring for unified diffs, making them much easier to read. Download it from Scintilla." msgstr "Ovaj tekst uređivač uključuje bojenje sintakse za ujedinjennj diff, čineći ih mnogo lakšim za čitanje. Skinite ga sa Scintilla." #. (term) #: ../source/TortoiseGit_en.xml:6701 msgid "Notepad2" msgstr "Notepad2" #. (para) #: ../source/TortoiseGit_en.xml:6703 msgid "Notepad2 is designed as a replacement for the standard Windows Notepad program, and is based on the Scintilla open-source edit control. As well as being good for viewing unified diffs, it is much better than the Windows notepad for most jobs. Download it for free here." msgstr "Notepad2 je napravljen kao zamena standardnog Vindouz Notepad programa i ima za osnovu Scintila otvoren-kod kontrolu uređenja. Kako je dobar za pregled jedinsvenih diff, mnogo je bolji od Vindouz notepada za većinu posla. Skinite ga besplatno sa here." #. (para) #: ../source/TortoiseGit_en.xml:6716 msgid "Read for information on how to set up TortoiseGit to use these tools." msgstr "Pročitajte za informacije kako da se podesi TortoiseGit da koristi ove alate." #. (title) #: ../source/TortoiseGit_en.xml:6723 msgid "Adding New Files And Directories" msgstr "Dodavanje novih fajlova i imenika" #. (primary) #: ../source/TortoiseGit_en.xml:6725 msgid "add" msgstr "dodaj" #. (primary) #: ../source/TortoiseGit_en.xml:6728 msgid "version new files" msgstr "verzionisati nove fajlove" #. (title) #. (title) #: ../source/TortoiseGit_en.xml:6733 #: ../source/TortoiseGit_en.xml:6913 msgid "Explorer context menu for unversioned files" msgstr "Eksplorerov kontekst meni za neverzionisane fajlve" #. (para) #: ../source/TortoiseGit_en.xml:6731 msgid " If you created new files and/or directories during your development process then you need to add them to source control too. Select the file(s) and/or directory and use TortoiseGitAdd." msgstr " Ako ste kreirali nove fajlove i/ili imenike u toku procesa razvoja tada vam je potrebno da ih dodate u alat za kontrolu izvernog koda takođe. Izaberite fajl(ove) i/ili imenik i koristite TortoiseGitDodaj." #. (para) #: ../source/TortoiseGit_en.xml:6745 msgid "After you added the files/directories to source control the file appears with a added icon overlay which means you first have to commit your working copy to make those files/directories available to other developers. Adding a file/directory does not affect the repository!" msgstr "Posle dodavanja fajlova/imenika kontroli koda fajlovi se pojavljuju sa dodat prekrivnom ikonom koja znači da najpre treba da urežete vašu radnu kopiju da učinite ove fajlove/imenike dostupne drugim saradnicima. Dodavanjem fajla/imenika ne ne utiče na spremište." #. (title) #: ../source/TortoiseGit_en.xml:6754 msgid "Many Adds" msgstr "Mnogo dodavanja" #. (para) #: ../source/TortoiseGit_en.xml:6755 msgid "You can also use the Add command on already versioned folders. In that case, the add dialog will show you all unversioned files inside that versioned folder. This helps if you have many new files and need to add them all at once." msgstr "Takođe možete koristiti Dodaj komandu na već verzionisane imenike. U tom slučaju dodaj dijalog će prikazati sve neverzionisane fajlove unutar verzionisanog imenika. To vam pomaže da ako imate puno novih fajlova da ih dodate odjednom." #. (para) #: ../source/TortoiseGit_en.xml:6768 msgid "select the files you want to add" msgstr "izaberite fajlove koje želite da dodate" #. (para) #. (para) #: ../source/TortoiseGit_en.xml:6773 #: ../source/TortoiseGit_en.xml:7209 msgid "right-drag them to the new location inside the working copy" msgstr "desno-povlačiti njih u novu lokaciju unutar radne kopije." #. (para) #. (para) #: ../source/TortoiseGit_en.xml:6779 #: ../source/TortoiseGit_en.xml:7215 msgid "release the right mouse button" msgstr "otpustite desno dugme miša" #. (para) #: ../source/TortoiseGit_en.xml:6784 msgid "select Context MenuSVN Add files to this WC. The files will then be copied to the working copy and added to version control." msgstr "izaberite Kontekst MeniSVN Dodaj fajlove u RK. Fajlovi će tada biti kopirani u radnu kopiju i dodati u kontrolu verzija." #. (para) #: ../source/TortoiseGit_en.xml:6763 msgid "To add files from outside your working copy you can use the drag-and-drop handler: " msgstr "Da bi se dodali falovi van vaše radne kopije možete koristiti uhvati-i-vuci ručicu: " #. (para) #: ../source/TortoiseGit_en.xml:6796 msgid "You can also add files within a working copy simply by left-dragging and dropping them onto the commit dialog." msgstr "Možete takođe dodati fajlove u okviru radne kopije jednostavno pomoću levog-vučenja i otpuštanja u dijalog urezivanja." #. (para) #: ../source/TortoiseGit_en.xml:6800 msgid "If you add a file or folder by mistake, you can undo the addition before you commit using TortoiseGitUndo add...." msgstr "Ako dodate fajl ili imenik greškom možete poništiti dodavanje pre nego urežete koristeći TortoiseGitPoništi dodavanje...." #. (title) #: ../source/TortoiseGit_en.xml:6810 msgid "Copying/Moving/Renaming Files and Folders" msgstr "Kopiranje/Pomeranje/Preimenovanje fajlova i imenika" #. (primary) #: ../source/TortoiseGit_en.xml:6812 msgid "copy files" msgstr "kopiraj fajlove" #. (primary) #: ../source/TortoiseGit_en.xml:6815 msgid "rename files" msgstr "preimenuj fajlove" #. (primary) #: ../source/TortoiseGit_en.xml:6818 msgid "move files" msgstr "pomeri fajlove" #. (primary) #. (primary) #: ../source/TortoiseGit_en.xml:6821 #: ../source/TortoiseGit_en.xml:8030 msgid "branch" msgstr "grana" #. (primary) #. (primary) #: ../source/TortoiseGit_en.xml:6824 #: ../source/TortoiseGit_en.xml:8033 msgid "tag" msgstr "znak" #. (para) #: ../source/TortoiseGit_en.xml:6826 msgid "It often happens that you already have the files you need in another project in your repository, and you simply want to copy them across. You could simply copy the files and add them as described above, but that would not give you any history. And if you subsequently fix a bug in the original files, you can only merge the fix automatically if the new copy is related to the original in Git." msgstr "Često se dešava to da već imate fajlove koji su vam potrebni u drugom projektu u vašem spremištu i jednostavno želite da ih kopirate unutar. Možete jednostavno kopirati fajlove i dodati ih kako je opisano gore, ali to vam neće dati istoriju. Ako subsekventno fiksirate bagove u originalnim fajlovima možete samo stopiti fiksirano automatski ako se nova kopija odnosi na originalnu Subverziju." #. (para) #: ../source/TortoiseGit_en.xml:6834 msgid "The easiest way to copy files and folders from within a working copy is to use the right-drag menu. When you right-drag a file or folder from one working copy to another, or even within the same folder, a context menu appears when you release the mouse. Now you can copy existing versioned content to a new location, possibly renaming it at the same time." msgstr "Najlakši način da se kopiraju fajlovi i imenici u okviru radne kopije je da se koristi meni desno-povlačenje. Kada desno-vučete fajl ili imenik iz jedne radne kopije u drugu, li čak u okviru istog imenika, kontekst meni se pojavljuje kada otpustite miš. Sada možete kopirati postojeći verzionisani sadržaj u novu lokaciju, moguće preimeovanjem u isto vreme." #. (para) #: ../source/TortoiseGit_en.xml:6846 msgid "You can also copy or move versioned files within a working copy, or between two working copies, using the familiar cut-and-paste method. Use the standard Windows Copy or Cut to copy one or more versioned items to the clipboard. If the clipboard contains such versioned items, you can then use TortoiseGitPaste (note: not the standard Windows Paste) to copy or move those items to the new working copy location." msgstr "Možete kopirati ili pomerati verzionisane fajlove unutar radne kopije, ili između dve radne opije, koristeći familijarnu iseci-i-nalepi metod.Koristite standardnu Vindouz Kopiraj ili Iseci da kopirate jednu ili više verzionisanih stavki u klipbord. Ako klipbord sadrži te verzionisane stavke, mžete koristiti TortoiseGitNalepi (primedba: notirajte standard Vindouz Paste) da kopirate ili pomerite te stavke u novu lokaciju radne kopije." #. (para) #: ../source/TortoiseGit_en.xml:6858 msgid "You can copy files and folders from your working copy to another location in the repository using TortoiseGitBranch/Tag. Refer to to find out more." msgstr "Mžete kopirati fajlove i imenike iz svoje radne kopije na drugu lokaciju u spremištu koristeći TortoiseGitGrana/Znak. Uporedite sa da nađete više o tome." #. (para) #: ../source/TortoiseGit_en.xml:6867 msgid "You can locate an older version of a file or folder in the log dialog and copy it to a new location in the repository directly from the log dialog using Context menuCreate branch/tag from revision. Refer to to find out more." msgstr "Možete locirati stariju verziju fajla ili imenika u dnevnik dijalogu i kopirati ih na novu lokaciju u imeniku spremišta direktno iz dnevnik dijaloga koristeći Kontekst meniKreiraj grana/znak iz revizije. Uporedi sa za više detalja. " #. (para) #: ../source/TortoiseGit_en.xml:6877 msgid "You can also use the repository browser to locate content you want, and copy it into your working copy directly from the repository, or copy between two locations within the repository. Refer to to find out more." msgstr "Takođe možete koristiti pretraživač spremišta da locirate sadržaj koji želite i da ga kopirate u svoju radnu kopiju direktno iz spremišta, ili da kopirate između dve lokacije unutar spremišta. Uporedite sa za više detalja." #. (title) #: ../source/TortoiseGit_en.xml:6884 msgid "Cannot copy between repositories" msgstr "Ne može da kopira između spremišta" #. (para) #: ../source/TortoiseGit_en.xml:6885 msgid "Whilst you can copy and files and folders within a repository, you cannot copy or move from one repository to another while preserving history using TortoiseGit. Not even if the repositories live on the same server. All you can do is copy the content in its current state and add it as new content to the second repository." msgstr "Mada možete kopirati fajlove i imenike unutar spremišta, vi ne možete kopirati ili pomerati iz jednog spremišta u drugo dok čuvate istoriju koristeći TortoiseGit. Čak ni ako spremište živi na istom serveru. Sve što mžete uraditi je kopiranje sadržaja u njegovom tekućem stanju i dodavanje kao novi sadržaj u drugo spremište." #. (para) #: ../source/TortoiseGit_en.xml:6893 msgid "If you are uncertain whether two URLs on the same server refer to the same or different repositories, use the repo browser to open one URL and find out where the repository root is. If you can see both locations in one repo browser window then they are in the same repository." msgstr "Ako ste nesigurni da li dva URL na istom serveru ukazuju na isti ili različita spremišta, koristite repo pretraživač da otvorite jedan URL i nađite gde je koren spremišta. Ako možete da vidite obe lokacije u jednom repo pretraživač prozoru onda su oni u istom spremištu." #. (title) #: ../source/TortoiseGit_en.xml:6903 msgid "Ignoring Files And Directories" msgstr "Zanemarivanje fajlova i imenika" #. (primary) #: ../source/TortoiseGit_en.xml:6905 msgid "ignore" msgstr "zanemari" #. (primary) #: ../source/TortoiseGit_en.xml:6908 msgid "unversioned files/folders" msgstr "razverzionisanje fajlova/imenika" #. (para) #: ../source/TortoiseGit_en.xml:6911 msgid " In most projects you will have files and folders that should not be subject to version control. These might include files created by the compiler, *.obj, *.lst, maybe an output folder used to store the executable. Whenever you commit changes, TortoiseGit shows your unversioned files, which fills up the file list in the commit dialog. Of course you can turn off this display, but then you might forget to add a new source file." msgstr " U većini projekata vi imate fajlove i imenike koji nisu subjekat kontrole verzija. Oni mogu uključivati fajlove kreirane kompajlerom, *.obj, *.lst, možda izlazni imenik korišćen za smeštanje izvršnih fajlova. Kadagod urezujete izmene, TortoiseGit prikazuje vaše neverzionisane fajlove koji popunjavaju listu u dijalogu urezivanja. Svakako da možete isključiti ovo prikazivanje, ali tada možete zaboraviti da dodate nove fajlove izvornog koda." #. (para) #: ../source/TortoiseGit_en.xml:6924 msgid "The best way to avoid these problems is to add the derived files to the project's ignore list. That way they will never show up in the commit dialog, but genuine unversioned source files will still be flagged up." msgstr "Najbolji način da se izbegnu ovi problemi je da se razvojni fajlovi dodaju listi zanemarenih u projektu. Na taj način oni se nikad ne prikazuju u dijalogu urezivanja, a pravi neverzionisani fajlovi izѕvornog koda su još uvek označeni." #. (para) #: ../source/TortoiseGit_en.xml:6930 msgid "If you right click on a single unversioned file, and select the command TortoiseGitAdd to Ignore List from the context menu, a submenu appears allowing you to select just that file, or all files with the same extension. If you select multiple files, there is no submenu and you can only add those specific files/folders." msgstr "Ako uradite desni klik na pojedini neverzionisani fajl, i izaberete komandu TortoiseGitDodaj Listi Zanemarenih iz kontekst menija, pojaviće se submeni koji vam omogućava da izaberete samo taj fajl, ili sve fajlove sa istom ekstenzijom. Ako izaberete više fajlova, nema submenija i možete samo da dodate te specifčne fajlove/imenike. " #. (para) #: ../source/TortoiseGit_en.xml:6942 msgid "If you want to remove one or more items from the ignore list, right click on those items and select TortoiseGitRemove from Ignore List You can also access a folder's svn:ignore property directly. That allows you to specify more general patterns using filename globbing, described in the section below. Read for more information on setting properties directly. Please be aware that each ignore pattern has to be placed on a separate line. Separating them by spaces does not work." msgstr "Ako želite da uklonite jednu ili više stavki iz liste zanemarenih, desni klik na te stavke i izaberite TortoiseGitUkloni sa Liste Zanemarenih Možete takođe pristupiti imeniku svn:ignore osobina direktno. To vam omogućava da specificirate mnogo opštiji model koristeći globiranje imena fajlova, opisano u sledećem paragrafu. Pročitajte za više informacija o podešavanju osobina direktno. Molim vas budite pažljivi jer svaki model zanemarivanja mora da bude smešten u posebnoj liniji. Odvajanje razmakom ne radi." #. (title) #: ../source/TortoiseGit_en.xml:6957 msgid "The Global Ignore List" msgstr "Globalna lista zanemarivanja" #. (para) #: ../source/TortoiseGit_en.xml:6958 msgid "Another way to ignore files is to add them to the global ignore list. The big difference here is that the global ignore list is a client property. It applies to all Git projects, but on the client PC only. In general it is better to use the svn:ignore property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read for more information." msgstr "Drugi nčin da se zanemare fajlovi je da se dodaju u globalnu listu zanemarivanja. Velika razlika ovde je da je globalna lista zanemarivanja je klijentska osobina. Primenjuje se na sve Subverzione projekte, ali na samo na klijentovom PC. Generalno je bolje da se koristi svn:ignore osobina kada je moguće jer može biti primenjena na specifičnu oblast projekta, i to radi za svakog ko preuzme projekat. Pročitajte za više informacija." #. (title) #: ../source/TortoiseGit_en.xml:6971 msgid "Ignoring Versioned Items" msgstr "Zanemarivanje verzionisanih stavki" #. (para) #: ../source/TortoiseGit_en.xml:6972 msgid "Versioned files and folders can never be ignored - that's a feature of Git. If you versioned a file by mistake, read for instructions on how to unversion it." msgstr "Verzionisani fajlovi i imenici ne mogu biti nikad zanemareni - to je osobina Subverzije. Ako verzionišete fajl greškom pročitajte za instrukcije kako da ga odverzionišete." #. (title) #: ../source/TortoiseGit_en.xml:6980 msgid "Pattern Matching in Ignore Lists" msgstr "Hvatanje modela u listi zanemarivanja" #. (primary) #: ../source/TortoiseGit_en.xml:6982 msgid "globbing" msgstr "globbing" #. (primary) #: ../source/TortoiseGit_en.xml:6985 msgid "pattern matching" msgstr "hvatanje modela" #. (term) #: ../source/TortoiseGit_en.xml:6994 msgid "*" msgstr "*" #. (para) #: ../source/TortoiseGit_en.xml:6996 msgid "Matches any string of characters, including the empty string (no characters)." msgstr "Čini sličnim svaki string karaktera, uključujući prazan string (bez karaktera)." #. (term) #: ../source/TortoiseGit_en.xml:7003 msgid "?" msgstr "?" #. (para) #: ../source/TortoiseGit_en.xml:7005 msgid "Matches any single character." msgstr "Hvatanje bilo kog pojedinog karaktera." #. (term) #: ../source/TortoiseGit_en.xml:7011 msgid "[...]" msgstr "[...]" #. (para) #: ../source/TortoiseGit_en.xml:7013 msgid "Matches any one of the characters enclosed in the square brackets. Within the brackets, a pair of characters separated by - matches any character lexically between the two. For example [AGm-p] matches any one of A, G, m, n, o or p." msgstr "Čini sličnim bilo koji karakter zatvoren u srednjoj zagradi. U okviru zagrada, par karaktera odvojenih sa - čine sličnim svaki karakter leksički između ta dva. Na primer [AGm-p] čini sličnim svaki od A, G, m, n, o or p." #. (para) #: ../source/TortoiseGit_en.xml:6987 msgid "Git's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: " msgstr "Subverzioni model zanemarivanja koristi globalisanje imena fajlova kao tehniku originalno korićenu u Uniksu da se specificiraju fajlovi koristeći meta-karaktere kao džokere. Sledeći karakteri imaju specijalna značenja: " #. (para) #: ../source/TortoiseGit_en.xml:7027 msgid "Pattern matching is case sensitive, which can cause problems on Windows. You can force case insensitivity the hard way by pairing characters, eg. to ignore *.tmp regardless of case, you could use a pattern like *.[Tt][Mm][Pp]." msgstr "Model sparivanja zavisi od veličine slova, što može uzrokovati problem na Vindouzu. Možete fosirati nezavisnost od veličine slova na teži način sparivanjem karaktera, tj. zanemarivanjem *.tmp bezobzira od veličine slova, možete koristiti model *.[Tt][Mm][Pp]." #. (para) #: ../source/TortoiseGit_en.xml:7034 msgid "If you want an official definition for globbing, you can find it in the IEEE specifications for the shell command language Pattern Matching Notation." msgstr "Ako želite zvaničnu definiciju globalisanja naćićete je u IEEE specifikacijama za komandni jezik školjke Pattern Matching Notation." #. (title) #: ../source/TortoiseGit_en.xml:7042 msgid "No Paths in Global Ignore List" msgstr "Nema Putanja u Globalnoj Listi Zanemarivanja" #. (para) #: ../source/TortoiseGit_en.xml:7043 msgid "You should not include path information in your pattern. The pattern matching is intended to be used against plain file names and folder names. If you want to ignore all CVS folders, just add CVS to the ignore list. There is no need to specify CVS */CVS as you did in earlier versions. If you want to ignore all tmp folders when they exist within a prog folder but not within a doc folder you should use the svn:ignore property instead. There is no reliable way to achieve this using global ignore patterns." msgstr "Ne ptreba da uključite informaciju putanje u vašem modelu. Traženje modela namerava da bude korišćeno prema punim imenima fajla i imenika. Ako želite da zanemarite sve CVS imenike, samo dodajte CVSu listu zanemarivanja. Nema potrebe da se specificira CVS */CVS kako ste radili u ranijim verzijama. Ako želite da zanemarite sve tmp imenike kada oni postoje u prog imeniku ali ne u okvoru doc imenika treba da koristite svn:ignore osobinu umestotoga. Nema pouzdanog načina da se ovo postigne koristeći model zanemarivanja." #. (title) #: ../source/TortoiseGit_en.xml:7061 msgid "Deleting, Moving and Renaming" msgstr "Brisanje, pomeranje i preimenovanje" #. (title) #: ../source/TortoiseGit_en.xml:7067 msgid "Explorer context menu for versioned files" msgstr "Eksplorerov kontekst meni za verzionisane fajlove" #. (para) #: ../source/TortoiseGit_en.xml:7062 msgid "Unlike CVS, Git allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. " msgstr "Suprotno CVS, Subverzija dozvoljava preimenovanje i pomeranje fajlova i imenika. Tako da ima meni ulaza za brisanje i preimenovanje u TortoiseGit submeniju. " #. (title) #: ../source/TortoiseGit_en.xml:7072 msgid "Deleting files and folders" msgstr "Brisanje fajlova i imenika" #. (primary) #: ../source/TortoiseGit_en.xml:7074 msgid "delete" msgstr "briši" #. (primary) #: ../source/TortoiseGit_en.xml:7077 msgid "remove" msgstr "ukloni" #. (para) #: ../source/TortoiseGit_en.xml:7079 msgid "Use TortoiseGitDelete to remove files or folders from Git." msgstr "Koristi TortoiseGitBriši da se uklone fajlovi i imenici iz subverzije." #. (para) #: ../source/TortoiseGit_en.xml:7087 msgid "When you TortoiseGitDelete a file, it is removed from your working copy immediately as well as being marked for deletion in the repository on next commit. The file's parent folder shows a deleted icon overlay. Up until you commit the change, you can get the file back using TortoiseGitRevert on the parent folder." msgstr "Kada uradite TortoiseGitBriši fajl, to ukloni iz vaše radne kopije trenutno kao što i markira za brisanje u spremištu pri sledećem urezivanju. Predački imenik fajla prikazuje obrisan prekrivnu ikonu. Sve dok ne urežete izmene možete vratiti fajlove nazad koristeći TortoiseGitVrati na predački imenik." #. (para) #: ../source/TortoiseGit_en.xml:7103 msgid "When you TortoiseGitDelete a folder, it remains in your working copy, but the overlay changes to indicate that it is marked for deletion. Up until you commit the change, you can get the folder back using TortoiseGitRevert on the folder itself. This difference in behaviour between files and folders is a part of Git, not TortoiseGit." msgstr "Kada TortoiseGitBriši imenik, ostaje u vašoj radnoj kopiji, ali se prekrivač menja da indicira da je markiran za brisanje. Sve dok ne urežete izmene možete vratiti imenik koristeći TortoiseGita NVrati na sam imenik. Ova razlika u ponašanju među fajlovima i imenicima je deo Subverzije, ne TortoiseGit." #. (para) #: ../source/TortoiseGit_en.xml:7120 msgid "If you want to delete an item from the repository, but keep it locally as an unversioned file/folder, use Extended Context MenuDelete (keep local). You have to hold the Shift key while right clicking on the item in the explorer list pane (right pane) in order to see this in the extended context menu." msgstr "Ako želite da obrišete stavku iz spremišta, ali da je zadržite lokalno kaoneverzionisani fajl/imenik, koristite Prišireni Kontekst MeniBriši (čuvaj lokalno). Treba da držite Shift taster kada desno kliknete na stavku u pretraživačevom list panelu (desni panel) da bi ga videli u proširenom kontekst meniju." #. (para) #: ../source/TortoiseGit_en.xml:7131 msgid "If a file is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Git will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use TortoiseGitDelete so that Git doesn't have to guess what you really want to do." msgstr "Ako je fajl obrisan preko pretraživača umesto korišćenjem TortoiseGit kontekst menija, dijalog urezivanja prikazuje te fajlove i dozvoljava vam da ih uklonite iz kontrole verzija pre urezivanja takođe. Međutim, ako ažurirate vašu radnu kopiju, Subverzija će obeležiti fajl koji nedostaje i zameniti ga sa zadnjom verzijom iz spremišta. Ako vam treba da obrišete verzija-kontrolisan fajl, uvek koristite TortoiseGitBriši tako da Subverzija ne mora da pogađa šta vi stvarno želite da uradite." #. (para) #: ../source/TortoiseGit_en.xml:7145 msgid "If a folder is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Git will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseGitDelete." msgstr "Ako je imenik izbrisan preko pretraživača umesto koristići TortoiseGit kontekst meni, vaša radna kopija će biti oštećena i vi nećeti moći da je urežete. Ako ažurirate vašu radnu kopiju Subverzija će zameniti nedostajući imenik sa zadnjom verzijom iz spremišta i možete ga tada obrisati na ispravan način koristeći TortoiseGitObriši." #. (title) #: ../source/TortoiseGit_en.xml:7158 msgid "Getting a deleted file or folder back" msgstr "Vraćanje izbrisanih fajlova i imenika" #. (para) #: ../source/TortoiseGit_en.xml:7159 msgid "If you have deleted a file or a folder and already committed that delete operation to the repository, then a normal TortoiseGitRevert can't bring it back anymore. But the file or folder is not lost at all. If you know the revision the file or folder got deleted (if you don't, use the log dialog to find out) open the repository browser and switch to that revision. Then select the file or folder you deleted, right-click and select Context MenuCopy to... as the target for that copy operation select the path to your working copy." msgstr "Ako ste obrisali fajl ili imenik i već ste urezali tu operaciju brisanja onda normalno TortoiseGitVrati ne može da to vrati uopšte. Ali fajl ili imenik nije izgubljen potpuno. Ako znate reviziju fajla ili imenika uzmite obrisane (ako ne, koristite dnevnik dijalog da ih nađete) otvorite pretraživač spremišta i prebacite na tu reviziju. Zatim izaberite fajl ili imenik koje ste obrisali, desni klik i izaberite Kontekst MeniKopiraj u... kao cilj za tu operaciju kopiralja izaberite putanju u vašoj radnoj kopiji." #. (title) #: ../source/TortoiseGit_en.xml:7181 msgid "Moving files and folders" msgstr "Pomeranje fajlova i imenika" #. (primary) #. (primary) #. (primary) #: ../source/TortoiseGit_en.xml:7183 #: ../source/TortoiseGit_en.xml:9522 #: ../source/TortoiseGit_en.xml:13288 msgid "rename" msgstr "preimenuj" #. (primary) #: ../source/TortoiseGit_en.xml:7186 msgid "move" msgstr "pomeri" #. (para) #: ../source/TortoiseGit_en.xml:7189 msgid "If you want to do a simple in-place rename of a file or folder, use Context MenuRename... Enter the new name for the item and you're done." msgstr "Ako želite da uradite jednostavno na-mestu preimenovanje fajla ili imenika, koristite Kontekst MeniPreimenuj... Unesite novo ime za stavku i uradite." #. (para) #: ../source/TortoiseGit_en.xml:7204 msgid "select the files or directories you want to move" msgstr "izbor fajlova ili imenika koje želite da pomerite" #. (para) #: ../source/TortoiseGit_en.xml:7220 msgid "in the popup menu select Context MenuSVN Move versioned files here" msgstr "u popap meniju izaberite Kontekst MeniSVN Pomeri verzionisani fajl ovde" #. (para) #: ../source/TortoiseGit_en.xml:7198 msgid "If you want to move files around inside your working copy, perhaps to a different sub-folder, use the right-mouse drag-and-drop handler: " msgstr "Ako želite da pomerite fajlove okolo unutar vaše radne kopije, možda u različit sub-imenik, koristite desni-miš vuci-i-baci ručicu: " #. (title) #: ../source/TortoiseGit_en.xml:7231 msgid "Commit the parent folder" msgstr "urezivanje predačkog imenika" #. (para) #: ../source/TortoiseGit_en.xml:7232 msgid "Since renames and moves are done as a delete followed by an add you must commit the parent folder of the renamed/moved file so that the deleted part of the rename/move will show up in the commit dialog. If you don't commit the removed part of the rename/move, it will stay behind in the repository and when your co-workers update, the old file will not be removed. i.e. they will have both the old and the new copies." msgstr "Kako su preimenovanje i pomeranje dati kao brisanje praćeno dodavanjem morate urezati predački imenik preimenovanih/pomerenih fajlova tako da obrisani deo preimenovanja/pomeranja će se prikazati u dijalogu urezivanja. Ako ne urežete uklonjeni deo preimenuj/pomeri, on će ostati iza u spremištu i kada vaš saradnik ažurira stari fajl neće biti uklonjen. tj. on će imati obe staru i novu kopiju. " #. (para) #: ../source/TortoiseGit_en.xml:7242 msgid "You must commit a folder rename before changing any of the files inside the folder, otherwise your working copy can get really messed up." msgstr "Vi morate urezati preimenovanje imenika pre izmena bilo kog fajla u imeniku, drugačije vaša radna kopija će stvarni biti zabrljana." #. (para) #: ../source/TortoiseGit_en.xml:7248 msgid "You can also use the repository browser to move items around. Read to find out more." msgstr "Možete takođe koristiti pretraživač spremišta da pomerate stavke naokolo. Pročitajte da nađete više detalja." #. (title) #: ../source/TortoiseGit_en.xml:7253 msgid "Do Not SVN Move Externals" msgstr "Nemojte da SVN pomera eksternale" #. (para) #: ../source/TortoiseGit_en.xml:7254 msgid "You should not use the TortoiseGit Move or Rename commands on a folder which has been created using svn:externals. This action would cause the external item to be deleted from its parent repository, probably upsetting many other people. If you need to move an externals folder you should use an ordinary shell move, then adjust the svn:externals properties of the source and destination parent folders." msgstr "Vi ne treba da koristite TortoiseGit Pomeri ili Preimenuj komande na imenicima koji su kreirani korišćenjem svn:externals. Ova akcija će prouzrokovati da se spoljašnja stavka obriše iz svog predačkog spremišta, verovatno unesretivši mnogo drugih ljudi. Ako treba da pomerite spoljašnji imenik treba koristiti obično pomeranje iz školjke, zatim podesite svn:externals osobine predačkog imenika izvora i odredišta." #. (title) #: ../source/TortoiseGit_en.xml:7269 msgid "Changing case in a filename" msgstr "Izmena velikih i malih slova u imenima fajla" #. (primary) #: ../source/TortoiseGit_en.xml:7271 msgid "case change" msgstr "izmena velikih i malih slova" #. (para) #: ../source/TortoiseGit_en.xml:7274 msgid "Making case-only changes to a filename is tricky with Git on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command." msgstr "Praveći izmene u veličini slova u fajlimenu je trik sa Subverzijom u Vindouzu, jer u kratkom periodu u toku preimenovanja, oba fajlimena postoje. Kako Vindouz ima fajl sistem nezavisan od veličine slova ovo ne radi korišćenjem obične Preimenuj komande." #. (para) #: ../source/TortoiseGit_en.xml:7280 msgid "Fortunately there are (at least) two possible methods to rename a file without losing its log history. It is important to rename it within Git. Just renaming in the explorer will corrupt your working copy!" msgstr "Srećom postoji (najmanje) dva moguća metoda za preimenovanje fajla bez gubtka njegove istorije. Važno je da se on preimenuje u okviru subverzije. Samo preimenovanje u pretraživaču pokvariće vašu radnu kopiju!" #. (para) #: ../source/TortoiseGit_en.xml:7290 msgid "Commit the changes in your working copy." msgstr "Urezivanje izmena u vašoj radnoj kopiji." #. (para) #: ../source/TortoiseGit_en.xml:7295 msgid "Rename the file from UPPERcase to upperCASE directly in the repository using the repository browser." msgstr "Preimenujte fajl iz UPPERcase u upperCASE direktno u spremištu koristeći pretraživač spremišta." #. (para) #: ../source/TortoiseGit_en.xml:7301 msgid "Update your working copy." msgstr "Ažuriranje vaše radne kopije." #. (para) #: ../source/TortoiseGit_en.xml:7286 msgid "Solution A) (recommended) " msgstr "Rešenje A) (preporučeno) " #. (para) #: ../source/TortoiseGit_en.xml:7311 msgid "Rename from UPPERcase to UPPERcase_ with the rename command in the TortoiseGit submenu." msgstr "Preimenujte UPPERcase u UPPERcase_ sa komandom preimenovanja u TortoiseGit submeniju." #. (para) #. (para) #: ../source/TortoiseGit_en.xml:7317 #: ../source/TortoiseGit_en.xml:7327 msgid "Commit the changes." msgstr "Urezivanje promena." #. (para) #: ../source/TortoiseGit_en.xml:7322 msgid "Rename from UPPERcase_ to upperCASE." msgstr "Preimenuj iz UPPERcase_ u upperCASE." #. (para) #: ../source/TortoiseGit_en.xml:7307 msgid "Solution B) " msgstr "Rešenje B) " #. (title) #: ../source/TortoiseGit_en.xml:7335 msgid "Dealing with filename case conflicts" msgstr "Rad sa konfliktom veličine slova u imenu fajla" #. (para) #: ../source/TortoiseGit_en.xml:7336 msgid "If the repository already contains two files with the same name but differing only in case (e.g. TEST.TXT and test.txt), you will not be able to update or checkout the parent directory on a Windows client. Whilst Git supports case-sensitive filenames, Windows does not." msgstr "Ako spremište već sadrži dva fajla sa istim imenom koji se razlikuju samo u veličini slova (npr. TEST.TXT i test.txt), vi nećete moći da ažurirate ili preuzmete predački imenik na Vindouz klijentu. Pošto Subverzija podržava fajlimena zavisna od veličine slova, Vindouz to ne radi." #. (para) #: ../source/TortoiseGit_en.xml:7344 msgid "This sometimes happens when two people commit, from separate working copies, files which happen to have the same name, but with a case difference. It can also happen when files are committed from a system with a case-sensitive file system, like Linux." msgstr "Ovo se ponekad dešava kada dva čoveka urezuju, iz posebnih radnih kopija, fajlove za koje se desi da imaju ista imena, ali sa razlikom u veličini slova. To se takođe dešava kada su fajlovi urezani iz sistema sa fajlsistemom koji razlikuje veličinu slova kao Linuks." #. (para) #: ../source/TortoiseGit_en.xml:7351 msgid "In that case, you have to decide which one of them you want to keep and delete (or rename) the other one from the repository." msgstr "U tom slučaju morate odlučiti koji od njih želite da zadržite i obrišete (ili preimenujete) drugi iz spremišta." #. (title) #: ../source/TortoiseGit_en.xml:7356 msgid "Preventing two files with the same name" msgstr "Preduprediti dva fajla sa istim imeno" #. (para) #: ../source/TortoiseGit_en.xml:7357 msgid "There is a server hook script available at: http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/ that will prevent checkins which result in case conflicts." msgstr "Postoji server zakačiva skripta dostupna na: http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/ koja će preduprediti proveru koja rezultira konfliktom usled veličine slova." #. (title) #: ../source/TortoiseGit_en.xml:7367 msgid "Repairing File Renames" msgstr "Ispravka preimenovanja fajlova" #. (para) #: ../source/TortoiseGit_en.xml:7368 msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Git. If you try to commit your changes, Git will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Git does not know the files are related." msgstr "Ponekad vaš prijateljski IDE će preimenovati fajlove za vas kao deo pravljenja primera, i svakako to ne kaže Subverziji. Ako pokušate da urežete svoje izmene Subverzija će videti stara fajlimena kao nedostajuća i nova kao neverzionisane fajlove. Možete samo proveriti novo fajlime da dodate ali tada gubite sliku istorije pošto Subverzija nezna fajlove na koje se odnosi. " #. (para) #: ../source/TortoiseGit_en.xml:7376 msgid "A better way is to notify Git that this change is actually a rename, and you can do this within the Commit and Check for Modifications dialogs. Simply select both the old name (missing) and the new name (unversioned) and use Context MenuRepair Move to pair the two files as a rename." msgstr "Bolji način je da se notira Subverzija da su ove izmene u stvari preimenovanja i možete to uraditi u okviru Ureži i Proveri Modifikaciju dijalog. Jednostavno izaberite staro ime (nedostaje) i novo ime (neverzionisano) i koristite Kontekst MeniPopravi Pomeri da uparite dva fajla kao preimenovanje." #. (title) #: ../source/TortoiseGit_en.xml:7390 msgid "Deleting Unversioned Files" msgstr "Brisanje neverzionisanih fajlova" #. (para) #: ../source/TortoiseGit_en.xml:7391 msgid "Usually you set your ignore list such that all generated files are ignored in Git. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks." msgstr "Obično podešavate listu zanemarivanja tako da su svi generisani fajlvi zanemareni u Subverziji. Ali šta ako želite da očistite sve zanemarene stavke da bi izradili čistu gradnju? Obično to podešavate u mejkfajlu ali ako debagujete mejkfajl ili menjanjem sistema izgradnje korisno je da se ima način čišćenja platforme." #. (para) #: ../source/TortoiseGit_en.xml:7398 msgid "TortoiseGit provides just such an option using Extended Context MenuDelete unversioned items.... You have to hold the Shift while right clicking on a folder in the explorer list pane (right pane) in order to see this in the extended context menu. This will produce a dialog which lists all unversioned files anywhere in your working copy. You can then select or deselect items to be removed." msgstr "TortoiseGit omogućava upravo takvu opciju korišćenjem Prošireni Kontekst MeniBriši neverzionisane stavke.... Držite Shift dok desno kliknete na imenik u panelu liste pretraživača (desni panel) da bi videli ovo u proširenom kontekst meniju. Ovo će proizvesti dijalog koji lista sve neverzionisane fajlove bilo gde u vašoj radnoj kopiji. Možete zatim izabrati stavke za uklanjanje." #. (para) #: ../source/TortoiseGit_en.xml:7410 msgid "When such items are deleted, the recycle bin is used, so if you make a mistake here and delete a file that should have been versioned, you can still recover it." msgstr "Kada se te stavke obrišu korpa za otpatke se koristi tako da ako napravite grešku i obrišete fajl koji treba da bude verzionisan još uvek ga možete povratiti." #. (title) #: ../source/TortoiseGit_en.xml:7418 msgid "Undo Changes" msgstr "Poništi izmene" #. (primary) #. (primary) #: ../source/TortoiseGit_en.xml:7420 #: ../source/TortoiseGit_en.xml:13421 msgid "revert" msgstr "vrati" #. (primary) #: ../source/TortoiseGit_en.xml:7423 msgid "undo" msgstr "poništi" #. (title) #: ../source/TortoiseGit_en.xml:7438 msgid "Revert dialog" msgstr "Vrati dijalog" #. (para) #: ../source/TortoiseGit_en.xml:7425 msgid "If you want to undo all changes you made in a file since the last update you need to select the file, right click to pop up the context menu and then select the command TortoiseGitRevert A dialog will pop up showing you the files that you've changed and can revert. Select those you want to revert and click on OK. " msgstr "Ako želite poništiti sve izmene koje ste uradili u fajlu od zadnjeg ažuriranja potrebno je da izaberete fajl, desni klik da iskoči kontekst meni i zatim izaberite komandu TortoiseGitVrati Dijalog će iskočiti prikazijući vam fajlove koje ste izmenili i vratili. Izaberite one koje želite da vratite i kliknite na OK. " #. (para) #: ../source/TortoiseGit_en.xml:7442 msgid "If you want to undo a deletion or a rename, you need to use Revert on the parent folder as the deleted item does not exist for you to right-click on." msgstr "Ako želite da poništite brisanje ili preimenovanje, potrebno je da koristite Vrati na predački imenik jer obrisani ne postoje da kliknete na njih." #. (para) #: ../source/TortoiseGit_en.xml:7447 msgid "If you want to undo the addition of an item, this appears in the context menu as TortoiseGitUndo add.... This is really a revert as well, but the name has been changed to make it more obvious." msgstr "Ako želite poništiti dodavanje stavke to se pojavljuje u kontekst meniju kao TortoiseGitPoništi Dodaj.... Ovo zaista vraća ali ime je promenjeno da ga učini mnogo uočljivijim." #. (para) #. (para) #: ../source/TortoiseGit_en.xml:7457 #: ../source/TortoiseGit_en.xml:9197 msgid "The columns in this dialog can be customized in the same way as the columns in the Check for modifications dialog. Read for further details." msgstr "Kolone u ovom dijalogu mogu se podesiti na isti način kao kolone u Proveri za modifikaciju dijalogu. Pročitajte za više detalja." #. (title) #: ../source/TortoiseGit_en.xml:7463 msgid "Undoing Changes which have been Committed" msgstr "Poništavanje izmena koje su urezane" #. (para) #: ../source/TortoiseGit_en.xml:7464 msgid "Revert will only undo your local changes. It does not undo any changes which have already been committed. If you want to undo all the changes which were committed in a particular revision, read for further information." msgstr "Vrati samo poništava vaše lokalne izmene. To ne poništava bilo koju izmenu koja je već urezana. Ako želite da poništite sve izmene koje su urezane u posebnoj reviziji pročitajte za dodatne informacije." #. (title) #: ../source/TortoiseGit_en.xml:7475 msgid "Revert is Slow" msgstr "Vraćanje je sporo" #. (para) #: ../source/TortoiseGit_en.xml:7476 msgid "When you revert changes you may find that the operation takes a lot longer than you expect. This is because the modified version of the file is sent to the recycle bin, so you can retrieve your changes if you reverted by mistake. However, if your recycle bin is full, Windows takes a long time to find a place to put the file. The solution is simple: either empty the recycle bin or deactivate the Use recycle bin when reverting box in TortoiseGit's settings." msgstr "Kada vratite izmene možete naći da ta operacija traje duže nego ste očekivali. To je zato što se izmenjena verzija fajla šalje u korpu tako da možete vratiti izmene ako ste pogrešili. Međutim, ako je korpa puna Vindouz uzima puno vremena da nađe mesto da stavi fajl. Rešenje je jednostavno: ili ispraznite korpu ili deaktivirajte Koristite korpu pri vraćanju boks u TortoiseGit podešavanju." #. (title) #. (entry) #. (title) #. (glossterm) #: ../source/TortoiseGit_en.xml:7489 #: ../source/TortoiseGit_en.xml:14039 #: ../source/TortoiseGit_en.xml:15084 #: ../source/TortoiseGit_en.xml:15873 msgid "Cleanup" msgstr "Čišćenje" #. (primary) #: ../source/TortoiseGit_en.xml:7491 msgid "cleanup" msgstr "čišćenje" #. (para) #: ../source/TortoiseGit_en.xml:7493 msgid "If a Git command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use TortoiseGitCleanup on the folder. It is a good idea to do this at the top level of the working copy." msgstr "Ako Subverziona komanda ne može da se završi uspešno, moguće zbog problema na serveru, vaša radna kopija biće ostavljena u nekonzistentnom stanju. U tom slučaju treba da koristite TortoiseGitČišćenje na imeniku. To je dobra ideja da se uradi na vršnom nivou radne kopije." #. (para) #: ../source/TortoiseGit_en.xml:7504 msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Git cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these broken timestamps and restore status checks to full speed." msgstr "Čišćenje ima i drugi propratni efekat. Ako je datum fajla promenjen a sadržaj nije, Subverzija ne može reći da li je zaista izmenjen osim proverom bajt-po-bajt sa čistom kopijom. Ako imate puno fajlova u ovom stanju provera statusa je vrlo spora što će uraditi puno dijaloga sporo odgovaranje. Izvršavanjem Čišćenja na radnoj kopiji popraviće poremećene vremenske markere i povratiti status provere punom brzinom." #. (title) #: ../source/TortoiseGit_en.xml:7515 msgid "Use Commit Timestamps" msgstr "Koristi vremenske markere urezivanja" #. (para) #: ../source/TortoiseGit_en.xml:7516 msgid "Some earlier releases of Git were affected by a bug which caused timestamp mismatch when you check out with the Use commit timestamps option checked. Use the Cleanup command to speed up these working copies." msgstr "Neke ranije realizacije Subverzije su imale bag koji je uzrokovao onflikt vremenskih markera kada ih proveravate sa Koristi urezivanje vremenskih markera proverom opcija. Koristite Čišćenje komandu da ubrzate ove radne kopije. " #. (title) #: ../source/TortoiseGit_en.xml:7526 msgid "Project Settings" msgstr "Podešavanje projekta" #. (primary) #: ../source/TortoiseGit_en.xml:7528 msgid "properties" msgstr "osobine" #. (title) #: ../source/TortoiseGit_en.xml:7532 msgid "Explorer property page, Git tab" msgstr "Vlasnički list eksplorera, Subverzioni tab" #. (para) #: ../source/TortoiseGit_en.xml:7530 msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Git provides in the explorer properties dialog. Just select the file or directory and select Windows Menuproperties in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Git control, where you can see all relevant information about the selected file/directory." msgstr " Ponekad želite da imate detaljnije informacije o fajl/imenik nego što je prekrivna ikona. Možete dobiti sve informacije koje Subverzija daje u dijalogu osobina pretraživača. Samo izaberite fajl ili imenik i izaberite Vindouz MeniOsobine u kontekst meniju (primedba: to je normalan meni osobina ulaz koji daje pretraživač, nije deo TortoiseGit submenija!). U dijalogu osobina TortoiseGit dodaje novu stranu osobina za fajlove/imenike pod Subverzijinom kontrolom, gde možete videti relevantne informacije o izabranom fajlu/imeniku." #. (title) #: ../source/TortoiseGit_en.xml:7552 msgid "Git Properties" msgstr "Subverzione osobine" #. (primary) #: ../source/TortoiseGit_en.xml:7554 msgid "Git properties" msgstr "Subverzione osobine" #. (title) #: ../source/TortoiseGit_en.xml:7560 msgid "Git property page" msgstr "Subverzioni vlasnički list" #. (para) #: ../source/TortoiseGit_en.xml:7558 msgid " You can read and set the Git properties from the Windows properties dialog, but also from TortoiseGitproperties and within TortoiseGit's status lists, from Context menuproperties." msgstr " Možete čitati i podesiti Subverzione osobine iz Vindouz osobine dijaloga, ali takođe iz TortoiseGitosobine i u okviru TortoiseGit statusne liste iz Kontekst meniosobine." #. (para) #: ../source/TortoiseGit_en.xml:7575 msgid "You can add your own properties, or some properties with a special meaning in Git. These begin with svn:. svn:externals is such a property; see how to handle externals in ." msgstr "Možete dodatu vaše lične osobine, ili neke osobine sa specifičnim značenjem u Subverziji. To što počinje sa svn:. svn:externals je takva osobinač vidite kako se rukuje eksternalima u xref linkend=\"tsvn-dug-import-4\"/>." #. (title) #: ../source/TortoiseGit_en.xml:7582 msgid "svn:keywords" msgstr "svn:ključnereči" #. (primary) #: ../source/TortoiseGit_en.xml:7584 msgid "keywords" msgstr "ključne reči" #. (primary) #: ../source/TortoiseGit_en.xml:7587 msgid "expand keywords" msgstr "proširenje ključnih reči" #. (para) #: ../source/TortoiseGit_en.xml:7597 msgid "Date of last known commit. This is based on information obtained when you update your working copy. It does not check the repository to find more recent changes." msgstr "Datum zadnjeg poznatog urezivanja. Ovo je zasnovano na informaciju dobijenu kada ste ažurirali vašu radnu kopiju. To ne proverava spremište da nađe najskorije izmene." #. (para) #: ../source/TortoiseGit_en.xml:7608 msgid "Revision of last known commit." msgstr "Revizija zadnje poznatog urezvanja." #. (para) #: ../source/TortoiseGit_en.xml:7616 msgid "Author who made the last known commit." msgstr "Autor koji je uradio zadnje poznato urezivanje." #. (para) #: ../source/TortoiseGit_en.xml:7624 msgid "The full URL of this file in the repository." msgstr "Pun URL ovog fajla u spremištu." #. (para) #: ../source/TortoiseGit_en.xml:7632 msgid "A compressed combination of the previous four keywords." msgstr "Komprimovana kombinacija prethodne četiri ključne reči." #. (para) #: ../source/TortoiseGit_en.xml:7589 msgid "Git supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " msgstr "Subverzija podržava CVS-slične proširenje ključnih reči koje se mogu koristiti da uglave fajlime i revizionu informaciju u sam fajl. Ključne reči trenutno podržane su: " #. (para) #: ../source/TortoiseGit_en.xml:7640 msgid "To find out how to use these keywords, look at the svn:keywords section in the Git book, which gives a full description of these keywords and how to enable and use them." msgstr "Da biste našli kako da koristite ključne reči pogledajte na svn:keywords section u Subverzionoj knjizi, koja vam daje pun opis ovih ključnih reči i kako ih omogućiti i koristiti." #. (para) #: ../source/TortoiseGit_en.xml:7650 msgid "For more information about properties in Git see the Special Properties." msgstr "Dalje informacije o svnservu mogu se naći na Specijalne osobine." #. (title) #: ../source/TortoiseGit_en.xml:7657 msgid "Adding and Editing Properties" msgstr "Dodavanje i uređenje osobina." #. (title) #: ../source/TortoiseGit_en.xml:7660 msgid "Adding properties" msgstr "Dodavanje osobina" #. (para) #: ../source/TortoiseGit_en.xml:7658 msgid " To add a new property, first click on Add.... Select the required property name from the combo box, or type in a name of your own choice, then enter a value in the box below. Properties which take multiple values, such as an ignore list, can be entered on multiple lines. Click on OK to add that property to the list." msgstr " Da biste dodali nove osobine najpre kliknite na Dodaj.... Izaberite ime željene osobine iz kombo boksa, ili ukucajte ime po vašem izboru, zatim unesite vrednost u boks ispod. Osobine koje imaju višestruke vrednosti, kao što je lista zanemarivanja, mogu se uneti u više linija. Kliknite na OK i dodajte tu osobinu u listu." #. (para) #: ../source/TortoiseGit_en.xml:7670 msgid "If you want to apply a property to many items at once, select the files/folders in explorer, then select Context menuproperties" msgstr "Ako želite da primenite osobinu na više stavki odjednom, izaberite fajlove/imenike u pretraživaču, zatim izaberite Kontekst meniosobine" #. (para) #: ../source/TortoiseGit_en.xml:7678 msgid "If you want to apply the property to every file and folder in the hierarchy below the current folder, check the Recursive checkbox." msgstr "Ako želite da primenite osobine na svaki fajl i imenik u hijerarhiji ispod tekućeg imenika, čekirajte Rekurziv čekboks. " #. (para) #: ../source/TortoiseGit_en.xml:7683 msgid "Some properties, for example svn:needs-lock, can only be applied to files, so the property name doesn't appear in the drop down list for folders. You can still apply such a property recursively to all files in a hierarchy, but you have to type in the property name yourself." msgstr "Neke osobine, na primer svn:needs-lock, mogu se samo primeniti na fajlove, tako ime osobine se ne pojavljuje u padajućoj listi za imenike. Možete tek primeniti takve osobine rekurzivno na sve fajlove u hijerarhiji, ali morate da otkucate ime osobine sami." #. (para) #: ../source/TortoiseGit_en.xml:7690 msgid "If you wish to edit an existing property, select that property from the list of existing properties, then click on Edit...." msgstr "Ako želite da uredite postojeću osobinu, izaberite tu osobinu iz liste postojećih osobina, zatim kliknite na Uredi...." #. (para) #: ../source/TortoiseGit_en.xml:7694 msgid "If you wish to remove an existing property, select that property from the list of existing properties, then click on Remove." msgstr "Ako želite da uklonite postojeću osobinu, izaberite osobinu iz liste postojećih osobina, zatim kliknite na Ukloni." #. (para) #: ../source/TortoiseGit_en.xml:7698 msgid "The svn:externals property can be used to pull in other projects from the same repository or a completely different repository. For more information, read ." msgstr "Osobina svn:externals može se koristiti da se privuče u druge projekte iz istog spremišta ili sasvim različitog spremišta. Za više informacija, pročitajte ." #. (title) #: ../source/TortoiseGit_en.xml:7706 msgid "Exporting and Importing Properties" msgstr "Izvoz i uvoz osobina" #. (para) #: ../source/TortoiseGit_en.xml:7707 msgid "Often you will find yourself applying the same set of properties many times, for example bugtraq:logregex. To simplify the process of copying properties from one project to another, you can use the Export/Import feature." msgstr "Često ćete zateći sebe da primenjujete isti skup osobina više puta, na primer bugtraq:logregex. Da pojednostavite proces kopiranja osobina iz jednog projekta u drugi, možete koristiti Izvezi/Uvezi mogućnost." #. (para) #: ../source/TortoiseGit_en.xml:7713 msgid "From the file or folder where the properties are already set, use TortoiseGitproperties, select the properties you wish to export and click on Export.... You will be prompted for a filename where the property names and values will be saved." msgstr "Od fajla ili imenika gde je osobina već podešena koristite TortoiseGitosobine, izaberite osobine koje želite da izvezete i kliknite na guibutton>Izvezi.... Bićete pitani za fajlime gde će se imena osobina i vrednosti sačuvati." #. (para) #: ../source/TortoiseGit_en.xml:7723 msgid "From the folder(s) where you wish to apply these properties, use TortoiseGitproperties and click on Import.... You will be prompted for a filename to import from, so navigate to the place you saved the export file previously and select it. The properties will be added to the folders non-recursively." msgstr "Iz imenika gde želite da primenite ove osobine, koristite TortoiseGitosobine kliknite na Uvoz.... Bićete pitani za fajlime za uvoz pa odite do mesta gde ste sačuvali ranije izvezen fajl i izaberite ga. Osobine će biti dodate imeniku ne-rekurzivno." #. (para) #: ../source/TortoiseGit_en.xml:7734 msgid "If you want to add properties to a tree recursively, follow the steps above, then in the property dialog select each property in turn, click on Edit..., check the Apply property recursively box and click on OK." msgstr "Ako želite da dodate osobine stablu rekurzivno pratite gornje korake, zatim u dijalogu osobina izaberite svaku osobinu jednu za drugom, Uredi..., čekirajte Primeni osobinu rekurzivnoboks i kliknite na OK. " #. (para) #: ../source/TortoiseGit_en.xml:7741 msgid "The Import file format is binary and proprietary to TortoiseGit. Its only purpose is to transfer properties using Import and Export, so there is no need to edit these files." msgstr "Uvozni fajl format je binarni i vlasništvo TortoiseGit. NJegova je jedina svrha da prenese osobine koristeći Uvoz i Izvoz, tako da nije potrebno uređenje ovih fajlova." #. (title) #: ../source/TortoiseGit_en.xml:7748 msgid "Binary Properties" msgstr "Binarne Osobine" #. (para) #: ../source/TortoiseGit_en.xml:7749 msgid "TortoiseGit can handle binary property values using files. To read a binary property value, Save... to a file. To set a binary value, use a hex editor or other appropriate tool to create a file with the content you require, then Load... from that file." msgstr "TortoiseGit može rukovati binarnim vrednostima osobina koristeći fajlove. Da bi se pročitala binarna vrednost osobine Sačuvaj... u fajl. Da se podesi binarna vrednost koristite heksa uređivač ili drugi odgovarajući alat da creirate fajl sa sadržajem koji vam je potreban, zatim Unesi... iz tog fajla." #. (para) #: ../source/TortoiseGit_en.xml:7756 msgid "Although binary properties are not often used, they can be useful in some applications. For example if you are storing huge graphics files, or if the application used to load the file is huge, you might want to store a thumbnail as a property so you can obtain a preview quickly." msgstr "Mada se binarne osobine ne koriste često one mogu biti korisne u nekim aplikacijama. Na primer ako smeštate ogromne grafičke fajlove, ili ako aplikacija korišćena da unese fajl je ogromna, možete želeti da sačuvate pregledne sličice kao oobinu da biste mogli da brzo dobijete pregled." #. (title) #: ../source/TortoiseGit_en.xml:7764 msgid "Automatic property setting" msgstr "Automatsko podešavanje osobina" #. (primary) #: ../source/TortoiseGit_en.xml:7766 msgid "auto-props" msgstr "auto-osob" #. (para) #: ../source/TortoiseGit_en.xml:7768 msgid "You can configure Git and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." msgstr "Možete konfigurisati Subverziju i TortoiseGit da podesite osobine automatski na fajlovima i imenicima kada se oni dodaju u spremište. Postoji dva načina da se to uradi." #. (para) #: ../source/TortoiseGit_en.xml:7773 msgid "You can edit the Git configuration file to enable this feature on your client. The General page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of Git's workings. You need to change two things: firstly in the section headed miscellany uncomment the line enable-auto-props = yes. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard Git feature and works with any Git client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." msgstr "Možete urediti subverzioni konfiguracioni fajl da omogućite ovu osobinu na klijentu. Generalna strana TortoiseGit podešavanja dijalog ima dugme za uređenje da ga pokrenete direktno. Konfig fajl je jednostavan tekst fajl koji kontroliše neke od subverzionih delovanja. Potrebno je da izmenite dve stvari: najpre u zaglavlju paragrafa asortiman otkomentirajte liniju enable-auto-props = yes. Drugo, potrebno je da uredite paragraf ispod da definiše koje osobine želite da dodate na koji tip fajla. Ovaj metod je standardna subverziona osobina i radi sa bilo kojim subverzionim klijentom. Međutim to je definisano kod svakog klijenta individualno - nema načina da se prenese ovo podešavanje iz spremišta." #. (para) #: ../source/TortoiseGit_en.xml:7790 msgid "An alternative method is to set the tsvn:autoprops property on folders, as described in the next section. This method only works for TortoiseGit clients, but it does get propagated to all working copies on update." msgstr "Alternativni metod je da se podesi tsvn:autoprops osobina na imeniku, kako je opisano u sledećem paragrafu. Ovaj metod radi samo za TortoiseGit klijente, ali to se dobija za sve radne kopije pri ažuriranju." #. (para) #: ../source/TortoiseGit_en.xml:7796 msgid "Whichever method you choose, you should note that auto-props are only applied to files at the time they are added to the repository. Auto-props will never change the properties of files which are already versioned." msgstr "Kojigod metod da se izabere morate primetiti da auto-osobine su primenjene samo na fajlove u vreme kada su dodati spremištu. Auto-osobine neće nikada izmeniti osobine fajlova koji su već verzionisani." #. (para) #: ../source/TortoiseGit_en.xml:7802 msgid "If you want to be absolutely sure that new files have the correct properties applied, you should set up a repository pre-commit hook to reject commits where the required properties are not set." msgstr "Ako želiti da budete apsolutno sigurni u to da novi fajlovi imaju ispravne osobine primenjene, vi treba da podesite u spremištu pre-urezivanja zakačaljku da odbaci urezivanje tamo gde nisu podešene odgovarajuće osobine." #. (title) #: ../source/TortoiseGit_en.xml:7809 msgid "Commit properties" msgstr "Urezivanje osobina" #. (para) #: ../source/TortoiseGit_en.xml:7810 msgid "Git properties are versioned. After you change or add a property you have to commit your changes." msgstr "Subverzione osobine su verzionisane. Posle izmena ili dodavanja osobina treba da urežete vaše izmene." #. (title) #: ../source/TortoiseGit_en.xml:7816 msgid "Conflicts on properties" msgstr "Konflikt u osobinama" #. (para) #: ../source/TortoiseGit_en.xml:7817 msgid "If there's a conflict on committing the changes, because another user has changed the same property, Git generates a .prej file. Delete this file after you have resolved the conflict." msgstr "Ako postoji konflikt pri urezivanju izmena, zato što drugi korisnik ima izmenjene iste osobine, Subverzija generiše .prej fajl. Obrišite ovaj fajl posle razrešenja konflikta." #. (title) #: ../source/TortoiseGit_en.xml:7826 msgid "TortoiseGit Project Properties" msgstr "Osobine TortoiseGit projekata" #. (primary) #: ../source/TortoiseGit_en.xml:7828 msgid "project properties" msgstr "osobine projekta" #. (primary) #: ../source/TortoiseGit_en.xml:7831 msgid "TortoiseGit properties" msgstr "TortoiseGit osobine" #. (para) #: ../source/TortoiseGit_en.xml:7838 msgid "tsvn:logminsize sets the minimum length of a log message for a commit. If you enter a shorter message than specified here, the commit is disabled. This feature is very useful for reminding you to supply a proper descriptive message for every commit. If this property is not set, or the value is zero, empty log messages are allowed." msgstr "tsvn:logminsize podešava minimalnu dužinu dnevnik poruke za urezivanje. Ako unesete kraću poruku nego što je specificirano ovde, urezivanje je onemogućeno. Ova osobina je veoma korisna da vas podseti da snabdete odgovarajuću opisnu poruku za svako urezivanje. Ako ova osobina nije podešena, ili ima vrednost nula, prazan dnevnik poruka je dozvoljen." #. (para) #: ../source/TortoiseGit_en.xml:7847 msgid "tsvn:lockmsgminsize sets the minimum length of a lock message. If you enter a shorter message than specified here, the lock is disabled. This feature is very useful for reminding you to supply a proper descriptive message for every lock you get. If this property is not set, or the value is zero, empty lock messages are allowed." msgstr "tsvn:lockmsgminsize podešava minimalnu dužinu poruke zaključavanja. Ako unesete kraću poruku od specificirane ovde, zaključavanje je onemogućeno. Ova osobina je veoma korisna da vas podseti da snabdete odgovarajuću opisnu poruku za svako zaključavanje koje uzmete. Ako ova osobina nije podešena, ili je vrednost nula, prazna poruka zaključavanja se dozvoljava." #. (para) #: ../source/TortoiseGit_en.xml:7858 msgid "tsvn:logwidthmarker is used with projects which require log messages to be formatted with some maximum width (typically 80 characters) before a line break. Setting this property to a non-zero will do 2 things in the log message entry dialog: it places a marker to indicate the maximum width, and it disables word wrap in the display, so that you can see whether the text you entered is too long. Note: this feature will only work correctly if you have a fixed-width font selected for log messages." msgstr "tsvn:logwidthmarker se koristi sa projektima koji zahtevaju dnevnik poruku formatiranu na maksimalnu širinu (tipično 80 karaktera) pre savijanja linije. Podešavanje ove osobine na ne-nula uradiće 2 stvari u dnevnik poruka dijalogu: smešta marker da indicira maksimalnu širinu i onemogućava savijanje reči na displeju, tako možete videti da li je tekst koji ste uneli suviše dugačak. Primetimo: ova osobina radi korektno samo ako imate pismo fiksne-širine izabran za dnevnik poruka." #. (para) #: ../source/TortoiseGit_en.xml:7871 msgid "tsvn:logtemplate is used with projects which have rules about log message formatting. The property holds a multi-line text string which will be inserted in the commit message box when you start a commit. You can then edit it to include the required information. Note: if you are also using tsvn:logminsize, be sure to set the length longer than the template or you will lose the protection mechanism." msgstr "tsvn:logtemplate se koristi sa projektima koji imaju pravila o formatiranju dnevnik poruka. osobine drže multi-linijski tekst string koji će biti ubačen u boks poruka urezivanja kada počnete urezivanje. Zatim možete urediti da uključite željene informacije. Primetio: ako takođe koristite tsvn:logminsize, budite sigurni da podesite dužinu veću od modela ili ćete izgubiti zaštitni mehanizam." #. (para) #: ../source/TortoiseGit_en.xml:7882 msgid "Git allows you to set autoprops which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their Git configuration file. tsvn:autoprops can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for Git autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." msgstr "Subverzija vam omogućava da podesite autoprops koji će biti primenjen na novo dodate ili uvezene fajlove, zasnovane na ekstenziji fajla. Ovo zavisi na svakom klijentu koji ima podešen odgovarajuči autoprops u svom subverzionom konfiguracionom fajlu. tsvn:autoprops može biti podešen na imeniku i to će biti stopljeno sa korisničkim lokalnim autoprops kada se uvezu ili dodaju fajlovi. Format je isti kao i za subverzioni autoprops, npr. *.sh = svn:eol-style=native;svn:executable podešava dve osobine na fajlovima sa .sh ekstenzijom." #. (para) #: ../source/TortoiseGit_en.xml:7895 msgid "If there is a conflict between the local autoprops and tsvn:autoprops, the project settings take precedence because they are specific to that project." msgstr "Ako postoji konflikt između lokalnih autoprops i tsvn:autoprops, podešavanje projekta uzima primat jer je specifično za projekt." #. (para) #: ../source/TortoiseGit_en.xml:7902 msgid "In the Commit dialog you have the option to paste in the list of changed files, including the status of each file (added, modified, etc). tsvn:logfilelistenglish defines whether the file status is inserted in English or in the localized language. If the property is not set, the default is true." msgstr "U Ureži dijalogu imate opcije da nalepite na listu izmenjenih fajlova, uključujući status svakog fajla (dodat,izmenjen,itd). tsvn:logfilelistenglish definiše da li je status fajla ubačen na engleskom ili na lokalnom jeziku. Ako osobina nije podešena uobičajeno stanje je true." #. (para) #: ../source/TortoiseGit_en.xml:7913 msgid "TortoiseGit can use spell checker modules which are also used by OpenOffice and Mozilla. If you have those installed this property will determine which spell checker to use, i.e. in which language the log messages for your project should be written. tsvn:projectlanguage sets the language module the spell checking engine should use when you enter a log message. You can find the values for your language on this page: MSDN: Language Identifiers." msgstr "TortoiseGit može koristiti proveru pravopisa modul koji se takođe koristi u OpenOffice i Mozilla. Ako ih imate instalirane ove osobine će odrediti koji proveravač pravopisa koristiti, tj. u kom jeziku dnevnik poruka za vaš projekat treba biti napisan. tsvn:projectlanguage podešava jezik model provere pravopisa mašine treba koristiti kada unesete dnevnik poruku. Možete naći vrednost za vaš jezik na strani: MSDN: Language Identifiers." #. (para) #: ../source/TortoiseGit_en.xml:7927 msgid "You can enter this value in decimal, or in hexadecimal if prefixed with 0x. For example English (US) can be entered as 0x0409 or 1033." msgstr "Možete uneti ovu vrednost u decimalnoj ili heksadecimalnoj formi ako se prefiksuje sa 0x. Na primer Engleski (US) može se uneti kao 0x0409 ili 1033." #. (para) #: ../source/TortoiseGit_en.xml:7935 msgid "The property tsvn:logsummary is used to extract a portion of the log message which is then shown in the log dialog as the log message summary." msgstr "Osobina tsvn:logsummary se koristi izdvoji deo dnevnik poruke koji će biti prikazan u dnevnik poruka rezultata." #. (para) #: ../source/TortoiseGit_en.xml:7940 msgid "The value of the tsvn:logsummary property must be set to a one line regex string which contains one regex group. Whatever matches that group is used as the summary." msgstr "Vrednost tsvn:logsummary osobine mora biti podešena na jednu liniju regeks stringa koji sadrži jednu regeks grupu. Štogod spari tu grupu koristi se kao rezultat." #. (para) #: ../source/TortoiseGit_en.xml:7946 msgid "An example: \\[SUMMARY\\]:\\s+(.*) Will catch everything after [SUMMARY] in the log message and use that as the summary." msgstr "Jedan primer: \\[SUMMARY\\]:\\s+(.*) Će uhvatiti sve posle [SUMMARY] u dnevnik poruka i koristi ga kao rezultat." #. (para) #: ../source/TortoiseGit_en.xml:7954 msgid "When you want to add a new property, you can either pick one from the list in the combo box, or you can enter any property name you like. If your project uses some custom properties, and you want those properties to appear in the list in the combo box (to avoid typos when you enter a property name), you can create a list of your custom properties using tsvn:userfileproperties and tsvn:userdirproperties. Apply these properties to a folder. When you go to edit the properties of any child item, your custom properties will appear in the list of pre-defined property names." msgstr "Kada želite da dodate novu osobinu vi možete ili uzeti jedan iz liste u kombo boksu ili možete uneti bilo koje ime osobine koje želite. Ako vaš projekat koristi neke uobičajene osobine i želite te osobine da se pojave na listi u kombo boksu ( da izbegnete greške kada unosite ime osobine), možete kreirati listu vaših uobičajenih osobina koristeći tsvn:userfileproperties i tsvn:userdirproperties. Primenite ove osobine na imenik. Kada uredite osobine bilo koje potomačke stavke, vaše uobičajene osobine će se pojaviti u listi pre-definisanih imena osobina." #. (para) #: ../source/TortoiseGit_en.xml:7833 msgid "TortoiseGit has a few special properties of its own, and these begin with tsvn:. " msgstr "TortoiseGit ima neke svoje specijalne osobine, i one počinju sa tsvn:. " #. (para) #. (para) #: ../source/TortoiseGit_en.xml:7970 #: ../source/TortoiseGit_en.xml:10487 msgid "Some tsvn: properties require a true/false value. TortoiseGit also understands yes as a synonym for true and no as a synonym for false." msgstr "Neke tsvn: osobine zahtevaju true/false vrednosti. TortoiseGit takođe razume yes kao sinonim za true i no kao sinonim za false." #. (para) #: ../source/TortoiseGit_en.xml:7976 msgid "TortoiseGit can integrate with some bug tracking tools. This uses project properties that start with bugtraq:. Read for further information." msgstr "TortoiseGit može se integrisati sa nekim alatima za bag praćenje. Ovo koristi osobine projekata koja počinje sa bugtraq:. Pročitajte za dodatne informacije." #. (para) #: ../source/TortoiseGit_en.xml:7981 msgid "It can also integrate with some web-based repository browsers, using project properties that start with webviewer:. Read for further information." msgstr "Može se takođe integrisati sa nekim veb-zasnovanim pretraživačem spremišta, koristeći osobine projekta koje počinju sa webviewer:. Pročitajte za dalje informacije." #. (title) #: ../source/TortoiseGit_en.xml:7987 msgid "Set the project properties on folders" msgstr "Podešavanje osobina projekta o imeniku" #. (para) #: ../source/TortoiseGit_en.xml:7988 msgid "These special project properties must be set on folders for the system to work. When you commit a file or folder the properties are read from that folder. If the properties are not found there, TortoiseGit will search upwards through the folder tree to find them until it comes to an unversioned folder, or the tree root (eg. C:\\) is found. If you can be sure that each user checks out only from e.g trunk/ and not some sub-folder, then it is sufficient to set the properties on trunk/. If you can't be sure, you should set the properties recursively on each sub-folder. A property setting deeper in the project hierarchy overrides settings on higher levels (closer to trunk/)." msgstr "Ove specijalne osobine projekta moraju biti podešene na imenike za sistem da rade. kada urezujete fajl ili imenik osobine se čitaju iz tog imenika. Ako se osobine ne nađu ovde TortoiseGit će potražiti nagore kroz stblo imenika da ih nađe sve dok ne dođe do neverzionisanog imenika, ili koren stabla (npr. C:\\) se nađe. Ako možete biti sigurni da svaki korisnik preuzima samo iz npr. trunk/ i ne isti sub-imenik, zatim je dovoljno da se podese osobine na trunk/. Ako niste sigurni, morate podesiti osobine rekurzivno na svakom sub-imeniku. Podešavanje osobine dublje u hijerarhiji projekta prebaci podešavanje na viši nivo (bliže trunk/)." #. (para) #: ../source/TortoiseGit_en.xml:8002 msgid "For project properties only you can use the Recursive checkbox to set the property to all sub-folders in the hierarchy, without also setting it on all files." msgstr "Za osobine projekta samo možete koristiti Rekurziv čekboks da podesite osobine svih sub-imenika u hijerarhiji, takođe bez podešavanja na sve fajlove." #. (para) #: ../source/TortoiseGit_en.xml:8009 msgid "When you add new sub-folders using TortoiseGit, any project properties present in the parent folder will automatically be added to the new child folder too." msgstr "Kada dodate novi sub-imenik koristeći TortoiseGit, osobine bilo kog projekta prisutne u predačkom imeniku će automatski biti dodate novom potomačkom imeniki takođe." #. (para) #: ../source/TortoiseGit_en.xml:8015 msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Git clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it." msgstr "Takođe TortoiseGit osobine projekta su izuzetno korisne, one samo rade sa TortoiseGit, i neki će samo raditi u novoj verziji TortoiseGit. Ako ljudi rade na vašem projektu koristite mnoštvo Subverzionih klijenata, ili moguće ako imate staru verziju TortoiseGit, možete da koristite zakačaljke spremišta da forsirate politiku projekta. Osobine projekta mogu pomoći da se primeni politika, ona se ne može forsirati. " #. (title) #: ../source/TortoiseGit_en.xml:8028 msgid "Branching / Tagging" msgstr "Grananje/označavanje" #. (primary) #. (primary) #: ../source/TortoiseGit_en.xml:8036 #: ../source/TortoiseGit_en.xml:9519 msgid "copy" msgstr "kopiraj" #. (primary) #: ../source/TortoiseGit_en.xml:8039 msgid "mark release" msgstr "markiranje oslobađanja" #. (para) #: ../source/TortoiseGit_en.xml:8042 msgid "One of the features of version control systems is the ability to isolate changes onto a separate line of development. This line is known as a branch. Branches are often used to try out new features without disturbing the main line of development with compiler errors and bugs. As soon as the new feature is stable enough then the development branch is merged back into the main branch (trunk)." msgstr "Jedna od osobina sistema kontrole verzija je mogućnost da se izoluju izmene na odvojenoj liniji razvoja. Ova linija je poznata kao grana. Grane se često koriste da se isprobaju nove osobine bez narušavanja glavne linije razvoja sa greškama kompajlera i bagovima. Uskoro kada nove osobine postanu stabilne razvojna grana je stopljena nazad u glavnu granu (deblo)." #. (para) #: ../source/TortoiseGit_en.xml:8052 msgid "Another feature of version control systems is the ability to mark particular revisions (e.g. a release version), so you can at any time recreate a certain build or environment. This process is known as tagging." msgstr "Druga osobina sistema kontrole verzija je mogućnost da se markira posbna revizija (npr. realizovana verzija), tako da možete u bilo koje vreme ponovo kreirate određenu izradu ili okolinu. Ovaj proces je poznat kao označavanje." #. (para) #: ../source/TortoiseGit_en.xml:8058 msgid "Git does not have special commands for branching or tagging, but uses so-called cheap copies instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository." msgstr "Subverzija nema specijalne komande za grananje i označavanje, ali koristi takozvane jeftine kopije umesto. Jeftine kopije su slične čvrstim vezama na Juniksu, koje znače to da se umesto pravljenja kompletnih kopija u spremištu, interna veza se kreira, ukazujući na specifično stablo/reviziju. Kao rezultat grane i značke se vrlo brzo kreiraju, i skoro da ne uzimaju dodatni prostor u spremištu." #. (title) #: ../source/TortoiseGit_en.xml:8068 msgid "Creating a Branch or Tag" msgstr "Kreiranje Grane ili znaka" #. (title) #: ../source/TortoiseGit_en.xml:8073 msgid "The Branch/Tag Dialog" msgstr "Grana/Znak dijalog" #. (para) #: ../source/TortoiseGit_en.xml:8069 msgid "If you have imported your project with the recommended directory structure, creating a branch or tag version is very simple: Select the folder in your working copy which you want to copy to a branch or tag, then select the command TortoiseGitBranch/Tag...." msgstr "Ako ste uvezli vaš projekat sa preporučenom strukturom imenika, kreiranjem grana ili znački verzija je veoma jednostavno: Izaberite imenik u vašoj radnoj kopiji koji želite da kopirate u granu ili znak, zatim izaberite komandu TortoiseGitGrana/Znak...." #. (para) #: ../source/TortoiseGit_en.xml:8083 msgid "" "The default destination URL for the new branch will be the source URL on which your working copy is based. You will need to edit that URL to the new path for your branch/tag. So instead of \n" " http://svn.collab.net/repos/ProjectName/trunk\n" " you might now use something like \n" " http://svn.collab.net/repos/ProjectName/tags/Release_1.10\n" " If you can't remember the naming convention you used last time, click the button on the right to open the repository browser so you can view the existing repository structure." msgstr "" "Uobičajeni destinacioni URL za novu granu bio bi izvorni URL na kome je radna kopija zasnovana. Potrebno vam je da uredite URL ka novoj putanji za granu/znak. Tako umesto \n" " http://svn.collab.net/repos/ProjectName/trunk\n" " možete sada koristiti nešto kao \n" " http://svn.collab.net/repos/ProjectName/tags/Release_1.10\n" " Ako ne možete zapamtiti konvenciju imenovanja koju ste koristili u poslednje vreme, kliknite na dugme desno da otvorite pretraživač spremišta tako možete videti postojeću strukturu spremišta." #. (term) #. (listitem) #: ../source/TortoiseGit_en.xml:8104 #: ../source/TortoiseGit_en.xml:15130 msgid "HEAD revision in the repository" msgstr "GLAVNA revizija u spremištu" #. (para) #: ../source/TortoiseGit_en.xml:8106 msgid "The new branch is copied directly in the repository from the HEAD revision. No data needs to be transferred from your working copy, and the branch is created very quickly." msgstr "Nova grana se kopira direktno u spremište iz GLAVNE revizije. Nikakve podatke ne treba preneti iz vaše radne kopije, i grana se kreira brzo." #. (term) #: ../source/TortoiseGit_en.xml:8115 msgid "Specific revision in the repository" msgstr "Određena revizija u spremištu" #. (para) #: ../source/TortoiseGit_en.xml:8117 msgid "The new branch is copied directly in the repository but you can choose an older revision. This is useful if you forgot to make a tag when you released your project last week. If you can't remember the revision number, click the button on the right to show the revision log, and select the revision number from there. Again no data is transferred from your working copy, and the branch is created very quickly." msgstr "Nova grana je kopirana direktno u spremište ali možete izabrati stariju reviziju. Ovo je korisno ako ste zaboravili da uradite znak kada ste realizovali vaš projekat prošle nedelje. Ako ne možete zapamtiti revizioni broj kliknite dugme s desne strane da prikažete revizioni dnevnik i izaberite revizioni broj odatle. Ponovo nema podataka koji se prenose iz vaše radne kopije i grana se kreira brzo." #. (para) #: ../source/TortoiseGit_en.xml:8132 msgid "The new branch is an identical copy of your local working copy. If you have updated some files to an older revision in your WC, or if you have made local changes, that is exactly what goes into the copy. Naturally this sort of complex tag may involve transferring data from your WC back to the repository if it does not exist there already." msgstr "Nova grana je idntična kopija vaše lokalne radne kopije. Ako ste ažurirali neke fajlove sa starijom revizijom u vašoj RK, ili ako ste napravili lokalne izmene, to je tačno ono što ide u kopiju. Prirodno ova vrsta kompleksnih znački može obuhvatiti podatke iz vaše RK nazad u spremište ako ona već ne postoji tamo." #. (para) #: ../source/TortoiseGit_en.xml:8099 msgid "Now you have to select the source of the copy. Here you have three options: " msgstr "Sada imate da izaberete izvor za kopiranje. Ovde imate tri mogućnosti: " #. (para) #: ../source/TortoiseGit_en.xml:8145 msgid "If you want your working copy to be switched to the newly created branch automatically, use the Switch working copy to new branch/tag checkbox. But if you do that, first make sure that your working copy does not contain modifications. If it does, those changes will be merged into the branch WC when you switch." msgstr "Ako želite vašu radnu kopiju da prebacite na novo kreiranu granu automatski, koristite prebaci radnu kopiju na novu granu/znak čekboks. Ali ako to uradite, najpre budite sigurni da vaša radna kopija ne sadrži izmene. Ako sadrži, ove promene će biti stopljene u granu RK kada prebacite." #. (para) #: ../source/TortoiseGit_en.xml:8153 msgid "Press OK to commit the new copy to the repository. Don't forget to supply a log message. Note that the copy is created inside the repository." msgstr "Pritisnite OK da urežete novu kopiju u spremište. Ne zaboravite da obezbedite dnevnik poruku. Primetimo da je kopija kreirana unutar spremišta." #. (para) #: ../source/TortoiseGit_en.xml:8158 msgid "Note that unless you opted to switch your working copy to the newly created branch, creating a Branch or Tag does not affect your working copy. Even if you create the branch from your WC, those changes are committed to the new branch, not to the trunk, so your WC may still be marked as modified with respect to the trunk." msgstr "Primetimo da osim što ste odlučili da prebacite vašu radnu kopiju na novokreiranu granu, kreiranje Grane ili Znaka ne utiče na vašu radnu kopiju. Čak i ako kreirate granu iz vaše RK, ove izmene su urezane u novu granu, ne u deblo, tako da vaša RK može još uvek biti markirana kao izmenjena sa respektom na deblo." #. (title) #: ../source/TortoiseGit_en.xml:8167 msgid "To Checkout or to Switch..." msgstr "Preuzeti ili prebaciti..." #. (primary) #: ../source/TortoiseGit_en.xml:8170 msgid "switch" msgstr "zamena" #. (para) #: ../source/TortoiseGit_en.xml:8172 msgid "...that is (not really) the question. While a checkout downloads everything from the desired branch in the repository to your working directory, TortoiseGitSwitch... only transfers the changed data to your working copy. Good for the network load, good for your patience. :-)" msgstr "... to nije (ne realno) pitanje. Dok preuzimanje skida sve iz željene grane u spremištu ka imeniku vaše radne kopije, TortoiseGitPrebaci... samo prenosi izmenjene podatke u vašu radnu kopiju. Dobro za mrežno unošenje, dobro za vaše strpljenje. :-)" #. (para) #: ../source/TortoiseGit_en.xml:8188 msgid "TortoiseGitCheckout to make a fresh checkout in an empty folder. You can check out to any location on your local disk and you can create as many working copies from your repository as you like." msgstr "TortoiseGitPreuzimanje da se uradi sveže preuzimanje u prazan imenik. Možete preuzeti bilo koju lokaciju na vašem lokalnom disku i možete kreirati onoliko radnih kopija iz vašeg spremišta koliko želite." #. (para) #: ../source/TortoiseGit_en.xml:8200 msgid "Switch your current working copy to the newly created copy in the repository. Again select the top level folder of your project and use TortoiseGitSwitch... from the context menu." msgstr "Prebacite vašu radnu kopiju u novo kreiranu kopiju spremištu. Opet izaberite vršni nivo imenik vašeg projekta i koristite TortoiseGitPrebaci... iz kontekst menija." #. (para) #: ../source/TortoiseGit_en.xml:8210 msgid "In the next dialog enter the URL of the branch you just created. Select the Head Revision radio button and click on OK. Your working copy is switched to the new branch/tag." msgstr "U sledećem dijalogu unesite URL grane koju ste kreirali. Izaberite Glavna Revizija radio dugme i kliknite na OK. Vaša radna kopija je prebačena na novu granu/znak." #. (para) #: ../source/TortoiseGit_en.xml:8218 msgid "Switch works just like Update in that it never discards your local changes. Any changes you have made to your working copy which have not yet been committed will be merged when you do the Switch. If you do not want this to happen then you must either commit the changes before switching, or revert your working copy to an already-committed revision (typically HEAD)." msgstr "Prebacite rad tek kao Ažuriranje i nikad ne odbaciti vaše lokalne izmene. Bilo koje izmene koje ste uradili u vašoj radnoj kopiji koje još nisu urezane biće stopljene kada uradite Prebacivanje. Ako ne želite da se to desi morate ili urezati izmene pre prebacivanje, ili vratiti vašu radnu kopiju u već-urezanu reviziju (tipčno GLAVNA)." #. (para) #: ../source/TortoiseGit_en.xml:8228 msgid "If you want to work on trunk and branch, but don't want the expense of a fresh checkout, you can use Windows Explorer to make a copy of your trunk checkout in another folder, then TortoiseGitSwitch... that copy to your new branch." msgstr "Ako želite da radite na deblu i grani, ali ne želite skupo sveže preuzimanje, možete koristiti Vindouz Eksplorer da napravite kopiju vašeg debla u sledći imenik, zatim TortoiseGitPrebaci... zatim kopirajte u novu granu." #. (title) #: ../source/TortoiseGit_en.xml:8241 msgid "The Switch Dialog" msgstr "Prebaci dijalog" #. (para) #: ../source/TortoiseGit_en.xml:8183 msgid "To be able to work with your freshly generated branch or tag you have several ways to handle it. You can: " msgstr "Da bi bili sposobni da radite sa sveže generisanom granom ili znakom imate više načina da rukujete time. Možete: " #. (para) #: ../source/TortoiseGit_en.xml:8250 msgid "Tags are typically used to create a static snapshot of the project at a particular stage. As such they not normally used for development - that's what branches are for, which is the reason we recommended the /trunk /branches /tags repository structure in the first place. Working on a tag revision is not a good idea, but because your local files are not write protected there is nothing to stop you doing this by mistake. However, if you try to commit to a path in the repository which contains /tags/, TortoiseGit will warn you." msgstr "Značke se obično koriste da se kreira statička slika projekta u pojedinom stanju. Kao takvi se ne koriste normalno pri razvoju - to je zašto postoje grane, koji rezon mi preporučujemo /trunk /branches /tags strukturu spremišta na prvom mestu. Rad na znak revizijama nije dobra ideja, ali vaši lokalni fajlovi nisu zaštićeni od upisivanja pa nema ništa da vas zaustavi da to uradite greškom. Međutim, ako pokušate da urežete putanju u spremište koja sadrži /tags/, TortoiseGit će vas upozoriti." #. (para) #: ../source/TortoiseGit_en.xml:8266 msgid "It may be that you need to make further changes to a release which you have already tagged. The correct way to handle this is to create a new branch from the tag first and commit the branch. Do your Changes on this branch and then create a new tag from this new branch, e.g. Version_1.0.1." msgstr "To može biti da je potrebno uaditi dalje izmene za realizaciju koju već označavate. Korektan način rukovanja ovim je kreiranje nove grane od znaka najpre i urezati granu. Uradite vaše Izmene na ovoj grani i zatim kreirajte novi znak od ove nove grane, npr. Version_1.0.1." #. (para) #: ../source/TortoiseGit_en.xml:8276 msgid "If you modify a working copy created from a branch and commit, then all changes go to the new branch and not the trunk. Only the modifications are stored. The rest remains a cheap copy." msgstr "Ako izmenite radnu kopiju kreiranu od grane i urežete, zatim sve izmene idu u novu granu i ne u deblo. Samo modifikacije su uskladištene. Ostatak ostaje jeftina kopija." #. (para) #: ../source/TortoiseGit_en.xml:8245 msgid "Although Git itself makes no distinction between tags and branches, the way they are typically used differs a bit. " msgstr "Takođe, sama Subverzija ne pravi razliku između znački i grana, način kako se tipično koriste razlikuje se u malom. " #. (title) #: ../source/TortoiseGit_en.xml:8289 msgid "Merging" msgstr "Spajanje" #. (primary) #. (primary) #. (primary) #. (primary) #: ../source/TortoiseGit_en.xml:8292 #: ../source/TortoiseGit_en.xml:8418 #: ../source/TortoiseGit_en.xml:8531 #: ../source/TortoiseGit_en.xml:8564 msgid "merge" msgstr "stopi" #. (para) #: ../source/TortoiseGit_en.xml:8294 msgid "Where branches are used to maintain separate lines of development, at some stage you will want to merge the changes made on one branch back into the trunk, or vice versa." msgstr "Tamo gde se grane koriste da održavaju odvojene linije razvoja, u nekim stanjima vi ćete želeti da stopite izmene napravljene na grani nazad u deblo, ili obratno." #. (para) #: ../source/TortoiseGit_en.xml:8299 msgid "It is important to understand how branching and merging works in Git before you start using it, as it can become quite complex. It is highly recommended that you read the chapter Branching and Merging in the Git book, which gives a full description and many examples of how it is used." msgstr "Važno je razumeti kako grane i stapanje rade na Subverziji pre početka njihovog korišćenja, jer može biti sasvim kompleksno. Jako se preporučuje da pročitate poglavlje Branching and Merging u Subverzionoj knjizi, koja daje pun opis i mnogo primera kak se korist." #. (para) #: ../source/TortoiseGit_en.xml:8309 msgid "The next point to note is that merging always takes place within a working copy. If you want to merge changes into a branch, you have to have a working copy for that branch checked out, and invoke the merge wizard from that working copy using TortoiseGitMerge...." msgstr "Sledeća tačka za notiranje je tda to stapanje uvek nalazi mesto u okviru radne kopije. Ako želite da stopite izmene u granu, imate da uzmete radnu kopiju za preuzimanje grane, i pozovete čarobnjak stapanja iz radne kopije koristeći TortoiseGitStopi...." #. (para) #: ../source/TortoiseGit_en.xml:8320 msgid "In general it is a good idea to perform a merge into an unmodified working copy. If you have made other changes in your WC, commit those first. If the merge does not go as you expect, you may want to revert the changes, and the Revert command will discard all changes including any you made before the merge." msgstr "Generalno je to dobra ideja da se izvrši stapanje u neizmenjenu radnu kopiju. Ako ste uradili druge izmene u vašoj RK, urežite ih najpre. Ako stapanje ne ide kako ste očekivali, morate vratiti izmene i Vrati komanda će poništiti sve izmene uključujući bilo koje urađene pre stapanja." #. (para) #: ../source/TortoiseGit_en.xml:8327 msgid "There are three common use cases for merging which are handled in slightly different ways, as described below. The first page of the merge wizard asks you to select the method you need." msgstr "Postoje tri često korišćena slučaja za stapanje koji su podržani u blago različitom načinu, kako je opisano dole. Prva strana čarobnjaka stapanja vas pita da izaberete metod koji vam treba." #. (term) #: ../source/TortoiseGit_en.xml:8335 msgid "Merge a range of revisions" msgstr "Stopi opseg revizija" #. (para) #: ../source/TortoiseGit_en.xml:8337 msgid "This method covers the case when you have made one or more revisions to a branch (or to the trunk) and you want to port those changes across to a different branch." msgstr "Metoda se koristi u slučaju kad ste napravili jednu ili više revizija u grani (ili glavnoj grani) i želite preneti te izmene u neku drugu granu." #. (para) #: ../source/TortoiseGit_en.xml:8342 msgid "What you are asking Git to do is this: Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B)." msgstr "Kako pitate Subverziju da to uradi: Izračunati izmene neophodne da uzmete [OD] revizije 1 grane A [DO] revizije 7 grane A, primenite ove izmene u mojoj radnoj kopiji (deblo ili grana B)." #. (term) #. (title) #: ../source/TortoiseGit_en.xml:8351 #: ../source/TortoiseGit_en.xml:8528 msgid "Reintegrate a branch" msgstr "Reintegriši granu" #. (para) #: ../source/TortoiseGit_en.xml:8353 msgid "This method covers the case when you have made a feature branch as discussed in the Git book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes." msgstr "Ovaj metod pokriva slučaj kada ste uradili posebnu granu što je razmatrano u Subverzionoj knjizi. Sve izmene debla su provedena u posebnoj grani, nedelja po nedelju, i sada je posebnost kompletno ono što želite da stopite nazad u deblo. Pošto hoćete da zadržite posebnu granu sinhroniziranu sa deblom, zadnja verzija grane i debla će biti apsolutno identične osim za vaše izmene grane." #. (para) #: ../source/TortoiseGit_en.xml:8362 msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Git to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes." msgstr "Ovo je specijalni slučaj stapanja stabla opisan dole, i on zahteva samo URL da stopi (normalno) vašu granu razvoja. Koristi praćenje stapanja osobinu Subverzije da izračuna ispravni revizioni opseg za korišćenje, i omogućava dodatnu proveru koja omogućava da je ta grana potpuno ažurirana izmenom debla. Ovo omogućava da vi ne poništite grškom rad koji su drugi urezali u deblo od vaše zadnje sihronizovane izmene." #. (para) #: ../source/TortoiseGit_en.xml:8372 msgid "After the merge, all branch development has been completely merged back into the main development line. The branch is now redundant and can be deleted." msgstr "Posle stapanja, cela grana razvoja je kompletno stopljena nazad u glavnu razvojnu liniju. Grana je sada nekorisna i može biti obrisana." #. (para) #: ../source/TortoiseGit_en.xml:8377 msgid "Once you have performed a reintegrate merge you should not continue to use it for development. The reason for this is that if you try to resynchronize your existing branch from trunk later on, merge tracking will see your reintegration as a trunk change that has not yet been merged into the branch, and will try to merge the branch-to-trunk merge back into the branch! The solution to this is simply to create a new branch from trunk to continue the next phase of your development." msgstr "Kada jednom izvršite reintegraciju stapanja nećete nastaviti da ga koristite za razvoj. Rezon za ovo je to da ako pokušate da resinhronizujete vašu postojeću granu iz debla kasnije, praćenje stapanja će pogledati vašu reintegraciju kao izmenu debla koje još nije stopljeno u granu, i pokušaće da stopi granu-u-deblo stapanje nazad u granu! Rešenje ovome je jednostavno da se kreira nova grana iz debla da se nastavi sledeća faza vašeg razvoja." #. (term) #: ../source/TortoiseGit_en.xml:8390 msgid "Merge two different trees" msgstr "Stopi dva različita stabla" #. (para) #: ../source/TortoiseGit_en.xml:8392 msgid "This is a more general case of the reintegrate method. What you are asking Git to do is: Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk). The net result is that trunk now looks exactly like the branch." msgstr "Ovo je mnogo opštiji slučaj reintegracionog metoda. Ono što pitate Subverziju da to uradi je: Izračunajte izmene neophodne da dobijete [OD] glavne revizije debla [DO]glavne revizije grane,i primeniti te izmen na moju radnu kopiju (debla). čist rezultat je to deblo sada izgleda tačno kao grana." #. (para) #: ../source/TortoiseGit_en.xml:8400 msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on vendor branches in the Git Book." msgstr "Ako vaš server/spremište ne podržava stapanje-praćenje onda je ovo jedini način da se stopi grana nazad u deblo. Sledeći slučaj korišćenja se javlja kada koristite prodajne grane i potrebno vam je da stopite izmene koje prate novi prodajni pad u vaš kod debla.Za više informacija pročitajte poglavlje vendor branches u Subverzionoj kljizi." #. (title) #: ../source/TortoiseGit_en.xml:8415 msgid "Merging a Range of Revisions" msgstr "Spajanje opsega revizija" #. (secondary) #: ../source/TortoiseGit_en.xml:8419 msgid "revision range" msgstr "raspon revizija" #. (title) #: ../source/TortoiseGit_en.xml:8423 msgid "The Merge Wizard - Select Revision Range" msgstr "Čarobnjak soajanja - Izbor opsega revizija" #. (para) #: ../source/TortoiseGit_en.xml:8421 msgid " In the From: field enter the full folder URL of the branch or tag containing the changes you want to port into your working copy. You may also click ... to browse the repository and find the desired branch. If you have merged from this branch before, then just use the drop down list which shows a history of previously used URLs." msgstr " U Od: polju unesite pun imenik URL grane ili znaka koji sadrži izmene koje želite da prenesete u radnu kopiju. Možete kliknuti ... da pretražite spremište i nađete željenu granu. Ako ste stopili iz ove grane ranije, sada samo koristite padajuću listu koja prikazuje istoriju prethodno korišćenih URLova." #. (para) #: ../source/TortoiseGit_en.xml:8436 msgid "In the Revision range to merge field enter the list of revisions you want to merge. This can be a single revision, a list of specific revisions separated by commas, or a range of revisions separated by a dash, or any combination of these." msgstr "U Revizioni opseg za stapanje polju unesite listu revizija koje želite da stopite. Ovo može biti pojedinačna revizija, lista specifičnih revizija odvojenih zapetama, ili opseg revizija odvojenih crticom, ili kombinacija svega." #. (para) #: ../source/TortoiseGit_en.xml:8444 msgid "There is an important difference in the way a revision range is specified with TortoiseGit compared to the command line client. The easiest way to visualise it is to think of a fence with posts and fence panels." msgstr "Postoji važna razlika u načinu kako je specificiran opseg revizija sa TortoiseGit poređena sa klijentom komandne linije. Najlakši način da se vizualizuje to je da se misli o ogradi sa zidom i ogradi panelom." #. (para) #: ../source/TortoiseGit_en.xml:8450 msgid "With the command line client you specify the changes to merge using two fence post revisions which specify the before and after points." msgstr "Sa klijentom komandne linije vi specificirate izmene za stapanje koristeći dva ograda sa zidom revizija koja specificira pre i posle tačaka." #. (para) #: ../source/TortoiseGit_en.xml:8456 msgid "With TortoiseGit you specify the changeset to merge using fence panels. The reason for this becomes clear when you use the log dialog to specify revisions to merge, where each revision appears as a changeset." msgstr "Sa TortoiseGit vi specificirate izmenljivskup da se stopi koristeći ograda panelima. Razlog za ovo postaje čista kada koristite dnevnik dijalog da specificirate revizije za stapanje, gde se svaka revizija pojavljuje kao izmenljivskup." #. (para) #: ../source/TortoiseGit_en.xml:8463 msgid "If you are merging revisions in chunks, the method shown in the Git book will have you merge 100-200 this time and 200-300 next time. With TortoiseGit you would merge 100-200 this time and 201-300 next time." msgstr "Ako stapate revizije u kriškama, prikazan metod u subverzionoj knjizi će stopiti 100-200 sada i 200-300 posle. Sa TortoiseGit stopićete 100-200 sada i 201-300 posle." #. (para) #: ../source/TortoiseGit_en.xml:8470 msgid "This difference has generated a lot of heat on the mailing lists. We acknowledge that there is a difference from the command line client, but we believe that for the majority of GUI users it is easier to understand the method we have implemented." msgstr "Ove razlike su generisale mnogo udara na mejling liste. Mi saznajemo to da ima razlike sa klijentom komandne linije, ali verujemo da većina GUI korisnika lakše razume metodu koju smo implementirali." #. (para) #: ../source/TortoiseGit_en.xml:8478 msgid "The easiest way to select the range of revisions you need is to click on Show Log, as this will list recent changes with their log comments. If you want to merge the changes from a single revision, just select that revision. If you want to merge changes from several revisions, then select that range (using the usual Shift-modifier). Click on OK and the list of revision numbers to merge will be filled in for you." msgstr "Najlakši način da se izabere opseg revizija koje su vam potrebne je da se klikne na Prikaži Dnevnik, koji će izlistati skore promene sa njihovim komentarima dnevnika. AAko želite da stopite izmene iz pojedinačne revizije samo kliknite na tu reviziju. Ako želite da stopite izmene iz više revizija, onda izaberite taj opseg (koristeći uobičajeni Shift-modifikator). Kliknite na OK i lista revizionih brojeva za stapanje će biti napunjena za vas." #. (para) #: ../source/TortoiseGit_en.xml:8489 msgid "If you want to merge changes back out of your working copy, to revert a change which has already been committed, select the revisions to revert and make sure the Reverse merge box is checked." msgstr "Ako želite da stopite izmene nazad van vaše radne kopije, da vratite izmene koje su već urezane, izaberite reviziju za vraćanje i budite sigurni da je Inverzno stapanje boks čekiran. " #. (para) #: ../source/TortoiseGit_en.xml:8495 msgid "If you have already merged some changes from this branch, hopefully you will have made a note of the last revision merged in the log message when you committed the change. In that case, you can use Show Log for the Working Copy to trace that log message. Remembering that we are thinking of revisions as changesets, you should Use the revision after the end point of the last merge as the start point for this merge. For example, if you have merged revisions 37 to 39 last time, then the start point for this merge should be revision 40." msgstr "Ako ste već stopili neke izmene iz ove grane, puni nade vi ćete napraviti zapažanje o zadnjoj reviziji stopljenoj u dnevnik poruci kada urezujete izmene. U ovom slučaju, možete koristiti Prikaži Dnevnik za Radnu Kopiju da bi pratili dnevnik poruku.Setite se da mislimo na revizije kao izmenjene skupove, treba da Koristite reviziju posle krajnje tačke zadnjeg stapanja kao početnu tačku za ovo stapanje. Na primer, ako ste stopili revizije 37 do 39 poslednji put, tada je početna tačka za ovo stapanje revizija 40." #. (para) #: ../source/TortoiseGit_en.xml:8508 msgid "If you are using the merge tracking features of Git, you do not need to remember which revisions have already been merged - Git will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read to find out more." msgstr "Ako koristite praćenje stapanja osobinu Subverzije, ne treba vam da pamtite koje revizije su već stopljene - Subverzija beleži to za vas. Ako ostavite revizioni opseg praznim, sve revizije koje još niste stopili biće uključene. Pročitajte da nađete više o tome." #. (para) #: ../source/TortoiseGit_en.xml:8516 msgid "If other people may be committing changes then be careful about using the HEAD revision. It may not refer to the revision you think it does if someone else made a commit after your last update." msgstr "Ako drugi ljudi možda urezuju izmene budite pažljivi pri korišćenju GLAVNE revizije. Ona možda ne ukazuje na reviziju na koju vi mislite ako još neko urezuje posle vašeg zadnjeg ažuriranja." #. (para) #: ../source/TortoiseGit_en.xml:8522 msgid "Click Next and go to " msgstr "Kliknite Sledeći i idite na " #. (secondary) #: ../source/TortoiseGit_en.xml:8532 msgid "reintegrate" msgstr "reintegracija" #. (title) #: ../source/TortoiseGit_en.xml:8536 msgid "The Merge Wizard - Reintegrate Merge" msgstr "Čarobnjak spajanja - Reintegracija spajanja" #. (para) #: ../source/TortoiseGit_en.xml:8534 msgid " To merge a feature branch back into the trunk you must start the merge wizard from within a working copy of the trunk." msgstr " Da stopite posebnu granu nazad u deblo morate početi čarobnjak stapanja unutar radne kopije debla." #. (para) #: ../source/TortoiseGit_en.xml:8542 msgid "In the From URL: field enter the full folder URL of the branch that you want to merge back. You may also click ... to browse the repository." msgstr "U Iz URL: polja unesite pun imenik URL grane koju želite da stopite nazad. Možete takođe kliknuti ... da pretražite spremište." #. (para) #: ../source/TortoiseGit_en.xml:8549 msgid "There are some conditions which apply to a reintegrate merge. Firstly, the server must support merge tracking. The working copy must be of depth infinite (no sparse checkouts), and it must not have any local modifications, switched items or items that have been updated to revisions other than HEAD. All changes to trunk made during branch development must have been merged across to the branch (or marked as having been merged). The range of revisions to merge will be calculated automatically." msgstr "Postoje neki uslovi koji dovode do reintegrisanja stapanja. Najpre, server mora da podržava stapanja praćenje. Radna kopija mora biti eskonačne dubine (bez praznog preuzimanja), i ne sme imati bilo kakvu lokalnu izmenu, prebačene stavke ili stavke koje su ažurirane na reviziju različitu od GLAVNE. Sve izmene debla urađene u toku razvoja grane moraju biti stopljene kroz granu (ili označene da su stopljene). Opseg revizija za stapanje biće izračunat automatski." #. (title) #: ../source/TortoiseGit_en.xml:8561 msgid "Merging Two Different Trees" msgstr "Spajanje dva različita stabla" #. (secondary) #: ../source/TortoiseGit_en.xml:8565 msgid "two trees" msgstr "dva stabla" #. (title) #: ../source/TortoiseGit_en.xml:8569 msgid "The Merge Wizard - Tree Merge" msgstr "Čarobnjak spajanja - Spajanje stabla" #. (para) #: ../source/TortoiseGit_en.xml:8567 msgid " If you are using this method to merge a feature branch back to trunk, you need to start the merge wizard from within a working copy of trunk." msgstr " Ako koristite ovaj metod da stopite posebnu granu nazad u deblo. ptreno vam je da počnete čarobnjak stapanja unutar radne kopije debla." #. (para) #: ../source/TortoiseGit_en.xml:8575 msgid "In the From: field enter the full folder URL of the trunk. This may sound wrong, but remember that the trunk is the start point to which you want to add the branch changes. You may also click ... to browse the repository." msgstr "U Iz: polju unesite pun imenik URL debla. Ovo možda zvuči loše, ali zapamtite da deblo je početna tačka kojoj želite da dodate izmene grane. Možete takođe kliknuti ... da pretražite spremište." #. (para) #: ../source/TortoiseGit_en.xml:8584 msgid "In the To: field enter the full folder URL of the feature branch." msgstr "U Do: polju unesite pun imenik URL posebne grane." #. (para) #: ../source/TortoiseGit_en.xml:8588 msgid "In both the From Revision field and the To Revision field, enter the last revision number at which the two trees were synchronized. If you are sure no-one else is making commits you can use the HEAD revision in both cases. If there is a chance that someone else may have made a commit since that synchronization, use the specific revision number to avoid losing more recent commits." msgstr "U oba Od Revizije polju i Do Revizije polju, unesite zadnji revizioni broj u kom dva stabla treba sinhronizovati. Ako ste sigurni da niko još ne urezuje možete koristiti GLAVNU reviziju u oba slučaja. Ako nema šanse da još neko urezuje od te sinhronizacije, koristite specifičan revizioni broj da izbegnete gubljenje skorih urezivanja." #. (para) #: ../source/TortoiseGit_en.xml:8598 msgid "You can also use Show Log to select the revision." msgstr "Možete takođe koristiti Prikaži Dnevnik da izaberete reviziju." #. (title) #: ../source/TortoiseGit_en.xml:8604 msgid "Merge Options" msgstr "Opcije spajanja" #. (para) #: ../source/TortoiseGit_en.xml:8606 msgid "This page of the wizard lets you specify advanced options, before starting the merge process. Most of the time you can just use the default settings." msgstr "Ova strana čarobnjaka vam dopušta da odredite dodatne opcije, pre početka procesa stapanja. Većinu vrmena vi ste koristili uobičajeno podešavanje." #. (para) #: ../source/TortoiseGit_en.xml:8611 msgid "You can specify the depth to use for the merge, i.e. how far down into your working copy the merge should go. The depth terms used are described in . The default depth is Working copy, which uses the existing depth setting, and is almost always what you want." msgstr "Morate odrediti dubinu koju ćete koristiti za stapanje, npr. koliko daleko u radnu kopiju stapanje ide. Korišćenje termina dubina opisano je u . Uobičajena dubina je Radna kopija, koja koristi postojeće podešavanje dubine, i skoro uvek je ono što želite." #. (para) #: ../source/TortoiseGit_en.xml:8618 msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Git has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Git use only path-based differences rather than history-based differences, check the Ignore ancestry box. Read more about this topic in the Git book, Noticing or Ignoring Ancestry" msgstr "Najviše vremena vi želite da stapanje uzme u obzir istoriju fajla, tako da izmene relativne zajedničkom prethodniku su stopljene. Ponekad vam je potrebno da stopite fajlove koji možda zavise, ali nisu u vašem spremištu. Na primer možda ste uvezli verzije 1 i 2 biblioteke trećeg lica u dva odvojena imenika.Takođe, oni su logički zavisni, Subverzija nema znanja o tome jer samo vidi loptu koju unesete. Ako pokušate da stopite razlike ta dva stabla videćete kompletno uklanjanje kome sledi kompletno dodavanje. Da učinite da Subverzija koristi samo zasnovane na putanji razlike pre nego istorijski-zasnovane razlike, čekirajte guilabel>Zanemari poreklo boks. Pročitajte više o ovome u Subverzionoj knjizi, Noticing or Ignoring Ancestry" #. (para) #: ../source/TortoiseGit_en.xml:8635 msgid "You can specify the way that line ending and whitespace changes are handled. These options are described in . The default behaviour is to treat all whitespace and line-end differences as real changes to be merged." msgstr "Možete odrediti način rukovanja sa završetkom linija i izmenama belihpolja. Ove opcije su opisane u . Uobičajeno ponašanje je da se tretiraju sva bela polja i kraj-linije razlike kao stvarne izmen koje se stapaju." #. (para) #: ../source/TortoiseGit_en.xml:8641 msgid "If you are using merge tracking and you want to mark a revision as having been merged, without actually doing the merge here, check the Only record the merge checkbox. There are two possible reasons you might want to do this. It may be that the merge is too complicated for the merge algorithms, so you code the changes by hand, then mark the change as merged so that the merge tracking algorithm is aware of it. Or you might want to prevent a particular revision from being merged. Marking it as already merged will prevent the merge occurring with merge-tracking-aware clients." msgstr "Ako koristite stapanja praćenje i želite da označite reviziju da je stopljena, bez stvarnog stapanja ovde, čekirajte Samo obeležite stapanje čekboks. Postoje dva moguća razloga koja možete želeti da ovo uradite. Može biti da je stapanje jako komplikovano za algoritam stapanja, onda ćete uraditi izmene ručno, zatim markirate izmene kao stopljene da bi stapanja praćenje algoritam bio upoznat sa tim. Ili možete želeti da predupredite posebne revizije da budu stopljene. Označavajuči ih već stopljenim predupređujete pojavu stapanja pomoću stopi-tragač-upoznat klijentima." #. (para) #: ../source/TortoiseGit_en.xml:8652 msgid "Now everything is set up, all you have to do is click on the Merge button. If you want to preview the results Test Merge performs the merge operation, but does not modify the working copy at all. It shows you a list of the files that will be changed by a real merge, and notes those areas where conflicts will occur." msgstr "Sada je sve podešeno, sve što imate da uradite je da kliknete na Stopi dugme. Ako želite da pregledate rezultat Testiraj Stapanje omogućava operaciju stapanja, ali ne modifikuje radnu kopiju uopšte. To prikazuje listu fajlova koji će biti izmenjeni stvarnim stapanjem, i notira te površine gde se konflikti javljaku." #. (para) #: ../source/TortoiseGit_en.xml:8660 msgid "The merge progress dialog shows each stage of the merge, with the revision ranges involved. This may indicate one more revision than you were expecting. For example if you asked to merge revision 123 the progress dialog will report Merging revisions 122 through 123. To understand this you need to remember that Merge is closely related to Diff. The merge process works by generating a list of differences between two points in the repository, and applying those differences to your working copy. The progress dialog is simply showing the start and end points for the diff." msgstr "Stapanje progres dijalog prikazuje svako stanje stapanja, sa revizionim opsezima uključenim. To može indicirati jednu više reviziju nego što ste očekivali. Na primer, ako tražite da stopite reviziju 123 dijalog napredovanja pokazuje Stapanje revizija122 do 123. Da shvatite ovo potrebno je da se setite da je Stapanje blisko zavisno sa Diff. Proces stapanja radi generišući listu razlika između dve tačke u spremištu, i primenjuje te razlike na radnu kopiju. Dijalog napredovanja jednostavno prikazuje početnu i krajnju tačku za diff." #. (title) #: ../source/TortoiseGit_en.xml:8673 msgid "Reviewing the Merge Results" msgstr "Pregled rezultata spajanja" #. (para) #: ../source/TortoiseGit_en.xml:8674 msgid "The merge is now complete. It's a good idea to have a look at the merge and see if it's as expected. Merging is usually quite complicated. Conflicts often arise if the branch has drifted far from the trunk." msgstr "Stapanje je sada kompletno. Dobra je ideja da se pogleda na stapanje i vidi da li je kako se očekivalo. Stapanje je obično sasvim kompletno. Konflikti često nastaju ako je grana pomerena daleko od debla. " #. (para) #: ../source/TortoiseGit_en.xml:8679 msgid "For Git clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should always include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to Best Practices for Merging in the Git book." msgstr "Za Subverzione klijente i servere pre 1.5, nisu stopi informacije uskladištene i stopljene revizije su praćene ručno. Kada ste testirali izmene i došli do urezivanja ove revizije, vaš dnevnik poruka urezivanja treba uvek da obuhvati revizione brojeve koji su preneti u stapanju. Ako želite da primenite sledeće stapanje kasnije potrebno vam je da znate šta ste već stopili, jer ne želite da prenesete izmene više nego jednom. Za više informacija o tome pogledajte Best Practices for Merging u Subverzijinoj knjizi." #. (para) #: ../source/TortoiseGit_en.xml:8696 msgid "If your server and all clients are running Git 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged." msgstr "Ako vaš server i svi klijenti rade Subverziju 1.5 ili višu, praćenje stapanja mogućnost će zabeležiti revizije stoljene i izostaviti revizije koje su stopljene više od jedanput. Ovo čini vaš život mnogo jednostavnijim kao kad jednostavno stopite celi revizioni opseg svaki put i znate da samo nova revizija će stvarno biti stopljena." #. (para) #: ../source/TortoiseGit_en.xml:8703 msgid "Branch management is important. If you want to keep this branch up to date with the trunk, you should be sure to merge often so that the branch and trunk do not drift too far apart. Of course, you should still avoid repeated merging of changes, as explained above." msgstr "Upravljanje granama je važno. Ako želite da držite ovu granu ažurnom sa deblom, treba da budete sigurni da stapate često tako da grana i deblo ne odu suviše daleko. Naravno, potrebno je još uvek izbegavati ponavljanje stapanja izmena, kako je objašnjeno gore." #. (para) #: ../source/TortoiseGit_en.xml:8710 msgid "If you have just merged a feature branch back into the trunk, the trunk now contains all the new feature code, and the branch is obsolete. You can now delete it from the repository if required." msgstr "Ako ste upravo stopili posebnu granu nazad u deblo, deblo sada sadrži sve nove posebne kodove, i grana je nepotrebna. Možete je sada obrisati iz spremišta ako je potrebno." #. (para) #: ../source/TortoiseGit_en.xml:8718 msgid "Git can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge." msgstr "Subverzija ne može stopiti fajl sa imenikom i obratno - samo imenici sa imenicima i fajlovi sa fajlovima. Ako kliknete na fajl i otvorite dijalog stapanja, zatim možete zadati putanju do fajla u dijalogu. Ako izaberete i pokrenete dijalog morate specificirati imenik URL za stapanje." #. (title) #: ../source/TortoiseGit_en.xml:8728 msgid "Merge Tracking" msgstr "Praćenje Spajanja" #. (primary) #: ../source/TortoiseGit_en.xml:8730 msgid "merge tracking" msgstr "praćenje spajanja" #. (para) #: ../source/TortoiseGit_en.xml:8738 msgid "You can avoid the danger of merging the same revision twice (repeated merge problem). Once a revision is marked as having been merged, future merges which include that revision in the range will skip over it." msgstr "Možete izbeći opasnost od stapanja iste revizije dvaput (problem ponavljanja stapanja). Kada je jednom revizija označena da je stopljena, buduća stapanja koja uključuju tu reviziju u svom opsegu preskočiće je." #. (para) #: ../source/TortoiseGit_en.xml:8746 msgid "When you merge a branch back into trunk, the log dialog can show you the branch commits as part of the trunk log, giving better traceability of changes." msgstr "Kada stopite granu nazad u deblo, dnevnik dijalog može prikazati urezivanje grane kao deo deblovog dnevnika, dajući bolju preglednost izmena." #. (para) #: ../source/TortoiseGit_en.xml:8753 msgid "When you show the log dialog from within the merge dialog, revisions already merged are shown in grey." msgstr "Kada prikažete dnevnik dijalog u okviru stapanja dijaloga, revizije već stopljene su prikazane sivo." #. (para) #: ../source/TortoiseGit_en.xml:8759 msgid "When showing blame information for a file, you can choose to show the original author of merged revisions, rather than the person who did the merge." msgstr "Kada se prikazuju invormacije okrivljavanja za fajl, možete izabrati da prikažete originalnog autora stopljene revizije, pre nego osobu koja je uradila stapanje." #. (para) #: ../source/TortoiseGit_en.xml:8766 msgid "You can mark revisions as do not merge by including them in the list of merged revisions without actually doing the merge." msgstr "Možete obeležiti reviziju kao ne stapaj uključujući je u listu stopljenih revizija bez stvarnog stapanja." #. (para) #: ../source/TortoiseGit_en.xml:8732 msgid "Git 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. " msgstr "Subverzija 1.5 uvodi mogućnost za praćenje stapanja. Kada se vaše stapanje menja sa jednog stabla na drugo, revizioni brojevi stopljeni su uskladišteni i ta informacija može biti korišćena za više različitih svrha. " #. (para) #: ../source/TortoiseGit_en.xml:8774 msgid "Merge tracking information is stored in the svn:mergeinfo property by the client when it performs a merge. When the merge is committed the server stores that information in a database, and when you request merge, log or blame information, the server can respond appropriately. For the system to work properly you must ensure that the server, the repository and all clients are upgraded. Earlier clients will not store the svn:mergeinfo property and earlier servers will not provide the information requested by new clients." msgstr "Praćenje stapanja informacija je uskladištena u svn:mergeinfo osobini klijenta kada on izvrši stapanje. Kada je stapanje urezano server uskladišti tu informaciju u bazi podataka, i kada zahtevate stapanje, dnevnik ili okrivljavanje informacije, server može odgovoriti odgovarajuće. Za sistem koji radi ispravno morate omogućiti takav server, spremište i svi klijenti su dograđeni. Raniji klijenti neće uskladištiti svn:mergeinfo osobinu i raniji serveri neće obezbediti informacije koje traže novi klijenti." #. (para) #: ../source/TortoiseGit_en.xml:8784 msgid "Find out more about merge tracking from Git's Merge tracking documentation." msgstr "Nađite više o praćenju stapanja iz Subverzione Merge tracking documentation." #. (title) #: ../source/TortoiseGit_en.xml:8792 msgid "Handling Conflicts during Merge" msgstr "Rukovanje konfliktima u toku spajanja" #. (primary) #: ../source/TortoiseGit_en.xml:8795 msgid "merge conflicts" msgstr "konflikti spajanja" #. (title) #: ../source/TortoiseGit_en.xml:8804 msgid "The Merge Conflict Callback Dialog" msgstr "Konflikti spajanja dijalog odgovora" #. (para) #: ../source/TortoiseGit_en.xml:8797 msgid "Merging does not always go smoothly. Sometimes there is a conflict, and if you are merging multiple ranges, you generally want to resolve the conflict before merging of the next range starts. TortoiseGit helps you through this process by showing the merge conflict callback dialog. " msgstr "Stapanje uvek ne ide ravno. Ponekad ima konflikta, i ako stapate više opsega vi generalno želite da rešite konflikt pre početka stapanja sledećeg opsega. TortoiseGit vam pomaže kroz ovaj proces prikazivanjem povratni konflikt stapanja dijalog. " #. (para) #: ../source/TortoiseGit_en.xml:8813 msgid "You may decide that your local changes are much more important, so you want to discard the version from the repository and keep your local version. Or you might discard your local changes in favour of the repository version. Either way, no attempt is made to merge the changes - you choose one or the other." msgstr "Možete odlučiti da su vaše lokalne izmene mnogo važne, tako vi želite da izbacite verziju iz spremišta i sačuvate lokalnu verziju. Ili želite da odbacite lokalne izmene kao uslugu verziji spremišta. U svakom slučaju nema pokušaja da se uradi stapanje izmena . izaberite jedno ili drugo." #. (para) #: ../source/TortoiseGit_en.xml:8823 msgid "Normally you will want to look at the conflicts and resolve them. In that case, choose the Edit Conflict which will start up your merge tool. When you are satisfied with the result, click Resolved." msgstr "Normalno vi ćete želeti da pogledate konflikt i da ga rešite. U tom slučaju, izaberite Uredi Konflikt koji će pokrenuti vaš alat stapanja. Kada ste zadovoljni rezultatom kliknite na Rešen." #. (para) #: ../source/TortoiseGit_en.xml:8831 msgid "The last option is to postpone resolution and continue with merging. You can choose to do that for the current conflicted file, or for all files in the rest of the merge. However, if there are further changes in that file, it will not be possible to complete the merge." msgstr "Poslednja opcija je odlaganje rešavanja i nastaviti stapanje. Možete izabrati da uradite to za tekuće fajlove u konfliktu, ili za fajlove u ostatku stapanja. Kakogod, ako ima daljih izmena u tom fajlu neće biti moguće kompletirati stapanje." #. (para) #: ../source/TortoiseGit_en.xml:8808 msgid "When a conflict occurs during the merge, you have three ways to handle it. " msgstr "Kada se konflikt pojavi u toku stapanja imate tri načina da ga opslužite. " #. (para) #: ../source/TortoiseGit_en.xml:8841 msgid "If you do not want to use this interactive callback, there is a checkbox in the merge progress dialog Merge non-interactive. If this is set for a merge and the merge would result in a conflict, the file is marked as in conflict and the merge goes on. You will have to resolve the conflicts after the whole merge is finished. If it is not set, then before a file is marked as conflicted you get the chance to resolve the conflict during the merge. This has the advantage that if a file gets multiple merges (multiple revisions apply a change to that file), subsequent merges might succeed depending on which lines are affected. But of course you can't walk away to get a coffee while the merge is running ;)" msgstr "Ako ne želite da koristite interaktivan povratni poziv postoji čekboks u progres dijalogu stapanja Stopi ne-interaktivno. Ako je ovo odabrano za stapanje i stapanje prouzrokuje konflikt, fajl je markiran da je u konfliktu i stapanje se nastavlja. Vi ćete rešiti konflikt posle svršetka ukupnog stapanja. Ako nije podešeno onda pre nego se fajl markira kao konfliktan dobijate šansu da rešite konflikt tokom stapanja.Ovo ima prednost ako fajl dobije višestruka spajanja (višestruke revizije primenjuju izmene tog fajl), sukcesivna stapanja se mogu nastaviti u zavisnosti na koje linije se odnosi. Ali svakako ne možete šetati okolo po kafu dok stapanje radi ;)" #. (title) #: ../source/TortoiseGit_en.xml:8856 msgid "Merge a Completed Branch" msgstr "Spajanje cele grane" #. (primary) #: ../source/TortoiseGit_en.xml:8859 msgid "merge reintegrate" msgstr "stopi reintegriraj" #. (title) #: ../source/TortoiseGit_en.xml:8871 msgid "The Merge reintegrate Dialog" msgstr "Dijalog reintegrisanog spajanja" #. (para) #: ../source/TortoiseGit_en.xml:8861 msgid "If you want to merge all changes from a feature branch back to trunk, then you can use the TortoiseGitMerge reintegrate... from the extended context menu (hold down the Shift key while you right click on the file). This dialog is very easy. All you have to do is set the options for the merge, as described in . The rest is done by TortoiseGit automatically using merge tracking." msgstr "Ako želite stopiti sve izmene posebne grane nazad u deblo tada možete koristiti TortoiseGitStopiti reintegrisano... iz proširenog kontekst menija (drži Shift taster dok desno kliknete na fajl). Ovaj dijalog je veoma lak. Sve što imate da uradite je da podesite opcije za stapanje kako je opisano . preostalo je dato sa TortoiseGit automatski koristeći praćenje stapanja." #. (title) #: ../source/TortoiseGit_en.xml:8880 msgid "Feature Branch Maintenance" msgstr "Osobina održavanja grane" #. (para) #: ../source/TortoiseGit_en.xml:8881 msgid "When you develop a new feature on a separate branch it is a good idea to work out a policy for re-integration when the feature is complete. If other work is going on in trunk at the same time you may find that the differences become significant over time, and merging back becomes a nightmare." msgstr "Kada razvijate nove osobine na izdvojenoj grani dobra je ideja da se radi plan reintegracije kda osobina bude kompletna. Ako ostali rad na deblu u isto vreme može se ispostaviti da su razlike postale značajne posle nekog vremena i stapanje nazad postaje noćna mora." #. (para) #: ../source/TortoiseGit_en.xml:8888 msgid "If the feature is relatively simple and development will not take long then you can adopt a simple approach, which is to keep the branch entirely separate until the feature is complete, then merge the branch changes back into trunk. In the merge wizard this would be a simple Merge a range of revisions, with the revision range being the revision span of the branch." msgstr "Ako je osobina relativno jednostavna i razvoj nije bio dug možete prihvatiti jednostavan pristup, koji drži celu granu izdvojenu dok se osobina ne kompletira, zatim se stapa izmena grane nazad u deblo. U čarobnjaku stapanja to će biti jednostavno Stopi opseg revizija, sa opsegom revizija koji je revizioni opseg grane. " #. (para) #: ../source/TortoiseGit_en.xml:8896 msgid "If the feature is going to take longer and you need to account for changes in trunk, then you need to keep the branch synchronised. This simply means that periodically you merge trunk changes into the branch, so that the branch contains all the trunk changes plus the new feature. The synchronisation process uses Merge a range of revisions. When the feature is complete then you can merge it back to trunk using either Reintegrate a branch or Merge two different trees." msgstr "Ako osobina uzima mnogo vremena i treba vam račun za izmene u deblu, potrbno je da zadržite sinhronizaciju grane. To jednostavno znači da periodično stapate izmene debla u granu, tako da grana sadrži sve izmene debla plus nove osobine. Proces sinhronizacije koristi Stopi opseg revizija. Kada je osobina kompletna možete je stopiti nazad na deblo koristeći ili Reintegriši granu ili Stopi dva različita stabla." #. (title) #: ../source/TortoiseGit_en.xml:8911 msgid "Locking" msgstr "Zaključavanje" #. (primary) #: ../source/TortoiseGit_en.xml:8913 msgid "locking" msgstr "zaključavanje" #. (primary) #: ../source/TortoiseGit_en.xml:8916 msgid "readonly" msgstr "samo za čitanje" #. (para) #: ../source/TortoiseGit_en.xml:8926 msgid "You are using unmergeable files, for example, graphics files. If two people change the same file, merging is not possible, so one of you will lose their changes." msgstr "Vi koristite nestopive fajlove, grafičke fajlove. Ako dva čoveka izmene isti fajl, stapanje nije moguće, tako da jedan od vas će izgubiti svoje izmene." #. (para) #: ../source/TortoiseGit_en.xml:8934 msgid "Your company has always used a locking revision control system in the past and there has been a management decision that locking is best." msgstr "Vaša kompanija je uvek koristila zaključan sistema kontrole verzija u prošlosti i postoji odluka uprave da zaključavanje je najbolje." #. (para) #: ../source/TortoiseGit_en.xml:8918 msgid "Git generally works best without locking, using the Copy-Modify-Merge methods described earlier in . However there are a few instances when you may need to implement some form of locking policy. " msgstr "Subverzija generalno radi najbolje bez zaključavanja, koristeći Kopiraj-Izmeni-Stopi metode opisane ranije u . Ipak, postoji nekoliko primera kada možete imati potrebu da primenite neku vrstu politike zaključavanja. " #. (para) #: ../source/TortoiseGit_en.xml:8942 msgid "Firstly you need to ensure that your Git server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using file:// access, then of course only your client needs to be updated." msgstr "Najpre treba obezbediti da Subverzioni server dograđen najmanje na verziju 1.2. Ranije verzije uopšte ne podržavaju zaključavanje. Ako koristite file:// pristup, svakako samo vaš klijent treba da bude ažuriran." #. (title) #: ../source/TortoiseGit_en.xml:8949 msgid "How Locking Works in Git" msgstr "Kako zaključavanje radi na Subverziji" #. (para) #: ../source/TortoiseGit_en.xml:8950 msgid "By default, nothing is locked and anyone who has commit access can commit changes to any file at any time. Others will update their working copies periodically and changes in the repository will be merged with local changes." msgstr "Uobičajeno, ništa nije zaključano i svako ko ima pristup urezivanju može urezivati izmene u svaki fajl u bilo koje vreme. Ostali će ažurirati svoje radne kopije periodično i izmene u spremištu će biti stopljene sa lokalnim izmenama." #. (para) #: ../source/TortoiseGit_en.xml:8956 msgid "If you Get a Lock on a file, then only you can commit that file. Commits by all other users will be blocked until you release the lock. A locked file cannot be modified in any way in the repository, so it cannot be deleted or renamed either, except by the lock owner." msgstr "Ako vi Stavite Katanac na fajl, onda samo vi možete urezivati taj fajl. Urezivanje svih ostalih korisnika je blokirano sve dok ne skinete katanac. Zaključan fajl ne može biti izmenjen na bilo koji način u spremištu, on ne može biti obrisan ili preimenovan, osim od vlasnika katanca." #. (para) #: ../source/TortoiseGit_en.xml:8963 msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Git property svn:needs-lock. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only unless that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing." msgstr "Međutim, drugi korisnici neće neophodno znati da ste uklonili katanac. Osim da provere status zaključavanja regularno, najpre oni moraju znati o tome kada urezivanje utkaže, što u većini slučajeva nije mnogo krisno. Da biste učinili to lakšim za manipulaciju postoji nova Subverziona osobina svn:needs-lock. Kada je ova osobina podešena (na bilo koju vrednost) na fajlu, kadgod se fajl preuzima ili ažurira, lokalna kopija postaje samo za čitanje osim ako ta radna kopija drži katanac za fajl. Ovo deluje kao upozorenje tako da ne možete uređivati taj fajl osim ako najpre ne dobijete katanac. Fajlovi koji su verzionisani i samo za čitanje označeni su specijalnim prekrivačem u TortoiseGit da ukažu da treba da dobijete katanac pre uređenja." #. (para) #: ../source/TortoiseGit_en.xml:8979 msgid "Locks are recorded by working copy location as well as by owner. If you have several working copies (at home, at work) then you can only hold a lock in one of those working copies." msgstr "Zaključavanje je upisano u lokaciji radne kopije kao i vlasnik. Ako imate više radnih kopija (kući, na poslu) vi možete samo da držite katanac na jednoj od tih radnih kopija." #. (para) #: ../source/TortoiseGit_en.xml:8985 msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Git provides a means to force locks. Releasing a lock held by someone else is referred to as Breaking the lock, and forcibly acquiring a lock which someone else already holds is referred to as Stealing the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers." msgstr "Ako jedan od vaših saradnika traži katanac i ode na odmor bez otključavanja šta da se radi? Subverzija omogućava način da se forsira zaključavanje. Otključavanje od još nekog označeno je kao Razbijanje katanca, a nasilno otključavanje koje neko uradi zove se Krađa katanca. Prirodno, ovo nisu stvari koje treba da radite olako ako želite da ostanete prijatelj sa saradnicima" #. (para) #: ../source/TortoiseGit_en.xml:8995 msgid "Locks are recorded in the repository, and a lock token is created in your local working copy. If there is a discrepancy, for example if someone else has broken the lock, the local lock token becomes invalid. The repository is always the definitive reference." msgstr "Zaključavanje se upisuje u spremištu i katanac žeton se kreira u vašoj lokalnoj radnoj kopiji. Ako postoji različitos, na primer ako još neko ima slomljen katanac, lokalni žeton katanac postaje neispravan. Spremište je uvek definitivna referenca. " #. (title) #: ../source/TortoiseGit_en.xml:9004 msgid "Getting a Lock" msgstr "Zaključavanje" #. (title) #: ../source/TortoiseGit_en.xml:9013 msgid "The Locking Dialog" msgstr "Dijalog zaključavanja" #. (para) #: ../source/TortoiseGit_en.xml:9005 msgid "Select the file(s) in your working copy for which you want to acquire a lock, then select the command TortoiseGitGet Lock.... A dialog appears, allowing you to enter a comment, so others can see why you have locked the file. The comment is optional and currently only used with Svnserve based repositories. If (and only if) you need to steal the lock from someone else, check the Steal lock box, then click on OK." msgstr "Izaberite fajl(ove) u vašoj radnoj kopiji za koje želite da dobijete katanac, zatim izaberite komandu TortoiseGitZaključaj.... Dijalog se pojavljuje dozvoljavajući da unesete komentar, tako ostali mogu videti zašto ste zaključali fajl. Komentar nije obavezan i trenutno se koristi samo sa Svnserve osnovanim spremištima. Ako ( i samo i) trebate da ukradete katanac od nekog proverite Još uvek zaključan boks, zatim kliknite na OK." #. (para) #: ../source/TortoiseGit_en.xml:9025 msgid "If you select a folder and then use TortoiseGitGet Lock... the lock dialog will open with every file in every sub-folder selected for locking. If you really want to lock an entire hierarchy, that is the way to do it, but you could become very unpopular with your co-workers if you lock them out of the whole project. Use with care ..." msgstr "Ako izaberete imenik i onda koristite TortoiseGitZaključaj... dijalog zaključavanja će se otvoriti sa svakim fajlom u svakom pod-imeniku izabranom za zaključavanje. Ako stvarno želite da zaključate celu hijerarhiju, ovo je način da to uradite, ali ćete postati jako nepopularni među saradnicima ako im zaključate ceo projekat. Koristite pažljivo..." #. (title) #: ../source/TortoiseGit_en.xml:9039 msgid "Releasing a Lock" msgstr "Otključavanje" #. (para) #: ../source/TortoiseGit_en.xml:9040 msgid "To make sure you don't forget to release a lock you don't need any more, locked files are shown in the commit dialog and selected by default. If you continue with the commit, locks you hold on the selected files are removed, even if the files haven't been modified. If you don't want to release a lock on certain files, you can uncheck them (if they're not modified). If you want to keep a lock on a file you've modified, you have to enable the Keep locks checkbox before you commit your changes." msgstr "Da biste osigurali da ne zaboravite da otključate ne treba vam ništa posebno, zaključani fajlovi su prikazani u dijalogu urezivanja i izabrani podrazumevano. Ako nastavite sa urezivanjem, katanac koji držite na izabranim fajlvima se uklanja, čak i ako fajlovi nisu izmenjeni. Ako ne želite da uklonite katanac sa nekih fajlva možete ih otčekirati (ako nisu izmenjeni). Ako želite da držite katanac na fajlu koji ste izmenili imate da omogućite Drži katanac čekboks pre urezivanja izmena." #. (para) #: ../source/TortoiseGit_en.xml:9051 msgid "To release a lock manually, select the file(s) in your working copy for which you want to release the lock, then select the command TortoiseGitRelease Lock There is nothing further to enter so TortoiseGit will contact the repository and release the locks. You can also use this command on a folder to release all locks recursively." msgstr "Da se ukloni katanac ručno, izaberite fajl(ove) u vašoj radnoj kopiji za koje hoćete da uklonite katanac, zatim izaberite komandu TortoiseGitOtključaj Ništa dalje ne treba uneti jer TortoiseGit kontaktira spremište i uklanja katance. Takođe možete koristiti komandu na imeniku da uklonite sve katance rekurzivno." #. (title) #: ../source/TortoiseGit_en.xml:9064 msgid "Checking Lock Status" msgstr "Provera statusa zaključavanja" #. (title) #: ../source/TortoiseGit_en.xml:9067 msgid "The Check for Modifications Dialog" msgstr "Provera dijaloga izmena" #. (para) #: ../source/TortoiseGit_en.xml:9065 msgid " To see what locks you and others hold, you can use TortoiseGitCheck for Modifications.... Locally held lock tokens show up immediately. To check for locks held by others (and to see if any of your locks are broken or stolen) you need to click on Check Repository." msgstr " Da vidite koje katance vi i drugi držite, koristite TortoiseGitProvera izmena.... Lokalno držan katanac žetoni se prikažu trenutno. Da biste proverili koje katance drže ostali (i da vidite da li je neki vaš katanac slomljen ili ukraden) treba da kliknete na Proveri Spremište." #. (para) #: ../source/TortoiseGit_en.xml:9080 msgid "From the context menu here, you can also get and release locks, as well as breaking and stealing locks held by others." msgstr "Iz kontekst menija ovde možete takođe staviti ili otkačiti katanac, kao i slomljene i ukradene katance koje drže drugi." #. (title) #: ../source/TortoiseGit_en.xml:9085 msgid "Avoid Breaking and Stealing Locks" msgstr "Izbegavanje razbijanja i krađa katanca" #. (para) #: ../source/TortoiseGit_en.xml:9086 msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Git doesn't lose data, but you have lost the team-working protection that locking gave you." msgstr "Ako slomite ili ukradete nekom drugom katanac bez pitanja možete potencijalno uzrokovati gubitak posla. Ako radite sa nestopivim tipom fajlva i nekom ukradete katanac kada vratite katanac oni su slobodni da provere svoje izmene i prekriju vaše. Subverzija ne gubi podatke ali vi možete izgubiti radnu zaštitu tima koje va zaključavanje omogućava." #. (title) #: ../source/TortoiseGit_en.xml:9098 msgid "Making Non-locked Files Read-Only" msgstr "Pravljenje nezaključanih fajlova samo za čitanje" #. (para) #: ../source/TortoiseGit_en.xml:9099 msgid "As mentioned above, the most effective way to use locking is to set the svn:needs-lock property on files. Refer to for instructions on how to set properties. Files with this property set will always be checked out and updated with the read-only flag set unless your working copy holds a lock. As a reminder, TortoiseGit uses a special overlay to indicate this." msgstr "Kako je napomenuto gore, mnogo efektivniji način za korišćenje zaključavanja je podešavanjem svn:needs-lock osobine na fajlu. Uporedite sa za instrukcije kako podesiti te osobine. Fajlovi sa tim osobinama podešenim će uvek biti preuzimani i ažurirani sa setovanim flegom samo-za-čitanje osim ako vaša kopija drži katanac. Kao podsetnik, TortoiseGit koristi specijalni prekrivač da označi to." #. (para) #: ../source/TortoiseGit_en.xml:9109 msgid "If you operate a policy where every file has to be locked then you may find it easier to use Git's auto-props feature to set the property automatically every time you add new files. Read for further information." msgstr "Ako radite sa politikom da svaki fajl može biti zaključan tada možda shvatite da je lakše da koristite Subverzionu suto-props osobinu da podesite osobine automatski svaki put kad dodajete novi fajl. Pročitajte za dalje informacije." #. (title) #: ../source/TortoiseGit_en.xml:9118 msgid "The Locking Hook Scripts" msgstr "Zakačive skripte za zaključavanje" #. (para) #: ../source/TortoiseGit_en.xml:9119 msgid "When you create a new repository with Git 1.2 or higher, four hook templates are created in the repository hooks directory. These are called before and after getting a lock, and before and after releasing a lock." msgstr "Kada kreirate novo spremište sa Subverzijom 1.2 ili višom, četiri modela zakačaljki se kreira u spremištu zakačaljke imenik.One se pozivaju pre i posle postavljanja katanca i pre i posle skidanja katanca." #. (para) #: ../source/TortoiseGit_en.xml:9125 msgid "It is a good idea to install a post-lock and post-unlock hook script on the server which sends out an email indicating the file which has been locked. With such a script in place, all your users can be notified if someone locks/unlocks a file. You can find an example hook script hooks/post-lock.tmpl in your repository folder." msgstr "Dobra je ideja da se instalira literal>post-zaključavanja and post-otključavanjak zakačiva skripta na serveru koja šalje epoštu označivši fajl koji je zaključan. Sa takvom skriptom svi vaši korisnici mogu biti obavešteni ako neko zaključa/otključa fajl. Možete naći primer zakačive skripte hooks/post-lock.tmpl u vašem imeniku spremišta" #. (para) #: ../source/TortoiseGit_en.xml:9133 msgid "You might also use hooks to disallow breaking or stealing of locks, or perhaps limit it to a named administrator. Or maybe you want to email the owner when one of their locks is broken or stolen." msgstr "Možete takođe koristiti zakačljke da onemogućite lomljenje i krađu katanaca, ili možda graničiti to na imenovanog administratora. Ili možda želite da pošaljete epoštu vlasnicima kada je neki od njihovih katanaca slomljen ili ukraden." #. (para) #: ../source/TortoiseGit_en.xml:9139 msgid "Read to find out more." msgstr "Pročitajte za više infižormacija." #. (title) #: ../source/TortoiseGit_en.xml:9145 msgid "Creating and Applying Patches" msgstr "Kreiranje i primena zakrpa" #. (primary) #: ../source/TortoiseGit_en.xml:9147 msgid "patch" msgstr "zakrpa" #. (primary) #: ../source/TortoiseGit_en.xml:9153 msgid "unified diff" msgstr "objedinjena razlika" #. (para) #: ../source/TortoiseGit_en.xml:9157 msgid "For open source projects (like this one) everyone has read access to the repository, and anyone can make a contribution to the project. So how are those contributions controlled? If just anyone could commit changes, the project would be permanently unstable and probably permanently broken. In this situation the change is managed by submitting a patch file to the development team, who do have write access. They can review the patch first, and then either submit it to the repository or reject it back to the author." msgstr "Za projekte otvorenog koda (kao ovaj) svako može da ima pristup čitanju spremišta, i svako može da doprinese projektu. Dakle kako se ti doprinosi kontrolišu? Ako samo svako urezuje izmene projekat će biti stalno nestabilan i moguće permanentno slomljen. U ovoj situaciji izmene se upravljaju predlaganjem zakrpa fajlova razvojnom timu koji ima pristup upisivanju. Oni mogu pregledati zakrpu najpre i onda ili je uneti u spremište ili je vratiti nazad autoru." #. (para) #: ../source/TortoiseGit_en.xml:9168 msgid "Patch files are simply Unified-Diff files showing the differences between your working copy and the base revision." msgstr "Fajlovi zakrpa su jednostavno Jedinstveni-Diff fajlovi koji prikazuju razlike između vaše radne kopije i osnovne revizije." #. (title) #: ../source/TortoiseGit_en.xml:9173 msgid "Creating a Patch File" msgstr "Kreiranje fajla zakrpe" #. (para) #: ../source/TortoiseGit_en.xml:9174 msgid "First you need to make and test your changes. Then instead of using TortoiseGitCommit... on the parent folder, you select TortoiseGitCreate Patch..." msgstr "Najpre treba da napravite i test vaših izmena. Zatim umesto da koristite TortoiseGitUreži... na predačkom imeniku, izaberite TortoiseGitKreiraj Zakrpu..." #. (title) #: ../source/TortoiseGit_en.xml:9188 msgid "The Create Patch dialog" msgstr "Kreiranje dijaloga zakrpe" #. (para) #: ../source/TortoiseGit_en.xml:9191 msgid "you can now select the files you want included in the patch, just as you would with a full commit. This will produce a single file containing a summary of all the changes you have made to the selected files since the last update from the repository." msgstr "možete sada izabrati fajlove koje hoćete da uključite u zakrpu, isto kako želite sa punim urezivanjem. Ovo će proizvesti pojedinačni fajl kji sadrži rezultat svih izmena kaoje ste uradili na izabranim fajlovima od zadnjeg ađuriranja iz spremišta." #. (para) #: ../source/TortoiseGit_en.xml:9202 msgid "You can produce separate patches containing changes to different sets of files. Of course, if you create a patch file, make some more changes to the same files and then create another patch, the second patch file will include both sets of changes." msgstr "Možete proizvesti izdvojene zakrpe koje sadrže izmene različitih skupova fajlova. Svakako, ako kreirate fajl zakrpu, uradite još neku izmenu na istim fajlovima i onda kreirajte sledeću zakrpu, drugi fajl zakrpe će uključivati oba skupa izmena." #. (para) #: ../source/TortoiseGit_en.xml:9208 msgid "Just save the file using a filename of your choice. Patch files can have any extension you like, but by convention they should use the .patch or .diff extension. You are now ready to submit your patch file." msgstr "Samo sačuvajte fajl koristeći fajlime po vašem izboru. Fajlovi zakrpa imaju ekstenziju koju god želite, ali konvencionalno bi trebalo da koriste filename>.patch ili .diff ekstenziju. Sada ste spremni da podnesete vaš fajl zakrpu." #. (para) #: ../source/TortoiseGit_en.xml:9215 msgid "You can also save the patch to the clipboard instead of to a file. You might want to do this so that you can paste it into an email for review by others. Or if you have two working copies on one machine and you want to transfer changes from one to the other, a patch on the clipboard is a convenient way of doing this." msgstr "Možete takođe da sačuvate zakrpu u klipbordu umesto u fajlu. Možete želeti da to uradite tako da ga nalepite u epoštu da ga pregledaju ostali. Ili ako imate radnu kopiju na jednoj mašini i želite da prenesete izmene sa jedne na drugu, zakrpa na klipbordu je konvencionalni način da to uradite." #. (title) #: ../source/TortoiseGit_en.xml:9224 msgid "Applying a Patch File" msgstr "Primena fajla zakrpe" #. (para) #: ../source/TortoiseGit_en.xml:9225 msgid "Patch files are applied to your working copy. This should be done from the same folder level as was used to create the patch. If you are not sure what this is, just look at the first line of the patch file. For example, if the first file being worked on was doc/source/english/chapter1.xml and the first line in the patch file is Index: english/chapter1.xml then you need to apply the patch to the doc/source/ folder. However, provided you are in the correct working copy, if you pick the wrong folder level, TortoiseGit will notice and suggest the correct level." msgstr "Fajlovi zakrpa se primenjuju na vašu radnu kopiju. Biće urađeni na istom nivou imenika koji su korišćeni kada je kreirana zakrpa. Ako niste sigurni šta je to, samo pogledajte prvu liniju fajla zakrpe. Na primer, ako je prvi fajl radio na s doc/source/english/chapter1.xml i prva linija fajla zakrpe je Index: english/chapter1.xml tada je potrebno da primenite zakrpu na doc/source/ imenik. Međutim, omogućava vam da ste na korektnoj radnoj kopiji, ako izaberete neispravan nivo foldera, TortoiseGit će to notirati i predložiti vam korektan nivo." #. (para) #: ../source/TortoiseGit_en.xml:9239 msgid "In order to apply a patch file to your working copy, you need to have at least read access to the repository. The reason for this is that the merge program must reference the changes back to the revision against which they were made by the remote developer." msgstr "Da bi primenili fajl zakrpe na vašu radnu kopiju potrebno vm je da imate najmanje pristup za čitanje spremišta. Razlog za ovo je da program stapanja mora da uporedi izmene nazad sa revizijom prema kojoj je urađen od udaljenog saradnika." #. (para) #: ../source/TortoiseGit_en.xml:9246 msgid "From the context menu for that folder, click on TortoiseGitApply Patch... This will bring up a file open dialog allowing you to select the patch file to apply. By default only .patch or .diff files are shown, but you can opt for All files. If you previously saved a patch to the clipboard, you can use Open from clipboard... in the file open dialog." msgstr "Iz kontekst menija za taj imenik, kliknite na menuchoice>TortoiseGitPrimeni Zakrpu... Ovo će otvoriti fajl otvori dijalog dozvoljavajući vam da izaberete fajl zakrpu za primenu. Uobičajeno samo .patch ili .diff fajlovi su prikazani, ali može se izabrati opcija za All files. Ako ste prethodno sačuvali zakrpu u klipbord možete koristiti Otvori iz klipborda... u fajl open dijalogu." #. (para) #: ../source/TortoiseGit_en.xml:9260 msgid "Alternatively, if the patch file has a .patch or .diff extension, you can right click on it directly and select TortoiseGitApply Patch.... In this case you will be prompted to enter a working copy location." msgstr "Alternativno, ako fajl zakrpa ima .patch ili .diff ekstenziju, možete desnim klikom na taj direktorijum da izaberete TortoiseGitPrimeni Zakrpu.... U tom slučaju bićete pitani da unesete lokaciju radne kopije." #. (para) #: ../source/TortoiseGit_en.xml:9270 msgid "These two methods just offer different ways of doing the same thing. With the first method you select the WC and browse to the patch file. With the second you select the patch file and browse to the WC." msgstr "Ova dva metoda tek nude različite načine da se uradi ista stvar. Sa prvim metodom birate RK i pretražujete fajl zakrpa. Drugim birate fajl zakrpe i pretražujete RK." #. (para) #: ../source/TortoiseGit_en.xml:9275 msgid "Once you have selected the patch file and working copy location, TortoiseMerge runs to merge the changes from the patch file with your working copy. A small window lists the files which have been changed. Double click on each one in turn, review the changes and save the merged files." msgstr "Jednom kad izaberete fajl zakrpa i lokaciju radne kopije, TortoiseGit kreće da stapa izmene iz fajla zakrpa sa vašom radnom kopijom. Mali prozor lista fajlove koji će biti izmenjeni. Dvostruki klik na svaki redom prikazaće izmene i sačuvati stopljene fajlove." #. (para) #: ../source/TortoiseGit_en.xml:9282 msgid "The remote developer's patch has now been applied to your working copy, so you need to commit to allow everyone else to access the changes from the repository." msgstr "Daljinski razvojne zakrpe su primenjene na vašoj radnoj kopiji tako da je potrebno urezati da se dozvoljava još nekom da menja iz spremišta." #. (title) #: ../source/TortoiseGit_en.xml:9290 msgid "Who Changed Which Line?" msgstr "Ko je izmenio koju liniju?" #. (primary) #: ../source/TortoiseGit_en.xml:9292 msgid "blame" msgstr "okriviti" #. (primary) #: ../source/TortoiseGit_en.xml:9295 msgid "annotate" msgstr "obeleži" #. (primary) #: ../source/TortoiseGit_en.xml:9298 msgid "praise" msgstr "veličina" #. (para) #: ../source/TortoiseGit_en.xml:9301 msgid "Sometimes you need to know not only what lines have changed, but also who exactly changed specific lines in a file. That's when the TortoiseGitBlame... command, sometimes also referred to as annotate command comes in handy." msgstr "Ponekad treba da znate ne samo linije koje su izmenjene, ali takođe ko je tačno izmenio određene linije u fajlu. Kada TortoiseGitOkrivi... komanda, ponekad se takođe poziva na anotiranje korisnih komandi." #. (para) #: ../source/TortoiseGit_en.xml:9311 msgid "This command lists, for every line in a file, the author and the revision the line was changed." msgstr "Ova komanda lista, za svaku liniju u fajlu, autora i reviziju linije koja je izmenjena." #. (title) #: ../source/TortoiseGit_en.xml:9316 msgid "Blame for Files" msgstr "Krivac za fajl" #. (title) #: ../source/TortoiseGit_en.xml:9319 msgid "The Annotate / Blame Dialog" msgstr "Beleška/Krivac dijalog" #. (para) #: ../source/TortoiseGit_en.xml:9317 msgid " If you're not interested in changes from earlier revisions you can set the revision from which the blame should start. Set this to 1, if you want the blame for every revision." msgstr " Ako vas ne interesuju izmene iz ranijih revizija možete podesiti reviziju odakle će okrivljavanje početi. Podesite to na 1, ako želite da okrivite svaku reviziju." #. (para) #: ../source/TortoiseGit_en.xml:9326 msgid "By default the blame file is viewed using TortoiseBlame, which highlights the different revisions to make it easier to read. If you wish to print or edit the blame file, select Use Text viewer to view blames" msgstr "Uobičajeno je da okrivljavanje fajl se pregleda koristeći TortoiseBlame, što osvetljava različite revizije što ih čini lakšim za čitanjem. Ako želite da štampate ili uredite fajl okrivljavanja, izaberite Koristi Tekst pregledač da vidite okrivljavanje" #. (para) #: ../source/TortoiseGit_en.xml:9332 msgid "You can specify the way that line ending and whitespace changes are handled. These options are described in . The default behaviour is to treat all whitespace and line-end differences as real changes, but if you want to ignore an indentation change and find the original author, you can choose an appropriate option here." msgstr "Možete specificirati način rukovanja završetkom linije i izmenom belihpolja. Ove opcije su opisane u . Uobičajeno ponašanje se tretiraju sva belapolja i kraj linija razlike kao realne izmene, ali ako želite da zanemarite uvlačenje izmene i naći originalne autore možete izabrati odgovarajuće opcije ovde." #. (para) #: ../source/TortoiseGit_en.xml:9339 msgid "Once you press OK TortoiseGit starts retrieving the data to create the blame file. Please note: This can take several minutes to finish, depending on how much the file has changed and of course your network connection to the repository. Once the blame process has finished the result is written into a temporary file and you can view the results." msgstr "Kada jednom pritisnete OK TortoiseGit počinje vraćati podatke da kreira fajl okrivljavanja. Molim primetite: Ovo može uzeti nekoliko minuta da se završi, u zavisnosti od toga koliko je fajl izmenjen i svakako mrežne konekcije u spremištu. Jednom kada proces okrivljavanja završi rezultat je upisan u privremeni fajl i vi možete videti rezultat." #. (title) #: ../source/TortoiseGit_en.xml:9349 msgid "TortoiseBlame" msgstr "TortozBlame" #. (para) #: ../source/TortoiseGit_en.xml:9347 msgid " TortoiseBlame, which is included with TortoiseGit, makes the blame file easier to read. When you hover the mouse over a line in the blame info column, all lines with the same revision are shown with a darker background. Lines from other revisions which were changed by the same author are shown with a light background. The colouring may not work as clearly if you have your display set to 256 colour mode." msgstr " TortoiseBlame, koji koji je uključen sa TortoiseGit, čini fajl okrivljavanja lakši za čitanje. Kada letite mišem preko linije u info kolonama okrivljavanja, sve linije sa istom revizijom su prikazani sa mračnijom osnovom. Linije iz raznih revizija koje su izmenjene od istih autora su prikazani sa svetlom osnovom. Bojenje ne može raditi tako kjasno ako je displej podešen u 256 boja modu. " #. (para) #: ../source/TortoiseGit_en.xml:9360 msgid "If you left click on a line, all lines with the same revision are highlighted, and lines from other revisions by the same author are highlighted in a lighter colour. This highlighting is sticky, allowing you to move the mouse without losing the highlights. Click on that revision again to turn off highlighting." msgstr "Ako uradite levi klik na liniju, sve linijesa istom revizijom su osvetljene, i linije od drugih revizija od istog autora su osvetljene svetlijom bojom. Ovo osvetljavanje je prilepljivo, omogućava pomeranje miša bez gubljenja osvetljenja. Kliknite na tu reviziju ponovo da biste isključili osvetljavanje." #. (para) #: ../source/TortoiseGit_en.xml:9367 msgid "The revision comments (log message) are shown in a hint box whenever the mouse hovers over the blame info column. If you want to copy the log message for that revision, use the context menu which appears when you right click on the blame info column." msgstr "Revizioni komentari (dnevnik poruke) su prikazani u boksu napomena kadgod miš leti preko info kolone okrivljavanja. Ako želite da kopirate dnevnik poruku za tu reviziju, koristite kontekst meni koji se pojavljuje kada uradite desni klik na info kolonu okrivljavanja." #. (para) #: ../source/TortoiseGit_en.xml:9373 msgid "You can search within the Blame report using EditFind.... This allows you to search for revision numbers, authors and the content of the file itself. Log messages are not included in the search - you should use the Log Dialog to search those." msgstr "Možete pretraživati unutar Okrivi izveštaja koristeći UrediNađi.... Ovo dopušta da pretražujete revizione brojeve, autore i sadržaj samog fajla. Dnevnik poruke nisu uključene u pretraživanje - treba da koristite Dnevnik Dijalog da pretraažujete njih." #. (para) #: ../source/TortoiseGit_en.xml:9383 msgid "You can also jump to a specific line number using EditGo To Line...." msgstr "Možete takođe skočiti na specifični broj linije koristeći UrediIdi Na Liniju...." #. (para) #: ../source/TortoiseGit_en.xml:9390 msgid "When the mouse is over the blame info columns, a context menu is available which helps with comparing revisions and examining history, using the revision number of the line under the mouse as a reference. Context menuBlame previous revision generates a blame report for the same file, but using the previous revision as the upper limit. This gives you the blame report for the state of the file just before the line you are looking at was last changed. Context menuShow changes starts your diff viewer, showing you what changed in the referenced revision. Context menuShow log displays the revision log dialog starting with the referenced revision." msgstr "Kada miš leti preko info kolona okrivljavanja, kontekst meni je dostupan što vam pomaže poređenjem revizija i pregledom istorije, koristeći revizione brojeve linija pod mišem kao referencu. Kontekst MeniOkrivi prethodnu reviziju generiše izveštaj okrivljavanja za iste fajlve, ali koristeći prethodnu reviziju kao gornju granicu. Ovo daje izveštaj okrivljavanja za stanje fajla baš pre linije koju gledate koja je zadnja izmenjena. Kontekst MeniPrikaži Izmene pokreće vaš diff pregledač, prikazujući vam šta je izmenjeno u referentnoj reviziji. Kontekst MeniPrikaži Dnevnik prikazuje revizioni dnevnik dijalog počevši sa referentnom revizijom." #. (para) #: ../source/TortoiseGit_en.xml:9412 msgid "If you need a better visual indicator of where the oldest and newest changes are, select ViewColor age of lines. This will use a colour gradient to show newer lines in red and older lines in blue. The default colouring is quite light, but you can change it using the TortoiseBlame settings." msgstr "Ako vam treba bolji vizualni indikator gde su najstarije i najnovije izmene, izaberi VidiBoja starosti linija. Obojenje ja sasvim svetlo, vo će koristiti gradijent boje da prikaže novije linije plavo. Uobičajeno bojenje je sasvim svetlo, ali možete ga promeniti koristeći TortoiseBlame podešavanje." #. (para) #: ../source/TortoiseGit_en.xml:9423 msgid "If you are using Merge Tracking, where lines have changed as a result of merging from another path, TortoiseBlame will show the revision and author of the last change in the original file rather than the revision where the merge took place. These lines are indicated by showing the revision and author in italics. If you do not want merged lines shown in this way, uncheck the Include merge info checkbox." msgstr "Ako koristite Stapanje Praćenje, gde su linije izmenjene kao rezultat stapanjaiz druge putanje, TortoiseBlame će pokazati reviziju i autora zadnje izmene u originalnom fajlu radije nego revizija gde se stapanje desilo. Ove linije su označene prikazivanjem revizije i autora u italiku. Ako ne želite da stopite linije prikazane ovog puta otčekiraj Uključi info stapanja checkbox." #. (para) #: ../source/TortoiseGit_en.xml:9432 msgid "If you want to see the paths involved in the merge, select ViewMerge paths." msgstr "Ako želite da vidite putanju umešane u stapanje, izaberite VidiPutanja stapanja." #. (para) #: ../source/TortoiseGit_en.xml:9439 msgid "The settings for TortoiseBlame can be accessed using TortoiseGitSettings... on the TortoiseBlame tab. Refer to ." msgstr "Podešavanju TortoiseBlame može ste pristupiti koristeći TortoiseGitPodešavanja... na TortoiseBlame tab. Uporedite sa ." #. (title) #: ../source/TortoiseGit_en.xml:9450 msgid "Blame Differences" msgstr "Razlikeke okrivljavanja" #. (para) #: ../source/TortoiseGit_en.xml:9451 msgid "One of the limitations of the Blame report is that it only shows the file as it was in a particular revision, and shows the last person to change each line. Sometimes you want to know what change was made, as well as who made it. What you need here is a combination of the diff and blame reports." msgstr "Jedno od ograničenja izveštaja Okrivljavanja je da se samo prikazuje fajl kakav je bio u partikularnoj reviziji, i prikazuje zadnju osobu koja menja svaku liniju. Ponekad želite da znate koje izmene su urađene, kao i ko ih je uradio. Sve što vam je ovde potrebno je kombinacija diff i okrivljavanja izveštaj." #. (term) #: ../source/TortoiseGit_en.xml:9461 msgid "Blame Revisions" msgstr "Krivac revizija" #. (para) #: ../source/TortoiseGit_en.xml:9463 msgid "In the top pane, select 2 revisions, then select Context menuBlame revisions. This will fetch the blame data for the 2 revisions, then use the diff viewer to compare the two blame files." msgstr "U gornjem panelu izaberite 2 revizije, zatim izaberite Kontekst meniOkrivljavanje revizija. Ovo će naći podatke okrivaljavanja za 2 revizije, zatim koristite diff pregledač da uporedite dva fajla okrivljavanja." #. (term) #: ../source/TortoiseGit_en.xml:9475 msgid "Blame Changes" msgstr "Krivac promena" #. (para) #: ../source/TortoiseGit_en.xml:9477 msgid "Select one revision in the top pane, then pick one file in the bottom pane and select Context menuBlame changes. This will fetch the blame data for the selected revision and the previous revision, then use the diff viewer to compare the two blame files." msgstr "Izaberite jednu reviziju u gornjem panelu, zatim izaberite jedan fajl u donjem panelu i izaberite Kontekst meniOkrivi izmene. Ovo će naći podatke okrivljavanja za izabrane revizije i prethodnih revizija, zatim koristite diff pregledač da uporedite dva fajla okrivljavanja." #. (term) #: ../source/TortoiseGit_en.xml:9491 msgid "Compare and Blame with Working BASE" msgstr "Uporedi sa radnom OSNOVOM i okrivi" #. (para) #: ../source/TortoiseGit_en.xml:9493 msgid "Show the log for a single file, and in the top pane, select a single revision, then select Context menuCompare and Blame with Working BASE. This will fetch the blame data for the selected revision, and for the file in the working BASE, then use the diff viewer to compare the two blame files." msgstr "Prikažite dnevnik za pojedinačni fajl, i na gornjem panelu, izaberite pojdinačnu reviziju, zatim izaberite Kontekst meniUporedite sa Radnom OSNOVOM. Ovo će naći podatke okrivljavanja za izabrane revizije, i za fajlove u radnoj OSNOVI, zatim koristite diff pregledač da uporedite dva fajla okrivljavanja." #. (para) #: ../source/TortoiseGit_en.xml:9457 msgid "The revision log dialog includes several options which allow you to do this. " msgstr "Dijalog dnevnika revizije uključuje više opcija koje omogućavaj da to uradite. " #. (title) #. (title) #: ../source/TortoiseGit_en.xml:9511 #: ../source/TortoiseGit_en.xml:9535 msgid "The Repository Browser" msgstr "Pretraživač spremišta" #. (primary) #: ../source/TortoiseGit_en.xml:9513 msgid "repo-browser" msgstr "repo-pretraživač" #. (primary) #: ../source/TortoiseGit_en.xml:9516 msgid "server-side actions" msgstr "akcije serverske strane" #. (primary) #: ../source/TortoiseGit_en.xml:9525 msgid "server viewer" msgstr "server pregledač" #. (para) #: ../source/TortoiseGit_en.xml:9528 msgid "Sometimes you need to work directly on the repository, without having a working copy. That's what the Repository Browser is for. Just as the explorer and the icon overlays allow you to view your working copy, so the Repository Browser allows you to view the structure and status of the repository. With the Repository Browser you can execute commands like copy, move, rename, ... directly on the repository." msgstr "Ponekad vam treba da radite direktno na spremištu, bez radne kopije. To je za šta je Pretraživač Spremišta. Kao pretraživač i prekrivač ikona dopušta da vidite vašu radnu kopiju tako Pretraživač Spremišta dopušta da vidite strukturu i status spremišta. Sa Pretraživačem Spremišta možete izvršiti komande kao kopiraj, pomeri, preimenuj, ... direktno u spremištu." #. (para) #: ../source/TortoiseGit_en.xml:9541 msgid "The repository browser looks very similar to the Windows explorer, except that it is showing the content of the repository at a particular revision rather than files on your computer. In the left pane you can see a directory tree, and in the right pane are the contents of the selected directory. At the top of the Repository Browser Window you can enter the URL of the repository and the revision you want to browse." msgstr "Pretraživač spremišta izgleda veoma slično Vindouz eksploreru, osim što prikazuje sadržaj spremišta u partikularnoj reviziji radije nego fajlove u vašem računaru. U levom panelu možete videti stablo imenika, au desnom panelu su sadžaji izabranih imenika. U gornjem Prozoru Pretraživača Spremišta možete uneti URL spremišta i reviziju koju hoćete da pretražite." #. (para) #: ../source/TortoiseGit_en.xml:9550 msgid "Just like Windows explorer, you can click on the column headings in the right pane if you want to set the sort order. And as in explorer there are context menus available in both panes." msgstr "Isto kao Vindouz eksplorer, možete kliknuti na zaglavlje kolone u desnom panelu ako želite da podesite red sortiranja. I kao u eksploreru postoji kontekst meni dostupan u oba panela." #. (para) #: ../source/TortoiseGit_en.xml:9565 msgid "Save an unversioned copy of the file to your hard drive." msgstr "Sačubajte neverzionisanu kopiju fajla na vaš tvrdi disk." #. (para) #: ../source/TortoiseGit_en.xml:9570 msgid "Show the revision log for that file, or show a graph of all revisions so you can see where the file came from." msgstr "Prikažite revizioni dnevnik za taj fajl, ili prikažite graf revizije tako da možete videti odakle fajl dolazi." #. (para) #: ../source/TortoiseGit_en.xml:9576 msgid "Blame the file, to see who changed which line and when." msgstr "Okrivite fajl da vidite ko je menjao koju liniju i kada." #. (para) #: ../source/TortoiseGit_en.xml:9581 msgid "Delete or rename the file." msgstr "Izbriši ili preimenuj fajl." #. (para) #: ../source/TortoiseGit_en.xml:9586 msgid "Make a copy of the file, either to a different part of the repository, or to a working copy rooted in the same repository." msgstr "Napravite kopiju fajla, ili u različitom delu spremišta , ili u radnoj kopiji sa korenom u isto spremištu." #. (para) #: ../source/TortoiseGit_en.xml:9592 msgid "View/Edit the file's properties." msgstr "Vidi/Uredi osobine fajla." #. (para) #: ../source/TortoiseGit_en.xml:9555 msgid "The context menu for a file allows you to: " msgstr "Kontekst meni za fajl dopušta vam da: " #. (para) #: ../source/TortoiseGit_en.xml:9602 msgid "Show the revision log for that folder, or show a graph of all revisions so you can see where the folder came from." msgstr "Prikažite revizioni dnevnik za imenik, ili prikažite graf svih revizija tako da možete videti odakle imenik dolazi." #. (para) #: ../source/TortoiseGit_en.xml:9608 msgid "Export the folder to a local unversioned copy on your hard drive." msgstr "Izvezite imenik u lokalnu neverzionisanu kopiju na vašem čvrstom disku." #. (para) #: ../source/TortoiseGit_en.xml:9613 msgid "Checkout the folder to produce a local working copy on your hard drive." msgstr "Preuzmite imenik da napravite lokalnu radnu kopiju na čvrstom disku." #. (para) #: ../source/TortoiseGit_en.xml:9618 msgid "Create a new folder in the repository." msgstr "Kreiraj novi imenik u spremištu." #. (para) #: ../source/TortoiseGit_en.xml:9623 msgid "Add files or folders directly to the repository." msgstr "Dodaj fajlove ili imenike direktno u spremište." #. (para) #: ../source/TortoiseGit_en.xml:9628 msgid "Delete or rename the folder." msgstr "Izbriši ili preimenuj imenik." #. (para) #: ../source/TortoiseGit_en.xml:9633 msgid "Make a copy of the folder, either to a different part of the repository, or to a working copy rooted in the same repository." msgstr "Napravite kopiju imenika, ili u različit deo spremišta, ili u radnu kopiju sa korenom u istom spremištu." #. (para) #: ../source/TortoiseGit_en.xml:9639 msgid "View/Edit the folder's properties." msgstr "Vidi/Uredi osobine imenika." #. (para) #: ../source/TortoiseGit_en.xml:9644 msgid "Mark the folder for comparison. A marked folder is shown in bold." msgstr "Napravite imenik za poređenje. Označeni imenik je prikazan masno." #. (para) #: ../source/TortoiseGit_en.xml:9649 msgid "Compare the folder with a previously marked folder, either as a unified diff, or as a list of changed files which can then be visually diffed using the default diff tool. This can be particularly useful for comparing two tags, or trunk and branch to see what changed." msgstr "Upoređuje imenik sa prethodno označenim imenikom, ili kao ujedinjene diff, ili kao lista izmenjenih fajlova koji zatim mogu biti vizualno razlikovani koristeći uobičajen diff alat. Ovo može biti posebno korisno za poređenje dva znaka, ili debla i grane da se vidi šta se promenilo." #. (para) #: ../source/TortoiseGit_en.xml:9598 msgid "The context menu for a folder allows you to: " msgstr "Kontekst meni za imenik vam omogućava da: " #. (para) #: ../source/TortoiseGit_en.xml:9658 msgid "If you select two folders in the right pane, you can view the differences either as a unified-diff, or as a list of files which can be visually diffed using the default diff tool." msgstr "Ako izaberete dva imenika u desnom panelu, možete videti razlike ili kao ujedinjeni-diff, ili listu fajlova koja može biti vizualno razlikovana korišćenjem uobičajenog diff alata." #. (para) #: ../source/TortoiseGit_en.xml:9663 msgid "If you select multiple folders in the right pane, you can checkout all of them at once into a common parent folder." msgstr "Ako izaberete više imenika u desnom panelu možete preuzeti sve njih u zajednički predački imenik." #. (para) #: ../source/TortoiseGit_en.xml:9667 msgid "If you select 2 tags which are copied from the same root (typically /trunk/), you can use Context MenuShow Log... to view the list of revisions between the two tag points." msgstr "Ako izaberete 2 znaka koji su kopirani iz istog korena (tipično /trunk/), možete koristiti Kontekst MeniPokaži Dnevnik... da vidite listu revizija između dve nak tačke." #. (para) #: ../source/TortoiseGit_en.xml:9676 msgid "You can use F5 to refresh the view as usual. This will refresh everything which is currently displayed. If you want to pre-fetch or refresh the information for nodes which have not been opened yet, use Ctrl-F5. After that, expanding any node will happen instantly without a network delay while the information is fetched." msgstr "Možete koristiti F5 da osvežite pregled kao ubično. To će osvežiti sve što se trenutno prikazuje. Ako želite da pretražite ili osvežite informacije za čvorove koji još nisu otvoreni, koristite Ctrl-F5. Posle toga, proširenjem bilo kog čvora desiće se trenutno bez obzira na mrežno kašnjenje dok se informacija tražila." #. (para) #: ../source/TortoiseGit_en.xml:9683 msgid "You can also use the repository browser for drag-and-drop operations. If you drag a folder from explorer into the repo-browser, it will be imported into the repository. Note that if you drag multiple items, they will be imported in separate commits." msgstr "Možete takođe koristiti pretraživač spremišta za vuci-i-baci operaciju. Ako vučete imenik iz eksplorera u repo-pretraživač biće uvezen u spremište. Primetite da ako vučete više stavki one će biti uvezene u odvojenim urezivanjima." #. (para) #: ../source/TortoiseGit_en.xml:9689 msgid "If you want to move an item within the repository, just left drag it to the new location. If you want to create a copy rather than moving the item, Ctrl-left drag instead. When copying, the cursor has a plus symbol on it, just as it does in Explorer." msgstr "Ako želite da pomerite stavke u okviru spremišta, samo levo vučenje na novu lokaciju. Ako želite da kreirate kopiju radije nego pomeranje stavke, Ctrl-levo vučenje umesto. Kada kopirate, kursor ima plus simbol na sebi, isto kako je to u Eksploreru." #. (para) #: ../source/TortoiseGit_en.xml:9695 msgid "If you want to copy/move a file or folder to another location and also give it a new name at the same time, you can right drag or Ctrl-right drag the item instead of using left drag. In that case, a rename dialog is shown where you can enter a new name for the file or folder." msgstr "Ako želite da kopirate/pomerite fajl ili folder na drugu lokaciju i takođe dajte mu novo ime u isto vreme, možete desno vučenje ili Ctrl-desno vučenje stavke umesto korišćenja levo vučenje. U ovom slučaju dijalog preimenovanja je prikazan gde možete uneti novo ime za fajl ili imenik." #. (para) #: ../source/TortoiseGit_en.xml:9702 msgid "Whenever you make changes in the repository using one of these methods, you will be presented with a log message entry dialog. If you dragged something by mistake, this is also your chance to cancel the action." msgstr "Kadgod napravite izmenu u spremištu koristeći jedan od ovih metoda, bićete predstavljeni dnevnik poruke ulazom dijaloga. Ako vučete nešto greškom, to je takođe vaša šansa da završite akciju." #. (para) #: ../source/TortoiseGit_en.xml:9707 msgid "Sometimes when you try to open a path you will get an error message in place of the item details. This might happen if you specified an invalid URL, or if you don't have access permission, or if there is some other server problem. If you need to copy this message to include it in an email, just right click on it and use Context MenuCopy error message to clipboard, or simply use Ctrl+C." msgstr "Ponekad kada pokušate da otvorite putanju dobićete poruku greške umesto detalja stavke. Ovo se može desiti ako specificirate neispravan URL, ili ako nemate pristupnu dozvolu, ili ako ima neki drugi problem servera. Ako vam treba da kopirate ovu poruku da je uključite u epoštu, samo desno kliknite na nju i koristite Kontekst MeniKopiraj poruku greške u klipbord, ili jednostavno koristite Ctrl+C." #. (title) #: ../source/TortoiseGit_en.xml:9722 msgid "Revision Graphs" msgstr "Revizioni Graf" #. (primary) #: ../source/TortoiseGit_en.xml:9727 msgid "graph" msgstr "graf" #. (primary) #: ../source/TortoiseGit_en.xml:9730 msgid "revision graph" msgstr "revizioni graf" #. (title) #: ../source/TortoiseGit_en.xml:9734 msgid "A Revision Graph" msgstr "Revizioni graf" #. (para) #: ../source/TortoiseGit_en.xml:9732 msgid " Sometimes you need to know where branches and tags were taken from the trunk, and the ideal way to view this sort of information is as a graph or tree structure. That's when you need to use TortoiseGitRevision Graph..." msgstr " Ponekad vam treba da znate odakle uzeti grane i znake iz debla, i idealan način da vidite ovu vrstu informavija je graf strukture stabla. Tamo gde treba da koristite TortoiseGitRevizioni Graf..." #. (para) #: ../source/TortoiseGit_en.xml:9745 msgid "This command analyses the revision history and attempts to create a tree showing the points at which copies were taken, and when branches/tags were deleted." msgstr "Ova komanda analizira istoriju revizija i pokušava da kreira stablo koje će prikazati iz koje kopije je uzeto, i kada su grane/znaci obrisani." #. (para) #: ../source/TortoiseGit_en.xml:9751 msgid "In order to generate the graph, TortoiseGit must fetch all log messages from the repository root. Needless to say this can take several minutes even with a repository of a few thousand revisions, depending on server speed, network bandwidth, etc. If you try this with something like the Apache project which currently has over 500,000 revisions you could be waiting for some time." msgstr "Da bi generisali graf, TortoiseGit mora naći poruke dnevnika iz korena spremišta. nepotrebno je reći da ovo mora uzeti nekoliko minuta čak sa spremištem od oko više hiljada revizija, u zavisnosti od brzine servera, propusnog opsega mreže, itd. Ako pokušate ovo sa nečim kao Apaš projekat koji trenutno ima preko 500.000 revizija morali bi da čekate izvsno vreme." #. (para) #: ../source/TortoiseGit_en.xml:9759 msgid "The good news is that if you are using Log Caching, you only have to suffer this delay once. After that, log data is held locally. Log caching is enabled in TortoiseGit's settings." msgstr "Dobre novosti su da ako koristite Dnevnik Keširanja, vi samo imate da trpite ovo kašnjenje jedanput. Posle toga, dnevnik podaci se drže lokalno. Dnevnik keširanje je omogućeno u TortoiseGit podešavanju." #. (title) #: ../source/TortoiseGit_en.xml:9766 msgid "Revision Graph Nodes" msgstr "Čvor revizionog grafa" #. (term) #: ../source/TortoiseGit_en.xml:9771 msgid "Added file/folder" msgstr "Dodat fajl/imenik" #. (para) #: ../source/TortoiseGit_en.xml:9773 msgid "Items which have been added, or created by copying another file/folder are shown using a rounded rectangle." msgstr "Stavke koje su dodate, ili kreirane kopiranjem drugog fajla/imenika su prikazane koristeći zaokružen pravougaonik." #. (term) #: ../source/TortoiseGit_en.xml:9780 msgid "Deleted file/folder" msgstr "Obrisan fajl/imenik" #. (para) #: ../source/TortoiseGit_en.xml:9782 msgid "Deleted items eg. a branch which is no longer required, are shown using an octagon (rectangle with corners cut off)." msgstr "Obrisane stavke npr. grana koja više nije potrebna, su prikazane koristeći oktagon (pravougaonik sa uglovima koji su presečeni)." #. (term) #: ../source/TortoiseGit_en.xml:9789 msgid "Branch tip revision" msgstr "Grana tip revizije" #. (para) #: ../source/TortoiseGit_en.xml:9791 msgid "Where a branch (or trunk or tag) has been modified since the last branch node, this is shown using an ellipse. Shown when the Show HEAD revisions option is selected." msgstr "Gde je grana (ili deblo ili znak) modifikovan od poslednjeg čvora grane, ovo je prikazano koristeći elipsu. Prikazano je kada Prikaži GLAVNE revizije opcija je izabrana." #. (term) #: ../source/TortoiseGit_en.xml:9800 msgid "Normal file/folder" msgstr "Normalan fajl/imenik" #. (para) #: ../source/TortoiseGit_en.xml:9802 msgid "All other items are shown using a plain rectangle." msgstr "Sve druge stavke su prikazane koristeći pun pravougaonik." #. (para) #: ../source/TortoiseGit_en.xml:9767 msgid "The revision graph shows several types of node: " msgstr "Revizioni graf prikazuje više tipova čvorova: " #. (para) #: ../source/TortoiseGit_en.xml:9809 msgid "Note that by default the graph only shows the points at which items were added or deleted. Showing every revision of a project will generate a very large graph for non-trivial cases. If you really want to see all revisions where changes were made, there is an option to do this in the View menu and on the toolbar." msgstr "primetimo da je uobičajeno da graf samo prikazuje tačke u kojima su stavke dodate ili izbrisane. Prikazujući svaku reviziju projekta će generisati veoma veliki graf u ne-trivijalnim slučajevima. Ako zaista želite da vidite sve revizije gde su uurađene izmene, ima jedna opcija da se to uradi u Vidi meniju i alatpultu. " #. (title) #: ../source/TortoiseGit_en.xml:9818 msgid "Changing the View" msgstr "Izmena pogleda." #. (term) #: ../source/TortoiseGit_en.xml:9826 msgid "Group branches" msgstr "Grupa grana" #. (para) #: ../source/TortoiseGit_en.xml:9828 msgid "The default behavior (grouping off) will use one row per revision and all rows are sorted strictly by revision. As a result, long-living branches occupy a whole column for only a few changes and the graph becomes very broad." msgstr "Uobičajeno ponašanje (bez grupiranja) će koristiti jedan red po reviziji i sve redove sortirane tačno po reviziji. Kao rezultat, dugo-živeće grane zauzmu celu kolonu za samo nekoliko izmena i graf postaje veoma široko." #. (para) #: ../source/TortoiseGit_en.xml:9834 msgid "This mode groups changes by branch, so that there is no global revision ordering: Consecutive revisions on a branch will be shown in (often) consecutive lines. Sub-branches, however, are arranged in such a way that later branches will be shown in the same column above older branches to keep the graph slim. As a result, a given row may contain changes from different revisions." msgstr "Ovaj mod grupiše izmene grana, tako da nema globalnog uređenja revizije: Kosekutivne revizije grana biće prikazane u (često) konsekutivnim linijama. Sub-grane, međutim, su uređene na takav način da kasnije grane budu prikazane u istoj koloni iznad starih grana da sačuvaju vitkost grafa. Kao rezultat dat red može sadržati izmene iz različitih revizija." #. (term) #: ../source/TortoiseGit_en.xml:9846 msgid "Oldest on top" msgstr "Najstariji na vrhu" #. (para) #: ../source/TortoiseGit_en.xml:9848 msgid "Normally the graph shows the oldest revision at the bottom, and the tree grows upwards. Use this option to grow down from the top instead." msgstr "Normalno graf prikazuje najstariju reviziju na dnu, i stablo raste. Koristite ove opcije da se smanji sa vrha umesto toga." #. (term) #: ../source/TortoiseGit_en.xml:9856 msgid "Show HEAD revisions" msgstr "Prikaži GLAVNE revizije" #. (para) #: ../source/TortoiseGit_en.xml:9858 msgid "This ensures that the latest revision on every branch is always shown on the graph." msgstr "Da bi se omogućilo da zadnja revizija na svakoj grani uvek se prikazuje na grafu." #. (term) #: ../source/TortoiseGit_en.xml:9865 msgid "Exact copy sources" msgstr "Tačna kopija izvora" #. (para) #: ../source/TortoiseGit_en.xml:9867 msgid "When a branch/tag is made, the default behaviour is to show the branch as taken from the last node where a change was made. Strictly speaking this is inaccurate since the branches are often made from the current HEAD rather than a specific revision. So it is possible to show the more correct (but less useful) revision that was used to create the copy." msgstr "Kada je grana/znak napravljen, uobičajeno ponašanje je da se prikaže kao dobijen od zadnjeg čvora gde su izmene naoravljene. GTačno govoreći ovo je netačno od kad su grane često napracljene od tekuće GLAVE radije nego od specifične revizije. Tak oje moguće da se pokaže mnogo tačnije (ali manje korisno) revizija koja je korišćena da se kreira kopija." #. (term) #: ../source/TortoiseGit_en.xml:9879 msgid "Fold tags" msgstr "Skupi oznake" #. (para) #: ../source/TortoiseGit_en.xml:9881 msgid "If you want to see a graph of software development, tagged releases may be of little interest to you. This option hides the nodes for tags and shows them instead in the tooltip for the node that they were copied from. A tag icon on the right side of the source node indicates that tags were made." msgstr "Ako želite da vidite graf razvoja softvera, označene realizacije mogu biti od malog interesa za vas. Opcija skriva čvorove za znake i prikazuje ih umesto njih u alatsavetu za čvorove koji su odatle kopirani. Ikona znaka s desne strane izvornog čvora pokazuje da je taj znak napravljen." #. (term) #: ../source/TortoiseGit_en.xml:9892 msgid "Reduce cross lines" msgstr "Smanji presečne-linije" #. (para) #: ../source/TortoiseGit_en.xml:9894 msgid "If the layout of the graph has produced a lot of crossing lines, use this option to clean it up. This may make the layout columns appear in less logical places, for example in a diagonal line rather than a column, and it may take a little time to optimise." msgstr "Izgled grafa je napravio mnogo presečnih linija, koristite ovu opciju da ih obrišete. Ovo može napraviti izgled kolona da se pojave u manje logičkih mesta, na primer u dijagonalnoj liniji radije nego u koloni i mogu uzeti malo vremena za optimizaciju." #. (term) #: ../source/TortoiseGit_en.xml:9905 msgid "Filter" msgstr "Filter" #. (para) #: ../source/TortoiseGit_en.xml:9907 msgid "Sometimes the revision graph contains more revisions than you want to see. This option opens a dialog which allows you to restrict the range of revisions displayed, and to hide particular paths by name." msgstr "Ponekad revizioni graf sadrži više revizija od onog što želite da vidite. Opcija otvara dijalog koji omogućava da ograničite opseg revizija koje su prikazae, i da sakrijete pojedine putanje pomoću imena." #. (para) #: ../source/TortoiseGit_en.xml:9819 msgid "Because a revision graph is often quite complex, there are a number of features which can be used to tailor the view the way you want it. These are available in the View menu and from the toolbar. " msgstr "Pošto je revizioni graf često jako kompleksan, postoje brojne osobine koje se mogu koristiti da urede izgled na način kako želite. One su dostupne u Pregled meniju i iz alatpulta. " #. (title) #: ../source/TortoiseGit_en.xml:9919 msgid "Using the Graph" msgstr "Korišćenje grafa" #. (para) #: ../source/TortoiseGit_en.xml:9920 msgid "To make it easier to navigate a large graph, use the overview window. This shows the entire graph in a small window, with the currently displayed portion highlighted. You can drag the highlighted area to change the displayed region." msgstr "Da bi se učinilo lakim kretanje po velikom grafu koristite pregledni prozor. On prikazuje ceo graf u malom prozoru, sa prikazanim tekućim delom koji je osvetljen. Možete vući osvetljenu oblast da izmenite prikazani region." #. (para) #: ../source/TortoiseGit_en.xml:9926 msgid "The revision date, author and comments are shown in a hint box whenever the mouse hovers over a revision box." msgstr "Revizioni datum, autor i komentari su prikazani u boksu napomena kadgod miš klizi preko revizionog boksa." #. (para) #: ../source/TortoiseGit_en.xml:9930 msgid "If you select two revisions (Use Ctrl-left click), you can use the context menu to show the differences between these revisions. You can choose to show differences as at the branch creation points, but usually you will want to show the differences at the branch end points, i.e. at the HEAD revision." msgstr "Ako izaberete dve revizije (Koristite Ctrl-levi klik), možete koristiti kontekst meni da prikažete razlike izmeu ovih revizija. Možete izabrati da prikažete razlike kao u tačkama kreiranja grana, ali obično ćete želeti da prikažete u krajnjim tačkama grana, tj. u GLAVNOJ reviziji." #. (para) #: ../source/TortoiseGit_en.xml:9937 msgid "You can view the differences as a Unified-Diff file, which shows all differences in a single file with minimal context. If you opt to Context MenuCompare Revisions you will be presented with a list of changed files. Double click on a file name to fetch both revisions of the file and compare them using the visual difference tool." msgstr "Možete videti razlike kao Objedinjene-Diff fajl, koji prikazuje sve razlike u pojedinačnom fajlu sa minimalnim sadržajem. Ako izabereteKontekst MeniUporedi Revizije biće vam prikazana lista izmenjenih fajlova. Dvostruki klik na ime fajla da se dobiju revizije fajla i uporede koristeći vizualni alat za razlikovanje." #. (para) #: ../source/TortoiseGit_en.xml:9948 msgid "If you right click on a revision you can use Context MenuShow Log to view the history." msgstr "Ako uradite desni klik na reviziju možete koristiti Kontekst MeniPrikaži Dnevnik da vidite istoriju." #. (para) #: ../source/TortoiseGit_en.xml:9956 msgid "You can also merge changes in the selected revision(s) into a different working copy. A folder selection dialog allows you to choose the working copy to merge into, but after that there is no confirmation dialog, nor any opportunity to try a dry run. It is a good idea to merge into an unmodified working copy so that you can revert the changes if it doesn't work out! This is a useful feature if you want to merge selected revisions from one branch to another." msgstr "Možete takođe stopiti izmene u izabranim revizijama u različitim radnim kopijama. Dijalog izbora imenika dopušta da izaberete radnu kopiju u koju stapate, ali posle toga nema dijloga potvrde, niti bilo kakvog sprečavanja da se pokuša neproduktivan rad. Dobra je ideja da se stopi u neizmenjenu radnu kopiju tako da možete vratiti izmene ako to ne radi! Ovo je korisna osobina ako želite da stopite izabrane revizije iz jedne grane u drugu." #. (para) #: ../source/TortoiseGit_en.xml:9967 msgid "Because Git cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results." msgstr "Zato što Subverzija ne može obezbediti sve informacije koje se traže izvestan deo interpretacije je potreban,koji ponekad daje čudne rzultate. Ipak, izlaz za deblo će generalno dati koristan rezultat." #. (para) #: ../source/TortoiseGit_en.xml:9977 msgid "If you want to check the server again for newer information, you can simply refresh the view using F5. If you are using the log cache (enabled by default), this will check the repository for newer commits and fetch only the new ones. If the log cache was in offline mode, this will also attempt to go back online." msgstr "Ako želite da proverite ponovo server za nove informacije, možete jednostavno osvežiti pregled koristeći F5. Ako koristite dnevnik keš (omogućen podrazumevano), ovo će proveriti spremište za nova urezivanja i naći samo nove. Ako je dnevnik keš isključen, ovo će pokušati da se ode na uključenje." #. (para) #: ../source/TortoiseGit_en.xml:9985 msgid "If you are using the log cache and you think the message content or author may have changed, you should use the log dialog to refresh the messages you need. Since the revision graph works from the repository root, we would have to invalidate the entire log cache, and refilling it could take a very long time." msgstr "Ako koristite dnevnik keš i mislite da je sadržaj poruke ili autor možda imao izmene, treba da koristite dnevnik dijalog da osvežite poruke koje vam trebaju. Kako revizioni graf radi iz korena spremišta, mi bi imali da učinimo neispravnim ceo dnevnik keš, i da ga ponovo napunimo što bi uzelo veoma mnogo vremena." #. (title) #: ../source/TortoiseGit_en.xml:9996 msgid "Exporting a Git Working Copy" msgstr "Izvoz Subverzione radne kopije" #. (primary) #: ../source/TortoiseGit_en.xml:9998 msgid "export" msgstr "izvoz" #. (primary) #: ../source/TortoiseGit_en.xml:10001 msgid "unversioned 'working copy'" msgstr "neverzionisana 'radna kopija'" #. (para) #: ../source/TortoiseGit_en.xml:10003 msgid "Sometimes you may want a copy of your working tree without any of those .svn directories, e.g. to create a zipped tarball of your source, or to export to a web server. Instead of making a copy and then deleting all those .svn directories manually, TortoiseGit offers the command TortoiseGitExport.... Exporting from a URL and exporting from a working copy are treated slightly differently." msgstr "Ponekad možete želeti kopiju vašeg radnog stabla bez ikakvog .svn imenika, tj. da kreirate zipovanu crnu loptu vašeg izvornog koda, ili da ga izvezete na veb server. Umesto da pravite kopiju i onda brišete sve te .svn imenike ručno, TortoiseGit omogućava komandu TortoiseGitIzvoz.... Izvoz iz URL i izvoz iz radne kopije se trtira malo drugačije." #. (title) #: ../source/TortoiseGit_en.xml:10018 msgid "The Export-from-URL Dialog" msgstr "Izvoz-iz-URL dijalog" #. (para) #: ../source/TortoiseGit_en.xml:10016 msgid " If you execute this command on an unversioned folder, TortoiseGit will assume that the selected folder is the target, and open a dialog for you to enter the URL and revision to export from. This dialog has options to export only the top level folder, to omit external references, and to override the line end style for files which have the svn:eol-style property set." msgstr " Ako izvršite ovu komandu na neverzionisani imenik, TortoiseGit će uzeti da je izabrani imenik cilj, i otvoriće dijalog da unesete URL i reviziju da izvezete iz njega. Ovaj dijalog ima opcije da izveze samo imenik vršnog nivoa, da se izbegnu spoljašne reference, i da prekrije linije i stil za fajlove koji imaju svn:eol-style podešenu osobinu." #. (para) #: ../source/TortoiseGit_en.xml:10028 msgid "Of course you can export directly from the repository too. Use the Repository Browser to navigate to the relevant subtree in your repository, then use Context MenuExport. You will get the Export from URL dialog described above." msgstr "Svakako da možete izvesti direktno iz spremišta takođe. Koristite Pretraživač Spremišta da upravljate do relevantnog podstabla u vašem spremištu, zatim koristite menuchoice>Kontekst MeniIzvoz. Dobićete Izvoz iz URL dijalog koji je opisan ranije." #. (para) #: ../source/TortoiseGit_en.xml:10038 msgid "If you execute this command on your working copy you'll be asked for a place to save the clean working copy without the .svn folders. By default, only the versioned files are exported, but you can use the Export unversioned files too checkbox to include any other unversioned files which exist in your WC and not in the repository. External references using svn:externals can be omitted if required." msgstr "Ako izvršite ovu komandu na vašoj radnoj kopiji bićete pitani za mesto da sačuvate čistu radnu kopiju bez .svn imenika. Uobučajeno, samo verzionisani fajlovi se izvoze, ali možete koristiti Izvoz neverzionisanih fajlova takođe čekboks da uključite sve ostale neverzionisane fajlove koji postoje u vašoj RK i nisu u spremištu. Spoljašne reference korišćenjem svn:externals mogu biti izostavljene ako se traži." #. (para) #: ../source/TortoiseGit_en.xml:10048 msgid "Another way to export from a working copy is to right drag the working copy folder to another location and choose Context MenuSVN Export here or Context MenuSVN Export all here. The second option includes the unversioned files as well." msgstr "Drugi način da se izveze iz radne kopije je da se desno vuče imenik radne kopije u drugu lokaciju i izabere Kontekst MeniSVN Izvoz ovde ili Kontekst MeniSVN Izvoz sve ovde. Druga opcija uključuje neverzionisane fajlove takođe." #. (para) #: ../source/TortoiseGit_en.xml:10062 msgid "When exporting from a working copy, if the target folder already contains a folder of the same name as the one you are exporting, you will be given the option to overwrite the existing content, or to create a new folder with an automatically generated name, eg. Target (1)." msgstr "Kada izvozite iz radne kopije, ako ciljni imenik već sadrži imenik istog imena kao onaj koji izvozite, biće vam data opcija da prepišete postojeći sadržaj, ili da kreirate novi imenik sa automatski generisanim imenom, npr. Cilj (1)." #. (title) #: ../source/TortoiseGit_en.xml:10070 msgid "Exporting single files" msgstr "Izvoz pojedinačnog fajla" #. (para) #: ../source/TortoiseGit_en.xml:10071 msgid "The export dialog does not allow exporting single files, even though Git can." msgstr "Izvozni dijalog ne dopušta izvoz pojedinačnih fajlova, bez obzira što Subverzija može." #. (para) #: ../source/TortoiseGit_en.xml:10075 msgid "To export single files with TortoiseGit, you have to use the repository browser (). Simply drag the file(s) you want to export from the repository browser to where you want them in the explorer, or use the context menu in the repository browser to export the files." msgstr "Da izvezete pojedinačne fajlove sa TortoiseGit, imate da koristite pretraživač spremišta (). Jednostavno vucite fajl(ove) koji želite da izvezete iz pretraživača spremišta tamo gde ga želite u eksploreru, ili koristite kontest meni u pretraživaču spremišta da izvezete fajlove." #. (title) #: ../source/TortoiseGit_en.xml:10084 msgid "Removing a working copy from version control" msgstr "Izbacivanje radne kopije iz kontrole verzija" #. (primary) #. (primary) #: ../source/TortoiseGit_en.xml:10086 #: ../source/TortoiseGit_en.xml:13768 msgid "unversion" msgstr "neverzionisan" #. (para) #: ../source/TortoiseGit_en.xml:10088 msgid "Sometimes you have a working copy which you want to convert back to a normal folder without the .svn directories. What you really need is an export-in-place command, that just removes the control directories rather than generating a new clean directory tree." msgstr "Ponekad imate radnu kopiju koju hoćete da konvertujete nazad u normlan imenik bez .svn imenika. Šta vam stvarno treba je izvezi-na-mestu komanda, ona samo uklanja kontrolne imenike radije nego da generiše novo čisto stablo imenika." #. (para) #: ../source/TortoiseGit_en.xml:10095 msgid "The answer is surprisingly simple - export the folder to itself! TortoiseGit detects this special case and asks if you want to make the working copy unversioned. If you answer yes the control directories will be removed and you will have a plain, unversioned directory tree." msgstr "Odgovor je iznenađujuće jednostavan - izvezite imenik u samog sebe! TortoiseGit otkriva ovaj specijalni slučaj i pita da li želite da napravite radnu kopiju neverzionisanu. Ako odgovorite da kontrolni imenici će biti uklonjeni i imaćete potpuno neverzionisano stablo imenika." #. (title) #: ../source/TortoiseGit_en.xml:10105 msgid "Relocating a working copy" msgstr "Relociranje radne kopije" #. (primary) #: ../source/TortoiseGit_en.xml:10107 msgid "relocate" msgstr "premesti" #. (primary) #: ../source/TortoiseGit_en.xml:10110 msgid "URL changed" msgstr "URL izmenjen" #. (primary) #: ../source/TortoiseGit_en.xml:10113 msgid "repository URL changed" msgstr "URL spremišta izmenjen" #. (primary) #: ../source/TortoiseGit_en.xml:10116 msgid "server moved" msgstr "server pomeren" #. (primary) #: ../source/TortoiseGit_en.xml:10119 msgid "moved server" msgstr "pomeren server" #. (title) #: ../source/TortoiseGit_en.xml:10124 msgid "The Relocate Dialog" msgstr "Relociranje dijalog" #. (para) #: ../source/TortoiseGit_en.xml:10122 msgid " If your repository has for some reason changed it's location (IP/URL). Maybe you're even stuck and can't commit and you don't want to checkout your working copy again from the new location and to move all your changed data back into the new working copy, TortoiseGitRelocate is the command you are looking for. It basically does very little: it scans all entries files in the .svn folder and changes the URL of the entries to the new value." msgstr " Ako je vaše spremište iz nekog razloga promenilo svoju lokaciju (IP/URL). Možda ste čak ukočeni i ne možete urezati i ne želite da preuzmete vašu radnu kopiju ponovo sa nove lokacije i pomerite sve izmenjene podatke nazad u novu radnu kopiju, <TortoiseGitRelociraj je komanda koju tražite. Ona u snovi radi veoma malo: skenira sve ulaze fajlova u .svn imeniku i menja URL ulaza u nove vrednosti." #. (para) #: ../source/TortoiseGit_en.xml:10141 msgid "You may be surprised to find that TortoiseGit contacts the repository as part of this operation. All it is doing is performing some simple checks to make sure that the new URL really does refer to the same repository as the existing working copy." msgstr "Možda ćete biti iznenađeni nalaženjem da TortoiseGit kontaktira spremište kao deo ove operacije. Sve što radi je izvođenje jednostavne provere da se osigura da novi URL stvarno ukazuje na isto spremište kao postojeća radna kopija." #. (para) #: ../source/TortoiseGit_en.xml:10154 msgid "The IP address of the server has changed." msgstr "IP adresa servera je promenjena" #. (para) #: ../source/TortoiseGit_en.xml:10157 msgid "The protocol has changed (e.g. http:// to https://)." msgstr "Protokol je promenjen (npr. http:// to https://)." #. (para) #: ../source/TortoiseGit_en.xml:10160 msgid "The repository root path in the server setup has changed." msgstr "Putanja korena spremišta u server podešavanju je izmenjena." #. (para) #: ../source/TortoiseGit_en.xml:10148 msgid "This is a very infrequently used operation. The relocate command is only used if the URL of the repository root has changed. Possible reasons are: Put another way, you need to relocate when your working copy is referring to the same location in the same repository, but the repository itself has moved." msgstr "Ovo je veoma retko korišćena operacija. Relokaciona komanda je emphasis>samo korišćena ako URL korena spremišta je promenjeno. Mogući razlozi su: Stavite drugi način, potrebno je da relocirate kada vaša radna kopija ukazuje na istu lokaciju u istom spremištu, ali je samo spremište pomereno." #. (para) #: ../source/TortoiseGit_en.xml:10171 msgid "You want to move to a different Git repository. In that case you should perform a clean checkout from the new repository location." msgstr "Hoćete da pomerite različita Subverziona spremišta. U tom slučaju treba da izvršite čisto preuzimanje iz nove lokacije spremišta." #. (para) #: ../source/TortoiseGit_en.xml:10177 msgid "You want to switch to a different branch or directory within the same repository. To do that you should use TortoiseGitSwitch.... Read for more information." msgstr "Želite da prebacite na različitu granu ili imenik unutar istog spremišta. Da uradite to trba da koristite TortoiseGitPrebaci.... Pročitajte za više informacija." #. (para) #: ../source/TortoiseGit_en.xml:10167 msgid "It does not apply if: " msgstr "To se ne primenjuje ako je: " #. (para) #: ../source/TortoiseGit_en.xml:10189 msgid "If you use relocate in either of the cases above, it will corrupt your working copy and you will get many unexplainable error messages while updating, committing, etc. Once that has happened, the only fix is a fresh checkout." msgstr "Ako koristite relociranje u jednom od navedenih slučajeva, to će pokvariti vašu radnu kopiju i vi ćete dobiti mnogo neobjašnjivih poruka o grešci kada ažurirate, urezujete, itd. Kada se to jednom desi fiksiranje je samo sveže preuzimanje." #. (title) #: ../source/TortoiseGit_en.xml:10198 msgid "Integration with Bug Tracking Systems / Issue Trackers" msgstr "Integracija sa Bag Praćenja Sistem / Problem Tragači" #. (primary) #: ../source/TortoiseGit_en.xml:10200 msgid "bug tracking" msgstr "bag praćenje" #. (primary) #: ../source/TortoiseGit_en.xml:10203 msgid "bug tracker" msgstr "bag tragač" #. (primary) #: ../source/TortoiseGit_en.xml:10206 msgid "issue tracker" msgstr "problem tragač" #. (primary) #: ../source/TortoiseGit_en.xml:10209 msgid "bugtracker" msgstr "bagtragač" #. (para) #: ../source/TortoiseGit_en.xml:10211 msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Git with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly." msgstr "Veoma je često u Razvoju Softvera za izmene da imaju specifične bagove ili problem ID. Korisnici bag tragač sistema (problem tragač) su voleli da pridruže izmene koje su napravili u Subverziji sa specifičnim ID u njihovom problem tragaču. Većina problem tragača zbog toga omogućavaju pre-urezivanja zakačive skripte koje analiziraju dnevnik poruke da nađu bag ID sa kojim je urezivanje povezano. Ovo je ponekad sklono greškama odkad je potrebno da korisnik upiše dnevnik poruku ispravno tako da preurezivanja zakačiv skript može ga analizirati korektno." #. (para) #: ../source/TortoiseGit_en.xml:10224 msgid "When the user enters a log message, a well defined line including the issue number associated with the commit can be added automatically. This reduces the risk that the user enters the issue number in a way the bug tracking tools can't parse correctly." msgstr "Kada korisnik unese dnevnik poruke, dobro definisana linija uključuje problem broj pridružen sa urezivanjem može biti dodat automatski. Ovo umanjuje rizik kada korisnik unosi problem broj na način da alat bag tragača ne može analizirati korektno." #. (para) #: ../source/TortoiseGit_en.xml:10230 msgid "Or TortoiseGit can highlight the part of the entered log message which is recognized by the issue tracker. That way the user knows that the log message can be parsed correctly." msgstr "Ili TortoiseGit može osvetliti deo celog dnevnik poruke koji je prepoznao problem tragač. Na taj način korisnik zna da dnevnik poruke ože biti analiziran korektno." #. (para) #: ../source/TortoiseGit_en.xml:10237 msgid "When the user browses the log messages, TortoiseGit creates a link out of each bug ID in the log message which fires up the browser to the issue mentioned." msgstr "Kada korisnik pretražuje dnevnik poruke, TortoiseGit kreira vezu za svaki bag ID u dnevnik poruka koja pokreće pretraživač do nagoveštenog problema." #. (para) #: ../source/TortoiseGit_en.xml:10220 msgid "TortoiseGit can help the user in two ways: " msgstr "TortoiseGit može pomoći korisniku na dva načina: " #. (title) #: ../source/TortoiseGit_en.xml:10246 msgid "Adding Issue Numbers to Log Messages" msgstr "Dodavanje Problem Brojeva u Dnevnik Poruka" #. (para) #: ../source/TortoiseGit_en.xml:10247 msgid "You can integrate a bug tracking tool of your choice in TortoiseGit. To do this, you have to define some properties, which start with bugtraq:. They must be set on Folders: ()" msgstr "Možete integrisati alat praćenja bagova po vašem izboru u TortoiseGit. Da to uradite, imate da definišete neke osobine, što se pokreće sa bugtraq:. To mora biti podešeno na Imenicima: ()" #. (para) #: ../source/TortoiseGit_en.xml:10262 msgid "Set this property to the URL of your bug tracking tool. It must be properly URI encoded and it has to contain %BUGID%. %BUGID% is replaced with the Issue number you entered. This allows TortoiseGit to display a link in the log dialog, so when you are looking at the revision log you can jump directly to your bug tracking tool. You do not have to provide this property, but then TortoiseGit shows only the issue number and not the link to it. e.g the TortoiseGit project is using http://issues.TortoiseGit.net/?do=details&id=%BUGID%" msgstr "Postavite ovu osobinu na URL vašeg alata za praćenje bagova. To mora biti odgovarajuće kodiran URI i mora sadržati %BUGID%. %BUGID% je zamenjen sa Problem brojem koji ste uneli. Ovo omogućava TortoiseGit da prikaže vezu u dnevnik dijalogu, tako da kad glrdate revizioni dnevnik možete samo skočiti direktnona vaš alat za praćenje bagova. Ne morate da omogućite ovu osobinu ali tada TortoiseGit prikazuje samo problem broj a ne vezu do njega, tj. TortoiseGit projekat koristi http://issues.TortoiseGit.net/?do=details&id=%BUGID%" #. (para) #: ../source/TortoiseGit_en.xml:10277 msgid "You can also use relative URLs instead of absolute ones. This is useful when your issue tracker is on the same domain/server as your source repository. In case the domain name ever changes, you don't have to adjust the bugtraq:url property. There are two ways to specify a relative URL:" msgstr "Možete takođe koristiti relativi URL umesto apsolutnog. Ovo je korisno kada vaš problem tragač je na istom domen/serveru kao i izvorno spremište. U slučaju da se ime domena ikada promeni, nemate da podešavate bugtraq:url osobinu. Postoje dva načina da se specificira relativni URL:" #. (para) #: ../source/TortoiseGit_en.xml:10284 msgid "If it begins with the string ^/ it is assumed to be relative to the repository root. For example, ^/../?do=details&id=%BUGID% will resolve to http://TortoiseGit.net/?do=details&id=%BUGID% if your repository is located on http://TortoiseGit.net/svn/trunk/." msgstr "Ako počinje sa stringom ^/ uzima se da je relativan na koren spremišta. Na primer, ^/../?do=details&id=%BUGID% se rešava u http://TortoiseGit.net/?do=details&id=%BUGID% ako je vaše spremište locirano na http://TortoiseGit.net/svn/trunk/." #. (para) #: ../source/TortoiseGit_en.xml:10293 msgid "A URL beginning with the string / is assumed to be relative to the server's hostname. For example /?do=details&id=%BUGID% will resolve to http://TortoiseGit.net/?do=details&id=%BUGID% if your repository is located anywhere on http://TortoiseGit.net." msgstr "URL koji počinje stringom / se uzima da je relativno na serverovo imedomaćina. Na primer /?do=details&id=%BUGID% će se rešiti u http://TortoiseGit.net/?do=details&id=%BUGID% ako je vaše spremište locirano bil gde na http://TortoiseGit.net." #. (para) #: ../source/TortoiseGit_en.xml:10307 msgid "Set this to true, if you want TortoiseGit to warn you because of an empty issue-number text field. Valid values are true/false. If not defined, false is assumed. " msgstr "Podesite ovo na istina, ako želite da vas TortoiseGit obaveštava o praznom problem-broj tekst polju. Ispravne vrednosti su istina/laž. Ako nije definisan, lažse pretpostavlja. " #. (para) #: ../source/TortoiseGit_en.xml:10253 msgid "There are two ways to integrate TortoiseGit with issue trackers. One is based on simple strings, the other is based on regular expressions. The properties used by both approaches are: " msgstr "Postoji dva načina da se integriše TortoiseGit sa problem tragačem. Jedna je zasnovana na jednostavnim stringovima, druga se bazira na regularnim izrazima. Osobine korišćene sa oba pristupa su: " #. (title) #: ../source/TortoiseGit_en.xml:10321 msgid "Issue Number in Text Box" msgstr "Izdavanje brojeva u tekst boksu" #. (para) #: ../source/TortoiseGit_en.xml:10330 msgid "This property activates the bug tracking system in Input field mode. If this property is set, then TortoiseGit will prompt you to enter an issue number when you commit your changes. It's used to add a line at the end of the log message. It must contain %BUGID%, which is replaced with the issue number on commit. This ensures that your commit log contains a reference to the issue number which is always in a consistent format and can be parsed by your bug tracking tool to associate the issue number with a particular commit. As an example you might use Issue : %BUGID%, but this depends on your Tool." msgstr "Ova osobina aktivira sistem praćenja bagova u Ulazno polje modu. Ako je ova osobina podešena tada TortoiseGit će vas pitati da unesete problem broj kada urezujete svoje izmene. To se koristi da se dodaju linije na kraj dnevnik poruke. Mora sadržati %BUGID%, koji je zamenjen sa problem brojem pri urezivanju. Ovo obezbeđuje da vaš dnevnik urezivanja sadrži referencu na problem broj koji je uvek konzistentnom formatu i može se analizirati vašim alatom za praćenje bagova da se pridruži problem broj sa posebnim urezivanjem. Kao jedan primer možete uzeti Issue : %BUGID%, ali ovo zavisi od vašeg Alata." #. (para) #: ../source/TortoiseGit_en.xml:10351 msgid "This property defines if the bug-ID is appended (true) to the end of the log message or inserted (false) at the start of the log message. Valid values are true/false. If not defined, true is assumed, so that existing projects don't break. " msgstr "Ova osobina definiše da li je bag-ID dodat (istina) na kraj dnevnik poruke ili ubačen (laž) na početak dnevnik poruke. Ispravne vrednosti su istina/laž. Ako nije definisana, istina se podrazumeva, tako da postojeći projekat ne pukne. " #. (para) #: ../source/TortoiseGit_en.xml:10366 msgid "This text is shown by TortoiseGit on the commit dialog to label the edit box where you enter the issue number. If it's not set, Bug-ID / Issue-Nr: will be displayed. Keep in mind though that the window will not be resized to fit this label, so keep the size of the label below 20-25 characters." msgstr "Ovaj tekst je prikazan pomoću TortoiseGit u dijalogu urezivanja da označi boks uređivanja gde unosite problem broj. Ako nije podešen, Bug-ID / Issue-Nr: će biti prikazan. Zapamtite to da taj prozor ne može promeniti veličinu da obuhvati ovu oznaku, pa neka je veličina ove oznake ispod 20-25 karaktera." #. (para) #: ../source/TortoiseGit_en.xml:10380 msgid "If set to true only numbers are allowed in the issue-number text field. An exception is the comma, so you can comma separate several numbers. Valid values are true/false. If not defined, true is assumed. " msgstr "Ako podesite istina samo brojevi su dozvoljeni u problem-broj tekst polju. Izuzetak je zarez, zako da možete zapetom izdvojiti više brojeva. Ispravne vrednosti su istina/laž. Ako nije definisana, istina se uzima. " #. (para) #: ../source/TortoiseGit_en.xml:10322 msgid "In the simple approach, TortoiseGit shows the user a separate input field where a bug ID can be entered. Then a separate line is appended/prepended to the log message the user entered. " msgstr "U jednostavnom pristupu, TortoiseGit prikazuje korisniku izdvojena ulazna polja gde bag ID može biti unet. Zatim su izdvojene linije dodate/ubačene u dnevnik poruke koju je uneo krisnik. " #. (title) #: ../source/TortoiseGit_en.xml:10395 msgid "Issue Numbers Using Regular Expressions" msgstr "Izdavanje brojeva koristeći regularne izraze" #. (para) #: ../source/TortoiseGit_en.xml:10407 msgid "This property activates the bug tracking system in Regex mode. It contains either a single regular expressions, or two regular expressions separated by a newline." msgstr "Ova osobina aktivira sistem praćenja bagova u Regeks modu. Sadrži ili podenični regularni izraz, ili dva regularna izraza razdvojena novimredom." #. (para) #: ../source/TortoiseGit_en.xml:10413 msgid "If two expressions are set, then the first expression is used as a pre-filter to find expressions which contain bug IDs. The second expression then extracts the bare bug IDs from the result of the first regex. This allows you to use a list of bug IDs and natural language expressions if you wish. e.g. you might fix several bugs and include a string something like this: This change resolves issues #23, #24 and #25" msgstr "Ako su dva izraza podešena, tada prvi izraz je korišćen kao pre-filte da nađe izraze koji sadrže bag ID. Drugi izraz zatim izdvaja gole bag ID iz rezultata prve regeks. Ovo dozvoljava da se koristi lista bag ID i prirodan jezik izraza ako želite npr. možete fiksirati nekoliko bagova i uključiti string nešto kao ovo: Ova izmena rešava probleme #23, #24 i #25" #. (para) #: ../source/TortoiseGit_en.xml:10423 msgid "If you want to catch bug IDs as used in the expression above inside a log message, you could use the following regex strings, which are the ones used by the TortoiseGit project: [Ii]ssues?:?(\\s*(,|and)?\\s*#\\d+)+ and (\\d+)" msgstr "Ako hoćete da uhvatite bag ID kako su korišćeni u gornjem izrazu unutar dnevnik poruke, možete koristiti sledeće regeks stringove, koji su jedni od korišćenih u TortoiseGit projektu: [Ii]ssues?:?(\\s*(,|and)?\\s*#\\d+)+ and (\\d+)" #. (para) #: ../source/TortoiseGit_en.xml:10430 msgid "The first expression picks out issues #23, #24 and #25 from the surrounding log message. The second regex extracts plain decimal numbers from the output of the first regex, so it will return 23, 24 and 25 to use as bug IDs." msgstr "Prvi izraz izvlači issues #23, #24 and #25 iz okruženja dnevnik poruke. Drugi regeks ekstrahuje pune decimalne brojeve iz izlaza prve regeks, tako da će to vratiti 23, 24 i 25 da se koristi kao bag ID." #. (para) #: ../source/TortoiseGit_en.xml:10437 msgid "Breaking the first regex down a little, it must start with the word issue, possibly capitalised. This is optionally followed by an s (more than one issue) and optionally a colon. This is followed by one or more groups each having zero or more leading whitespace, an optional comma or and and more optional space. Finally there is a mandatory # and a mandatory decimal number." msgstr "Mala greška kod prve regeks, mora se početi rečju problem, moguće sa velikim slovima. Ovo je opcionalno praćeno sa jednim s (više od jednog problema) i opcionalno tačkom i zarezom. Ovo je praćeno jednim ili više grupe svaki ima nula ili više vodećih belihpolja, opcionalna zapeta ili i i više opcionalnih razmaka. Na kraju postoji obavezan # i obavezan decimalni broj." #. (para) #: ../source/TortoiseGit_en.xml:10446 msgid "If only one expression is set, then the bare bug IDs must be matched in the groups of the regex string. Example: [Ii]ssue(?:s)? #?(\\d+) This method is required by a few issue trackers, e.g. trac, but it is harder to construct the regex. We recommend that you only use this method if your issue tracker documentation tells you to." msgstr "Ako je samo jedan izraz podešen onda go bag ID mora biti uhvaćen u grupama regeks stringova. Primer: [Ii]ssue(?:s)? #?(\\d+) Ovaj metod traži više problem tragača, npr. trac, ali to je teže konstruisati regeks. Preporučujemo da samo koristite ovaj metod ako dokumentacija vašeg problem tragača to kaže. " #. (para) #: ../source/TortoiseGit_en.xml:10455 msgid "If you are unfamiliar with regular expressions, take a look at the introduction at http://en.wikipedia.org/wiki/Regular_expression, and the online documentation and tutorial at http://www.regular-expressions.info/." msgstr "Ako niste familijarni sa regeks izrazima pogledajte u uvod na http://en.wikipedia.org/wiki/Regular_expression, i onlajn dokumentaciju i tutorijal na http://www.regular-expressions.info/." #. (para) #: ../source/TortoiseGit_en.xml:10396 msgid "In the approach with regular expressions, TortoiseGit doesn't show a separate input field but marks the part of the log message the user enters which is recognized by the issue tracker. This is done while the user writes the log message. This also means that the bug ID can be anywhere inside a log message! This method is much more flexible, and is the one used by the TortoiseGit project itself. " msgstr "U pristupu sa regularnim izrazima, TortoiseGit ne prikazuje izdvojena ulazna polja ali markira deo dnevnik poruku koju korisnik unese što je prepoznato od problem tragača. Ovo je datodok korisnik piše dnevnik poruku. Ovo takođe znači da bag ID može biti bilo gde unutar dnevnika poruke! Ovaj metod je mnogo više fleksibilan, i jedan je od onih koje projekat TortoiseGit koristi sam. " #. (para) #: ../source/TortoiseGit_en.xml:10471 msgid "If both the bugtraq:message and bugtraq:logregex properties are set, logregex takes precedence." msgstr "Ako oba bugtraq:message i bugtraq:logregex osobine setovanr, logregex ima prednost." #. (para) #: ../source/TortoiseGit_en.xml:10476 msgid "Even if you don't have an issue tracker with a pre-commit hook parsing your log messages, you still can use this to turn the issues mentioned in your log messages into links!" msgstr "Čak i ako nemate problem tragač sa pre-urezivanje zakačaljka analizira vaš dnevnik poruka, vi još uvek možete koristiti ovo da okrenete problem zamišljen u vašem dnevniku poruka u vezi!" #. (para) #: ../source/TortoiseGit_en.xml:10481 msgid "And even if you don't need the links, the issue numbers show up as a separate column in the log dialog, making it easier to find the changes which relate to a particular issue." msgstr "I čak ako vam ne treba veza, problem brojevi prikazuju kao izdvojena kolona u dnevnik dijalogu, čineći to lakšim da nađete što se odnosi na poseban problem." #. (title) #. (title) #: ../source/TortoiseGit_en.xml:10494 #: ../source/TortoiseGit_en.xml:10660 msgid "Set the Properties on Folders" msgstr "Podešavabje osobina imenika" #. (para) #. (para) #: ../source/TortoiseGit_en.xml:10495 #: ../source/TortoiseGit_en.xml:10661 msgid "These properties must be set on folders for the system to work. When you commit a file or folder the properties are read from that folder. If the properties are not found there, TortoiseGit will search upwards through the folder tree to find them until it comes to an unversioned folder, or the tree root (eg. C:\\) is found. If you can be sure that each user checks out only from e.g trunk/ and not some sub-folder, then it's enough if you set the properties on trunk/. If you can't be sure, you should set the properties recursively on each sub-folder. A property setting deeper in the project hierarchy overrides settings on higher levels (closer to trunk/)." msgstr "Ove osobine moraju biti podešene na imeniku za sistem koji radi. Kada urezujete fajl ili imenik osobine su pročitane iz imenika. Ako osobine nisu nađene tamo, TortoiseGit će pretraživati nagore kroz stablo imenika da ga nađete dok ne dođe neverzionisani imenik, ili koren stabla (npr. C:\\) nađen. Ako možete biti sigurni da svaki korisnik preuzima samo sa npr. trunk/ a ne neke sub-imenike, zatim to je dovoljno ako podesite osobine na trunk/. Ako možete biti sigurni, morate podesiti osobine rekurzivno na svakom sub-imeniku. osobine podešene dublje u hijerarhiji projekta koja prepisuje podešavanje na višim nivoima (bliže ka trunk/)." #. (para) #. (para) #: ../source/TortoiseGit_en.xml:10509 #: ../source/TortoiseGit_en.xml:10675 msgid "For tsvn: properties only you can use the Recursive checkbox to set the property to all sub-folders in the hierarchy, without also setting it on all files." msgstr "Za tsvn: osobine samo možete koristite Rekurzivno čekboks da podesi osobine na sve sub-imenike u hierarhiji, bez podešavanje na sve fajlove takođe." #. (title) #: ../source/TortoiseGit_en.xml:10517 msgid "No Issue Tracker Information from Repository Browser" msgstr "Nema Problem Tragač Informacije iz Pretraživača Spremišta" #. (para) #: ../source/TortoiseGit_en.xml:10518 msgid "Because the issue tracker integration depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." msgstr "Zato što problem tragač integracija zavisi od pristupa subverzionih osobina, vi ćete samo videti rezultate kada koristite preuzetu radnu kopiju. Dobavljanje osobina daljinski je sporo, tako ne možete videti ovu osobinu u akciji repo pretraživača." #. (para) #: ../source/TortoiseGit_en.xml:10525 msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Git client. For more information, read the full Issue Tracker Integration Specification in the TortoiseGit source repository. ( explains how to access the repository)." msgstr "Problem tragač integracija nije ograničena na TortoiseGit; to može biti korišćeno sa bilo kojim Subverzionim klijentom. Za više informacija pročitajte potpunije Problem Tragač Integracija Specifikacija u TortoiseGit izvorno spremište. ( objašnjava kako da pristupite spremištu)." #. (title) #: ../source/TortoiseGit_en.xml:10536 msgid "Getting Information from the Issue Tracker" msgstr "Dobijanje informacija od poblem tragača" #. (para) #: ../source/TortoiseGit_en.xml:10537 msgid "The previous section deals with adding issue information to the log messages. But what if you need to get information from the issue tracker? The commit dialog has a Windows COM interface which allows integration an external program that can talk to your tracker. Typically you might want to query the tracker to get a list of open issues assigned to you, so that you can pick the issues that are being addressed in this commit." msgstr "Prethodni paragraf razmatra dodavanje problem informacija u dnevnik poruka. Ali šta ako vam treba da dobijete informaciju od problem tragača? Dijalog urezivanja ima Vindouz COM interfejs koji dozvoljava integraciju spoljašnjih programa koji mogu govoriti vašem tragaču. Tipično možete želeti da tražite tragaču da da listu otvorenih problema pridruženih vama, tako da možete odabrati problem koji će biti adresiran pri urezivanju." #. (para) #: ../source/TortoiseGit_en.xml:10546 msgid "Any such interface is of course highly specific to your system, so we cannot provide this part, and describing how to create such a program is beyond the scope of this manual. The interface definition and sample programs can be obtained from the contrib folder in the TortoiseGit repository. ( explains how to access the repository)." msgstr "Svaki takav interfejs je svakako jako specifično za vaš sistem , tako da ne možete omogućiti ovaj deo, i opisati kako da kreirate takav program je van razmatranja ovog uputstva. Definicija interfejsa i jednostavni programi mogu biti dobijeni iz contrib imenika u TortoiseGit spremište. ( objašnjava kako pristupiti spremištu)." #. (title) #: ../source/TortoiseGit_en.xml:10565 msgid "Example issue tracker query dialog" msgstr "Primer dijaloga zahteva problem tragača" #. (para) #: ../source/TortoiseGit_en.xml:10557 msgid "For illustration purposes, let's suppose that your system administrator has provided you with an issue tracker plugin which you have installed, and that you have set up some of your working copies to use the plugin in TortoiseGit's settings dialog. When you open the commit dialog from a working copy to which the plugin has been assigned, you will see a new button at the top of the dialog. In this example you can select one or more open issues. The plugin can then generate specially formatted text which it adds to your log message." msgstr "U ilustrativne svrhe, pretpostavimo da je vaš sitem administrator obezbedio problem tragač plagin koji ste instalirali, i da ste podesili neke vaše radne kopije da koriste plagin u TortoiseGit dijalogu podešavanja. Kada otvorite dijalog urezivanje iz radne kopije na koju je asociran plagin možete videti novo dugme na vrhu dijaloga. U ovom primeru možete izabrati jedan ili više otvorenih problema. Plagin možete generisati specijalno formatirani tekst koji ste dodali vašem dnevniku porke." #. (title) #: ../source/TortoiseGit_en.xml:10575 msgid "Integration with Web-based Repository Viewers" msgstr "Integracija sa Veb-zasnovanom pregledaču spremišta" #. (primary) #: ../source/TortoiseGit_en.xml:10577 msgid "web view" msgstr "veb vidi" #. (primary) #: ../source/TortoiseGit_en.xml:10580 msgid "repo viewer" msgstr "rep pregledač" #. (primary) #: ../source/TortoiseGit_en.xml:10583 msgid "ViewVC" msgstr "VidiRK" #. (primary) #: ../source/TortoiseGit_en.xml:10586 msgid "WebSVN" msgstr "VebSVN" #. (para) #: ../source/TortoiseGit_en.xml:10588 msgid "There are several web-based repository viewers available for use with Git such as ViewVC and WebSVN. TortoiseGit provides a means to link with these viewers." msgstr "Postoji više veb-zasnovanih pregledača spremišta dostupnih za korišćenje kao PregledajVC and ViewVC and WebSVNVebSVN. TortoiseGit omogućava način da povežete sa ovim pregledačem." #. (para) #: ../source/TortoiseGit_en.xml:10600 msgid "You can integrate a repo viewer of your choice in TortoiseGit. To do this, you have to define some properties which define the linkage. They must be set on Folders: ()" msgstr "Možete integrisati repo pregledač vašeg izbora u TortoiseGit. Da se to uradi imate da definišete neke osobine koje definišu povezivanju. Oni moraju biti podešene na Imenicima: ()" #. (para) #: ../source/TortoiseGit_en.xml:10610 msgid "Set this property to the URL of your repo viewer to view all changes in a specific revision. It must be properly URI encoded and it has to contain %REVISION%. %REVISION% is replaced with the revision number in question. This allows TortoiseGit to display a context menu entry in the log dialog Context MenuView revision in webviewer" msgstr "Podesite ove osobine za URL vašeg repo pregledača da vidite izmene u specifičnoj reviziji. Mora biti odgovarajući URI kodiran i mora da sadrži %REVISION%. %REVISION% je zamenjena sa revizionim brojem u pitanju. Ovo dopušta TrotoiseSVN da prikaže ulaz kontekst menija u dnevnik dijaloga Kontekst MeniPregledati reviziju na vebsajtu" #. (para) #: ../source/TortoiseGit_en.xml:10629 msgid "Set this property to the URL of your repo viewer to view changes to a specific file in a specific revision. It must be properly URI encoded and it has to contain %REVISION% and %PATH%. %PATH% is replaced with the path relative to the repository root. This allows TortoiseGit to display a context menu entry in the log dialog Context MenuView revision and path in webviewer For example, if you right-click in the log dialog bottom pane on a file entry /trunk/src/file then the %PATH% in the URL will be replaced with /trunk/src/file." msgstr "Podeite ove osobine u URL vašeg repo pregledača da vidite izmene posebnih fajlova u posebnoj reviziji. Mora biti ispravno URI kodirano i ima da sadrži %REVISION%i %PATH%. %PATH% se zamenjuje sa putanjom relativnom sa korenom spremišta. Ovo omogućava TortoiseGit da prikaže kontekst meni ulaz u dnevnik dijalogu Kontekst MeniPregled revizije i putanje u vebpregledaču Na primaer, ako uradite desni-klik na donji panel dnevnik dijaloga fajl ulaza /trunk/src/file zatim %PATH% u URL će biti zamenjen sa /trunk/src/file." #. (para) #: ../source/TortoiseGit_en.xml:10651 msgid "You can also use relative URLs instead of absolute ones. This is useful in case your web viewer is on the same domain/server as your source repository. In case the domain name ever changes, you don't have to adjust the webviewer:revision and webviewer:pathrevision property. The format is the same as for the bugtraq:url property. See ." msgstr "Možete takođe da koristite URL umesto apsolutnih. Ovo je korisno u slučaju da je vaš veb pregledač na istom domen/serveru kao vaše izvorno spremište. U slučaju da se ime domena ikad promeni, vi nemate da podesite webviewer:revisioni webviewer:pathrevision osobinu. Format je isti kao za bugtraq:url osobinu. Vidite ." #. (title) #: ../source/TortoiseGit_en.xml:10683 msgid "No Repo Viewer Links from Repository Browser" msgstr "Nema Repo Pregledač Veza iz Pretraživača Spremišta" #. (para) #: ../source/TortoiseGit_en.xml:10684 msgid "Because the repo viewer integration depends upon accessing Git properties, you will only see the results when using a checked out working copy. Fetching properties remotely is a slow operation, so you will not see this feature in action from the repo browser." msgstr "Zato što problem tragač integracija zavisi od pristupa subverzionih osobina, vi ćete samo videti rezultate kada koristite preuzetu radnu kopiju. Dobavljanje osobina daljinski je sporo, tako ne možete videti ovu osobinu u akciji repo pretraživača." #. (title) #: ../source/TortoiseGit_en.xml:10693 msgid "TortoiseGit's Settings" msgstr "TortoiseGit postavke" #. (primary) #: ../source/TortoiseGit_en.xml:10695 msgid "settings" msgstr "podešavanje" #. (para) #: ../source/TortoiseGit_en.xml:10697 msgid "To find out what the different settings are for, just leave your mouse pointer a second on the editbox/checkbox... and a helpful tooltip will popup." msgstr "Da biste našli koja različita podešavanja su za to, samo ostavite pointer miša sekundu na editboks/čekboks.. i pojaviće se alatsavet za pomoć." #. (title) #: ../source/TortoiseGit_en.xml:10706 msgid "General Settings" msgstr "Generalno podešavanje" #. (primary) #: ../source/TortoiseGit_en.xml:10708 msgid "sounds" msgstr "zvuci" #. (title) #: ../source/TortoiseGit_en.xml:10712 msgid "The Settings Dialog, General Page" msgstr "Dijalog podešavanja, opšta stranica" #. (para) #: ../source/TortoiseGit_en.xml:10710 msgid " This dialog allows you to specify your preferred language, and the Git-specific settings." msgstr " Ovaj dijalog omogućava da odredite svoj željeni jezik, i Subverziono-specifučna podešavanja." #. (term) #: ../source/TortoiseGit_en.xml:10720 msgid "Language" msgstr "Jezik" #. (para) #: ../source/TortoiseGit_en.xml:10722 msgid "Selects your user interface language. What else did you expect?" msgstr "Izaberite vaš jezik korisnočkog interfejsa. Šta ste još očekivali?" #. (term) #: ../source/TortoiseGit_en.xml:10729 msgid "Automatically check for newer versions every week" msgstr "Automatski proveri novije verzije jednom nedeljno" #. (para) #: ../source/TortoiseGit_en.xml:10731 msgid "If checked, TortoiseGit will contact its download site once a week to see if there is a newer version of the program available. Use Check now if you want an answer right away. The new version will not be downloaded; you simply receive an information dialog telling you that the new version is available." msgstr "Ako je čekiran, TortoiseGit će kontaktirati njegov sajt za skidanje jednom nedeljno da vidi dali postoji nova verzija programa. Koristite Proveri sada ako želite odgovor upravo sada. Nova verzija neće biti skinuta; vi jednostavno dobijate informacioni dijalog koji vam kaže da je nova verzija dostupna." #. (term) #: ../source/TortoiseGit_en.xml:10742 msgid "System sounds" msgstr "Sistemski zvuci" #. (para) #: ../source/TortoiseGit_en.xml:10748 msgid "Error" msgstr "Greška" #. (para) #: ../source/TortoiseGit_en.xml:10753 msgid "Notice" msgstr "Beleška" #. (para) #: ../source/TortoiseGit_en.xml:10758 msgid "Warning" msgstr "Upozorenje" #. (para) #: ../source/TortoiseGit_en.xml:10744 msgid "TortoiseGit has three custom sounds which are installed by default. You can select different sounds (or turn these sounds off completely) using the Windows Control Panel. Configure is a shortcut to the Control Panel." msgstr "TortoiseGit ima tri obična zvuka koji su instalirani uobičajeno. Možete izabrati različite zvuke (ili potpuno isključiti zvuk) koristeći Vindouz Kontrolni Panel. guibutton>Konfiguriši je skraćenica za Kontrolni Panel." #. (term) #: ../source/TortoiseGit_en.xml:10770 msgid "Global ignore pattern" msgstr "Globalni uzorak izostavljanja" #. (primary) #: ../source/TortoiseGit_en.xml:10773 msgid "exclude pattern" msgstr "isključi model" #. (primary) #: ../source/TortoiseGit_en.xml:10776 msgid "global ignore" msgstr "globalno zanemarivanje" #. (para) #: ../source/TortoiseGit_en.xml:10778 msgid "Global ignore patterns are used to prevent unversioned files from showing up e.g. in the commit dialog. Files matching the patterns are also ignored by an import. Ignore files or directories by typing in the names or extensions. Patterns are separated by spaces e.g. */bin */obj *.bak *.~?? *.jar *.[Tt]mp. Remember that these patterns may be used against paths which include N levels of parent directory. Setting ignore patterns for anything other than simple file extensions is not as trivial as it first appears, so be sure to read for more information on the pattern-matching syntax, and how paths are checked." msgstr "Globalni modeli zanemarivanja su korišćeni da preduprede neverzionisane fajlove da budu prikazani npr. u dijalogu urezivanja. Fajlovi koje uhvati model su takođe zanemareni pri uvozu. Zanemarite fajlove ili imenike unošenjem njihovih imena ili ekstenzija. Modeli su razdvojeni razmacima npr. */bin */obj *.bak *.~?? *.jar *.[Tt]mp. Zapamtite da ovi modeli se mogu koristiti za putanje koje uključuju N nivoa predačkog imenika. Podešavanje modela zanemarivanja za bilo šta drugo osim jednostavnih ekstenzija fajlova nije trivijalno kada se prvi put javi, da biste bili sigurni pročitajte za više informacija o model-hvatanja sintaksi i kako se putanje proveravaju." #. (para) #: ../source/TortoiseGit_en.xml:10792 msgid "Note that the ignore patterns you specify here will also affect other Git clients running on your PC, including the command line client." msgstr "Primetimo da se modeli zanemarivanja koje ste ovde specificirali takođe utiču na ostale Subverzione klijente koji rade na vašem PC, uključujući klijente komandne linije." #. (para) #: ../source/TortoiseGit_en.xml:10798 msgid "If you use the Git configuration file to set a global-ignores pattern, it will override the settings you make here. The Git configuration file is accessed using the Edit as described below." msgstr "Ako koristite Subverzioni konfiguracioni fajl da podesite global-ignores model, to će premostiti podešavanje koje ste ovde uradili. Subverzioni konfiguracioni fajl je kontaktiran korišćenjem Uredi kako je objašnjeno u daljem tekstu." #. (para) #: ../source/TortoiseGit_en.xml:10806 msgid "This ignore pattern will affect all your projects. It is not versioned, so it will not affect other users. By contrast you can also use the versioned svn:ignore property to exclude files or directories from version control. Read for more information." msgstr "Ovaj model zanemarivanja će uticati na sve vaše projekte. On nije verzionisan, tako da neće uticati na druge korisnike. Zbog kontrasta možete takođe koristiti verzionisanu svn:ignore osobinu da isključite fajlove ili imenike iz kontrole verzija. Pročitajte za viže informacija." #. (term) #: ../source/TortoiseGit_en.xml:10818 msgid "Set file dates to the last commit time" msgstr "Podesite datum fajla na poslednje vreme urezivanja" #. (para) #: ../source/TortoiseGit_en.xml:10820 msgid "This option tells TortoiseGit to set the file dates to the last commit time when doing a checkout or an update. Otherwise TortoiseGit will use the current date. If you are developing software it is generally best to use the current date because build systems normally look at the date stamps to decide which files need compiling. If you use last commit time and revert to an older file revision, your project may not compile as you expect it to." msgstr "Ova opcija kaže TortoiseGit da podesi datum fajla na vreme zadnjeg urezivanja kada se radi preuzimanje ili ažuriranje. Drugačije TortoiseGit će koristiti tekući datum. Ako ste razvijali softver generalno je najbolje da koristite tekući datum jer sistem za izgradnju normalno gleda na datum markicu da odredi koje fajlove treba komajlirati. Ako koristite last commit time i vratiti u stariju reviziju, vaš projekat ne može kompajlirati onako kako očekujete od njega." #. (term) #: ../source/TortoiseGit_en.xml:10834 msgid "Git configuration file" msgstr "Subverzijin konfiguracioni fajl" #. (para) #: ../source/TortoiseGit_en.xml:10836 msgid "Use Edit to edit the Git configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Git config file see the Runtime Configuration Area. The section on Automatic Property Setting is of particular interest, and that is configured here. Note that Git can read configuration information from several places, and you need to know which one takes priority. Refer to Configuration and the Windows Registry to find out more." msgstr "Koristite Uredi da uredite Subverzioni konfiguracioni fajl direktno. neka podešavanje se ne mogu izmeniti sa TortoiseGit, i traže da umesto toga budu podešena ovde. Za više informacija o Subverzionom konfig fajlu vidite Runtime Configuration Area. Poglavlje na Automatic Property Setting je od posebnog interesa, i ono je konfigurisano ovde. Primetimo da Subverzija može čitati konfiguracione informacije sa više mesta , i potrebno je da znate koji ima prioritet. Uporedite sa Configuration and the Windows Registry da nađete više o tome." #. (term) #: ../source/TortoiseGit_en.xml:10861 msgid "Use _svn instead of .svn directories" msgstr "Koristite _svnumesto .svn imenika." #. (para) #: ../source/TortoiseGit_en.xml:10863 msgid "VS.NET when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET and the frontpage extensions it uses. Read to find out more about this issue." msgstr "VS.NET kada se koristi sa veb projektima ne može da rukuje sa .svn imenicima koje Subverzija koristi da smešta interne informacije. Ovo nije bag u Subverziji. Bag je u VS.NET i prednjoj strani koju koristi. Pročitajte da nađete više o ovom problemu." #. (para) #: ../source/TortoiseGit_en.xml:10870 msgid "If you want to change the behaviour of Git and TortoiseGit, you can use this checkbox to set the environment variable which controls this." msgstr "Ako želite da izmenite ponašanje Subverzije i TortoiseGit, možete koristiti čekboks da podesite promenljive okoline koje to kontrolišu." #. (para) #: ../source/TortoiseGit_en.xml:10875 msgid "You should note that changing this option will not automatically convert existing working copies to use the new admin directory. You will have to do that yourself using a script (See our FAQ) or simply check out a fresh working copy." msgstr "Treba da primetite da izmena ovih opcija ne konvertuje automatski postojeće radne kopije da koriste novi admin imenik. Imaćete da to uradite lično koristeći skript (Vidite naš ČPP) ili jednostavno preuzmite svežu radnu kopiju." #. (title) #: ../source/TortoiseGit_en.xml:10885 msgid "Context Menu Settings" msgstr "Podešavanje kontekstnog menija" #. (title) #: ../source/TortoiseGit_en.xml:10889 msgid "The Settings Dialog, Context Menu Page" msgstr "Dijalog podešavanja, Konetekst meni strana" #. (para) #: ../source/TortoiseGit_en.xml:10887 msgid " This page allows you to specify which of the TortoiseGit context menu entries will show up in the main context menu, and which will appear in the TortoiseGit submenu. By default most items are unchecked and appear in the submenu." msgstr " Ova strana omogućava da odredite koji od TortoiseGit kontekst meni ulaz će biti prikazan u glavnom kontekst meniju, i koji će se pojaviti u TortoiseGit submeni. Uobičajeno je da je većina stavki neproverena i pojavljuju se u submeniju." #. (para) #: ../source/TortoiseGit_en.xml:10897 msgid "There is a special case for Get Lock. You can of course promote it to the top level using the list above, but as most files don't need locking this just adds clutter. However, a file with the svn:needs-lock property needs this action every time it is edited, so in that case it is very useful to have at the top level. Checking the box here means that when a file is selected which has the svn:needs-lock property set, Get Lock will always appear at the top level." msgstr "Postoji poseban slučaj za Uzmi Katanac. Možete, svakako, pogurati to na vršni nivo koristeći gornju listu, ali kako većina fajlova ne zahteva zaključavanje samo dodaje gužvu. Međutim, fajl sa svn:needs-lock osobinom zahteva ovu akciju svaki put kada se uređuje, tako da u tom slučaju to je veoma korisno imati ga na gornjem nivou. Čekiranjem boksa ovde znači to da kada je fajl izabran koji ima svn:needs-lock osobinu izabranu, Nabavi Katanac će se uvek pojaviti u gornjem nivou." #. (title) #: ../source/TortoiseGit_en.xml:10909 msgid "TortoiseGit Dialog Settings 1" msgstr "TortoiseGit dijalog podešavanje 1" #. (title) #: ../source/TortoiseGit_en.xml:10913 msgid "The Settings Dialog, Dialogs 1 Page" msgstr "Podešavanje dijaloga, dijalog 1 strana" #. (para) #: ../source/TortoiseGit_en.xml:10911 msgid " This dialog allows you to configure some of TortoiseGit's dialogs the way you like them." msgstr " Ovaj dijalog vam dozvoljava da konfigurišete neke TortoiseGit dijaloge na način kako volite." #. (term) #: ../source/TortoiseGit_en.xml:10921 msgid "Default number of log messages" msgstr "Uobičajen broj poruka dnevnika" #. (para) #: ../source/TortoiseGit_en.xml:10923 msgid "Limits the number of log messages that TortoiseGit fetches when you first select TortoiseGitShow Log Useful for slow server connections. You can always use Show All or Next 100 to get more messages." msgstr "Ograničava broj dnevnik poruka koje TortoiseGit nađe kada najpre izaberete TortoiseGitPokaži Dnevnik Korisno za spor server vezu. Možete uvek koristiti Prikaži Svel ili Sledećih 100 da dobojete više poruka." #. (term) #: ../source/TortoiseGit_en.xml:10937 msgid "Font for log messages" msgstr "Pismo za poruke dnevnika" #. (para) #: ../source/TortoiseGit_en.xml:10939 msgid "Selects the font face and size used to display the log message itself in the middle pane of the Revision Log dialog, and when composing log messages in the Commit dialog." msgstr "Izabira oblik pisma i veličinu korišćenu za prikazivanje same dnevnik poruke u srednjem panelu Dnevnik Revizija dijalogu, i kada se sastavlja dnevnik poruke u Ureži dijalogu." #. (term) #: ../source/TortoiseGit_en.xml:10948 msgid "Short date / time format in log messages" msgstr "Kratak oblik datum/vreme u dnevniku poruka" #. (para) #: ../source/TortoiseGit_en.xml:10950 msgid "If the standard long messages use up too much space on your screen use the short format." msgstr "Ako standardne dugačke poruke koriste suviše prostora na vašem ekranu koristite kratak format." #. (term) #: ../source/TortoiseGit_en.xml:10957 msgid "Progress Dialog" msgstr "Progres dijalog" #. (para) #: ../source/TortoiseGit_en.xml:10959 msgid "TortoiseGit can automatically close all progress dialogs when the action is finished without error. This setting allows you to select the conditions for closing the dialogs. The default (recommended) setting is Close manually which allows you to review all messages and check what has happened. However, you may decide that you want to ignore some types of message and have the dialog close automatically if there are no critical changes." msgstr "TortoiseGit može automatski da završi sve progres dijaloge kada se akcija završi bez greške. Ovo podešavanje vam omogućava da izaberete uslove zatvaranja dijaloga. Uobičajeno (preporučeno) podešavanje je Zatvori ručno što dozvoljava da pregledate sve poruke i proverite šta se desilo. Međutim, možete odlučiti da želite da zanemarite neki tip poruka i dijalog je zatvoren automatski ako nema kritičnih izmena." #. (para) #: ../source/TortoiseGit_en.xml:10970 msgid "Auto-close if no merges, adds or deletes means that the progress dialog will close if there were simple updates, but if changes from the repository were merged with yours, or if any files were added or deleted, the dialog will remain open. It will also stay open if there were any conflicts or errors during the operation." msgstr "Aut-zatvaranje ako nema stapanja, dodaj ili obriši znači da progres dijalog će se zatvoriti ako je bilo jednostavnog ažuriranja, ali ako su izmene iz spremišta stopljene sa vašim, ili ako je bilo koji fajl dodat ili obrisan, dijalog će ostati otvoren. On će takođe ostati otvoren ako je bio bio koji konflikt ili greška u toku operacije." #. (para) #: ../source/TortoiseGit_en.xml:10978 msgid "Auto-close if no merges, adds or deletes for local operations means that the progress dialog will close as for Auto-close if no merges, adds or deletes but only for local operations like adding files or reverting changes. For remote operations the dialog will stay open." msgstr "Auto-zatvaranje ako nema stapanja, dodavanja ili brisanja za lokalne operacije znači da će se progres dijalog zatvoriti kao za Auto-zatvaranje ako nema stapanja, dodavanja i brisanja ali samo za lokalne operacije kao dodavanje fajlova ili vraćanje izmena. Za daljinske operacije dijalog će ostati otvoren." #. (para) #: ../source/TortoiseGit_en.xml:10986 msgid "Auto-close if no conflicts relaxes the criteria further and will close the dialog even if there were merges, adds or deletes. However, if there were any conflicts or errors, the dialog remains open." msgstr "Auto-zatvaranje ako nema konflikta dalje oslabljuje kriterijume i zatvoriće dijalog čak i ako ima stapanja, dodavanja i brisanja. Međutim, ako je bilo bilo kakvog konflikta ili grešaka, dijalog ostaje otvoren." #. (para) #: ../source/TortoiseGit_en.xml:10993 msgid "Auto-close if no errors always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Git is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date." msgstr "Auto-zatvaranje ako nema grešaka uvek zatvara dijalog čak i ako je bio konflikata. Jedini uslov koji drži otvoren dijalog je uslov greške, što se javlja kada je Subverzija omogućenada kompletira zadatak. Na primer, ažuriranje je neuspešno zato što je server nedostupan, ili urezivanje je neuspešno zato što je radna kopija zastarela." #. (term) #: ../source/TortoiseGit_en.xml:11005 msgid "Use URL of WC as the default From: URL" msgstr "Koristi URL od RK kao uobičajeno Od: URL" #. (para) #: ../source/TortoiseGit_en.xml:11007 msgid "In the merge dialog, the default behaviour is for the From: URL to be remembered between merges. However, some people like to perform merges from many different points in their hierarchy, and find it easier to start out with the URL of the current working copy. This can then be edited to refer to a parallel path on another branch." msgstr "U dijalogu stapanja, uobičajeno ponašanje je za Od: URL biće zapamćen između stapanja. Međutim, neki ljudi vole da primene stapanje od mnogo različitih tačaka u njihovoj hijerarhiji, i nađe da je lakše da počne sa URL tekuće radne kopije. Ovo može biti uređeno da se odnosi na paralelnu putanju na drugoj grani. " #. (term) #: ../source/TortoiseGit_en.xml:11019 msgid "Default checkout path" msgstr "Uobičajena putanja preuzimanja" #. (para) #: ../source/TortoiseGit_en.xml:11021 msgid "You can specify the default path for checkouts. If you keep all your checkouts in one place, it is useful to have the drive and folder pre-filled so you only have to add the new folder name to the end." msgstr "Možete specificirati uobičajenu putanju za preuzimanje. Ako čuvate sva preuzimanja na jednom mestu, korisno je imati drajv i imenik popunjen tako da samo imate da dodate novo ime imenika na kraju. " #. (term) #: ../source/TortoiseGit_en.xml:11030 msgid "Default checkout URL" msgstr "Uobičajen URL preuzimanja" #. (para) #: ../source/TortoiseGit_en.xml:11032 msgid "You can also specify the default URL for checkouts. If you often checkout sub-projects of some very large project, it can be useful to have the URL pre-filled so you only have to add the sub-project name to the end." msgstr "Možete takođe specificirati uobičajeni URL za preuzimanje. Ako često preuzimate sub-projekte nekih veoma velike projekte, može biti korisno imati URL pre-popunjene tako da se ima samo dodati sub-projekat ime na kraju." #. (title) #: ../source/TortoiseGit_en.xml:11043 msgid "TortoiseGit Dialog Settings 2" msgstr "TortoiseGit dijalog pdešavanja 2" #. (title) #: ../source/TortoiseGit_en.xml:11047 msgid "The Settings Dialog, Dialogs 2 Page" msgstr "Dijalog podešavanja, Dijalog 2 stranica" #. (term) #: ../source/TortoiseGit_en.xml:11053 msgid "Recurse into unversioned folders" msgstr "Rekurzija u neverzionisanim imenicima " #. (para) #: ../source/TortoiseGit_en.xml:11055 msgid "If this box is checked (default state), then whenever the status of an unversioned folder is shown in the Add, Commit or Check for Modifications dialog, every child file and folder is also shown. If you uncheck this box, only the unversioned parent is shown. Unchecking reduces clutter in these dialogs. In that case if you select an unversioned folder for Add, it is added recursively." msgstr "Ovaj boks je čekiran (uobičajeno stanje), zatim kadgod je status neverzionisani imenik prikazan u Dodaj, Ureži ili Privera Modifikacija dijalog, svaki potomački fajl i imenik je takođe prikazan. Ako otčekirate ovaj boks, samo neverzionisani predak je prikazan. Otčekivanje redukuje gužvu u ovim dijalozima. U ovom slučaju ako izaberete neverzionisani imenik za Dodaj, dodaje se rekurzivno." #. (term) #: ../source/TortoiseGit_en.xml:11069 msgid "Use auto-completion of file paths and keywords" msgstr "Koristi autokompletiranje fajl putanja i ključnih reči" #. (para) #: ../source/TortoiseGit_en.xml:11071 msgid "The commit dialog includes a facility to parse the list of filenames being committed. When you type the first 3 letters of an item in the list, the auto-completion box pops up, and you can press Enter to complete the filename. Check the box to enable this feature." msgstr "Dijalog urezivanja uključuje mogućnost da analizira listu imenafajlova koja se urezuje. Kada ukucate prva 3 slova stavke u listu, auto-kompletiranje boks iskoči, i možete pritisnuti Enter da kompletirate fajlime. Čekirajte boks da omogućite ovu osobinu." #. (term) #: ../source/TortoiseGit_en.xml:11081 msgid "Timeout in seconds to stop the auto-completion parsing" msgstr "Kašnjenje u skundama da se zaustavi analiziranje za autokompletiranje" #. (para) #: ../source/TortoiseGit_en.xml:11083 msgid "The auto-completion parser can be quite slow if there are a lot of large files to check. This timeout stops the commit dialog being held up for too long. If you are missing important auto-completion information, you can extend the timeout." msgstr "Auto-kompletiranje analizator može biti sasvim spor ako ima mnogo velikih fajlova da se provere. Tajmaut zaustavlja dijalog urezivanja da bude držan suviše dugo. Ako vam nedostaju važne informacije auto-kompletiranja, možete proširiti tajmaut." #. (term) #: ../source/TortoiseGit_en.xml:11092 msgid "Only use spellchecker when tsvn:projectlanguage is set" msgstr "Samo koristite proveru pravopisa kada je tsvn:projectlanguage podešen." #. (para) #: ../source/TortoiseGit_en.xml:11094 msgid "If you don't wish to use the spellchecker for all commits, check this box. The spellchecker will still be enabled where the project properties require it." msgstr "Ako ne želite da koristite proveru sintakse za sva urezivanja čekirajte ovaj boks. Provera sintakse će još biti omogućena gde osobine projekta to zahtevaju." #. (term) #: ../source/TortoiseGit_en.xml:11102 msgid "Max. items to keep in the log message history" msgstr "Maks. stavki za čuvanje u istoriji dnevnika poruka" #. (para) #: ../source/TortoiseGit_en.xml:11104 msgid "TortoiseGit stores the last 25 log messages you entered for each repository. You can customize the number stored here. If you have many different repositories, you may wish to reduce this to avoid filling your registry." msgstr "TortoiseGit skladišti zadnjih 25 dnevnik poruka koje ste uneli za svako spremište. Možete prilagoditi brojeve uskladištene ovde.Ako imate mnogo različitih spremišta, možete želeti da redukujete ovo da bi izbegli punjenje registra." #. (term) #: ../source/TortoiseGit_en.xml:11113 msgid "Re-open commit and branch/tag dialog after a commit failed" msgstr "Re-otvara urezivanje i grana/znak dijalog posle neipravnog urezivanja." #. (para) #: ../source/TortoiseGit_en.xml:11115 msgid "When a commit fails for some reason (working copy needs updating, pre-commit hook rejects commit, network error, etc), you can select this option to keep the commit dialog open ready to try again. However, you should be aware that this can lead to problems. If the failure means you need to update your working copy, and that update leads to conflicts you must resolve those first." msgstr "kada urezivanje otkaže iz nekog razloga (radna kopija traži ažuriranje, pre-urezivanja zakačaljka odbija urezivanje, mrežna greška, itd.), možete izabrati ovu opciju da držite dijalog urezivanja otvoren i spreman da pokuša ponovo. Međutim, treba da budete oprezni jer ovo može dovesti do problema. Ako kvarvznači da treba da ažurirate radnu kopiju, i to ažuriranje dovodi do konflikta koja morate rešiti najpre." #. (term) #: ../source/TortoiseGit_en.xml:11126 msgid "Select items automatically" msgstr "Odaberi stavke automatski" #. (para) #: ../source/TortoiseGit_en.xml:11128 msgid "The normal behaviour in the commit dialog is for all modified (versioned) items to be selected for commit automatically. If you prefer to start with nothing selected and pick the items for commit manually, uncheck this box." msgstr "Normalno ponašanje u dijalogu urezivanja za sve modifikovane (verzionisane) stavke je sizabrano za urezivanje automatski. Ako više volite da počnete tako što ništa nije izabrano i odaberemo stavku za urezivanje ručno otčekirajte ovaj boks." #. (term) #: ../source/TortoiseGit_en.xml:11137 msgid "Contact the repository on startup" msgstr "Kontaktiraj spremište pri pokretanja" #. (para) #: ../source/TortoiseGit_en.xml:11139 msgid "The Check for Modifications dialog checks the working copy by default, and only contacts the repository when you click Check repository. If you always want to check the repository, you can use this setting to make that action happen automatically." msgstr "Provera Modifikacija dijalog čekira radnu kopiju uobičajeno, i samo kontakt spremišta kada kliknete Provera spremišta. Ako uvek želite da čekirate spremište, možete koristiti ovo podešavanje da učinite tu akciju koja se dešava automatski." #. (term) #: ../source/TortoiseGit_en.xml:11149 msgid "Show Lock dialog before locking files" msgstr "Prikaži dijalog zaključavanja pre zaključavanja fajlova" #. (para) #: ../source/TortoiseGit_en.xml:11151 msgid "When you select one or more files and then use TortoiseGitLock to take out a lock on those files, on some projects it is customary to write a lock message explaining why you have locked the files. If you do not use lock messages, you can uncheck this box to skip that dialog and lock the files immediately." msgstr "Kada izaberete jedan ili više fajlova i onda koristite TortoiseGitKatanac da uklonite katanac na ove fajlove, na nekim projektima je uobičajeno da se napiše katanac poruka koja objašnjava zašto imate zaključane fajlove. Ako ne koristite katanac poruke, možete otčekirati ovaj boks da preskočite taj dijalog i zaključate fajlove trenutno." #. (para) #: ../source/TortoiseGit_en.xml:11163 msgid "If you use the lock command on a folder, you are always presented with the lock dialog as that also gives you the option to select files for locking." msgstr "Ako koristite zaključaj komandu na imenik, vama je predstavljen dijalog zaključavanja kao nešto što vam daje opcije da izaberete fajlve za zaključavanje." #. (para) #: ../source/TortoiseGit_en.xml:11168 msgid "If your project is using the tsvn:lockmsgminsize property, you will see the lock dialog regardless of this setting because the project requires lock messages." msgstr "Ako vaš projekat koristi tsvn:lockmsgminsize osobinu, videćete dijalog zaključavanja bezobzira na ovo podešavanje jer projekat zahteva poruke zaključavanja." #. (title) #: ../source/TortoiseGit_en.xml:11178 msgid "TortoiseGit Colour Settings" msgstr "TortoiseGit podešavanje boja" #. (title) #: ../source/TortoiseGit_en.xml:11182 msgid "The Settings Dialog, Colours Page" msgstr "Dijalog Podešavanja, Stranica Boja" #. (para) #: ../source/TortoiseGit_en.xml:11180 msgid " This dialog allows you to configure the text colours used in TortoiseGit's dialogs the way you like them." msgstr " Ovaj dijalog dopušta da konfigurišete boje teksta korišćene u TortoiseGit dijalozima na način kakav volite." #. (term) #: ../source/TortoiseGit_en.xml:11190 msgid "Possible or real conflict / obstructed" msgstr "Moguć ili stvarni sukob / sprečen" #. (para) #: ../source/TortoiseGit_en.xml:11192 msgid "A conflict has occurred during update, or may occur during merge. Update is obstructed by an existing unversioned file/folder of the same name as a versioned one." msgstr "Konflikt se može pojaviti tokom ažuriranja, ili se može pojaviti u toku stapanja. Ažurriranje je ometeno postojećim neverzionisanim fajlom/imenikom istog imena kao neki verzionisan." #. (para) #: ../source/TortoiseGit_en.xml:11197 msgid "This colour is also used for error messages in the progress dialogs." msgstr "Boja se takođe koristi za poruke greške u progres dijalozima." #. (term) #: ../source/TortoiseGit_en.xml:11203 msgid "Added files" msgstr "Dodati fajlovi" #. (para) #: ../source/TortoiseGit_en.xml:11205 msgid "Items added to the repository." msgstr "Stavke dodate u spremište" #. (term) #: ../source/TortoiseGit_en.xml:11211 msgid "Missing / deleted / replaced" msgstr "Nedostaje / obrisano / zamenjeno" #. (para) #: ../source/TortoiseGit_en.xml:11213 msgid "Items deleted from the repository, missing from the working copy, or deleted from the working copy and replaced with another file of the same name." msgstr "Obrisane stavke iz spremišta, koje nedostaju u radnoj kopiji, ili obrisane iz radne kopije i zamenjene sa drugim fajlom istog imena. " #. (term) #: ../source/TortoiseGit_en.xml:11221 msgid "Merged" msgstr "Stopljeno" #. (para) #: ../source/TortoiseGit_en.xml:11223 msgid "Changes from the repository successfully merged into the WC without creating any conflicts." msgstr "Izmene u spremištu sukcesivno stopljene u RK bez kreiranja bilo kakvog konflikta." #. (term) #: ../source/TortoiseGit_en.xml:11230 msgid "Modified / copied" msgstr "Promenjeno / kopirano" #. (para) #: ../source/TortoiseGit_en.xml:11232 msgid "Add with history, or paths copied in the repository. Also used in the log dialog for entries which include copied items." msgstr "Dodavanje sa istorijom, ili putanja kopirana u spremište. Takođe u dnevnik dijalogu za ulaze koje uključuje kopirana stavka." #. (term) #: ../source/TortoiseGit_en.xml:11240 msgid "Deleted node" msgstr "Obrisani čvor" #. (para) #: ../source/TortoiseGit_en.xml:11242 msgid "An item which has been deleted from the repository." msgstr "Stavka koja je obrisana u spremištu." #. (term) #: ../source/TortoiseGit_en.xml:11248 msgid "Added node" msgstr "Dodat čvor" #. (para) #: ../source/TortoiseGit_en.xml:11250 msgid "An item which has been added to the repository, by an add, copy or move operation." msgstr "Stavka koja je dodata u spremište, pomoču dodaj, kopiraj ili pomeri operacije." #. (term) #: ../source/TortoiseGit_en.xml:11257 msgid "Renamed node" msgstr "Preimenovani čvor" #. (para) #: ../source/TortoiseGit_en.xml:11259 msgid "An item which has been renamed within the repository." msgstr "Stavka koja je preimenovana u okviru spremišta." #. (term) #: ../source/TortoiseGit_en.xml:11265 msgid "Replaced node" msgstr "Zamenjen čvor" #. (para) #: ../source/TortoiseGit_en.xml:11267 msgid "The original item has been deleted and a new item with the same name replaces it." msgstr "Originalna stavka je obrisana i nova stavka istog imena je zamenila." #. (title) #: ../source/TortoiseGit_en.xml:11277 msgid "Icon Overlay Settings" msgstr "Ikona prekrivač podešavanje" #. (title) #: ../source/TortoiseGit_en.xml:11281 msgid "The Settings Dialog, Icon Overlays Page" msgstr "Dijalog podešavanja, Ikona prekrivači stranica" #. (para) #: ../source/TortoiseGit_en.xml:11279 msgid " This page allows you to choose the items for which TortoiseGit will display icon overlays." msgstr " Ova strana dopušta da izaberete stavku za koju TortoiseGit će prikazati prekrivnu ikonu." #. (para) #: ../source/TortoiseGit_en.xml:11287 msgid "By default, overlay icons and context menus will appear in all open/save dialogs as well as in Windows Explorer. If you want them to appear only in Windows Explorer, check the Show overlays and context menu only in explorer box." msgstr "Uobičajeno, prekrivne ikone i kontekst meniji će se pojaviti u svim otvori/sačuvaj dijalozima kao u Vindouz Eksploreru. Ako želite da se oni pojave samo u Vindouz Eksploreru, čekirajte Prikaži prekrivače i kontekst meni samo u eksploreru boks." #. (para) #: ../source/TortoiseGit_en.xml:11293 msgid "Ignored items and Unversioned items are not usually given an overlay. If you want to show an overlay in these cases, just check the boxes." msgstr "Zanemarene stavke i Neverzionisane stavke obično nemaju prekrivač. Ako želite da prikažete prekrivač u ovim slučajevima, samo čekirajte boksove." #. (para) #: ../source/TortoiseGit_en.xml:11297 msgid "You can also choose to mark folders as modified if they contain unversioned items. This could be useful for reminding you that you have created new files which are not yet versioned. This option is only available when you use the default status cache option (see below)." msgstr "Možete takođe izabrati da označite imenik kao izmenjen ako on sadrži neverzionisane stavke. Ovo može biti korisno da vas podseti da ste kreirali nove fajlove koji još nisu verzionisani. Ova opcija je dostupna samo ako koristite uobičajen status keš opciju (vidi dole)." #. (term) #: ../source/TortoiseGit_en.xml:11312 msgid "Default" msgstr "Uobičajeno" #. (para) #: ../source/TortoiseGit_en.xml:11314 msgid "Caches all status information in a separate process (TSVNCache.exe). That process watches all drives for changes and fetches the status again if files inside a working copy get modified. The process runs with the least possible priority so other programs don't get hogged because of it. That also means that the status information is not real time but it can take a few seconds for the overlays to change." msgstr "Kešira sve status informacije u odvojenim procesima (TSVNCache.exe). Taj proces posmatra sve drajvove za izmene i nalazi ponovo status ako su fajlovi unutar radne kopije modifikovani. Proces radi sa najmanjim mogućim prioritetom tako da drugi programi blokirani zbog njega. To takođe znači da status informacija nije u realnom vremenu ali može uzeti nekoliko sekundi da se prekrivač promeni." #. (para) #: ../source/TortoiseGit_en.xml:11325 msgid "Advantage: the overlays show the status recursively, i.e. if a file deep inside a working copy is modified, all folders up to the working copy root will also show the modified overlay. And since the process can send notifications to the shell, the overlays on the left tree view usually change too." msgstr "Pogodnosti: prekrivači prikazuju status rekurzivno, tj. ako je fajl duboku unutar radne kopije izmenjen, svi imenici do korena radne kopije biće takođe prikazani izmenjenom ikonom. I kako proces može poslati notifikaciju školjci, prekrivači u ostalom stablu će se takođe promeniti." #. (para) #: ../source/TortoiseGit_en.xml:11333 msgid "Disadvantage: the process runs constantly, even if you're not working on your projects. It also uses around 10-50 MB of RAM depending on number and size of your working copies." msgstr "Nepogodnosti: proces stalno radi, čak i ako ne radite na vašem projektima. On takođe koristi oko 10-50 MB od RAM zavisno od broja i veličine vaših radnih kopija." #. (term) #: ../source/TortoiseGit_en.xml:11341 msgid "Shell" msgstr "Školjka" #. (para) #: ../source/TortoiseGit_en.xml:11343 msgid "Caching is done directly inside the shell extension dll, but only for the currently visible folder. Each time you navigate to another folder, the status information is fetched again." msgstr "Hvatanje je dato direktno unutar dll ekstenzije školjke, ali samo za tekući vidljivi imenik. Svaki put kad se krećete ka drugom imeniku status informacija se nalazi ponovo." #. (para) #: ../source/TortoiseGit_en.xml:11349 msgid "Advantage: needs only very little memory (around 1 MB of RAM) and can show the status in real time." msgstr "Pogodnosti: zahteva samo veoma maku memoriju (oko 1 MB RAMa) i može prikazati status u realnom vremenu." #. (para) #: ../source/TortoiseGit_en.xml:11353 msgid "Disadvantage: Since only one folder is cached, the overlays don't show the status recursively. For big working copies, it can take more time to show a folder in explorer than with the default cache. Also the mime-type column is not available." msgstr "Nepogodnosti: Pošto je samo jedan imenik uhvaćen, prekrivači ne pokazuju status rekurzivno. Za velike radne kopije može uzeti mnogo vremena da prikaže imenik u eksploreru sa uobičajenim hvatanjem. Takođe mime-tip kolone nije dostupan." #. (term) #: ../source/TortoiseGit_en.xml:11363 msgid "None" msgstr "Ništa" #. (para) #: ../source/TortoiseGit_en.xml:11365 msgid "With this setting, the TortoiseGit does not fetch the status at all in Explorer. Because of that, files don't get an overlay and folders only get a 'normal' overlay if they're versioned. No other overlays are shown, and no extra columns are available either." msgstr "Sa ovim podešavanjem TortoiseGit uopšte ne hvata status u Eksploreru. Zato što, fajlovi ne dobijaju prekrivače i imenici samo dobijaju 'normalne' prekrivače ako su verzionisani. Drugi prekrivači su prikazani i nema dodatnih kolona da su dostupne." #. (para) #: ../source/TortoiseGit_en.xml:11372 msgid "Advantage: uses absolutely no additional memory and does not slow down the Explorer at all while browsing." msgstr "Pogodnost: apsolutno ne koristi dodatnu memoriju i uopšte ne usporava Eksplorer dok pretražuje." #. (para) #: ../source/TortoiseGit_en.xml:11376 msgid "Disadvantage: Status information of files and folders is not shown in Explorer. To see if your working copies are modified, you have to use the Check for modifications dialog." msgstr "Nepogodnost: SDtatus informacija fajlova i imenika nije prikazana u Eksploreru. Da vidite da li je vaša radna kopija izmenjena, treba da koristite Provera izmena dijalog." #. (para) #: ../source/TortoiseGit_en.xml:11304 msgid "Since it takes quite a while to fetch the status of a working copy, TortoiseGit uses a cache to store the status so the explorer doesn't get hogged too much when showing the overlays. You can choose which type of cache TortoiseGit should use according to your system and working copy size here: " msgstr "Pošto uzima sasvim malo da nađe status radne kopije, TortoiseGit koristi keš da smesti status tako da eksplorer ne blokira mnogo dok prikazuje prekrivače. Možete izabrati koji tip keša TortoiseGit treba da koristi u skladu sa vašim sistemom i veličinom radne kopije ovde: " #. (para) #: ../source/TortoiseGit_en.xml:11385 msgid "The next group allows you to select which classes of storage should show overlays. By default, only hard drives are selected. You can even disable all icon overlays, but where's the fun in that?" msgstr "Sledeća grupa dopušta vam da izaberete koju klasu skladištenja će prikazati prekrivač. Uobičajeno, samo tvrdi diskovi su izabrani. Možete čak onemogućiti prekrivače ikona, ali gde je zabava u tome?" #. (para) #: ../source/TortoiseGit_en.xml:11390 msgid "Network drives can be very slow, so by default icons are not shown for working copies located on network shares." msgstr "Mrežni drajvovi mogu biti veoma spori, tako da uobičajeno ikone nisu prikazane za radnu kopiju lociranu na mrežnoj podeli." #. (para) #: ../source/TortoiseGit_en.xml:11394 msgid "USB Flash drives appear to be a special case in that the drive type is identified by the device itself. Some appear as fixed drives, and some as removable drives." msgstr "USB Fleš drajv se javlja kao specijalan slučaj u to drajv tipu se identificira od samog uređaja. Neki se javljaju kao fiksni diskovi, a neki kao pokretni drajvovi." #. (para) #: ../source/TortoiseGit_en.xml:11399 msgid "The Exclude Paths are used to tell TortoiseGit those paths for which it should not show icon overlays and status columns. This is useful if you have some very big working copies containing only libraries which you won't change at all and therefore don't need the overlays. For example:" msgstr "Isključi Putanje se koristi da kaže TortoiseGit te putanje za koje ne treba prikazati prekrivač ikona i status kolone. Ovo je korisno ako imate neke veoma velike radne kopije koje sadrže samo biblioteke koje želite uopšte da menjate i zato ne traži prekrivače. Na primer:" #. (para) #: ../source/TortoiseGit_en.xml:11407 msgid "f:\\development\\SVN\\Git will disable the overlays only on that specific folder. You still can see the overlays on all files and folder inside that folder." msgstr "f:\\development\\SVN\\Git će onemogućiti prekrivače samo na specifičnom imeniku. Vi još možete videti prekrivače na svim fajlovima unutar imenika." #. (para) #: ../source/TortoiseGit_en.xml:11412 msgid "f:\\development\\SVN\\Git* will disable the overlays on all files and folders whose path starts with f:\\development\\SVN\\Git. That means you won't see overlays for any files and folders below that path." msgstr "f:\\development\\SVN\\Git* će onemogućiti prekrivače na sve fajlove i imenike čije putanje počinju sa f:\\development\\SVN\\Git. To znači da vi želite da vidite prekrivače za svaki fajl i imenik ispod putanje." #. (para) #: ../source/TortoiseGit_en.xml:11419 msgid "The same applies to the Include Paths. Except that for those paths the overlays are shown even if the overlays are disabled for that specific drive type, or by an exclude path specified above." msgstr "Isto se primenjuje na Uključi Putanje. Osim toga za te putanje prekrivači su prikazani čak ako su prekrivači onemogućeni za specifične tipove drajvova, ili isključenjem putanje specificirane gore." #. (para) #: ../source/TortoiseGit_en.xml:11424 msgid "" "Users sometimes ask how these three settings interact, and the definitive answer is: \n" "if (path is in include list)\n" " show overlays\n" "if (path is allowed drive type) AND (path is not in exclude list)\n" " show overlays\n" " The include list always makes the overlays show. Otherwise, overlays are shown for all marked drive types unless the path is excluded." msgstr "" "Korisnici ponekad pita kako ovo podešavanje stabla međusobno zavise, i definitivan odgovor je: \n" "if (path is in include list)\n" " show overlays\n" "if (path is allowed drive type) AND (path is not in exclude list)\n" " show overlays\n" " Lista uključivanja uvek čini da se prekrivači prikažu. Drugačije, prekrivači su prikazani za sve označene tipove drajvova osim putanje koja je isključena." #. (para) #: ../source/TortoiseGit_en.xml:11437 msgid "TSVNCache.exe also uses these paths to restrict its scanning. If you want it to look only in particular folders, disable all drive types and include only the folders you specifically want to be scanned." msgstr "TSVNCache.exe takođe koristi ove putanje da ograniči skeniranje. Ako želite da pogledate samo u pojedinačni imenik, onemogućite sve tipove drajvova i uključiti vaše specifične želje da budu skenirane. " #. (title) #: ../source/TortoiseGit_en.xml:11443 msgid "Exclude SUBST Drives" msgstr "Iskljućiti SUBST Drajvovi" #. (primary) #: ../source/TortoiseGit_en.xml:11445 msgid "SUBST drives" msgstr "SUBST diskovi" #. (para) #: ../source/TortoiseGit_en.xml:11447 msgid "" "It is often convenient to use a SUBST drive to access your working copies, e.g. using the command \n" "subst T: C:\\TortoiseGit\\trunk\\doc\n" " However this can cause the overlays not to update, as TSVNCache will only receive one notification when a file changes, and that is normally for the original path. This means that your overlays on the subst path may never be updated." msgstr "" "Često je običaj da se koristi SUBST drajv da pristupi vašim radnim kopijama, tj. koristeći komandu \n" "subst T: C:\\TortoiseGit\\trunk\\doc\n" " Međutim ovo može prouzrokovati prekrivanja nisu ažurirani, kao TSVNCache će samo primiti jednu notifikaciju kada se fajl izmeni, i to je normalno za originalnu putanju. Ovo znači da vaši prekrivači na subst putanji može biti da se nikad ne ažurira." #. (para) #: ../source/TortoiseGit_en.xml:11459 msgid "An easy way to work around this is to exclude the original path from showing overlays, so that the overlays show up on the subst path instead." msgstr "Lak način da se radi oko ovoga je da se isključi originalna putanja iz prikazanih prekrivača, tako prekrivači su prikazani na subst putanji umesto toga." #. (para) #: ../source/TortoiseGit_en.xml:11465 msgid "Sometimes you will exclude areas that contain working copies, which saves TSVNCache from scanning and monitoring for changes, but you still want a visual indication that such folders are versioned. The Show excluded folders as 'normal' checkbox allows you to do this. With this option, versioned folders in any excluded area (drive type not checked, or specifically excluded) will show up as normal and up-to-date, with a green check mark. This reminds you that you are looking at a working copy, even though the folder overlays may not be correct. Files do not get an overlay at all. Note that the context menus still work, even though the overlays are not shown." msgstr "Ponekad vi ćete isključiti polja koja sadrže radne kopije, koji čuva TSVNCache od skeniranja i nadgledanja za izmene, ali vi još uvek želite vizuelnu indikaciju tamo gde su takvi imenici verzionisani. Prikaži isključene imenike kao 'normalne' čekboksove dopušta vam da uradite ovo. Sa ovom opcijom, verzionisani imenici u bilo kojoj isključenoj oblasti (tip drrajva nije čekiran, ili je specifično isključen) će prikazati kao normalno i savremen, sa zelenom ček oznakom. Ovo vas podseća da gledate radnu kopiju, čak ako imenik prekrivači ne moraju biti korektni. Fajlovi uopšte ne dobijaju prekrivače. Primetimo da kontekst meniji još rade, čak i ako prekrivači nisu uključeni." #. (para) #: ../source/TortoiseGit_en.xml:11478 msgid "As a special exception to this, drives A: and B: are never considered for the Show excluded folders as 'normal' option. This is because Windows is forced to look on the drive, which can result in a delay of several seconds when starting Explorer, even if your PC does have a floppy drive." msgstr "Kao specijalni izuzetak na to, drajvi A: i B: se nikad ne uzimaju u obzir za Prikaži isključene imnjnike kao 'normalan' opciju. Ovo se zbog Vindouza forsirano da gleda na drajv, što može prouzrokovati kašnjenje od nekoliko sekundi kada se pokrene Eksplorer, čak ako vaš PC ima flopi drajv." #. (title) #: ../source/TortoiseGit_en.xml:11487 msgid "Icon Set Selection" msgstr "Skup podešavanja ikona" #. (title) #: ../source/TortoiseGit_en.xml:11491 msgid "The Settings Dialog, Icon Set Page" msgstr "Dijalog podešavanja, Podešavanje ikona stranica" #. (para) #: ../source/TortoiseGit_en.xml:11489 msgid " You can change the overlay icon set to the one you like best. Note that if you change overlay set, you may have to restart your computer for the changes to take effect." msgstr "e Možete izmeniti podešavanje pokrivne ikone na ono što najviše volite. Primetimo da ako izmenimo podešavanje pokrivanja, možete restartovati vaš računar da bi izmene postale efikasne." #. (title) #: ../source/TortoiseGit_en.xml:11502 msgid "Network Settings" msgstr "Mrežna podešavanja" #. (primary) #: ../source/TortoiseGit_en.xml:11504 msgid "proxy server" msgstr "proksi server" #. (title) #: ../source/TortoiseGit_en.xml:11508 msgid "The Settings Dialog, Network Page" msgstr "Dijalog podešavanja, Mrežna stranica" #. (para) #: ../source/TortoiseGit_en.xml:11506 msgid " Here you can configure your proxy server, if you need one to get through your company's firewall." msgstr " Ovde možete konfigurisat vaš proksi server, ako vam treba da provlačite kroz fajervol vaše kompanije." #. (para) #: ../source/TortoiseGit_en.xml:11514 msgid "If you need to set up per-repository proxy settings, you will need to use the Git servers file to configure this. Use Edit to get there directly. Consult the Runtime Configuration Area for details on how to use this file." msgstr "Ako vam je potrebno da podesite po-spremištu proksi podešavanja, potrebno je da koristite Subverzioni server fajl da konfiguriše ovo. Koristi Uredi da dobiješ to direktno. Konsultujte Runtime Configuration Area za detalje kako koristiti ovaj fajl." #. (para) #: ../source/TortoiseGit_en.xml:11524 msgid "You can also specify which program TortoiseGit should use to establish a secure connection to a svn+ssh repository. We recommend that you use TortoisePlink.exe. This is a version of the popular Plink program, and is included with TortoiseGit, but it is compiled as a Windowless app, so you don't get a DOS box popping up every time you authenticate." msgstr "Možete takođe specificirati koji program TortoiseGit treba da koristi da postavi sigurnu vezu ka svn+ssh spremišta. Preporučujemo da koristite TortoisePlink.exe. Ovo je verzija popularnog Plink programa, i uključeno je sa TortoiseGit, ali to je kompajlirano kao Vindouzbez aplikacija, tako da ne možete dobiti DOS boks koji iskače svaki put kada se prijavljujete." #. (para) #: ../source/TortoiseGit_en.xml:11532 msgid "" "You must specify the full path to the executable. For TortoisePlink.exe this is the standard TortoiseGit bin directory. Use the Browse button to help locate it. Note that if the path contains spaces, you must enclose it in quotes, e.g. \n" "\"C:\\Program Files\\TortoiseGit\\bin\\TortoisePlink.exe\"\n" "" msgstr "" "Morate specificirati punu putanju za izvršne programe. Za TortoisePlink.exe ovo je standardni TortoiseGit bin imenik. Koristite Pretraži dugme kao pomoć da se nađe. Primetimo to da ako putanja sadrži prazna polja, morate zaokružiti navodnicima, npr. \n" "\"C:\\Program Files\\TortoiseGit\\bin\\TortoisePlink.exe\"\n" "" #. (para) #: ../source/TortoiseGit_en.xml:11542 msgid "One side-effect of not having a window is that there is nowhere for any error messages to go, so if authentication fails you will simply get a message saying something like Unable to write to standard output. For this reason we recommend that you first set up using standard Plink. When everything is working, you can use TortoisePlink with exactly the same parameters." msgstr "Jedan ivični-efekat koji nema prozor je to da nema nigde da ode bilo kakva poruka greške, tako ako autentifikacija ne uspe vi ćete jednostavno dobiti poruku koja kaže nešto kao Nesposoban da piše na standardnom izlazu. Iz ovog razloga preporučujemo da najpre izvršite podešavanje koristeći standardni Plink. Kada sve radi, možete koristiti TortoisePlink sa tačno istim parametrima." #. (para) #: ../source/TortoiseGit_en.xml:11551 msgid "TortoisePlink does not have any documentation of its own because it is just a minor variant of Plink. Find out about command line parameters from the PuTTY website" msgstr "TortoisePlink nema nikakvu dokumentaciju o sebi zato što je minorna varijanta Plinka. Nađite o parametrima komandne linije na PuTTY website" #. (para) #: ../source/TortoiseGit_en.xml:11559 msgid "To avoid being prompted for a password repeatedly, you might also consider using a password caching tool such as Pageant. This is also available for download from the PuTTY website." msgstr "Da bi izbegli da budete pitani za lozinku neprestano možete takođe razmotriti koristeći alat nalaženja lozinke kao Pageant. Ovo je takođe dozvoljeno za skidanje sa PuTTY vebsajta." #. (para) #: ../source/TortoiseGit_en.xml:11564 msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under Git/TortoiseGit SSH How-To." msgstr "Na kraju, podešavanje SSH na serveru i klijentima je ne-trivijalan proces koji je van interesa ovog fajla pomoći. Međutim, možete naći vodič u TortoiseGit ČPP izlistanih pod Git/TortoiseGit SSH How-To." #. (title) #: ../source/TortoiseGit_en.xml:11574 msgid "External Program Settings" msgstr "Spoljašnji program podešavanja" #. (title) #: ../source/TortoiseGit_en.xml:11577 msgid "The Settings Dialog, Diff Viewer Page" msgstr "Dijalog podešavanja, Razl pregledač stranica" #. (para) #: ../source/TortoiseGit_en.xml:11575 msgid " Here you can define your own diff/merge programs that TortoiseGit should use. The default setting is to use TortoiseMerge which is installed alongside TortoiseGit." msgstr " Ovde možete definisati vaš lični diff/stopi programi koje TortoiseGit treba da koristi. Uobičajeno podešavanje je da se koristi TortoiseMerge koji je instaliran kad i TortoiseGit." #. (para) #: ../source/TortoiseGit_en.xml:11585 msgid "Read for a list of some of the external diff/merge programs that people are using with TortoiseGit." msgstr "Pročitajte xref linkend=\"tsvn-dug-diff-tools\"/> za listu nekih od spoljašnjih diff/stopi programa koje ljudi koriste sa TortoiseGit." #. (title) #: ../source/TortoiseGit_en.xml:11590 msgid "Diff Viewer" msgstr "Razl pregledač" #. (para) #: ../source/TortoiseGit_en.xml:11605 msgid "The original file without your changes" msgstr "Originalan fajl bez vaših izmena" #. (para) #. (para) #: ../source/TortoiseGit_en.xml:11613 #: ../source/TortoiseGit_en.xml:11722 msgid "The window title for the base file" msgstr "Vindouz naslov osnovnog fajla" #. (para) #: ../source/TortoiseGit_en.xml:11621 msgid "Your own file, with your changes" msgstr "Vaš lični fajl, sa vašim izmenama" #. (para) #. (para) #: ../source/TortoiseGit_en.xml:11629 #: ../source/TortoiseGit_en.xml:11738 msgid "The window title for your file" msgstr "Vindouz naslov za vaš fajl" #. (para) #: ../source/TortoiseGit_en.xml:11592 msgid "An external diff program may be used for comparing different revisions of files. The external program will need to obtain the filenames from the command line, along with any other command line options. TortoiseGit uses substitution parameters prefixed with %. When it encounters one of these it will substitute the appropriate value. The order of the parameters will depend on the Diff program you use. " msgstr "Spoljašnji diff program može biti korišten za poređenje revizija fajlova. Sponjašnji programi će tražiti da dobijete fajlime iz komandne linije, zajedno sa svakom drugom opcijom komande. TortoiseGit koristi parametre zamene sa prefiksom %. Kada se uoči jedan od tih koji će biti zamenjeni odgovarajućom vrednošću. Red parametara će zavisiti na Diff programe koje koristite. " #. (para) #: ../source/TortoiseGit_en.xml:11636 msgid "The window titles are not pure filenames. TortoiseGit treats that as a name to display and creates the names accordingly. So e.g. if you're doing a diff from a file in revision 123 with a file in your working copy, the names will be filename : revision 123 and filename : working copy" msgstr "Naslov prozora nije čisto fajlime. TortoiseGit tretira to kao ime da prikaže i kreira imena u skladu sa tim. Tako npr. ako radite sa diff sa fajlom u reviziji 123 sa fajlom u vašoj radnoj kopiji, imena će biti filename : revision 123 i filename : working copy" #. (para) #: ../source/TortoiseGit_en.xml:11646 msgid "" "For example, with ExamDiff Pro: \n" "C:\\Path-To\\ExamDiff.exe %base %mine --left_display_name:%bname\n" " --right_display_name:%yname\n" " or with KDiff3: \n" "C:\\Path-To\\kdiff3.exe %base %mine --L1 %bname --L2 %yname\n" " or with WinMerge: \n" "C:\\Path-To\\WinMerge.exe -e -ub -dl %bname -dr %yname %base %mine\n" " or with Araxis: \n" "C:\\Path-To\\compare.exe /max /wait /title1:%bname /title2:%yname\n" " %base %mine\n" "" msgstr "" "Na primer, sa EgzamDiffPro: \n" "C:\\Path-To\\ExamDiff.exe %base %mine --left_display_name:%bname\n" " --right_display_name:%yname\n" " or with KDiff3: \n" "C:\\Path-To\\kdiff3.exe %base %mine --L1 %bname --L2 %yname\n" " or with WinMerge: \n" "C:\\Path-To\\WinMerge.exe -e -ub -dl %bname -dr %yname %base %mine\n" " or with Araxis: \n" "C:\\Path-To\\compare.exe /max /wait /title1:%bname /title2:%yname\n" " %base %mine\n" "" #. (para) #: ../source/TortoiseGit_en.xml:11666 msgid "If you use the svn:keywords property to expand keywords, and in particular the revision of a file, then there may be a difference between files which is purely due to the current value of the keyword. Also if you use svn:eol-style = native the BASE file will have pure LF line endings whereas your file will have CR-LF line endings. TortoiseGit will normally hide these differences automatically by first parsing the BASE file to expand keywords and line endings before doing the diff operation. However, this can take a long time with large files. If Convert files when diffing against BASE is unchecked then TortoiseGit will skip pre-processing the files." msgstr "Ako koristite svn:keywords osobinu da proširite ključne reči i u posebnoj reviziji fajla, zatim ovde može biti razlika između fajlova koji su čisto podesni za tekuću vrednost ključne reči. Takođe vi koristite svn:eol-style = native OSNOVNI fajl će imati čist LF završetak linije dok vaš fajl ima CR-LF kraj linije. TortoiseGit će normalno sakriti ove razlike automatski najpre analizirajući OSNOVNI fajl da prošire ključne reči i kraj linije pre izvršenja diff operacije. Međutim, ovo može uzeti puno vremena sa velikim fajlovima. Ako Konvertuj fajlove kada se pravi razlika prema OSNOVI je otčekirano zatim TortoiseGit će preskočiti preprocesiranje fajlova." #. (para) #: ../source/TortoiseGit_en.xml:11680 msgid "You can also specify a different diff tool to use on Git properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer." msgstr "Možete takođe specifirati različit diff alat da koriste Subverzione osobine. Kako ovo teži da bude skraćen jednostavan tekst string, vi možete želeti jednostavno mnogo kompaktniji pregled." #. (para) #: ../source/TortoiseGit_en.xml:11685 msgid "If you have configured an alternate diff tool, you can access TortoiseMerge and the third party tool from the context menus. Context menuDiff uses the primary diff tool, and Shift+ Context menuDiff uses the secondary diff tool." msgstr "Ako ste konfigurisali alternativni diff alat, možete pristupiti TortoiseMerge i alatu trećeg lica iz kontekst menija. Kontekst meniDiff koristi primarni diff alt, a Shift+ Kontekst meniDiff koristi sekundarni diff alat." #. (title) #: ../source/TortoiseGit_en.xml:11703 msgid "Merge Tool" msgstr "Alat spajanja" #. (para) #: ../source/TortoiseGit_en.xml:11713 msgid "the original file without your or the others changes" msgstr "Originalni fajl bez vaših ili drugih izmena" #. (para) #: ../source/TortoiseGit_en.xml:11730 msgid "your own file, with your changes" msgstr "vaš lični fajl, sa vašim izmenama" #. (para) #: ../source/TortoiseGit_en.xml:11746 msgid "the file as it is in the repository" msgstr "fajl kakav je u spremištu" #. (para) #: ../source/TortoiseGit_en.xml:11754 msgid "The window title for the file in the repository" msgstr "Vindouz naslov fajla u spremištu" #. (para) #: ../source/TortoiseGit_en.xml:11762 msgid "the conflicted file, the result of the merge operation" msgstr "fajl sa konfliktom, rezultat operacije sajanja" #. (para) #: ../source/TortoiseGit_en.xml:11771 msgid "The window title for the merged file" msgstr "Vindouz naslov za stopljen fajl" #. (para) #: ../source/TortoiseGit_en.xml:11705 msgid "An external merge program used to resolve conflicted files. Parameter substitution is used in the same way as with the Diff Program. " msgstr "Eksterni program za stapanje koristi se da reši konfliktne fajlove. Parametar substitucije se koristi na isti način kao sa Diff Programom. " #. (para) #: ../source/TortoiseGit_en.xml:11778 msgid "" "For example, with Perforce Merge: \n" "C:\\Path-To\\P4Merge.exe %base %theirs %mine %merged\n" " or with KDiff3: \n" "C:\\Path-To\\kdiff3.exe %base %mine %theirs -o %merged\n" " --L1 %bname --L2 %yname --L3 %tname\n" " or with Araxis: \n" "C:\\Path-To\\compare.exe /max /wait /3 /title1:%tname /title2:%bname\n" " /title3:%yname %theirs %base %mine %merged /a2\n" " or with WinMerge (2.8 or later): \n" "C:\\Path-To\\WinMerge.exe %merged\n" "" msgstr "" "Na primer, sa Perforce Merge: \n" "C:\\Path-To\\P4Merge.exe %base %theirs %mine %merged\n" " or with KDiff3: \n" "C:\\Path-To\\kdiff3.exe %base %mine %theirs -o %merged\n" " --L1 %bname --L2 %yname --L3 %tname\n" " or with Araxis: \n" "C:\\Path-To\\compare.exe /max /wait /3 /title1:%tname /title2:%bname\n" " /title3:%yname %theirs %base %mine %merged /a2\n" " or with WinMerge (2.8 or later): \n" "C:\\Path-To\\WinMerge.exe %merged\n" "" #. (title) #: ../source/TortoiseGit_en.xml:11800 msgid "Diff/Merge Advanced Settings" msgstr "Razl/Stopi napredno podešavanje" #. (title) #: ../source/TortoiseGit_en.xml:11804 msgid "The Settings Dialog, Diff/Merge Advanced Dialog" msgstr "Dijalog podešavanja, Razl/Stopi napredni dijalog" #. (para) #: ../source/TortoiseGit_en.xml:11802 msgid " In the advanced settings, you can define a different diff and merge program for every file extension. For instance you could associate Photoshop as the Diff Program for .jpg files :-) You can also associate the svn:mime-type property with a diff or merge program." msgstr " U naprednom podešavanju, možete definisati različite diff i stopi programe za svaku ekstenziju fajla. Na primer možete pridružiti Fotošop kao DiffProgram za .jpg fajlove :-) Takođe pridružite svn:mime-type osobinu sa diff ili stopi programom." #. (para) #: ../source/TortoiseGit_en.xml:11813 msgid "To associate using a file extension, you need to specify the extension. Use .bmp to describe Windows bitmap files. To associate using the svn:mime-type property, specify the mime type, including a slash, for example text/xml." msgstr "Da pridružite korišćenjem ekstenziju fajla, potrebno vam je da specificirate ekstenziju. Koristite .bmp da opišete Vindouz bitmap fajlove. Da pridružite svn:mime-type osobinu, specificirajte mime tip, uključujući kosu crtu, na primer text/xml." #. (title) #: ../source/TortoiseGit_en.xml:11822 msgid "Unified Diff Viewer" msgstr "Objedinjeni Razl pregledač" #. (para) #: ../source/TortoiseGit_en.xml:11824 msgid "A viewer program for unified-diff files (patch files). No parameters are required. The Default option is to check for a file association for .diff files, and then for .txt files. If you don't have a viewer for .diff files, you will most likely get NotePad." msgstr "Program pregledač za ujedinjen-diff fajlve 8fajlove zakrpa). Nisu parametri potrebni. Uobičajena opcija je da se čekira pridruživanje za .diff fajlove, i zatim za .txt fajlove. Ako nemate pregledač za .diff fajlove, možda će vam se dopasti NotePad." #. (para) #: ../source/TortoiseGit_en.xml:11833 msgid "The original Windows NotePad program does not behave well on files which do not have standard CR-LF line-endings. Since most unified diff files have pure LF line-endings, they do not view well in NotePad. However, you can download a free NotePad replacement Notepad2 which not only displays the line-endings correctly, but also colour codes the added and removed lines." msgstr "Originalni Vindouz NotePad program nije dobar za fajlove koji nemaju standardni CR-LF završetak-linija. Kako većina ujedinjeni diff fajlovi imaju čist LF završetak-linije, oni se neće videti dobro u NotePad. Međutim, možete skinuti besplatnu zamenu NotePad Notepad2 koji ne prikazuje samo kraj-linije korektno, već takođe bojama kodira dodate i uklonjene linije." #. (title) #: ../source/TortoiseGit_en.xml:11849 msgid "Saved Data Settings" msgstr "Sčvani podaci podešavanje" #. (title) #: ../source/TortoiseGit_en.xml:11852 msgid "The Settings Dialog, Saved Data Page" msgstr "Dijalog podešavanja, Sačuvani podaci stranica" #. (para) #: ../source/TortoiseGit_en.xml:11850 msgid " For your convenience, TortoiseGit saves many of the settings you use, and remembers where you have been lately. If you want to clear out that cache of data, you can do it here." msgstr " Za vašu udobnost, TortoiseGit čuva većinu podešavanja koje koristite, i pamti pređašnje stanje. Ako želite da obrišete keš podataka to možete uraditi ovde." #. (term) #: ../source/TortoiseGit_en.xml:11861 msgid "URL history" msgstr "URL istorija" #. (para) #: ../source/TortoiseGit_en.xml:11863 msgid "Whenever you checkout a working copy, merge changes or use the repository browser, TortoiseGit keeps a record of recently used URLs and offers them in a combo box. Sometimes that list gets cluttered with outdated URLs so it is useful to flush it out periodically." msgstr "Kadgod preuzmete radnu kopiju, stopite izmene ili koristite pretraživač spremišta, TortoiseGit čuva zapis o skorašnje korišćenom URL i nudi ga u kombo boksu. Ponekad taj list postaje blokiran sa zastarelim URL tako da je korisno da se periodično osveži." #. (para) #: ../source/TortoiseGit_en.xml:11870 msgid "If you want to remove a single item from one of the combo boxes you can do that in-place. Just click on the arrow to drop the combo box down, move the mouse over the item you want to remove and type Shift+Del." msgstr "Ako želite da uklonite pojedinačnu stavku iz jednog od kombo boksova možete to uraditi na licu mesta. Samo kliknite na strelicu da svučete kombo boks, pomerite miša na stavku koju želite da uklonite i otkucajte Shift+Del." #. (term) #: ../source/TortoiseGit_en.xml:11879 msgid "Log messages (Input dialog)" msgstr "Poruke dnevnika (Ulazni dijalog)" #. (para) #: ../source/TortoiseGit_en.xml:11881 msgid "TortoiseGit stores recent commit log messages that you enter. These are stored per repository, so if you access many repositories this list can grow quite large." msgstr "TortoiseGit čuva skorašnje dnevnik poruke urezivanja koje ste uneli. One su sačuvane u spremištu, tako da ako pristupate ka više spremišta ova lista može porasti jako mnogo." #. (term) #: ../source/TortoiseGit_en.xml:11889 msgid "Log messages (Show log dialog)" msgstr "Poruke dnevnika (Prikaži dijalog dnevnika)" #. (para) #: ../source/TortoiseGit_en.xml:11891 msgid "TortoiseGit caches log messages fetched by the Show Log dialog to save time when you next show the log. If someone else edits a log message and you already have that message cached, you will not see the change until you clear the cache. Log message caching is enabled on the Log Cache tab." msgstr "TortoiseGit kešira dnevnik poruke nađene u Prikaži Dnevnik dijalogu da sačuva vreme kada sledeći put prikazijete dnevnik. Ako još neko uređuje dnevnik poruka i vi takođe imate keširanu poruku, nećete videti izmenu sve dik ne obrišete keš. Dnevnik poruka keširanje je omogućeno na Dnevnik Keš tab. " #. (term) #: ../source/TortoiseGit_en.xml:11902 msgid "Dialog sizes and positions" msgstr "Dijalog veličina i pozicije" #. (para) #: ../source/TortoiseGit_en.xml:11904 msgid "Many dialogs remember the size and screen position that you last used." msgstr "Mnogi dijalozi pamte veličinu i poziciju ekrana koji ste zadnji put koristili." #. (term) #: ../source/TortoiseGit_en.xml:11911 msgid "Authentication data" msgstr "Autentifikacioni podatak" #. (para) #: ../source/TortoiseGit_en.xml:11913 msgid "When you authenticate with a Git server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?" msgstr "Kada se autentifikujete na Subverzioni server, korisničko ime i lozinka se keširaju lokalno tako da ne morate da ih unosite. Možete želeti da obrišete ovo iz sigurnosnih razloga, ili zato što želite da pristupite spremištu pod drugim korisničkim imenom ... da li DŽon zna da vi koristite njegov PC?" #. (para) #: ../source/TortoiseGit_en.xml:11920 msgid "If you want to clear authentication data for one particular server only, read for instructions on how to find the cached data." msgstr "Ako želite da obrišete autentifikacione podatke samo za jedan poseban server, pročitajte za instrukcije kako da nađete keširane podatke." #. (term) #: ../source/TortoiseGit_en.xml:11928 msgid "Action log" msgstr "Dnevnik akcija" #. (para) #: ../source/TortoiseGit_en.xml:11930 msgid "TortoiseGit keeps a log of everything written to its progress dialogs. This can be useful when, for example, you want to check what happened in a recent update command." msgstr "TortoiseGit čuva dnevnik svega napisanog u progres dijalogu. Ovo može biti korisno kada, na primer, želite da proverite šta se dešava u skoroj komandi ažuriranja." #. (para) #: ../source/TortoiseGit_en.xml:11935 msgid "The log file is limited in length and when it grows too big the oldest content is discarded. By default 4000 lines are kept, but you can customize that number." msgstr "Dnevnik fajl je ograničene dužine i kada poraste mnogo veliki stariji sadržaj se odbacuje. Uobičajeno je da se 4000 linija čuva, ali možete podesiti taj broj." #. (para) #: ../source/TortoiseGit_en.xml:11940 msgid "From here you can view the log file content, and also clear it." msgstr "Odavde možete videti sadržaj dnevnik fajla, i takođe ga obrisati." #. (title) #: ../source/TortoiseGit_en.xml:11949 msgid "Log Caching" msgstr "Keš dnevnika" #. (primary) #: ../source/TortoiseGit_en.xml:11951 msgid "log cache" msgstr "keš dnevnika" #. (title) #: ../source/TortoiseGit_en.xml:11955 msgid "The Settings Dialog, Log Cache Page" msgstr "Dijalog podešavanja, Keš dnevnika stranica" #. (para) #: ../source/TortoiseGit_en.xml:11953 msgid " This dialog allows you to configure the log caching feature of TortoiseGit, which retains a local copy of log messages and changed paths to avoid time-consuming downloads from the server. Using the log cache can dramatically speed up the log dialog and the revision graph. Another useful feature is that the log messages can still be accessed when offline." msgstr " Ovaj dijalog vam omogućava da konfigurišete dnevnik keš osobine TortoiseGit, koje čuvaju lokalnu kopiju dnebnik poruka i izmenjenih putanja da se izbegne vremenski-zahtevno skidanje sa servera. Koristeći dnevnik keš može dramatično ubrzati dnevnik dijalog i revizioni graf. Sledeća korisna osobina je da dnevnik poruka može biti kontaktiran kada niste povezani." #. (term) #: ../source/TortoiseGit_en.xml:11968 msgid "Enable log caching" msgstr "Omogući keš dnevnika" #. (para) #: ../source/TortoiseGit_en.xml:11970 msgid "Enables log caching whenever log data is requested. If checked, data will be retrieved from the cache when available, and any messages not in the cache will be retrieved from the server and added to the cache." msgstr "Omogućava dnevnik keširanje kadgod su dnevnik podaci zatraženi. Ako je proveren, podaci će biti vraćeni iz keša ako su dostupni, i ako bilo koja poruka nije u kešu biće uzeta sa servera i dodata kešu." #. (para) #: ../source/TortoiseGit_en.xml:11976 msgid "If caching is disabled, data will always be retrieved directly from the server and not stored locally." msgstr "Ako je keširanje onemogućeno, podaci će uvek biti uzeti direktno sa servera i neće biti sačuvano lokalno." #. (term) #: ../source/TortoiseGit_en.xml:11983 msgid "If the repository cannot be contacted" msgstr "Ako spremište ne može biti spojeno" #. (para) #: ../source/TortoiseGit_en.xml:11985 msgid "If you are working offline, or if the repository server is down, the log cache can still be used to supply log messages already held in the cache. Of course the cache may not be up-to-date, so there are options to allow you to select whether this feature should be used." msgstr "Ako radite van linije, ili ako je spremište palo, dnevnik keš može još biti korišćen da snabde dnevnik poruke koje se već drže u kešu. Svakako keš ne mora biti ažuran, tako postoje opcije da dozvole da izaberete da li treba ovu osobinu da koristite." #. (para) #: ../source/TortoiseGit_en.xml:11992 msgid "When log data is being taken from the cache without contacting the server, the dialog using those message will show the offline state in its title bar." msgstr "Kada se dnevnik podaci uzmu iz keša bez kontaktiranja servera, dijalog koji koristi te poruke će prikazati isključeno stanje na naslovnom pultu." #. (term) #: ../source/TortoiseGit_en.xml:12000 msgid "Timeout before updating the HEAD revision" msgstr "Isteklo vreme pre ažuriranja GLAVNE revizije" #. (para) #: ../source/TortoiseGit_en.xml:12002 msgid "When you invoke the log dialog you will normally want to contact the server to check for any newer log messages. If the timeout set here is non-zero then the server will only be contacted when the timeout has elapsed since the last time contact. This can reduce server round-trips if you open the log dialog frequently and the server is slow, but the data shown may not be completely up-to-date. If you want to use this feature we suggest using a value of 300 (5 minutes) as a compromise." msgstr "Kada pozovete dnevnik dijalog normalno ćete želeti da kontaktirate server da proverite za neku novu dnevnik poruku. Ako je postavljeno granično vreme veće od nule server će samo biti kontaktiran kada prođe ograničeno vreme od zadnjeg vremena kontakta. Ovo može redukovati serverov obilazak ako otvarate dnevnik dijalog često a server je spor, ali prikazani podaci ne moraju biti kompletno ažurirani. Ako želite da koristite ovu osobinu preporučujemo vam vrednost 300 (5 minuta) kao kompromis." #. (para) #: ../source/TortoiseGit_en.xml:12017 msgid "Below the settings you can see a list of the repositories that are cached locally, and the space used for the cache. If you select one of the repositories you can then use the buttons underneath." msgstr "Ispod podešavanja možete videti listu spremišta lokalno keširanih, i prostor korišćen za keš. Ako izaberete jedno od spremišta možete tada koristiti skrivene dugmiće." #. (title) #: ../source/TortoiseGit_en.xml:12024 msgid "Log Cache Statistics" msgstr "Statistika keša dnevnika" #. (title) #: ../source/TortoiseGit_en.xml:12027 msgid "The Settings Dialog, Log Cache Statistics" msgstr "Dijalog podešavanja, Keš dnevnika statistika" #. (term) #: ../source/TortoiseGit_en.xml:12036 msgid "RAM" msgstr "RAM" #. (para) #: ../source/TortoiseGit_en.xml:12038 msgid "The amount of memory required to service this cache." msgstr "Iznos memorije potrebne za opsluživanje keša" #. (term) #: ../source/TortoiseGit_en.xml:12044 msgid "Disk" msgstr "Disk" #. (para) #: ../source/TortoiseGit_en.xml:12046 msgid "The amount of disk space used for the cache. Data is compressed, so disk usage is generally fairly modest." msgstr "Iznos prostora na disku korišćen za keš. Podaci su komprimovani, tako da je korišćenje diska generalno sasvim skromno." #. (term) #: ../source/TortoiseGit_en.xml:12053 msgid "Connection" msgstr "Veza" #. (para) #: ../source/TortoiseGit_en.xml:12055 msgid "Shows whether the repository was available last time the cache was used." msgstr "Prikazuje da li je spremište dostupno zadnji put kada je keš korišćen" #. (term) #: ../source/TortoiseGit_en.xml:12062 msgid "Last update" msgstr "Zadnje ažuriranje" #. (para) #: ../source/TortoiseGit_en.xml:12064 msgid "The last time the cache content was changed." msgstr "Poslednji put kada je promenjen sadržaj keša" #. (term) #: ../source/TortoiseGit_en.xml:12070 msgid "Last head update" msgstr "Zadnje glavno ažuriranje" #. (para) #: ../source/TortoiseGit_en.xml:12072 msgid "The last time we requested the HEAD revision from the server." msgstr "Poslednje vreme zahteva GLAVNE revizije sa servera." #. (term) #: ../source/TortoiseGit_en.xml:12079 msgid "Authors" msgstr "Autori" #. (para) #: ../source/TortoiseGit_en.xml:12081 msgid "The number of different authors with messages recorded in the cache." msgstr "Broj različitih autora sa porukama zabeleženim u kešu." #. (term) #: ../source/TortoiseGit_en.xml:12088 msgid "Paths" msgstr "Putanje" #. (para) #: ../source/TortoiseGit_en.xml:12090 msgid "The number of paths listed, as you would see using svn log -v." msgstr "Broj putanja izlistanih, kao što možete videti koristeći svn log -v." #. (term) #: ../source/TortoiseGit_en.xml:12097 msgid "Skip ranges" msgstr "Preskoči raspone" #. (para) #: ../source/TortoiseGit_en.xml:12099 msgid "The number of revision ranges which we have not fetched, simply because they haven't been requested. This is a measure of the number of holes in the cache." msgstr "Broj opsega revizija koji nisu nađeni, jednostavno zato zato što nisu traženi." #. (term) #: ../source/TortoiseGit_en.xml:12107 msgid "Max revision" msgstr "Maks. revizija" #. (para) #: ../source/TortoiseGit_en.xml:12109 msgid "The highest revision number stored in the cache." msgstr "Najviši revizioni broj smešten u keš." #. (term) #: ../source/TortoiseGit_en.xml:12115 msgid "Revision count" msgstr "Broj revizija" #. (para) #: ../source/TortoiseGit_en.xml:12117 msgid "The number of revisions stored in the cache. This is another measure of cache completeness." msgstr "Broj revizija sačuvanih u kešu. Ovo je druga mera kompletnosti keša." #. (para) #: ../source/TortoiseGit_en.xml:12025 msgid " Click on the Details button to see detailed statistics for a particular cache. Many of the fields shown here are mainly of interest to the developers of TortoiseGit, so they are not all described in detail. " msgstr " Kliknite na Detalji dugme da vidite detaljnu statistiku za partikularni keš. Mnoga od polja prikazana ovde su uglavnom od onteresa za razvojni tim TortoiseGit, tako da svi nisu opisani dataljno." #. (para) #: ../source/TortoiseGit_en.xml:12126 msgid "Click on the Update to completely refresh the cache and fill in any holes. For a large repository this could be very time consuming, but useful if you are about to go offline and want the best available cache." msgstr "Kliknite na Ažuriraj da kompletirate osvežavanje keša i popunite nek praznine. Za velika spremišta ovo će uzeti mnogo vremena, ali je korisno ako ako nameravate da radite bez veze i želite potpuno dostupan keš." #. (para) #: ../source/TortoiseGit_en.xml:12132 msgid "Click on the Export button to export the entire cache as a set of CSV files. This could be useful if you want to process the log data using an external program, although it is mainly useful to the developers." msgstr "Kliknite na Izvezi dugme da izvezete ceo keš kao skup CVS fajlova. Ovo bi bilo korisno ako želite da procesirate dnevnik podataka koristeći spoljašnji program, takođe to je uglavnom korisno razvojnom timu." #. (para) #: ../source/TortoiseGit_en.xml:12138 msgid "Click on Delete to remove all cached data for the selected repositories. This does not disable caching for the repository so the next time you request log data, a new cache will be created." msgstr "Kliknite na Obriši da uklonite sve keširane podatke za izabrno spremište. Ovo ne onemogućava keširanje za spremište tako da sledeće put kada tražite podatke dnevnika, kreiraće se novi keš." #. (title) #: ../source/TortoiseGit_en.xml:12145 msgid "Client Side Hook Scripts" msgstr "Zakačiv skript klijentske strane" #. (primary) #: ../source/TortoiseGit_en.xml:12149 msgid "client hooks" msgstr "klijentska zakačaljka" #. (title) #: ../source/TortoiseGit_en.xml:12156 msgid "The Settings Dialog, Hook Scripts Page" msgstr "Dijalog podešavanja, Zakačiv skript stranica" #. (para) #: ../source/TortoiseGit_en.xml:12154 msgid " This dialog allows you to set up hook scripts which will be executed automatically when certain Git actions are performed. As opposed to the hook scripts explained in , these scripts are executed locally on the client." msgstr " Ovaj dijalog omogućava da podesite zakačive skripte koje će se izvršiti automatski kada se izvesne Subverzione akcije izvršavaju. Suprotno zakačivim skriptama objašnjenim u , ove skripte se izvršavaju lokalno na klijentu." #. (para) #: ../source/TortoiseGit_en.xml:12164 msgid "One application for such hooks might be to call a program like SubWCRev.exe to update version numbers after a commit, and perhaps to trigger a rebuild." msgstr "Jedna aplikacija za takve zakačaljke može biti pozivanje programa kao SubWCRev.exe da se ažurira broj verzije posle urezivanja, i možda da se pokrene reizrada." #. (para) #: ../source/TortoiseGit_en.xml:12169 msgid "For various security and implementation reasons, hook scripts are defined locally on a machine, rather than as project properties. You define what happens, no matter what someone else commits to the repository. Of course you can always choose to call a script which is itself under version control." msgstr "Zbog različitih sigurnosnih i primenljivih razloga, zakačive skripte su definisane lokalno na mašini, radije nego osobine projekta. Definišite šta će se desiti, nije važno što još neko urezije u spremište. Svakako uvek možete izabrati da zovete skript koji je sam pod kontrolom verzija. " #. (title) #: ../source/TortoiseGit_en.xml:12177 msgid "The Settings Dialog, Configure Hook Scripts" msgstr "Dijalog podešavanja, Konfiguracija zakačivog skripta" #. (para) #: ../source/TortoiseGit_en.xml:12175 msgid " To add a new hook script, simply click Add and fill in the details." msgstr " Da bi se dodala zakačiva skripta, jednostavno kliknite Dodaj i popunite detalje." #. (term) #. (term) #: ../source/TortoiseGit_en.xml:12187 #: ../source/TortoiseGit_en.xml:12260 msgid "Start-commit" msgstr "Start-urezivanja" #. (para) #: ../source/TortoiseGit_en.xml:12189 msgid "Called before the commit dialog is shown. You might want to use this if the hook modifies a versioned file and affects the list of files that need to be committed and/or commit message. However you should note that because the hook is called at an early stage, the full list of objects selected for commit is not available." msgstr "Pozvan pre nego se pojavi dijalog urezivanja. Možete žieleti da koristite ovo ako zakačaljke menjaju verzionisane fajlove i utiču na listu fajlova koji zahtevaju da budu urezani i/ili poruku urezivanja. Međutim treba da primetite to zato što je zakačaljka pozvana na ranijoj etapi, puna lista izabranih objekata za urezivanje nije dostupna." #. (term) #. (term) #: ../source/TortoiseGit_en.xml:12200 #: ../source/TortoiseGit_en.xml:12264 msgid "Pre-commit" msgstr "Pre-urezivanje" #. (para) #: ../source/TortoiseGit_en.xml:12202 msgid "Called after the user clicks OK in the commit dialog, and before the actual commit begins. This hook has a list of exactly what will be committed." msgstr "Pozvan posle korisnikovog klika na OK u dijalogu urezivanja, i pre nego počne aktuelno urezivanje. Ova zakačaljka ima listu šta će se tačno urezati." #. (term) #. (term) #: ../source/TortoiseGit_en.xml:12210 #: ../source/TortoiseGit_en.xml:12268 msgid "Post-commit" msgstr "Post-urezivanje" #. (para) #: ../source/TortoiseGit_en.xml:12212 msgid "Called after the commit finishes (whether successful or not)." msgstr "Poziva se posle završetka urezivanja (bilo da je uspešno ili ne)." #. (term) #. (term) #: ../source/TortoiseGit_en.xml:12218 #: ../source/TortoiseGit_en.xml:12272 msgid "Start-update" msgstr "Start-ažuriranja" #. (para) #: ../source/TortoiseGit_en.xml:12220 msgid "Called before the update-to-revision dialog is shown." msgstr "Pozivan pre nego je prikazan ažuriraj-do-revizije dijalog." #. (term) #. (term) #: ../source/TortoiseGit_en.xml:12226 #: ../source/TortoiseGit_en.xml:12276 msgid "Pre-update" msgstr "Pre-ažuriraj" #. (para) #: ../source/TortoiseGit_en.xml:12228 msgid "Called before the actual Git update begins." msgstr "Pozivana pre nego aktuelno Subverzono ažuriranje počne. " #. (term) #. (term) #: ../source/TortoiseGit_en.xml:12234 #: ../source/TortoiseGit_en.xml:12280 msgid "Post-update" msgstr "Post-ažuriranje" #. (para) #: ../source/TortoiseGit_en.xml:12236 msgid "Called after the update finishes (whether successful or not)." msgstr "Pozivano posle završetka ažuriranja (bilo uspešno ili ne)." #. (para) #: ../source/TortoiseGit_en.xml:12183 msgid "There are currently six types of hook script available " msgstr "Postoji tekućih šest tipova zakačivih skripti dostupan " #. (para) #: ../source/TortoiseGit_en.xml:12243 msgid "A hook is defined for a particular working copy path. You only need to specify the top level path; if you perform an operation in a sub-folder, TortoiseGit will automatically search upwards for a matching path." msgstr "Zakačaljka je definisana za posebnu radnu kopiju. Samo vam je potrebno da odredite putalju vršnog nivoa; ako izvršite operaciju u sub-imeniku, TortoiseGit će automatski tražiti prema traženoj putanji." #. (para) #: ../source/TortoiseGit_en.xml:12248 msgid "Next you must specify the command line to execute, starting with the path to the hook script or executable. This could be a batch file, an executable file or any other file which has a valid windows file association, eg. a perl script." msgstr "Sledeće morate specificirati komandnu liniju da izvršiti, poćevši sa putaljom ka zakačivoj skripti ili izvršnom programu. Ovo bi mogao biti beč fajl, izvršni fajl ili bilo koji fajl koji ima isparvan prozor pridruživanja, npr. perl skript." #. (para) #: ../source/TortoiseGit_en.xml:12254 msgid "The command line includes several parameters which get filled in by TortoiseGit. The parameters passed depend upon which hook is called. Each hook has its own parameters which are passed in the following order: " msgstr "Komandna linija uključuje izvesne parametre koji su popunjeni sa TortoiseGit. Prošli parametri zavise od toga koja zakačaljka je pozvana. Svaka zakačaljka ima svoje lične parametre koji prolaze u sledećem redosledu: " #. (para) #: ../source/TortoiseGit_en.xml:12291 msgid "A path to a temporary file which contains all the paths for which the operation was started. Each path is on a separate line in the temp file." msgstr "Putanja ka privremenom fajlu koji sadrži sve putanje za koje operacija počinje. Svaka putanja je na odvojenoj liniji u temp fajlu." #. (para) #: ../source/TortoiseGit_en.xml:12301 msgid "The depth with which the commit/update is done." msgstr "Dubina sa kojom je urezivanje/ažuriranje urađeno" #. (literal) #: ../source/TortoiseGit_en.xml:12311 msgid "svn_depth_unknown" msgstr "svn_dubina_nepoznata" #. (literal) #: ../source/TortoiseGit_en.xml:12319 msgid "svn_depth_exclude" msgstr "svn_dubina_isključena" #. (literal) #: ../source/TortoiseGit_en.xml:12327 msgid "svn_depth_empty" msgstr "svn_dubina_prazna" #. (literal) #: ../source/TortoiseGit_en.xml:12335 msgid "svn_depth_files" msgstr "svn_dubina_fajlova" #. (literal) #: ../source/TortoiseGit_en.xml:12343 msgid "svn_depth_immediates" msgstr "svn_dubina_trenutni" #. (literal) #: ../source/TortoiseGit_en.xml:12351 msgid "svn_depth_infinity" msgstr "svn_dubina_beskonačno" #. (para) #: ../source/TortoiseGit_en.xml:12304 msgid "Possible values are: " msgstr "Moguće vrednosti su: " #. (para) #: ../source/TortoiseGit_en.xml:12362 msgid "Path to a file containing the log message for the commit. The file contains the text in UTF-8 encoding. After successful execution of the start-commit hook, the log message is read back, giving the hook a chance to modify it." msgstr "Putanja ka fajlu koji sadrži dnevnik poruke za urezivanje. Fajl sadrži tekst u UTF-8 kodiranju. Posle uspešnog izvršenja početak-urezivanja zakačaljke, dnevnik poruka je ponovo pročitan, dajući zakačaljki šansu da ga izmeni." #. (para) #: ../source/TortoiseGit_en.xml:12374 msgid "The repository revision to which the update should be done or after a commit completes." msgstr "Revizija spremišta za koju bi ažuriranje bilo dato ili se urezivanje kompletiralo." #. (para) #: ../source/TortoiseGit_en.xml:12383 msgid "Path to a file containing the error message. If there was no error, the file will be empty." msgstr "Putanja ka fajlu koji sadrži poruku greške. Ako nema greške, fajl će biti prazan." #. (para) #: ../source/TortoiseGit_en.xml:12392 msgid "The current working directory with which the script is run. This is set to the common root directory of all affected paths." msgstr "Tekući radni imenik sa koji skript radi. Ovo je skup ka zajdničkom korenu imenika svih odgovarajućih piutanja." #. (para) #: ../source/TortoiseGit_en.xml:12285 msgid "The meaning of each of these parameters is described here: " msgstr "Značenje svakog od ovih parametara opisan je ovde: " #. (para) #: ../source/TortoiseGit_en.xml:12400 msgid "Note that although we have given these parameters names for convenience, you do not have to refer to those names in the hook settings. All parameters listed for a particular hook are always passed, whether you want them or not ;-)" msgstr "Primetimo takođe da imamo data imena tih parametarakonvencionalno, ne možete se pozvati na ta imena u podešavanju zakačaljki. Svi izlistani parametri za pojedinačne zakačaljke su uvek prošli, bez obzira da li ih želite ili ne ;-)" #. (para) #: ../source/TortoiseGit_en.xml:12406 msgid "If you want the Git operation to hold off until the hook has completed, check Wait for the script to finish." msgstr "Ako želite da Subervezione operacije drže isključeno sve dok se zakačaljka kompletira, proverite Čekajte dok skript završi." #. (para) #: ../source/TortoiseGit_en.xml:12410 msgid "Normally you will want to hide ugly DOS boxes when the script runs, so Hide the script while running is checked by default." msgstr "Normalno želte da sakrijete ružne DOS boksove dok skript radi, tako Sakri skript dok radi je čekiran uobičajeno." #. (para) #: ../source/TortoiseGit_en.xml:12414 msgid "Sample client hook scripts can be found in the contrib folder in the TortoiseGit repository. ( explains how to access the repository)." msgstr "Jednostavna klijent zakačaljka skripta može biti nađeno u kontrib imeniku u TortoiseGit spremište. ( objašljava kako pristupiti spremištu)." #. (title) #: ../source/TortoiseGit_en.xml:12422 msgid "Issue Tracker Integration" msgstr "Integracija problem tragača" #. (para) #: ../source/TortoiseGit_en.xml:12425 msgid "TortoiseGit can use a COM plugin to query issue trackers when in the commit dialog. The use of such plugins is described in . If your system administrator has provided you with a plugin, which you have already installed and registered, this is the place to specify how it integrates with your working copy." msgstr "TortoiseGit može koristiti COM plagin da nađe problem tragač kada je u dijalogu urezivanja. Korišćenje takvih plagina opisano je u . Ako je sistem administator snabdeo plagin koji ste već instalirali i registrovali, ovo je mesto da se specificira kako se integriše sa vašom radnom kopijom." #. (title) #: ../source/TortoiseGit_en.xml:12435 msgid "The Settings Dialog, Issue Tracker Integration Page" msgstr "Dijalog podešavanja, Stranica integracije problem tragača" #. (para) #: ../source/TortoiseGit_en.xml:12433 msgid " Click on Add... to use the plugin with a particular working copy. Here you can specify the working copy path, choose which plugin to use from a drop down list of all registered issue tracker plugins, and any parameters to pass. The parameters will be specific to the plugin, but might include your user name on the issue tracker so that the plugin can query for issues which are assigned to you." msgstr " Kliknite na Dodaj... da koristite plagin sa posebnom radnom kopijom. Ovde možete specificirati putanju radne kopije, izaberite koji plagin da se koristi iz padajuće liste svih registrovanih problem tragača, i neke parametre da doda. Parametri će biti specificirani plaginu, ali mogu uključiti vaše korisničko ime za problem tragač tako da plagin može tražiti probleme koji su vama ozančeni. " #. (para) #: ../source/TortoiseGit_en.xml:12455 msgid "This property specifies the COM UUID of the IBugTraqProvider, for example {91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}." msgstr "Ovo osobine specificiraju COM UUID od IBugTraqProvider, na primer {91974081-2DC7-4FB1-B3BE-0DE1C8D6CE4E}." #. (para) #: ../source/TortoiseGit_en.xml:12464 msgid "This property specifies the parameters passed to the IBugTraqProvider." msgstr "Ova osobina određuje parametre poslate u IBugTraqProvider." #. (para) #: ../source/TortoiseGit_en.xml:12446 msgid "If you want all users to use the same COM plugin for your project, you can specify the plugin also with the properties bugtraq:provideruuid and bugtraq:providerparams. Please check the documentation of your IBugTraqProvider plugin to find out what to specify in these two properties." msgstr "Ako želite da svi korisnici koriste iste COM plagin za vaš projekat, možete specificirati plagin takođe sa osobinama bugtraq:provideruuidi bugtraq:providerparams. Molimo proverite dokumentaciju vašeg IBugTraqProvider plagina da nađete šta specificirati u ove dve osobine." #. (title) #: ../source/TortoiseGit_en.xml:12477 msgid "TortoiseBlame Settings" msgstr "TortozBlame podešavanje" #. (title) #: ../source/TortoiseGit_en.xml:12480 msgid "The Settings Dialog, TortoiseBlame Page" msgstr "Dijalog podešavanja, TortozBlame stranica" #. (para) #: ../source/TortoiseGit_en.xml:12478 msgid " The settings used by TortoiseBlame are controlled from the main context menu, not directly with TortoiseBlame itself." msgstr " Podešavanja korišćena sa TortoiseBlame su kontrolisani iz glavnog kontekst menija, ne direktno sa samim TortoiseBlame." #. (term) #: ../source/TortoiseGit_en.xml:12488 msgid "Colors" msgstr "Boje" #. (para) #: ../source/TortoiseGit_en.xml:12490 msgid "TortoiseBlame can use the background colour to indicate the age of lines in a file. You set the endpoints by specifying the colours for the newest and oldest revisions, and TortoiseBlame uses a linear interpolation between these colours according to the repository revision indicated for each line." msgstr "TortoiseBlame može koristiti boju osnove da indicira starost linija u fajlu. Podesite krajnje tačke specificirajući boje za novije i starije revizije, i TortoiseBlame koristi linearnu interpolaciju između ovih boja u skladu revizijom spremišta označenu za svaku liniju." #. (term) #: ../source/TortoiseGit_en.xml:12500 msgid "Font" msgstr "Pismo" #. (para) #: ../source/TortoiseGit_en.xml:12502 msgid "You can select the font used to display the text, and the point size to use. This applies both to the file content, and to the author and revision information shown in the left pane." msgstr "Možete izabrati pismo koje se koristi da se prikaže tekst, i njegovu veličinu. Ovo se primenjuje na sadržaj fajla, i autore i revizione informacije prikazane u levom panelu." #. (term) #: ../source/TortoiseGit_en.xml:12510 msgid "Tabs" msgstr "Tabovi" #. (para) #: ../source/TortoiseGit_en.xml:12512 msgid "Defines how many spaces to use for expansion when a tab character is found in the file content." msgstr "Definiše koliko razmaka koristiti za ekspanziju kada se tab karakter naže u sadržaju fajla." #. (title) #: ../source/TortoiseGit_en.xml:12521 msgid "Registry Settings" msgstr "Podešavanje registra" #. (primary) #: ../source/TortoiseGit_en.xml:12523 msgid "registry" msgstr "registri" #. (para) #: ../source/TortoiseGit_en.xml:12525 msgid "A few infrequently used settings are available only by editing the registry directly." msgstr "Sasvim retko korišćena podešavanja su omogućena samo uređivanjem registra direktno." #. (para) #: ../source/TortoiseGit_en.xml:12533 msgid "You can specify a different location for the Git configuration file using registry location HKCU\\Software\\TortoiseGit\\ConfigDir. This will affect all TortoiseGit operations." msgstr "Možete specificirati različitu lokaciju za Subverzioni konfiguracioni fajl koristeći registri lokaciju HKCU\\Software\\TortoiseGit\\ConfigDir. Ovo će uticati na sve TortoiseGit operacije." #. (term) #: ../source/TortoiseGit_en.xml:12542 msgid "Cache tray icon" msgstr "Ikona keš kutije" #. (para) #: ../source/TortoiseGit_en.xml:12544 msgid "To add a cache tray icon for the TSVNCache program, create a DWORD key with a value of 1 at HKCU\\Software\\TortoiseGit\\CacheTrayIcon. This is really only useful for developers as it allows you to terminate the program gracefully." msgstr "Da bi dodali keš ikonu za TSVNCashe program, kreirajte DWORD taster sa vrednošću 1 na HKCU\\Software\\TortoiseGit\\CacheTrayIcon. Ovo je stvarno korisno samo za razvojni tim kada vam ljubazno dozvoljavaju da završite program. " #. (term) #: ../source/TortoiseGit_en.xml:12554 msgid "Filenames without extensions in auto-completion list" msgstr "Fajlime bez ekstenzije u auto-kompletirajućoj listi." #. (para) #: ../source/TortoiseGit_en.xml:12556 msgid "The auto-completion list shown in the commit message editor displays the names of files listed for commit. To also include these names with extensions removed, create a DWORD key with a value of 1 at HKCU\\Software\\TortoiseGit\\AutocompleteRemovesExtensions." msgstr "Auto-kompletirajuća lista prikazana u editoru poruka urezivanja prikazuje imena fajlova izlistanih za urezivanje. Takođe obuhvata ova imena sa uklonjenom ekstenzijom, kreirajte DWORD tater sa vrednošću 1 na literal>HKCU\\Software\\TortoiseGit\\AutocompleteRemovesExtensions." #. (term) #: ../source/TortoiseGit_en.xml:12566 msgid "Explorer columns everywhere" msgstr "Eksplorer kolumne bilo gde" #. (para) #: ../source/TortoiseGit_en.xml:12568 msgid "The extra columns the TortoiseGit adds to the details view in Windows Explorer are normally only active in a working copy. If you want those to be accessible everywhere, not just in working copies, create a DWORD key with a value of 1 at HKCU\\Software\\TortoiseGit\\ColumnsEveryWhere." msgstr "Dodatne kolone TortoiseGit koje dodaje detaljnom pregledu u Vindouz Eksploreru aktivne su samo u radnoj kopiji. Ako želite da budu dostupne bilo gde, ne samo u radnoj kopiji, kreirajte DWORD taster sa vrednošću 1 u HKCU\\Software\\TortoiseGit\\ColumnsEveryWhere." #. (term) #: ../source/TortoiseGit_en.xml:12579 msgid "Merge log separator" msgstr "Stopi separator dnevnika" #. (para) #: ../source/TortoiseGit_en.xml:12581 msgid "When you merge revisions from another branch, and merge tracking information is available, the log messages from the revisions you merge will be collected to make up a commit log message. A pre-defined string is used to separate the individual log messages of the merged revisions. If you prefer, you can create a SZ key at HKCU\\Software\\TortoiseGit\\MergeLogSeparator containing a separator string of your choice." msgstr "Kada stapate revizije iz druge grane, i informacije praćenja stapanja su dostupne, dnevnik poruke iz revizija koje stapate se sakupljaju da naprave dnevnik poruku urezivanja. Predefinisani string se koristi da odvoji pojedinačne dnevnik poruke stopljenih revizija. Ako više volite, možete kreirati SZ taster u HKCU\\Software\\TortoiseGit\\MergeLogSeparatorkoji sadrži separator string po vašem izboru." #. (term) #: ../source/TortoiseGit_en.xml:12594 msgid "Always blame changes with TortoiseMerge" msgstr "Uvek okrivi izmene sa TortoiseMerge" #. (para) #: ../source/TortoiseGit_en.xml:12596 msgid "TortoiseGit allows you to assign external diff viewer. Most such viewers, however, are not suited for change blaming (), so you might wish to fall back to TortoiseMerge in this case. To do so, create a DWORD key with a value of 1 at HKCU\\Software\\TortoiseGit\\DiffBlamesWithTortoiseMerge." msgstr "TortoiseGit dopušta da označite spoljašnji diff pregledač. Većina takvih pregledača, međutim, ne odgovara za izmenu okrivljavanja (), tako da možete želeti da se vratite TortoiseMerge u tom slučaju. Da biste to uradili kreirajte DWORD taster sa vrednošću 1 u HKCU\\Software\\TortoiseGit\\DiffBlamesWithTortoiseMerge." #. (term) #: ../source/TortoiseGit_en.xml:12607 msgid "Current revision highlighting for folders in log dialog" msgstr "Tekuće revizijsko osvetljavanje za imenike u dnevnik dijalogu" #. (para) #: ../source/TortoiseGit_en.xml:12609 msgid "The log dialog highlights the current working copy revision when the log is shown for a file. To do the same thing for a folder requires a working copy crawl, which can be a slow operation for large working copies. If you want to enable this feature you must create a DWORD registry key with value 1 at HKCU\\Software\\TortoiseGit\\RecursiveLogRev." msgstr "Dnevnik dijalog osvetljava tekuću reviziju radne kopije kada je prikazan dnevnik fajla. Da se uradi ista stvar za imenik zahteva se puzanje kroz radnu kopiju, što može biti spora operacija za velike radne kopije. Ako želite da omogućite ovu osobinu morate kreirati DWORD registar taster sa vrednošću 1 u HKCU\\Software\\TortoiseGit\\RecursiveLogRev." #. (title) #: ../source/TortoiseGit_en.xml:12623 msgid "Git Working Folders" msgstr "Subverzioni Radni Imenici" #. (primary) #: ../source/TortoiseGit_en.xml:12625 msgid ".svn folder" msgstr ".svn imenik" #. (primary) #: ../source/TortoiseGit_en.xml:12628 msgid "_svn folder" msgstr "_svn imenik" #. (para) #: ../source/TortoiseGit_en.xml:12630 msgid "VS.NET 2003 when used with web projects can't handle the .svn folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET 2003 and the frontpage extensions it uses." msgstr "VS.NET 2003 kada se koristi sa veb projektima ne može rukovati sa .svn imenicima koje Subverzija koristi da smesti interne informacije. Ovo nije bag u Subverziji. Bag je u VS.NET 2003 i ulazne stranice koje koristi kao proširenje." #. (para) #: ../source/TortoiseGit_en.xml:12637 msgid "Note that the bug is fixed in VS2005 and later versions." msgstr "Primetimo da je bag fiksiran u VS2005 i daljim verzijama." #. (para) #: ../source/TortoiseGit_en.xml:12641 msgid "As of Version 1.3.0 of Git and TortoiseGit, you can set the environment variable SVN_ASP_DOT_NET_HACK. If that variable is set, then Git will use _svn folders instead of .svn folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to ." msgstr "Od Verzije 1.3.0 Subverzije i TortoiseGit, možete podesiti promenljivu okruženja SVN_ASP_DOT_NET_HACK. Ako je ta promenljiva podešena Subverzija će koristiti _svn imenik umesto .svn imenik. Morate restartovati vašu školjku za tu promenljivu okoline da postane efektna. Normalno to znači rebutovanje PC. Da se to olakša, možete sada uraditi to sa stranice generalnog podešavanja koristeći jednostavan čekboks - obratite se na ." #. (para) #: ../source/TortoiseGit_en.xml:12651 msgid "For more information, and other ways to avoid this problem in the first place, check out the article about this in our FAQ." msgstr "Za više informacija, i druge načine da se izbegne ovaj problem na prvo mest, preuzmite naš članak FAQ." #. (title) #: ../source/TortoiseGit_en.xml:12661 msgid "Final Step" msgstr "Finalni korak" #. (title) #: ../source/TortoiseGit_en.xml:12667 msgid "Donate!" msgstr "Donirajte!" #. (para) #: ../source/TortoiseGit_en.xml:12668 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 pomoći razvojni tim slanjem zakrpa i igrati aktivnu ulogu u razvoju. Možete pomoći da nas ohrabrite u toku dugih sati koje trošimo ispred računara." #. (para) #: ../source/TortoiseGit_en.xml:12674 msgid "While working on TortoiseGit we love to listen to music. And since we spend many hours on the project we need a lot of music. Therefore we have set up some wish-lists with our favourite music CDs and DVDs: http://TortoiseGit.tigris.org/donate.html Please also have a look at the list of people who contributed to the project by sending in patches or translations." msgstr "Dok radimo na TortoiseGit mi volimo da slušamo muziku. Kako trošimo mnogo vremena na projektu potrebno nam je mnogo muzike. Zbog toga smo napravili listu želja sa muzikom koju volimo na CD ili DVD: http://TortoiseGit.tigris.org/donate.html Molimo da takođe pogledate listu ljudi koji pomažu projektu slanjem zakrpa ili prevoda." #. (title) #: ../source/TortoiseGit_en.xml:12688 msgid "The SubWCRev Program" msgstr "SubVCRev program" #. (primary) #: ../source/TortoiseGit_en.xml:12691 msgid "version extraction" msgstr "izdvajanje verzije" #. (primary) #: ../source/TortoiseGit_en.xml:12694 msgid "SubWCRev" msgstr "SubVCRev" #. (primary) #: ../source/TortoiseGit_en.xml:12697 msgid "COM" msgstr "COM" #. (primary) #: ../source/TortoiseGit_en.xml:12700 msgid "version number in files" msgstr "broj verzije u fajlovima" #. (para) #: ../source/TortoiseGit_en.xml:12702 msgid "SubWCRev is Windows console program which can be used to read the status of a Git working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an About box." msgstr "SubWCRev je Vindouz konzolni program koji se može koristiti da se pročita status Subverzione radne kopije i omogući zamena ključnih reči u fajl modelu. Ovo se često koristi kao deo procesa izrade u značenju unošenja informacije radne kopije u objekat koji izrađujete. Tipično to može biti korišženo da se uključi revizioni broj u Opis programa boks." #. (title) #: ../source/TortoiseGit_en.xml:12716 msgid "The SubWCRev Command Line" msgstr "SubVCRev komandna linija" #. (para) #: ../source/TortoiseGit_en.xml:12717 msgid "SubWCRev reads the Git status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout." msgstr "SubWCRev čita Subverzioni status svih fajlova u radnoj kopiji, izostavljajući spoljašnje uobičajeno. Zapisuje najveći nađen broj urezane revizije, i vremensku oznaku urezivanja te revizije. Takođe zapisuje da li postoje lokalne izmene u radnoj kopiji, ili pomešano ažurirane revizije. Revizioni broj, opseg ažuriranja revizija i status izmena su prikazani na stdout." #. (para) #: ../source/TortoiseGit_en.xml:12725 msgid "" "SubWCRev.exe is called from the command line or a script, and is controlled using the command line parameters. \n" "SubWCRev WorkingCopyPath [SrcVersionFile DstVersionFile] [-nmdfe]\n" "" msgstr "" "SubWCRev.exe je pozvan iz komandne linije ili skripta, i kontrolisan koristeći parametre komandne linije. \n" "SubWCRev WorkingCopyPath [SrcVersionFile DstVersionFile] [-nmdfe]\n" "" #. (para) #: ../source/TortoiseGit_en.xml:12732 msgid "WorkingCopyPath is the path to the working copy being checked. You can only use SubWCRev on working copies, not directly on the repository. The path may be absolute or relative to the current working directory." msgstr "WorkingCopyPath je putanja do radne kopije koja se proverava. Možete samo koristiti SubWCRev na radnim kopijama, ne direktno na spremištu. Putanja može biti apsolutna ili relativna ka tekućem radnom imeniku." #. (para) #: ../source/TortoiseGit_en.xml:12738 msgid "If you want SubWCRev to perform keyword substitution, so that fields like repository revision and URL are saved to a text file, you need to supply a template file SrcVersionFile and an output file DstVersionFile which contains the substituted version of the template." msgstr "Ako želite SubWCRev da izvrši zamenu ključne reči, ta polja kao reviziju spremišta i URL se čuvaju u tekst fahlu, potrebno je da obezbedite model fajl SrcVersionFile i izlazni fajl DstVersionFile koji sadrže zamenjenu verziju modela." #. (title) #. (title) #: ../source/TortoiseGit_en.xml:12754 #: ../source/TortoiseGit_en.xml:12839 msgid "List of available command line switches" msgstr "Lista dostupnih prekidača komandne linije" #. (entry) #. (entry) #. (title) #. (glossterm) #: ../source/TortoiseGit_en.xml:12760 #: ../source/TortoiseGit_en.xml:14047 #: ../source/TortoiseGit_en.xml:15142 #: ../source/TortoiseGit_en.xml:16156 msgid "Switch" msgstr "Zamena" #. (entry) #. (entry) #. (entry) #. (entry) #. (entry) #: ../source/TortoiseGit_en.xml:12761 #: ../source/TortoiseGit_en.xml:12846 #: ../source/TortoiseGit_en.xml:13044 #: ../source/TortoiseGit_en.xml:14303 #: ../source/TortoiseGit_en.xml:14712 msgid "Description" msgstr "Opis" #. (literal) #: ../source/TortoiseGit_en.xml:12769 msgid "ERRORLEVEL 7" msgstr "NIVOGREŠKE 7" #. (entry) #: ../source/TortoiseGit_en.xml:12767 msgid "If this switch is given, SubWCRev will exit with if the working copy contains local modifications. This may be used to prevent building with uncommitted changes present." msgstr "Ako je ovaj prekidač dat, SubWCRev će izaći sa ako radna kopija sadrži lokalne izmene. Ovo može biti korišćeno da se predupredi izrada sa neurezanim izmenama koje su prisutne." #. (literal) #: ../source/TortoiseGit_en.xml:12778 msgid "ERRORLEVEL 8" msgstr "NIVOGREŠKE 8" #. (entry) #: ../source/TortoiseGit_en.xml:12776 msgid "If this switch is given, SubWCRev will exit with if the working copy contains mixed revisions. This may be used to prevent building with a partially updated working copy." msgstr "Ako je ovaj prekidač dat, SubWCRev će izaći sa ako radna kopija sadrži pomešane revizije. Ovo se može koristiti da se spreči izrada sa parcijalno ažuriranom radnom kopijom." #. (literal) #: ../source/TortoiseGit_en.xml:12787 msgid "ERRORLEVEL 9" msgstr "NIVOGREŠKE 9" #. (entry) #: ../source/TortoiseGit_en.xml:12785 msgid "If this switch is given, SubWCRev will exit with if the destination file already exists." msgstr "Ako je ovaj prekidač dat, SubWCRev će izaći sa ako destinacioni fajl već postoji." #. (entry) #: ../source/TortoiseGit_en.xml:12793 msgid "If this switch is given, SubWCRev will include the last-changed revision of folders. The default behaviour is to use only files when getting the revision numbers." msgstr "Ako je ovaj prekidač dat, SubWCRev će uključiti zadlju-izmenjenu reviziju imenika. Uobičajeno ponašanje je da se koriste samo fajlovi kada se uzimaju revizioni brojevi." #. (literal) #: ../source/TortoiseGit_en.xml:12805 msgid "svn:externals" msgstr "svn:externals" #. (entry) #: ../source/TortoiseGit_en.xml:12802 msgid "If this switch is given, SubWCRev will examine directories which are included with , but only if they are from the same repository. The default behaviour is to ignore externals." msgstr "Ako je ovaj prekidač dat, SubWCRev će pregledati imenike koji su uključeni sa , ali samo ako su iz istog spremišta. Uobičajeno ponašanje je da se zanemare eksternali." #. (entry) #: ../source/TortoiseGit_en.xml:12812 msgid "If this switch is given, SubWCRev will output the revision numbers in HEX." msgstr "Ako je ovaj prekidač dat, SubWCRev će dati na izlazu revizione brojeve u HEKS." #. (entry) #: ../source/TortoiseGit_en.xml:12819 msgid "If this switch is given, SubWCRev will output the revision numbers in HEX, with '0X' prepended." msgstr "Ako je ovaj prekidač dat, SubWCRev će dati na izlazu revizione brojeve u HEKS, sa '0X' ispred." #. (para) #: ../source/TortoiseGit_en.xml:12747 msgid "There are a number of optional switches which affect the way SubWCRev works. If you use more than one, they must be specified as a single group, eg. -nm, not -n -m. " msgstr "Postoji veliki broj opcionih prekidača koji utiču na način rada SubWCRev. Ako koristite više od jednog on mora biti specificiran kao pojedinačna grupa, npr. -nm, ne -n -m. " #. (title) #: ../source/TortoiseGit_en.xml:12834 msgid "Keyword Substitution" msgstr "Zamena ključnih reči" #. (entry) #: ../source/TortoiseGit_en.xml:12845 msgid "Keyword" msgstr "Ključna reč" #. (entry) #: ../source/TortoiseGit_en.xml:12852 msgid "Replaced with the highest commit revision in the working copy." msgstr "Zamenjeno najvišom urezanom revizijom u radnoj kopiji." #. (literal) #: ../source/TortoiseGit_en.xml:12863 msgid "yyyy-mm-dd hh:mm:ss" msgstr "yyyy-mm-dd hh:mm:ss" #. (literal) #: ../source/TortoiseGit_en.xml:12865 msgid "strftime()" msgstr "strftime()" #. (literal) #: ../source/TortoiseGit_en.xml:12867 msgid "$WCDATE=%a %b %d %I:%M:%S %p$" msgstr "$WCDATE=%a %b %d %I:%M:%S %p$" #. (citetitle) #: ../source/TortoiseGit_en.xml:12870 msgid "online reference" msgstr "onlajn reference" #. (entry) #: ../source/TortoiseGit_en.xml:12859 msgid "Replaced with the commit date/time of the highest commit revision. By default, international format is used: . Alternatively, you can specify a custom format which will be used with , for example: . For a list of available formatting characters, look at the ." msgstr "Zamenjeno sa datum/vreme urezivanja najviše urezane revizije. Uobičajeno, internacionalni format se koristi: . Alternativno, možete specificirati običan format koji će se koristiti sa , na primer: . Za listu dostupnih karaktera za formatiranje pogledajte ." #. (literal) #. (literal) #. (literal) #: ../source/TortoiseGit_en.xml:12880 #: ../source/TortoiseGit_en.xml:12948 #: ../source/TortoiseGit_en.xml:13074 msgid "$WCDATE$" msgstr "$WCDATE$" #. (entry) #: ../source/TortoiseGit_en.xml:12876 msgid "Replaced with the current system date/time. This can be used to indicate the build time. Time formatting can be used as described for ." msgstr "Zamenjeno sa tekućim sistemskim datum/vreme. Ovo se može koristiti da označi vreme izrade. Formatiranje se može koristiti kao opisano za ." #. (entry) #: ../source/TortoiseGit_en.xml:12885 msgid "Replaced with the update revision range in the working copy. If the working copy is in a consistent state, this will be a single revision. If the working copy contains mixed revisions, either due to being out of date, or due to a deliberate update-to-revision, then the range will be shown in the form 100:200" msgstr "Zamenjeno sa opsegom ažuriranih revizija u radnoj kopiji. Ako je radna kopija u konzistentnom stanju ovo je pojedinačna revizija. Ako radna kopija sadrži mešane revizije, ili zbog toga što je zastarela, ili zato što planski ažurirana-ka-reviziji, onda će opseg biti prikazan u obliku 100:200" #. (literal) #: ../source/TortoiseGit_en.xml:12898 msgid "$WCMIXED?TText:FText$" msgstr "$WCMIXED?TText:FText$" #. (literal) #. (literal) #. (literal) #. (literal) #. (literal) #: ../source/TortoiseGit_en.xml:12899 #: ../source/TortoiseGit_en.xml:12907 #: ../source/TortoiseGit_en.xml:12922 #: ../source/TortoiseGit_en.xml:12930 #: ../source/TortoiseGit_en.xml:12939 msgid "TText" msgstr "TTekst" #. (literal) #. (literal) #. (literal) #. (literal) #. (literal) #: ../source/TortoiseGit_en.xml:12900 #: ../source/TortoiseGit_en.xml:12908 #: ../source/TortoiseGit_en.xml:12923 #: ../source/TortoiseGit_en.xml:12932 #: ../source/TortoiseGit_en.xml:12940 msgid "FText" msgstr "FTekst" #. (entry) #: ../source/TortoiseGit_en.xml:12897 msgid " is replaced with if there are mixed update revisions, or if not." msgstr " je zamenjen sa ako postoji pomešane ažurirane revizije, ili ako ne." #. (literal) #: ../source/TortoiseGit_en.xml:12906 msgid "$WCMODS?TText:FText$" msgstr "$WCMODS?TText:FText$" #. (entry) #: ../source/TortoiseGit_en.xml:12905 msgid " is replaced with if there are local modifications, or if not." msgstr " je zamenjeno sa ako postoje lokalne izmene, ili ako ne." #. (entry) #: ../source/TortoiseGit_en.xml:12913 msgid "Replaced with the repository URL of the working copy path passed to SubWCRev." msgstr "Zamenjeno sa spremišta URL putanje radne kopije poslate u SubWCRev." #. (literal) #: ../source/TortoiseGit_en.xml:12921 msgid "$WCINSVN?TText:FText$" msgstr "$WCINSVN?TText:FText$" #. (entry) #: ../source/TortoiseGit_en.xml:12920 msgid " is replaced with if the entry is versioned, or if not." msgstr "je zamenjeno sa ako je ulaz verzionisan, ili ako nije." #. (literal) #: ../source/TortoiseGit_en.xml:12929 msgid "$WCNEEDSLOCK?TText:FText$" msgstr "$WCNEEDSLOCK?TText:FText$" #. (literal) #. (literal) #: ../source/TortoiseGit_en.xml:12931 #: ../source/TortoiseGit_en.xml:13113 msgid "svn:needs-lock" msgstr "svn:traži-ključ" #. (entry) #: ../source/TortoiseGit_en.xml:12928 msgid " is replaced with if the entry has the property set, or if not." msgstr "je zamenjeno sa ako je ulaz ima podešenu osobinu, ili ako nema." #. (literal) #: ../source/TortoiseGit_en.xml:12938 msgid "$WCISLOCKED?TText:FText$" msgstr "$WCISLOCKED?TText:FText$" #. (entry) #: ../source/TortoiseGit_en.xml:12937 msgid " is replaced with if the entry is locked, or if not." msgstr "je zamenjeno sa ako je ulaz zaključan, ili ako nije." #. (entry) #: ../source/TortoiseGit_en.xml:12945 msgid "Replaced with the lock date. Time formatting can be used as described for ." msgstr "Zamenjeno sa datumom zaključavanja. Formatiranje može biti korišćeno kako je opisano u ." #. (entry) #: ../source/TortoiseGit_en.xml:12953 msgid "Replaced with the name of the lock owner." msgstr "Zamenjeno imenom vlasnika katanca." #. (entry) #: ../source/TortoiseGit_en.xml:12959 msgid "Replaced with the comment of the lock." msgstr "Zamenjeno komentarom katanca." #. (para) #: ../source/TortoiseGit_en.xml:12835 msgid "If a source and destination files are supplied, SubWCRev copies source to destination, performing keyword substitution as follows: " msgstr "Ako su izvorni i odredišni fajlovi snabdeveni, SubWCRev kopira izvor u odredište, izvršavajući zamenu ključnih reči na sledeći način: " #. (title) #: ../source/TortoiseGit_en.xml:12972 msgid "Keyword Example" msgstr "Primer ključne reči" #. (para) #: ../source/TortoiseGit_en.xml:12973 msgid "The example below shows how keywords in a template file are substituted in the output file." msgstr "Sledeći primer prikazuje kako ključne reči u model fajlu budu zamenjene u izlazom fajlu." #. (programlisting) #: ../source/TortoiseGit_en.xml:12977 #, no-wrap msgid "" "\n" "// Test file for SubWCRev: testfile.tmpl\n" "\n" "char *Revision = \"$WCREV$\";\n" "char *Modified = \"$WCMODS?Modified:Not modified$\";\n" "char *Date = \"$WCDATE$\";\n" "char *Range = \"$WCRANGE$\";\n" "char *Mixed = \"$WCMIXED?Mixed revision WC:Not mixed$\";\n" "char *URL = \"$WCURL$\";\n" "\n" "#if $WCMODS?1:0$\n" "#error Source is modified\n" "#endif\n" "\n" "// End of file\n" msgstr "" "\n" "// Test file for SubWCRev: testfile.tmpl\n" "\n" "char *Revision = \"$WCREV$\";\n" "char *Modified = \"$WCMODS?Modified:Not modified$\";\n" "char *Date = \"$WCDATE$\";\n" "char *Range = \"$WCRANGE$\";\n" "char *Mixed = \"$WCMIXED?Mixed revision WC:Not mixed$\";\n" "char *URL = \"$WCURL$\";\n" "\n" "#if $WCMODS?1:0$\n" "#error Source is modified\n" "#endif\n" "\n" "// End of file\n" #. (para) #: ../source/TortoiseGit_en.xml:12993 msgid "After running SubWCRev.exe path\\to\\workingcopy testfile.tmpl testfile.txt, the output file testfile.txt would looks like this:" msgstr "Posle izvršenja SubWCRev.exe path\\to\\workingcopy testfile.tmpl testfile.txt,izlazni fajl testfile.txt će izgledati kao ovo:" #. (programlisting) #: ../source/TortoiseGit_en.xml:12997 #, no-wrap msgid "" "\n" "// Test file for SubWCRev: testfile.txt\n" "\n" "char *Revision = \"3701\";\n" "char *Modified = \"Modified\";\n" "char *Date = \"2005/06/15 11:15:12\";\n" "char *Range = \"3699:3701\";\n" "char *Mixed = \"Mixed revision WC\";\n" "char *URL = \"http://project.domain.org/svn/trunk/src\";\n" "\n" "#if 1\n" "#error Source is modified\n" "#endif\n" "\n" "// End of file\n" msgstr "" "\n" "// Test file for SubWCRev: testfile.txt\n" "\n" "char *Revision = \"3701\";\n" "char *Modified = \"Modified\";\n" "char *Date = \"2005/06/15 11:15:12\";\n" "char *Range = \"3699:3701\";\n" "char *Mixed = \"Mixed revision WC\";\n" "char *URL = \"http://project.domain.org/svn/trunk/src\";\n" "\n" "#if 1\n" "#error Source is modified\n" "#endif\n" "\n" "// End of file\n" #. (para) #: ../source/TortoiseGit_en.xml:13014 msgid "A file like this will be included in the build so you would expect it to be versioned. Be sure to version the template file, not the generated file, otherwise each time you regenerate the version file you need to commit the change, which in turn means the version file needs to be updated." msgstr "Ovakav fajl će biti uključen u izradu tako da možete očekivati da je verzionisan. Budite sigurni da verzionišete model fajl, ne generisani fajl, u drugom slučaju svaki put kad generišete verzionisan fajl moraćete da urezujete izmene, što ne znači da verzion fajl treba da bude ažuriran." #. (title) #: ../source/TortoiseGit_en.xml:13027 msgid "COM interface" msgstr "COM interfejs" #. (primary) #: ../source/TortoiseGit_en.xml:13029 msgid "COM SubWCRev interface" msgstr "COM SubVCRev interfejs" #. (title) #: ../source/TortoiseGit_en.xml:13037 msgid "COM/automation methods supported" msgstr "COM/automatizacija metode podržane" #. (entry) #: ../source/TortoiseGit_en.xml:13043 msgid "Method" msgstr "Metod" #. (literal) #: ../source/TortoiseGit_en.xml:13056 msgid "-f" msgstr "-f" #. (literal) #: ../source/TortoiseGit_en.xml:13059 msgid "-e" msgstr "-e" #. (entry) #: ../source/TortoiseGit_en.xml:13050 msgid "This method traverses the working copy gathering the revision information. Naturally you must call this before you can access the information using the remaining methods. The first parameter is the path. The second parameter should be true if you want to include folder revisions. Equivalent to the command line switch. The third parameter should be true if you want to include svn:externals. Equivalent to the command line switch." msgstr "Ovaj metod prelazi radnu kopiju sakupljajući revizione informacije. Prirodno morate ovo pozvati pre nego pristupite informacijama koristeći preostale motode. Prvi parametar je putanja. Drugi parametar treba da bude istinit ako želite da uključite reviziju imenika. Ekvivalent sa prekidačima komandne linije. Treći parametar treba da bude istina ako želite da uključite svn:externals. Ekvivalent sa prekidačima komandne linije." #. (literal) #: ../source/TortoiseGit_en.xml:13067 msgid "$WCREV$" msgstr "$WCREV$" #. (entry) #: ../source/TortoiseGit_en.xml:13065 msgid "The highest commit revision in the working copy. Equivalent to " msgstr "Najviša urezana revizija u radnoj kopiji. Ekvivalent sa " #. (entry) #: ../source/TortoiseGit_en.xml:13072 msgid "The commit date/time of the highest commit revision. Equivalent to " msgstr "Urezivanje datm/vreme najviše urezane revizije. Ekvivalent sa " #. (entry) #: ../source/TortoiseGit_en.xml:13079 msgid "The author of the highest commit revision, that is, the last person to commit changes to the working copy." msgstr "Autor najviše urezane revizije, to je, poslednja osoba koja je urezala izmene u radnu kopiju." #. (literal) #. (literal) #: ../source/TortoiseGit_en.xml:13086 #: ../source/TortoiseGit_en.xml:13090 msgid "$WCRANGE$" msgstr "$WCRANGE$" #. (entry) #: ../source/TortoiseGit_en.xml:13086 msgid "The minimum update revision, as shown in " msgstr "Minimum ažurirana revizija, kao što je prikazano u " #. (entry) #: ../source/TortoiseGit_en.xml:13090 msgid "The maximum update revision, as shown in " msgstr "Maksimum ažurirana revizija, kao što je prikazano u " #. (entry) #: ../source/TortoiseGit_en.xml:13094 msgid "True if there are local modifications" msgstr "Tačno ako postoji lokalna izmena" #. (literal) #: ../source/TortoiseGit_en.xml:13100 msgid "GetWCInfo" msgstr "GetVCInfo" #. (literal) #: ../source/TortoiseGit_en.xml:13101 msgid "$WCURL$" msgstr "$WCURL$" #. (entry) #: ../source/TortoiseGit_en.xml:13098 msgid "Replaced with the repository URL of the working copy path used in . Equivalent to " msgstr "Zamenjeno sa spremištem URL putanje radne kopije korišćene u .Ekvivalent sa " #. (entry) #: ../source/TortoiseGit_en.xml:13106 msgid "True if the item is versioned." msgstr "Istina ako je stavka verzionisana." #. (entry) #: ../source/TortoiseGit_en.xml:13112 msgid "True if the item has the property set." msgstr "Istina ako stavka ima posešenu osobinu." #. (entry) #: ../source/TortoiseGit_en.xml:13119 msgid "True if the item is locked." msgstr "Istina ako je stavka zaključana." #. (entry) #: ../source/TortoiseGit_en.xml:13125 msgid "String representing the date when the lock was created, or an empty string if the item is not locked." msgstr "String koji reprezentuje datum kada je katanac kreiran, ili prazan string ako stavka nije zaključana." #. (entry) #: ../source/TortoiseGit_en.xml:13132 msgid "String representing the lock owner, or an empty string if the item is not locked." msgstr "String koji rprezentuje vlasnika katanca, ili prazan string ako stavka nije zaključana." #. (entry) #: ../source/TortoiseGit_en.xml:13139 msgid "The message entered when the lock was created." msgstr "Poruka uneta kada je katanac kreiran." #. (para) #: ../source/TortoiseGit_en.xml:13031 msgid "If you need to access Git revision information from other programs, you can use the COM interface of SubWCRev. The object to create is SubWCRev.object, and the following methods are supported: " msgstr "Ako treba da pristupite Subverzijinoj reviziojinoj informaciji iz drugih programa, možete koristiti COM interfejs SubWCRev. Objekat koji se kreira je literal>SubWCRev.object, i sledeći metodi su podržani: " #. (programlisting) #: ../source/TortoiseGit_en.xml:13149 #, no-wrap msgid "" "\n" "// testCOM.js - javascript file\n" "// test script for the SubWCRev COM/Automation-object\n" "\n" "filesystem = new ActiveXObject(\"Scripting.FileSystemObject\");\n" "\n" "revObject1 = new ActiveXObject(\"SubWCRev.object\");\n" "revObject2 = new ActiveXObject(\"SubWCRev.object\");\n" "revObject3 = new ActiveXObject(\"SubWCRev.object\");\n" "revObject4 = new ActiveXObject(\"SubWCRev.object\");\n" "\n" "revObject1.GetWCInfo(\n" " filesystem.GetAbsolutePathName(\".\"), 1, 1);\n" "revObject2.GetWCInfo(\n" " filesystem.GetAbsolutePathName(\"..\"), 1, 1);\n" "revObject3.GetWCInfo(\n" " filesystem.GetAbsolutePathName(\"SubWCRev.cpp\"), 1, 1);\n" "revObject4.GetWCInfo(\n" " filesystem.GetAbsolutePathName(\"..\\\\..\"), 1, 1);\n" "\n" "wcInfoString1 = \"Revision = \" + revObject1.Revision + \n" "\t\t\t\t\"\\n" "Min Revision = \" + revObject1.MinRev + \n" "\t\t\t\t\"\\n" "Max Revision = \" + revObject1.MaxRev + \n" "\t\t\t\t\"\\n" "Date = \" + revObject1.Date + \n" "\t\t\t\t\"\\n" "URL = \" + revObject1.Url + \"\\n" "Author = \" + \n" "\t\t\t\trevObject1.Author + \"\\n" "HasMods = \" + \n" "\t\t\t\trevObject1.HasModifications + \"\\n" "IsSvnItem = \" + \n" "\t\t\t\trevObject1.IsSvnItem + \"\\n" "NeedsLocking = \" + \n" "\t\t\t\trevObject1.NeedsLocking + \"\\n" "IsLocked = \" + \n" "\t\t\t\trevObject1.IsLocked + \"\\n" "LockCreationDate = \" + \n" "\t\t\t\trevObject1.LockCreationDate + \"\\n" "LockOwner = \" + \n" "\t\t\t\trevObject1.LockOwner + \"\\n" "LockComment = \" + \n" "\t\t\t\trevObject1.LockComment;\n" "wcInfoString2 = \"Revision = \" + revObject2.Revision + \n" "\t\t\t\t\"\\n" "Min Revision = \" + revObject2.MinRev + \n" "\t\t\t\t\"\\n" "Max Revision = \" + revObject2.MaxRev + \n" "\t\t\t\t\"\\n" "Date = \" + revObject2.Date + \n" "\t\t\t\t\"\\n" "URL = \" + revObject2.Url + \"\\n" "Author = \" + \n" "\t\t\t\trevObject2.Author + \"\\n" "HasMods = \" + \n" "\t\t\t\trevObject2.HasModifications + \"\\n" "IsSvnItem = \" + \n" "\t\t\t\trevObject2.IsSvnItem + \"\\n" "NeedsLocking = \" + \n" "\t\t\t\trevObject2.NeedsLocking + \"\\n" "IsLocked = \" + \n" "\t\t\t\trevObject2.IsLocked + \"\\n" "LockCreationDate = \" + \n" "\t\t\t\trevObject2.LockCreationDate + \"\\n" "LockOwner = \" + \n" "\t\t\t\trevObject2.LockOwner + \"\\n" "LockComment = \" + \n" "\t\t\t\trevObject2.LockComment;\n" "wcInfoString3 = \"Revision = \" + revObject3.Revision + \n" "\t\t\t\t\"\\n" "Min Revision = \" + revObject3.MinRev + \n" "\t\t\t\t\"\\n" "Max Revision = \" + revObject3.MaxRev + \n" "\t\t\t\t\"\\n" "Date = \" + revObject3.Date + \n" "\t\t\t\t\"\\n" "URL = \" + revObject3.Url + \"\\n" "Author = \" + \n" "\t\t\t\trevObject3.Author + \"\\n" "HasMods = \" + \n" "\t\t\t\trevObject3.HasModifications + \"\\n" "IsSvnItem = \" + \n" "\t\t\t\trevObject3.IsSvnItem + \"\\n" "NeedsLocking = \" + \n" "\t\t\t\trevObject3.NeedsLocking + \"\\n" "IsLocked = \" + \n" "\t\t\t\trevObject3.IsLocked + \"\\n" "LockCreationDate = \" + \n" "\t\t\t\trevObject3.LockCreationDate + \"\\n" "LockOwner = \" + \n" "\t\t\t\trevObject3.LockOwner + \"\\n" "LockComment = \" + \n" "\t\t\t\trevObject3.LockComment;\n" "wcInfoString4 = \"Revision = \" + revObject4.Revision + \n" "\t\t\t\t\"\\n" "Min Revision = \" + revObject4.MinRev + \n" "\t\t\t\t\"\\n" "Max Revision = \" + revObject4.MaxRev + \n" "\t\t\t\t\"\\n" "Date = \" + revObject4.Date + \n" "\t\t\t\t\"\\n" "URL = \" + revObject4.Url + \"\\n" "Author = \" + \n" "\t\t\t\trevObject4.Author + \"\\n" "HasMods = \" + \n" "\t\t\t\trevObject4.HasModifications + \"\\n" "IsSvnItem = \" + \n" "\t\t\t\trevObject4.IsSvnItem + \"\\n" "NeedsLocking = \" + \n" "\t\t\t\trevObject4.NeedsLocking + \"\\n" "IsLocked = \" + \n" "\t\t\t\trevObject4.IsLocked + \"\\n" "LockCreationDate = \" + \n" "\t\t\t\trevObject4.LockCreationDate + \"\\n" "LockOwner = \" + \n" "\t\t\t\trevObject4.LockOwner + \"\\n" "LockComment = \" + \n" "\t\t\t\trevObject4.LockComment;\n" "\n" "WScript.Echo(wcInfoString1);\n" "WScript.Echo(wcInfoString2);\n" "WScript.Echo(wcInfoString3);\n" "WScript.Echo(wcInfoString4);\n" "\n" msgstr "" "\n" "// testCOM.js - javascript file\n" "// test script for the SubWCRev COM/Automation-object\n" "\n" "filesystem = new ActiveXObject(\"Scripting.FileSystemObject\");\n" "\n" "revObject1 = new ActiveXObject(\"SubWCRev.object\");\n" "revObject2 = new ActiveXObject(\"SubWCRev.object\");\n" "revObject3 = new ActiveXObject(\"SubWCRev.object\");\n" "revObject4 = new ActiveXObject(\"SubWCRev.object\");\n" "\n" "revObject1.GetWCInfo(\n" " filesystem.GetAbsolutePathName(\".\"), 1, 1);\n" "revObject2.GetWCInfo(\n" " filesystem.GetAbsolutePathName(\"..\"), 1, 1);\n" "revObject3.GetWCInfo(\n" " filesystem.GetAbsolutePathName(\"SubWCRev.cpp\"), 1, 1);\n" "revObject4.GetWCInfo(\n" " filesystem.GetAbsolutePathName(\"..\\\\..\"), 1, 1);\n" "\n" "wcInfoString1 = \"Revision = \" + revObject1.Revision + \n" "\t\t\t\t\"\\n" "Min Revision = \" + revObject1.MinRev + \n" "\t\t\t\t\"\\n" "Max Revision = \" + revObject1.MaxRev + \n" "\t\t\t\t\"\\n" "Date = \" + revObject1.Date + \n" "\t\t\t\t\"\\n" "URL = \" + revObject1.Url + \"\\n" "Author = \" + \n" "\t\t\t\trevObject1.Author + \"\\n" "HasMods = \" + \n" "\t\t\t\trevObject1.HasModifications + \"\\n" "IsSvnItem = \" + \n" "\t\t\t\trevObject1.IsSvnItem + \"\\n" "NeedsLocking = \" + \n" "\t\t\t\trevObject1.NeedsLocking + \"\\n" "IsLocked = \" + \n" "\t\t\t\trevObject1.IsLocked + \"\\n" "LockCreationDate = \" + \n" "\t\t\t\trevObject1.LockCreationDate + \"\\n" "LockOwner = \" + \n" "\t\t\t\trevObject1.LockOwner + \"\\n" "LockComment = \" + \n" "\t\t\t\trevObject1.LockComment;\n" "wcInfoString2 = \"Revision = \" + revObject2.Revision + \n" "\t\t\t\t\"\\n" "Min Revision = \" + revObject2.MinRev + \n" "\t\t\t\t\"\\n" "Max Revision = \" + revObject2.MaxRev + \n" "\t\t\t\t\"\\n" "Date = \" + revObject2.Date + \n" "\t\t\t\t\"\\n" "URL = \" + revObject2.Url + \"\\n" "Author = \" + \n" "\t\t\t\trevObject2.Author + \"\\n" "HasMods = \" + \n" "\t\t\t\trevObject2.HasModifications + \"\\n" "IsSvnItem = \" + \n" "\t\t\t\trevObject2.IsSvnItem + \"\\n" "NeedsLocking = \" + \n" "\t\t\t\trevObject2.NeedsLocking + \"\\n" "IsLocked = \" + \n" "\t\t\t\trevObject2.IsLocked + \"\\n" "LockCreationDate = \" + \n" "\t\t\t\trevObject2.LockCreationDate + \"\\n" "LockOwner = \" + \n" "\t\t\t\trevObject2.LockOwner + \"\\n" "LockComment = \" + \n" "\t\t\t\trevObject2.LockComment;\n" "wcInfoString3 = \"Revision = \" + revObject3.Revision + \n" "\t\t\t\t\"\\n" "Min Revision = \" + revObject3.MinRev + \n" "\t\t\t\t\"\\n" "Max Revision = \" + revObject3.MaxRev + \n" "\t\t\t\t\"\\n" "Date = \" + revObject3.Date + \n" "\t\t\t\t\"\\n" "URL = \" + revObject3.Url + \"\\n" "Author = \" + \n" "\t\t\t\trevObject3.Author + \"\\n" "HasMods = \" + \n" "\t\t\t\trevObject3.HasModifications + \"\\n" "IsSvnItem = \" + \n" "\t\t\t\trevObject3.IsSvnItem + \"\\n" "NeedsLocking = \" + \n" "\t\t\t\trevObject3.NeedsLocking + \"\\n" "IsLocked = \" + \n" "\t\t\t\trevObject3.IsLocked + \"\\n" "LockCreationDate = \" + \n" "\t\t\t\trevObject3.LockCreationDate + \"\\n" "LockOwner = \" + \n" "\t\t\t\trevObject3.LockOwner + \"\\n" "LockComment = \" + \n" "\t\t\t\trevObject3.LockComment;\n" "wcInfoString4 = \"Revision = \" + revObject4.Revision + \n" "\t\t\t\t\"\\n" "Min Revision = \" + revObject4.MinRev + \n" "\t\t\t\t\"\\n" "Max Revision = \" + revObject4.MaxRev + \n" "\t\t\t\t\"\\n" "Date = \" + revObject4.Date + \n" "\t\t\t\t\"\\n" "URL = \" + revObject4.Url + \"\\n" "Author = \" + \n" "\t\t\t\trevObject4.Author + \"\\n" "HasMods = \" + \n" "\t\t\t\trevObject4.HasModifications + \"\\n" "IsSvnItem = \" + \n" "\t\t\t\trevObject4.IsSvnItem + \"\\n" "NeedsLocking = \" + \n" "\t\t\t\trevObject4.NeedsLocking + \"\\n" "IsLocked = \" + \n" "\t\t\t\trevObject4.IsLocked + \"\\n" "LockCreationDate = \" + \n" "\t\t\t\trevObject4.LockCreationDate + \"\\n" "LockOwner = \" + \n" "\t\t\t\trevObject4.LockOwner + \"\\n" "LockComment = \" + \n" "\t\t\t\trevObject4.LockComment;\n" "\n" "WScript.Echo(wcInfoString1);\n" "WScript.Echo(wcInfoString2);\n" "WScript.Echo(wcInfoString3);\n" "WScript.Echo(wcInfoString4);\n" "\n" #. (para) #: ../source/TortoiseGit_en.xml:13147 msgid "The following example shows how the interface might be used. " msgstr "Sledeći primer prikazuje kako interfejs može da se koristi. " #. (title) #: ../source/TortoiseGit_en.xml:13232 msgid "Frequently Asked Questions (FAQ)" msgstr "Često postavljana pitanja (ČPP)" #. (primary) #: ../source/TortoiseGit_en.xml:13235 msgid "FAQ" msgstr "ČPP" #. (para) #: ../source/TortoiseGit_en.xml:13237 msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an online FAQ which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists tortoisegit-dev@googlegroups.com and tortoisegit-users@googlegroups.com ." msgstr "Pošto se TortoiseGit razvija sve vreme ponekad je teško da se dokumentacija drži ažurno. Mi održavamo online FAQ koji sadrži izbor pitanja koja su najviše postavljana na TortoiseGit mejling listama tortoisegit-dev@googlegroups.com i tortoisegit-users@googlegroups.com ." #. (para) #: ../source/TortoiseGit_en.xml:13249 msgid "We also maintain a project Issue Tracker which tells you about some of the things we have on our To-Do list, and bugs which have already been fixed. If you think you have found a bug, or want to request a new feature, check here first to see if someone else got there before you." msgstr "Takođe podržavamo projekat Issue Tracker koji vam govori o nekim stvarima koje imamo na našoj Šta-Uraditi listi, i bagove koji su već fiksirani. Ako mislite da ste našli bag, ili želite da zatražite novu mogućnost, proverite najpre ovde da vidite da li je neko to uradio pre vas." #. (para) #: ../source/TortoiseGit_en.xml:13259 msgid "If you have a question which is not answered anywhere else, the best place to ask it is on one of the mailing lists. tortoisegit-users@googlegroups.com is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on tortoisegit-dev@googlegroups.com ." msgstr "Ako imate pitanje na koje nije odgovoreno bilo gde drugde, najbolje mesto da pitate je jedna od mejling listi. tortoisegit-users@googlegroups.com je jedna da služi ako imate pitanja o korišćelju TortoiseGit. Ako želite pomoć u razvoju TortoiseGit, treba da uzmete učešće u diskusiji na tortoisegit-dev@googlegroups.com ." #. (title) #: ../source/TortoiseGit_en.xml:13275 msgid "How Do I..." msgstr "Kako da ja..." #. (para) #: ../source/TortoiseGit_en.xml:13277 msgid "This appendix contains solutions to problems/questions you might have when using TortoiseGit." msgstr "Dodatak sadrži rešenje problema/pitanja koja možete imati dok koristite TortoiseGit." #. (title) #: ../source/TortoiseGit_en.xml:13283 msgid "Move/copy a lot of files at once" msgstr "Pomeri/kopiraj mnogo fajlova ođednom" #. (primary) #: ../source/TortoiseGit_en.xml:13285 msgid "moving" msgstr "premeštanje" #. (primary) #: ../source/TortoiseGit_en.xml:13291 msgid "reorganize" msgstr "reorganizuj" #. (para) #: ../source/TortoiseGit_en.xml:13293 msgid "Moving/Copying single files can be done by using TortoiseGitRename.... But if you want to move/copy a lot of files, this way is just too slow and too much work." msgstr "Pomeranje/Kopiranje pojedinčnih fajlova može biti urađeno korišćenjem TortoiseGitPreimenuj.... Ali ako želite pomeri/kopiraj mnogo fajlova, ovaj način je suviše spor i zahteva mnogo rada." #. (para) #: ../source/TortoiseGit_en.xml:13302 msgid "The recommended way is by right-dragging the files to the new location. Simply right-click on the files you want to move/copy without releasing the mouse button. Then drag the files to the new location and release the mouse button. A context menu will appear where you can either choose Context MenuSVN Copy versioned files here. or Context MenuSVN Move versioned files here." msgstr "Preporučen način je pomoću desno-vučenje fajlova u novu lokaciju. Jednostavno desni-klik na fajlove koje želite da pomeri/kopiraj bez otpuštanja dugmeta miša. Zatim vucite fajlove u novu lokaciju i otpustite dugme miša. Kontekst meni će se pojaviti gde možete ili izabrati Kontekst MeniSVN Kopiraj verzionisane fajlove ovde. ili Kontekst MeniSVN Pomeri verzionisane fajlove ovde." #. (title) #: ../source/TortoiseGit_en.xml:13330 msgid "Force users to enter a log message" msgstr "Forsirati korisnike da unesu poruke dnevnika" #. (primary) #: ../source/TortoiseGit_en.xml:13332 msgid "log message" msgstr "poruka dnevnika" #. (primary) #: ../source/TortoiseGit_en.xml:13335 msgid "commit message" msgstr "poruka urezivanja" #. (primary) #: ../source/TortoiseGit_en.xml:13338 msgid "empty message" msgstr "prazna poruka" #. (para) #: ../source/TortoiseGit_en.xml:13340 msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Git clients, but requires access to the server directly." msgstr "Postoji dva načina da se spreče korisnici da urezuju sa praznom dnevnik porukom. Jedan je specifičan za TortoiseGit, drugi radi za sve Subverzione klijente, ali zahteva pristup serveru direktno." #. (title) #: ../source/TortoiseGit_en.xml:13346 msgid "Hook-script on the server" msgstr "Zakačiv skript na serveru" #. (para) #: ../source/TortoiseGit_en.xml:13347 msgid "If you have direct access to the repository server, you can install a pre-commit hook script which rejects all commits with an empty or too short log message." msgstr "Ako imate direktan pristup serveru spremišta, možete instalirati pre-urezivanja zakačiv skript koji odbija sva urezivanja sa praznom ili suviše kratkom dnevnik porukom." #. (para) #: ../source/TortoiseGit_en.xml:13352 msgid "In the repository folder on the server, there's a sub-folder hooks which contains some example hook scripts you can use. The file pre-commit.tmpl contains a sample script which will reject commits if no log message is supplied, or the message is too short. The file also contains comments on how to install/use this script. Just follow the instructions in that file." msgstr "U imeniku spremišta na serveru postoji sub-imenik hooks koji sadrži neke primere zakačivih skripti koje možete koristiti. Fajl pre-commit.tmpl sadrži jednostavan skript koji odbija urezivanje ako nema dnevnik poruke upisane, ili je poruka suviše kratka. Fajl takođe sadrži komentar kako da instalirate/koristite ovaj skript. Samo pratite instrukcije u tom fajlu." #. (para) #: ../source/TortoiseGit_en.xml:13362 msgid "This method is the recommended way if your users also use other Git clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the OK button disabled until the log message is long enough then please use the method described below." msgstr "Ovaj metod je preporučen način ako vaš korisnik takođe koristi druge Subverzione klijente osim TortoiseGit. Neugodnodt je da je urezivanje odbijeno od servera i tada korisnik dobija poruku o grešci. Klijent ne može znati pre urezivanja da će biti odbijen. Ako želite da učinite TortoiseGit da ima OK dugme onemogućeno dok dnevnik poruka ne bude dovoljno dugačka koristite metod opisan dole." #. (title) #: ../source/TortoiseGit_en.xml:13373 msgid "Project properties" msgstr "Osobine projekta" #. (para) #: ../source/TortoiseGit_en.xml:13374 msgid "TortoiseGit uses properties to control some of its features. One of those properties is the tsvn:logminsize property." msgstr "TortoiseGit koristi karakteristike da kontroliše neke od svojih mogućnosti. Jedna od tih karakteristika je tsvn:logminsize karakteristika." #. (para) #: ../source/TortoiseGit_en.xml:13378 msgid "If you set that property on a folder, then TortoiseGit will disable the OK button in all commit dialogs until the user has entered a log message with at least the length specified in the property." msgstr "Ako podesite te karakteristike na imenik, onda TortoiseGit može onemogućiti OK dugme u svim dijalozima urezivanja sve dok korisnik ne unese dnevnik poruku sa najmanje sa dužinom specificiranom u krakteristikama." #. (para) #: ../source/TortoiseGit_en.xml:13383 msgid "For detailed information on those project properties, please refer to " msgstr "Detaljne informacije o tim karakteristikama projekta, molim pogledajte u " #. (title) #: ../source/TortoiseGit_en.xml:13390 msgid "Update selected files from the repository" msgstr "Ažuriranje izabranih fajlova iz spremišta" #. (para) #: ../source/TortoiseGit_en.xml:13394 msgid "Normally you update your working copy using TortoiseGitUpdate. But if you only want to pick up some new files that a colleague has added without merging in any changes to other files at the same time, you need a different approach." msgstr "Normalno vi ažurirate vašu radnu kopiju koristeći TortoiseGitAžuriraj. Ali ako samo želite da pokupite neke nove fajlove koje su kolege dodale bez stapanja sa izmenama drugih fajlova u isto vreme, potreban vam je drugačiji pristup." #. (para) #: ../source/TortoiseGit_en.xml:13404 msgid "Use TortoiseGitCheck for Modifications. and click on Check repository to see what has changed in the repository. Select the files you want to update locally, then use the context menu to update just those files." msgstr "Koristite TortoiseGitProveri Izmene. i kliknite na Proveri spremište da vidite šta je izmenjeno u spremištu. Izaberite fajlove koje želite da ažurirate lokalno, zatim koristite kontekst meni da ažurirate samo te fajlove." #. (title) #: ../source/TortoiseGit_en.xml:13416 msgid "Roll back (Undo) revisions in the repository" msgstr "Vrati nazad (poništi) revizije u spremištu" #. (primary) #: ../source/TortoiseGit_en.xml:13418 msgid "rollback" msgstr "premotavanje" #. (primary) #: ../source/TortoiseGit_en.xml:13424 msgid "undo commit" msgstr "poništavanje urezivanja" #. (primary) #: ../source/TortoiseGit_en.xml:13427 msgid "undo change" msgstr "poništavanje izmena" #. (title) #: ../source/TortoiseGit_en.xml:13430 msgid "Use the revision log dialog" msgstr "Koristi dijalog dnevnika revizija" #. (para) #: ../source/TortoiseGit_en.xml:13431 msgid "The easiest way to revert the changes from a single revision, or from a range of revisions, is to use the revision log dialog. This is also the method to use of you want to discard recent changes and make an earlier revision the new HEAD." msgstr "Najlakši način da vratite izmene iz pojedinačne revizije, ili iz opsega revizija, je da koristite revizioni dnevnik dijalog. Ovo je takođe metod koji se koristi ako želite da izbacite skore izmene i napravite raniju reviziju kao novu GLAVNU." #. (para) #: ../source/TortoiseGit_en.xml:13440 msgid "Select the file or folder in which you need to revert the changes. If you want to revert all changes, this should be the top level folder." msgstr "Izaberite fajl ili imenik u kome želite da vratite izmene. Ako želite da vratite sve izmene, ovo će biti imenik na vrhu." #. (para) #: ../source/TortoiseGit_en.xml:13447 msgid "Select TortoiseGitShow Log to display a list of revisions. You may need to use Show All or Next 100 to show the revision(s) you are interested in." msgstr "Izaberite TortoiseGitPrikaži dnevnik da prikažete listu revizija. Možda će vam trebati da koristite Prikaži Sve ili Sledećih 100 da prikažete reviziju(e) koja vas interesuje." #. (para) #: ../source/TortoiseGit_en.xml:13460 msgid "Select the revision you wish to revert. If you want to undo a range of revisions, select the first one and hold the Shift key while selecting the last one. Note that for multiple revisions, the range must be unbroken with no gaps. Right click on the selected revision(s), then select Context MenuRevert changes from this revision." msgstr "Izaberite reviziju koju želite da vratite. Ako želite da poništite opseg revizija, izaberite najpre jednu i držite Shift taster dok birate poslednji. Primetimo da za višestruke revizije opseg mora biti neprekinut bez rupa. Desni klik na izabranu reviziju(e), zatim izaberite Kontekst MeniVratite izmene iz ove revizije." #. (para) #: ../source/TortoiseGit_en.xml:13475 msgid "Or if you want to make an earlier revision the new HEAD revision, right click on the selected revision, then select Context MenuRevert to this revision. This will discard all changes after the selected revision." msgstr "Ili ako želite da učinite raniju reviziju novu GLAVNU reviziju, desni klik na izabranu reviziju, zatim izaberite Kontekst MeniVrati u ovu reviziju. Ovo će uništiti sve izmene posle izabrane revizije." #. (para) #. (para) #: ../source/TortoiseGit_en.xml:13488 #: ../source/TortoiseGit_en.xml:13545 msgid "You have reverted the changes within your working copy. Check the results, then commit the changes." msgstr "Vi ste vratili izmene u okviru radne kopije. Proverite rezultat, zatim urežite izmene." #. (title) #: ../source/TortoiseGit_en.xml:13494 msgid "Use the merge dialog" msgstr "Koristi dijalog spajanja" #. (para) #: ../source/TortoiseGit_en.xml:13495 msgid "To undo a larger range of revisions, you can use the Merge dialog. The previous method uses merging behind the scenes; this method uses it explicitly." msgstr "Da se poništi veći opseg revizija, možete koristiti Stopi dijalog. Prethodni metod koristi stapanje iza scene; ovaj metod ga koristi eksplicitno." #. (para) #: ../source/TortoiseGit_en.xml:13502 msgid "In your working copy select TortoiseGitMerge." msgstr "U vašoj radnoj kopiji izaberite TortoiseGitStopi." #. (para) #: ../source/TortoiseGit_en.xml:13511 msgid "In the From: field enter the full folder URL of the branch or tag containing the changes you want to revert in your working copy. This should come up as the default URL." msgstr "U Iz: polju unesite pun imenik URL grane ili znaka koji sadrži izmene koje želite da vratite u vašu radnu kopiju. Ovo treba da dođe kao uobičajeni URL." #. (para) #: ../source/TortoiseGit_en.xml:13519 msgid "In the From Revision field enter the revision number that you are currently at. If you are sure there is no-one else making changes, you can use the HEAD revision." msgstr "U Iz Revizije polju unesite revizioni broj gde ste trebtno. Ako ste sigurni da niko ne radi izmene možete koristiti GLAVNU reviziju." #. (para) #: ../source/TortoiseGit_en.xml:13527 msgid "make sure the Use \"From:\" URL checkbox is checked." msgstr "budite sigurni da Koristi \"Iz:\" URL čekboks čekiran." #. (para) #: ../source/TortoiseGit_en.xml:13533 msgid "In the To Revision field enter the revision number that you want to revert to, namely the one before the first revision to be reverted." msgstr "U U Reviziju polju unesite revizioni broj gde želite da vratite, recimo jedan pre prve revizije koja će biti vraćena." #. (para) #: ../source/TortoiseGit_en.xml:13540 msgid "Click OK to complete the merge." msgstr "Kliknite OK da kompletirate stapanje." #. (title) #: ../source/TortoiseGit_en.xml:13551 msgid "Use svndumpfilter" msgstr "Koristi svndumpfilter" #. (para) #: ../source/TortoiseGit_en.xml:13552 msgid "Since TortoiseGit never loses data, your rolled back revisions still exist as intermediate revisions in the repository. Only the HEAD revision was changed to a previous state. If you want to make revisions disappear completely from your repository, erasing all trace that they ever existed, you have to use more extreme measures. Unless there is a really good reason to do this, it is not recommended. One possible reason would be that someone committed a confidential document to a public repository." msgstr "Pošto TortoiseGit nikad ne gubi podatke, vaša vraćena nazad revizija još uvek postoji kao intermedijalna revizija u spremištu. Samo GLAVNA revizija je izmenjena u prethodno stanje. Ako želite da napravite da revizije nestanu kompletno iz spremišta, brisanjem svih staza koje su ikad postojale, morate koristiti mnogo ekstremnije mere. Osim ako ne postoji veoma dobar razlog da se to radi, to emphasis>nije preporučljivo. Jedan poseban razlog bi bio da neko urezuje poverljiv dokument u javno spremište." #. (para) #: ../source/TortoiseGit_en.xml:13563 msgid "The only way to remove data from the repository is to use the Git command line tool svnadmin. You can find a description of how this works in the Repository Maintenance." msgstr "Jedini način da se izbace podaci iz spremišta je da se alat Subverzione komandne linije svnadmin. Možete naći opis kako ovo radi u Održavanje spremišta." #. (title) #: ../source/TortoiseGit_en.xml:13574 msgid "Compare two revisions of a file" msgstr "Uporedi dve revizije fajla" #. (primary) #: ../source/TortoiseGit_en.xml:13576 msgid "compare files" msgstr "uporedi fajlove" #. (primary) #: ../source/TortoiseGit_en.xml:13579 msgid "changes" msgstr "izmene" #. (para) #: ../source/TortoiseGit_en.xml:13581 msgid "If you want to compare two revisions in a file's history, for example revisions 100 and 200 of the same file, just use TortoiseGitShow Log to list the revision history for that file. Pick the two revisions you want to compare then use Context MenuCompare Revisions." msgstr "Ako želite uporediti dve revizije u istoriji fajla, na primer revizije 100 i 200 istog fajla, samo koristite TortoiseGitPrikaži Dnevnik da izlistate istoriju revizija za taj fajl. Odaberite dve revizije koje želite da uporedite i koristite Kontekst MeniUporedi Revizije." #. (para) #: ../source/TortoiseGit_en.xml:13595 msgid "If you want to compare the same file in two different trees, for example the trunk and a branch, you can use the repository browser to open up both trees, select the file in both places, then use Context MenuCompare Revisions." msgstr "Ako želite da uporedite isti fajl u dva različita stabla, na primer deblo i granu, možete koristiti pretraživač spremišta da otvorite oba stabla, izaberite fajl na oba mesta, zatim koristite Kontekst MeniUporedi Revizije." #. (para) #: ../source/TortoiseGit_en.xml:13605 msgid "If you want to compare two trees to see what has changed, for example the trunk and a tagged release, you can use TortoiseGitRevision Graph Select the two nodes to compare, then use Context MenuCompare HEAD Revisions. This will show a list of changed files, and you can then select individual files to view the changes in detail. Alternatively use Context MenuUnified Diff of HEAD Revisions to see a summary of all differences, with minimal context." msgstr "Ako želite da uporedite dva stabla da vidite šta se izmenilo, na primer deblo i znakovnu realizaciju, možete koristiti TortoiseGitRevizioni Graf Izaberite dva čvora za poređenje, zatim koristite Kontekst MeniUporedi GLAVNE Revizije. Ovo će prikazati listu izmenjenih fajlova, i možete zatim izabrati pojedine fajlove da vidite izmene detaljno. Alternativno koristite Kontekst MeniUjedinjene Diff od GLAVNIH Revizija da vidite rezultat svih razlika, sa minimalnim sadržajem." #. (title) #: ../source/TortoiseGit_en.xml:13628 msgid "Include a common sub-project" msgstr "Uključi sličan sub-projekat" #. (primary) #: ../source/TortoiseGit_en.xml:13630 msgid "common projects" msgstr "slični projekti" #. (primary) #: ../source/TortoiseGit_en.xml:13636 msgid "vendor projects" msgstr "distributerski projekti" #. (para) #: ../source/TortoiseGit_en.xml:13638 msgid "Sometimes you will want to include another project within your working copy, perhaps some library code. You don't want to make a duplicate of this code in your repository because then you would lose connection with the original (and maintained) code. Or maybe you have several projects which share core code. There are at least 3 ways of dealing with this." msgstr "Ponekad ćete želeti da uključite drugi projekat u okviru vaše radne kopije, možda neki bibliotečki kod. Vi ne želite da napravite duplikat ovog koda u vašem spremištu jer onda gubite vezu sa originalnim (i podržanim) kodom. Ili možda imate više projekata koji dele osnovni kod. Postoji najmanje 3 načina da se radi sa ovim." #. (title) #: ../source/TortoiseGit_en.xml:13648 msgid "Use svn:externals" msgstr "Koristite svn:externals" #. (para) #: ../source/TortoiseGit_en.xml:13649 msgid "Set the svn:externals property for a folder in your project. This property consists of one or more lines; each line has the name of a sub-folder which you want to use as the checkout folder for common code, and the repository URL that you want to be checked out there. For full details refer to ." msgstr "Podesite svn:externals karakteristiku za imenik u vašem projektu. Ova karakteristika se sastoji od jedne ili više linija; svaka linija ima ime pod-imenikakoji želite da koristite kao imenik za preuzimanje zajdničkog koda, i URL spremišta odakle želite da preuzimate. Za potpune detalje pogledajte ." #. (para) #: ../source/TortoiseGit_en.xml:13657 msgid "Commit the new folder. Now when you update, Git will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects." msgstr "Urežite novi imenik. Sada kada ažurirate, Subverzija će vući kopiju projekta iz spremišta u vašu radnu kopiju. Pod-imenici će biti kreirani automatski ako se zahteva. Svaki put kada ažurirate vašu glavnu radnu kopiju, vi ćete takođe dobiti zadnju verziju svih spoljašnjih projekata." #. (para) #: ../source/TortoiseGit_en.xml:13676 msgid "Of the three methods described, this is the only one which needs no setup on the client side. Once externals are specified in the folder properties, all clients will get populated folders when they update." msgstr "Jedan od tri metoda je opisan, ovo je samo jedno što vam treba pri podešavanju na strani klijenta. Kada se eksternali jednom specificiraju u karakteristikama imenika, svi klijenti će dobiti popunjene imenike kada se ažuriraju." #. (title) #: ../source/TortoiseGit_en.xml:13684 msgid "Use a nested working copy" msgstr "Koristi ugnježdenu radnu kopiju" #. (para) #: ../source/TortoiseGit_en.xml:13685 msgid "Create a new folder within your project to contain the common code, but do not add it to Git" msgstr "Kreirajte novi imenik u okviru vašeg projekta da sadrži zajedničke kodove, ali ne dodajte to Subverziji." #. (para) #: ../source/TortoiseGit_en.xml:13689 msgid "Select TortoiseGitCheckout for the new folder and checkout a copy of the common code into it. You now have a separate working copy nested within your main working copy." msgstr "Izaberite TortoiseGitPreuzimanje za nove imenike i preuzmite kopiju zajedničkih kodova u njega." #. (para) #: ../source/TortoiseGit_en.xml:13699 msgid "The two working copies are independent. When you commit changes to the parent, changes to the nested WC are ignored. Likewise when you update the parent, the nested WC is not updated." msgstr "ve radne kopije su nezavisne. Kada urežete izmene u predačku, izmene u ugnježdenu RK se ignorišu. Slično ako ažurirate predačku, ugnježdena RK se ne ažurira." #. (title) #: ../source/TortoiseGit_en.xml:13706 msgid "Use a relative location" msgstr "Koristi relativnu lokaciju" #. (para) #: ../source/TortoiseGit_en.xml:13707 msgid "" "If you use the same common core code in several projects, and you do not want to keep multiple working copies of it for every project that uses it, you can just check it out to a separate location which is related to all the other projects which use it. For example: \n" "C:\\Projects\\Proj1\n" "C:\\Projects\\Proj2\n" "C:\\Projects\\Proj3\n" "C:\\Projects\\Common\n" " and refer to the common code using a relative path, eg. ..\\..\\Common\\DSPcore." msgstr "" "Ako koristite isti zajednički osnovni kod u više projekata, i ne želite da čuvate višestruke radne kopije za svaki projekat koji ih koristi, možete ih samo preuzeti u izdvojene lokacije koje su povezane sa svim ostalim projektima koji ih koriste. Na primer: \n" "C:\\Projects\\Proj1\n" "C:\\Projects\\Proj2\n" "C:\\Projects\\Proj3\n" "C:\\Projects\\Common\n" " i pozovite se na zajednički kod koristeći relativnu putanju, npr. ..\\..\\Common\\DSPcore." #. (para) #: ../source/TortoiseGit_en.xml:13722 msgid "" "If your projects are scattered in unrelated locations you can use a variant of this, which is to put the common code in one location and use drive letter substitution to map that location to something you can hard code in your projects, eg. Checkout the common code to D:\\Documents\\Framework or C:\\Documents and Settings\\{login}\\My Documents\\framework then use \n" "SUBST X: \"D:\\Documents\\framework\"\n" " to create the drive mapping used in your source code. Your code can then use absolute locations. \n" "#include \"X:\\superio\\superio.h\"\n" "" msgstr "" "Ako je vaš projekat razbacan u nevezanim lokacijama možete koristiti varijantu ovoga, što će staviti zajednički kod u jednu lokaciju i koristiti slovo drajva kao zmenu da označi lokaciju ka nečemu što teško kodirate u vašem projektu, npr. Preuzimanje zajedničkog koda sa D:\\Documents\\Framework ili C:\\Documents and Settings\\{login}\\My Documents\\framework zatim koristite \n" "SUBST X: \"D:\\Documents\\framework\"\n" " to create the drive mapping used in your source code. Your code can then use absolute locations. \n" "#include \"X:\\superio\\superio.h\"\n" "" #. (para) #: ../source/TortoiseGit_en.xml:13740 msgid "This method will only work in an all-PC environment, and you will need to document the required drive mappings so your team know where these mysterious files are. This method is strictly for use in closed development environments, and not recommended for general use." msgstr "Ovaj metod će samo raditi na potpun-PC okolini, i trebaće vam da dokumentujete zahtevano obeležavanje drajva tako da vaš tim zna gde se ovi misteriozni fajlovi nalaze. Ovaj metod je striktno za korišćenje u okolini bliskoj razvoju, i ne preporučuje se za opštu upotrebu." #. (title) #: ../source/TortoiseGit_en.xml:13750 msgid "Create a shortcut to a repository" msgstr "Kreiraj skraćenicu za spremište" #. (primary) #: ../source/TortoiseGit_en.xml:13752 msgid "shortcut" msgstr "skraćenica" #. (para) #: ../source/TortoiseGit_en.xml:13754 msgid "" "If you frequently need to open the repository browser at a particular location, you can create a desktop shortcut using the automation interface to TortoiseProc. Just create a new shortcut and set the target to: \n" "TortoiseProc.exe /command:repobrowser /path:\"url/to/repository\"\n" " Of course you need to include the real repository URL." msgstr "" "Ako vam često treba da otvarate pretraživač spremišta na posebnoj lokaciji, možete kreirati prečicu na desktopu koristeći automtizovani interfejs ka TortoiseProc. Samo kreirajte novu prečicu i podesite cilj ka \n" "TortoiseProc.exe /command:repobrowser /path:\"url/to/repository\"\n" " Svakako potrebno je da uključite pravi URL spremišta." #. (title) #: ../source/TortoiseGit_en.xml:13766 msgid "Ignore files which are already versioned" msgstr "Zanemarivanje fajlova koji su već verzionisani." #. (primary) #: ../source/TortoiseGit_en.xml:13771 msgid "remove versioning" msgstr "ukloni verzionisanje" #. (primary) #: ../source/TortoiseGit_en.xml:13774 msgid "detach from repository" msgstr "otkači od spremišta" #. (para) #: ../source/TortoiseGit_en.xml:13776 msgid "If you accidentally added some files which should have been ignored, how do you get them out of version control without losing them? Maybe you have your own IDE configuration file which is not part of the project, but which took you a long time to set up just the way you like it." msgstr "Ako greško dodate neke fajlove koji bi trebalo da budu zanemareni, kako ih izvući iz kontrojžle verzija a da ih ne izgubimo? Možda imate vaš lični IDE konfiguracioni fajl koji nije deo projekta, ali koji uzima dosta vremena da se podesi na način kako volite." #. (para) #: ../source/TortoiseGit_en.xml:13783 msgid "If you have not yet committed the add, then all you have to do is use TortoiseGitRevert... to undo the add. You should then add the file(s) to the ignore list so they don't get added again later by mistake." msgstr "Ako još niste urezali dodavanje, tada imate da koristite TortoiseGitVrati... da poništite dodavanje. Zatim treba da dodate fajl(ove) u listu zanemarenih tako da ih greškom ne dodate ponovo kasnije." #. (para) #: ../source/TortoiseGit_en.xml:13798 msgid "Hold the Shift key to get the extended context menu and use TortoiseGitDelete (keep local) to mark the file/folder for deletion from the repository without losing the local copy." msgstr "Držite Shift taster da dobijete prošireni kontekst meni i koristite TortoiseGitBriši(drži lokalnol) da označite fajl/imenik za brisanje iz spremišta bez gubljenja lokalne kopije." #. (para) #: ../source/TortoiseGit_en.xml:13810 msgid "TortoiseGitCommit the parent folder." msgstr "TortoiseGitUreži predački imenik." #. (para) #: ../source/TortoiseGit_en.xml:13819 msgid "Add the file/folder to the ignore list so you don't get into the same trouble again." msgstr "Dodajte fajl/imenik u listu zanemarenih tako da ne dođete u isti problem ponovo." #. (para) #: ../source/TortoiseGit_en.xml:13793 msgid "If the files are already in the repository, you have to do a little more work. " msgstr "Ako su fajlovi već u spremištu, morate uraditi malo više posla. " #. (title) #: ../source/TortoiseGit_en.xml:13828 msgid "Unversion a working copy" msgstr "Neverzionisana radna kopija" #. (para) #: ../source/TortoiseGit_en.xml:13829 msgid "If you have a working copy which you want to convert back to a plain folder tree without the .svn directories, you can simply export it to itself. Read to find out how." msgstr "Ako imate radnu kopiju koju želite da konvertujete nazad u čisto stablo imenika bez .svn imenika, možete je jednostavno izvesti u sebe samu. Pročitajte da nađete više detalja." #. (title) #: ../source/TortoiseGit_en.xml:13837 msgid "Remove a working copy" msgstr "Ukloni radnu kopiju" #. (para) #: ../source/TortoiseGit_en.xml:13838 msgid "If you have a working copy which you no longer need, how do you get rid of it cleanly? Easy - just delete it in Windows Explorer! Working copies are private local entities, and they are self-contained." msgstr "Ako imate radnu kopiju koja vam više nije potrebna, kako ćete se nje osloboditi potpuno? Jednostavno - samo je obrišite u Vindouz Eksploreru! Radne kopije su privatni lokalni entiteti, i one su sveobuhvatne." #. (title) #: ../source/TortoiseGit_en.xml:13846 msgid "Useful Tips For Administrators" msgstr "Korisni saveti za administratore" #. (para) #: ../source/TortoiseGit_en.xml:13848 msgid "This appendix contains solutions to problems/questions you might have when you are responsible for deploying TortoiseGit to multiple client computers." msgstr "Ovaj dodatak sadrži rešenja problema/pitanja koja biste mogli imati kada ste odgovorni za razmeštanje TortoiseGit na više računara klijenata." #. (title) #: ../source/TortoiseGit_en.xml:13855 msgid "Deploy TortoiseGit via group policies" msgstr "Raspoređivanje TortoiseGit preko grupne polise" #. (primary) #. (primary) #: ../source/TortoiseGit_en.xml:13857 #: ../source/TortoiseGit_en.xml:13982 msgid "group policies" msgstr "grupne polise" #. (primary) #. (glossterm) #: ../source/TortoiseGit_en.xml:13860 #: ../source/TortoiseGit_en.xml:15964 msgid "GPO" msgstr "GPO" #. (primary) #: ../source/TortoiseGit_en.xml:13863 msgid "msi" msgstr "msi" #. (primary) #: ../source/TortoiseGit_en.xml:13866 msgid "domain controller" msgstr "kontrolor domena" #. (primary) #: ../source/TortoiseGit_en.xml:13869 msgid "deploy" msgstr "raspoređivanje" #. (para) #: ../source/TortoiseGit_en.xml:13871 msgid "The TortoiseGit installer comes as an MSI file, which means you should have no problems adding that MSI file to the group policies of your domain controller." msgstr "TortoiseGit instalacija dolazi kao MSI fajl, što unači da ne bi trbalo da imate probleme pri dodavanju tog MSI fajla grupi vašeg kontrolora domena." #. (para) #: ../source/TortoiseGit_en.xml:13876 msgid "A good walk-through on how to do that can be found in the knowledge base article 314934 from Microsoft: http://support.microsoft.com/?kbid=314934." msgstr "Dobar pregled kako da se to uradi može se naći u bazi znanja u Mikrosoftovom članku 314934: http://support.microsoft.com/?kbid=314934." #. (para) #: ../source/TortoiseGit_en.xml:13883 msgid "Versions 1.3.0 and later of TortoiseGit must be installed under Computer Configuration and not under User Configuration. This is because those versions need the new CRT and MFC DLLs, which can only be deployed per computer and not per user. If you really must install TortoiseGit on a per user basis, then you must first install the MFC and CRT package version 8 from Microsoft on each computer you want to install TortoiseGit as per user." msgstr "Verzije 1.3.0 i kasnije TortoiseGit moraju biti instalirane pod Računar Konfiguracija a ne pod Korisnik Konfiguracija. Ovo je zbog toga što ove verzije traže novi CRT i MFC DLLove, koji se mogu rasporediti samo za računar a ne za korisnika. Ako stvarno morate instalirati TortoiseGit po osnovi za korisnika, onda morate najpre instalirati MFC i CRT paket verziu 8 od Mikrosofta na svaki kompjuter na koji želite da instalirate TortoiseGit po korisniku." #. (title) #: ../source/TortoiseGit_en.xml:13895 msgid "Redirect the upgrade check" msgstr "Preusmeravanje provere nadogradnje" #. (primary) #: ../source/TortoiseGit_en.xml:13897 msgid "upgrade check" msgstr "provera nadogradnje" #. (primary) #: ../source/TortoiseGit_en.xml:13900 msgid "check new version" msgstr "provera nove verzije" #. (primary) #: ../source/TortoiseGit_en.xml:13903 msgid "version" msgstr "verzija" #. (para) #: ../source/TortoiseGit_en.xml:13905 msgid "TortoiseGit checks if there's a new version available every few days. If there is a newer version available, a dialog shows up informing the user about that." msgstr "TortoiseGit proverava da li je dostupna nova verzija svakih nekoliko dana. Ako postoji nova verzija, dijalog se otvara informišući korisnika o tome." #. (title) #: ../source/TortoiseGit_en.xml:13911 msgid "The upgrade dialog" msgstr "dijalog nadogradnje" #. (para) #: ../source/TortoiseGit_en.xml:13914 msgid "If you're responsible for a lot of users in your domain, you might want your users to use only versions you have approved and not have them install always the latest version. You probably don't want that upgrade dialog to show up so your users don't go and upgrade immediately." msgstr "Ako ste odgovorni za više korisnika na vašem domenu, možda želite da vaši korisnici koriste samo verzije koje ste vi odobrili i nećete imati instalisanu poslednju verziju. Verovatno ne želite taj dijalog za dogradnju da se pojavi i da vaši korisnici odu i izvrše trenutnu dogradnju." #. (para) #: ../source/TortoiseGit_en.xml:13920 msgid "" "Versions 1.4.0 and later of TortoiseGit allow you to redirect that upgrade check to your intranet server. You can set the registry key HKCU\\Software\\TortoiseGit\\UpdateCheckURL (string value) to an URL pointing to a text file in your intranet. That text file must have the following format: \n" "1.4.1.6000\n" "A new version of TortoiseGit is available for you to download!\n" "http://192.168.2.1/downloads/TortoiseGit-1.4.1.6000-svn-1.4.0.msi\n" " The first line in that file is the version string. You must make sure that it matches the exact version string of the TortoiseGit installation package. The second line is a custom text, shown in the upgrade dialog. You can write there whatever you want. Just note that the space in the upgrade dialog is limited. Too long messages will get truncated! The third line is the URL to the new installation package. This URL is opened when the user clicks on the custom message label in the upgrade dialog. You can also just point the user to a web page instead of the MSI file directly. The URL is opened with the default web browser, so if you specify a web page, that page is opened and shown to the user. If you specify the MSI package, the browser will ask the user to save the MSI file locally." msgstr "" "Verzija 1.4.0 i dalje TortoiseGit dozvoljavaju da preusmerite proveru dogradnje ka vašem internet serveru. Možete podesiti ključ registra HKCU\\Software\\TortoiseGit\\UpdateCheckURL (string vrednost) ka URL koji pokazuje na tekst fajl vašeg intraneta. Taj tekst fajl mora imati sledeći format: \n" "1.4.1.6000\n" "A new version of TortoiseGit is available for you to download!\n" "http://192.168.2.1/downloads/TortoiseGit-1.4.1.6000-svn-1.4.0.msi\n" " Prva linija u tom fajlu je string verzije. Morate osigurati da to tačno opisuje string verzije TortoiseGit instalacionog paketa. Druga linija je uobičajen tekst prikazan u dijalogu dogradnje. Tu možete napisati što god želite. Obratite pažnju da je prostor u dijalogu dogradnje ograničen. Suviše dugačke poruke će biti skraćene! Treća linija je URL ka novom instalacionom paketu. URL je otvoren kada korisnik klikne na oznaku uobičajene poruke u dijalogo dogradnje. Možete takođe samo uputiti korisnika na veb stranicu umesto na MSI fajl direktno. URL se otvara podrazumevanim pretraživačem veba, tako da ako specificirate veb stranicu, ta stranica se otvorila i prikazuje se korisniku. Ako specificirate MSI paket, pretraživač će pitati korisnika da sačuva MSI fajl lkalno." #. (title) #: ../source/TortoiseGit_en.xml:13945 msgid "Setting the SVN_ASP_DOT_NET_HACK environment variable" msgstr "Podešavanje SVN_ASP_DOT_NET_HACK promenljive okruženja." #. (primary) #: ../source/TortoiseGit_en.xml:13947 msgid "SVN_ASP_DOT_NET_HACK" msgstr "SVN_ASP_DOT_NET_HACK" #. (primary) #: ../source/TortoiseGit_en.xml:13950 msgid "VS2003" msgstr "VS2003" #. (primary) #: ../source/TortoiseGit_en.xml:13953 msgid "ASP projects" msgstr "ASP projekti" #. (para) #: ../source/TortoiseGit_en.xml:13955 msgid "As of version 1.4.0 and later, the TortoiseGit installer doesn't provide the user with the option to set the SVN_ASP_DOT_NET_HACK environment variable anymore, since that caused many problems and confusions with users which always install everything no matter if they know what it is for." msgstr "Od verzije 1.4.0 i dalje, instalacija TortoiseGit više ne omogućava korisniku da podesi SVN_ASP_DOT_NET_HACK promenljivu okruženja, jer je to uzrokovalo mnoge probleme i konfuziju kod korisnika koji uvek instaliraju sve ne brinući šta to u stvari znači." #. (para) #: ../source/TortoiseGit_en.xml:13963 msgid "" "But that option is only hidden for the user. You still can force the TortoiseGit installer to set that environment variable by setting the ASPDOTNETHACK property to TRUE. For example, you can start the installer like this: \n" "msiexec /i TortoiseGit-1.4.0.msi ASPDOTNETHACK=TRUE\n" "" msgstr "" "Ali ta opcija je samo sakrivena za korisnika. Vi još možete naterati TortoiseGit unstalaciju da podesi tu promenljivu okruženja podešavanjem ASPDOTNETHACK karakteristike na ISTINA. Na primer, možete početi instalaciju kao: \n" "msiexec /i TortoiseGit-1.4.0.msi ASPDOTNETHACK=TRUE\n" "" #. (title) #: ../source/TortoiseGit_en.xml:13974 msgid "Disable context menu entries" msgstr "Onemugući ulaz kontekstnog menija" #. (primary) #: ../source/TortoiseGit_en.xml:13976 msgid "context menu entries" msgstr "ulazi kontekstnog menija" #. (primary) #: ../source/TortoiseGit_en.xml:13979 msgid "disable functions" msgstr "funkcije onemogućavanja" #. (para) #: ../source/TortoiseGit_en.xml:13984 msgid "As of version 1.5.0 and later, TortoiseGit allows you to disable (actually, hide) context menu entries. Since this is a feature which should not be used lightly but only if there is a compelling reason, there is no GUI for this and it has to be done directly in the registry. This can be used to disable certain commands for users who should not use them. But please note that only the context menu entries in the explorer are hidden, and the commands are still available through other means, e.g. the command line or even other dialogs in TortoiseGit itself!" msgstr "Od verzije 1.5.0 i dalje, TortoiseGit omogućava da onemogućite (stvarno, sakrijete) ulaze kontekst menija. Pošto je to mogućnost koja ne bi trebalo da se koristi olako osim ako ne postoji obavezujući razlog, ne postoji GUI za to i to se mora uraditi dirktno u registru. Ovo se može koristiti da se onemoguće izvesne komande za korisnike koji ih ne bi koristio. Ali molim primetite da samo ulazi kontekst menija u eksploreru su sakrivene, a komande su i dalje dostupne kroz druge načine, npr. komandne linije i čak dijaloga u samoj TortoiseGit!" #. (para) #: ../source/TortoiseGit_en.xml:13994 msgid "The registry keys which hold the information on which context menus to show are HKEY_CURRENT_USER\\Software\\TortoiseGit\\ContextMenuEntriesMaskLow and HKEY_CURRENT_USER\\Software\\TortoiseGit\\ContextMenuEntriesMaskHigh." msgstr "Registri ključevi koji sadrže informacije po kojim se prikazuju kontekst meniji su HKEY_CURRENT_USER\\Software\\TortoiseGit\\ContextMenuEntriesMaskLow i HKEY_CURRENT_USER\\Software\\TortoiseGit\\ContextMenuEntriesMaskHigh." #. (para) #: ../source/TortoiseGit_en.xml:13999 msgid "Each of these registry entries is a DWORD value, with each bit corresponding to a specific menu entry. A set bit means the corresponding menu entry is deactivated." msgstr "Svaki od ovih ulaza registra je DWORD vrednost, sa svakim bitom koji odgovara posebnom ulazu menija. Podešen bit znači da je odgovarajući ulaz menija deaktiviran." #. (title) #: ../source/TortoiseGit_en.xml:14006 msgid "Menu entries and their values" msgstr "Ulazi menija i njihove vrednosti" #. (entry) #: ../source/TortoiseGit_en.xml:14012 msgid "Value" msgstr "Vrednost" #. (entry) #: ../source/TortoiseGit_en.xml:14013 msgid "Menu entry" msgstr "Ulazi menija" #. (entry) #. (title) #. (glossterm) #: ../source/TortoiseGit_en.xml:14019 #: ../source/TortoiseGit_en.xml:14836 #: ../source/TortoiseGit_en.xml:15864 msgid "Checkout" msgstr "Preuzimanje" #. (entry) #. (title) #. (glossterm) #: ../source/TortoiseGit_en.xml:14023 #: ../source/TortoiseGit_en.xml:14854 #: ../source/TortoiseGit_en.xml:16170 msgid "Update" msgstr "Ažuriranje" #. (entry) #. (title) #. (glossterm) #: ../source/TortoiseGit_en.xml:14027 #: ../source/TortoiseGit_en.xml:14893 #: ../source/TortoiseGit_en.xml:15890 msgid "Commit" msgstr "Urezivanje" #. (entry) #. (title) #. (glossterm) #: ../source/TortoiseGit_en.xml:14031 #: ../source/TortoiseGit_en.xml:15203 #: ../source/TortoiseGit_en.xml:15807 msgid "Add" msgstr "Dodavanje" #. (entry) #. (title) #. (glossterm) #: ../source/TortoiseGit_en.xml:14035 #: ../source/TortoiseGit_en.xml:15062 #: ../source/TortoiseGit_en.xml:16103 msgid "Revert" msgstr "Vrati na staro" #. (entry) #. (glossterm) #: ../source/TortoiseGit_en.xml:14043 #: ../source/TortoiseGit_en.xml:16091 msgid "Resolve" msgstr "Reši" #. (entry) #. (title) #. (glossterm) #: ../source/TortoiseGit_en.xml:14055 #: ../source/TortoiseGit_en.xml:15166 #: ../source/TortoiseGit_en.xml:15945 msgid "Export" msgstr "Izvezi" #. (entry) #: ../source/TortoiseGit_en.xml:14059 msgid "Create Repository here" msgstr "Kreiraj spremište ovde" #. (entry) #. (title) #: ../source/TortoiseGit_en.xml:14063 #: ../source/TortoiseGit_en.xml:15118 msgid "Branch/Tag" msgstr "Grana/znak" #. (entry) #. (title) #. (glossterm) #: ../source/TortoiseGit_en.xml:14067 #: ../source/TortoiseGit_en.xml:15149 #: ../source/TortoiseGit_en.xml:16017 msgid "Merge" msgstr "Stopi" #. (entry) #. (title) #. (glossterm) #: ../source/TortoiseGit_en.xml:14071 #: ../source/TortoiseGit_en.xml:15056 #: ../source/TortoiseGit_en.xml:15924 msgid "Delete" msgstr "Obriši" #. (entry) #. (title) #: ../source/TortoiseGit_en.xml:14075 #: ../source/TortoiseGit_en.xml:15050 msgid "Rename" msgstr "Preimenuj" #. (entry) #: ../source/TortoiseGit_en.xml:14079 msgid "Update to revision" msgstr "Ažuriraj prema reviziji" #. (entry) #. (title) #. (glossterm) #: ../source/TortoiseGit_en.xml:14083 #: ../source/TortoiseGit_en.xml:14940 #: ../source/TortoiseGit_en.xml:15936 msgid "Diff" msgstr "Razl" #. (entry) #. (title) #: ../source/TortoiseGit_en.xml:14087 #: ../source/TortoiseGit_en.xml:14961 msgid "Show Log" msgstr "Prikaži dnevnik" #. (entry) #. (title) #: ../source/TortoiseGit_en.xml:14091 #: ../source/TortoiseGit_en.xml:15036 msgid "Edit Conflicts" msgstr "Uredi sukob" #. (entry) #. (title) #. (glossterm) #: ../source/TortoiseGit_en.xml:14095 #: ../source/TortoiseGit_en.xml:15191 #: ../source/TortoiseGit_en.xml:16063 msgid "Relocate" msgstr "Premesti" #. (entry) #: ../source/TortoiseGit_en.xml:14099 msgid "Check for modifications" msgstr "Provera izmena" #. (entry) #: ../source/TortoiseGit_en.xml:14103 msgid "Ignore" msgstr "Zanemari" #. (entry) #: ../source/TortoiseGit_en.xml:14107 msgid "Repository Browser" msgstr "Pretraživač spremišta" #. (entry) #. (title) #. (glossterm) #: ../source/TortoiseGit_en.xml:14111 #: ../source/TortoiseGit_en.xml:15223 #: ../source/TortoiseGit_en.xml:15828 msgid "Blame" msgstr "Krivac" #. (entry) #. (title) #: ../source/TortoiseGit_en.xml:14115 #: ../source/TortoiseGit_en.xml:15249 msgid "Create Patch" msgstr "Izradi zakrpu" #. (entry) #. (title) #: ../source/TortoiseGit_en.xml:14119 #: ../source/TortoiseGit_en.xml:15259 msgid "Apply Patch" msgstr "Primena zakrpa" #. (entry) #: ../source/TortoiseGit_en.xml:14123 msgid "Revision graph" msgstr "Revizioni graf" #. (entry) #. (glossterm) #: ../source/TortoiseGit_en.xml:14127 #: ../source/TortoiseGit_en.xml:15989 msgid "Lock" msgstr "Zaključavanje" #. (entry) #: ../source/TortoiseGit_en.xml:14131 msgid "Remove Lock" msgstr "Ukloni ključ" #. (entry) #: ../source/TortoiseGit_en.xml:14135 msgid "Properties" msgstr "Osobine" #. (entry) #: ../source/TortoiseGit_en.xml:14139 msgid "Diff with URL" msgstr "Razl sa URL" #. (entry) #: ../source/TortoiseGit_en.xml:14143 msgid "Delete unversioned items" msgstr "Obriši neverzionisane stavke " #. (entry) #: ../source/TortoiseGit_en.xml:14147 msgid "Settings" msgstr "Postavke" #. (entry) #: ../source/TortoiseGit_en.xml:14151 msgid "Help" msgstr "Pomoć" #. (entry) #: ../source/TortoiseGit_en.xml:14155 msgid "About" msgstr "O" #. (para) #: ../source/TortoiseGit_en.xml:14161 msgid "" "Example: to disable the Relocate the Delete unversioned items and the Settings menu entries, add the values assigned to the entries like this: \n" " 0x0000000000080000\n" "+ 0x0000000080000000\n" "+ 0x2000000000000000\n" "= 0x2000000080080000\n" " The lower DWORD value (0x80080000) must then be stored in HKEY_CURRENT_USER\\Software\\TortoiseGit\\ContextMenuEntriesMaskLow, the higher DWORD value (0x20000000) in HKEY_CURRENT_USER\\Software\\TortoiseGit\\ContextMenuEntriesMaskHigh." msgstr "" "Primer: da se onemogući Relociraj Obriši neverzionisane stavke i Podešavanja ulazi menija, dodajte vrednosti pridružene ulazima kao ove: \n" " 0x0000000000080000\n" "+ 0x0000000080000000\n" "+ 0x2000000000000000\n" "= 0x2000000080080000\n" " Manja DWORD vrednost (0x80080000) mora biti smeštena u HKEY_CURRENT_USER\\Software\\TortoiseGit\\ContextMenuEntriesMaskLow, veća DWORD vrednost (0x20000000) u HKEY_CURRENT_USER\\Software\\TortoiseGit\\ContextMenuEntriesMaskHigh." #. (para) #: ../source/TortoiseGit_en.xml:14178 msgid "To enable the menu entries again, simply delete the two registry keys." msgstr "Da biste ponovo omogućili ulaze menija, jednostavno obrišite dva registar ključa." #. (title) #: ../source/TortoiseGit_en.xml:14184 msgid "Automating TortoiseGit" msgstr "Automatizovanje TortoiseGit" #. (para) #: ../source/TortoiseGit_en.xml:14186 msgid "Since all commands for TortoiseGit are controlled through command line parameters, you can automate it with batch scripts or start specific commands and dialogs from other programs (e.g. your favourite text editor)." msgstr "Pošto su sve komande TortoiseGit kontrolisane kroz parametre kontrolne linije, možete automatizovati to sa beč skriptom da pokrenete posebne komande i dijaloge iz drugih programa (npr. vašeg najdražeg tekst uređivača)." #. (para) #: ../source/TortoiseGit_en.xml:14192 msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Git command line client instead." msgstr "Zapamtite da je TortoiseGit GUI klijent, i ovaj automatizacioni vodič prikazuje kako da učinite da se TortoiseGit dijalog pojavi da sakupi korisnikove ulaze. Ako želite da napišete skript koji ne zahteva ulaz, treba da koristite zvaničan Subverzioni linijski klijent umesto toga." #. (title) #. (title) #: ../source/TortoiseGit_en.xml:14204 #: ../source/TortoiseGit_en.xml:14834 msgid "TortoiseGit Commands" msgstr "TortoiseGit komande" #. (primary) #. (primary) #: ../source/TortoiseGit_en.xml:14206 #: ../source/TortoiseGit_en.xml:14679 msgid "automation" msgstr "utomatizovanje" #. (primary) #. (primary) #: ../source/TortoiseGit_en.xml:14209 #: ../source/TortoiseGit_en.xml:14682 msgid "command line" msgstr "komandna linija" #. (para) #: ../source/TortoiseGit_en.xml:14211 msgid "The TortoiseGit GUI program is called TortoiseProc.exe. All commands are specified with the parameter where abcd is the required command name. Most of these commands need at least one path argument, which is given with . In the following table the command refers to the parameter and the path refers to the parameter." msgstr "TortoiseGit GUI program se zove TortoiseProc.exe. Sve komande su specificirane sa parametrom gde je abcd željeno ime komande. Većina od ovih komandi zahteva najmanje jednu putanju kao argument, što je dato sa . U sledećoj tabeli komande se odnose na parametar i putanju koja se odnosi na parametar." #. (para) #: ../source/TortoiseGit_en.xml:14220 msgid "Since some of the commands can take a list of target paths (e.g. committing several specific files) the parameter can take several paths, separated by a * character." msgstr "Kako neke od komandi mogu uzeti listu ciljnih putanja (npr. urezivanje više specifičnih fajlova) parametar može uzeti više putalji, odvojenih sa * karakterom." #. (para) #: ../source/TortoiseGit_en.xml:14225 msgid "TortoiseGit uses temporary files to pass multiple arguments between the shell extension and the main program. From TortoiseGit 1.5.0 on and later, parameter is obsolete and there is no need to add it anymore." msgstr "TortoiseGit koristi privremene fajlove da provuče višestruke argumente između proširenja školjke i glavnog programa. Iz TortoiseGit 1.5.0 i dalje, parametar je napušten i nema potrebe da se više dodaje." #. (para) #: ../source/TortoiseGit_en.xml:14231 msgid "The progress dialog which is used for commits, updates and many more commands usually stays open after the command has finished until the user presses the OK button. This can be changed by checking the corresponding option in the settings dialog. But using that setting will close the progress dialog, no matter if you start the command from your batch file or from the TortoiseGit context menu." msgstr "Progres dijalog koji se koristi za urezivanje, ažurira i mnogo više komandi obično ostaje otvoreno posle zavreštka rada komande dok korisnik ne pritisne OK dugme. Ovo bi se moglo promeniti proverom odgovarajiće opvžcije u dijalogu podešavanja. Koristeći to podešavanje zatvoriće se progres dijalog, nije bitno da li ste počeli komandu iz beč fajla ili iz TortoiseGit kontekst menija." #. (para) #: ../source/TortoiseGit_en.xml:14239 msgid "To specify a different location of the configuration file, use the parameter . This will override the default path, including any registry setting." msgstr "Da se specificira različita lokacija konfiguracionog fajla, koristite parametar . Ovo će promeniti uobičajenu putanju, uključujući i podešavanje registra." #. (para) #: ../source/TortoiseGit_en.xml:14250 msgid " don't close the dialog automatically" msgstr " ne zatvara dijalog automatski" #. (para) #: ../source/TortoiseGit_en.xml:14255 msgid " auto close if no errors" msgstr " auto zatvaranje ako nema grešaka" #. (para) #: ../source/TortoiseGit_en.xml:14260 msgid " auto close if no errors and conflicts" msgstr " auto zatvaranje ako nema grešaka i konflikata" #. (para) #: ../source/TortoiseGit_en.xml:14265 msgid " auto close if no errors, conflicts and merges" msgstr "auto zatvaranje ako nema grešaka, konflikata i stapanja" #. (para) #: ../source/TortoiseGit_en.xml:14270 msgid " auto close if no errors, conflicts and merges for local operations" msgstr "auto zatvaranje ako nema grešaka, konflikata i stapanja za lokalne operacije" #. (para) #: ../source/TortoiseGit_en.xml:14244 msgid "To close the progress dialog at the end of a command automatically without using the permanent setting you can pass the parameter. " msgstr "Da bi se zatvorio progres dijalog na kraju komande bez korišćenja stalnog podešavanja treba da provučete parametar. " #. (para) #: ../source/TortoiseGit_en.xml:14277 msgid "The table below lists all the commands which can be accessed using the TortoiseProc.exe command line. As described above, these should be used in the form /command:abcd. In the table, the /command prefix is omitted to save space." msgstr "Tabela koja sledi lista sve komande kojima treba da pristupi TortoiseProc.egze komandna linija. Kako je ranije opisano, ovo treba da se koristi u obliku /command:abcd. U tabeli, /command prefiks nedostaje da se uštedi na prostoru." #. (title) #: ../source/TortoiseGit_en.xml:14296 msgid "List of available commands and options" msgstr "Lista dostupnih komandnih opcija" #. (entry) #: ../source/TortoiseGit_en.xml:14302 msgid "Command" msgstr "Komanda" #. (entry) #: ../source/TortoiseGit_en.xml:14309 msgid "Shows the about dialog. This is also shown if no command is given." msgstr "Prikazuje dijalog sa opisom programa. Ovaj dijalog je takođe prikazan ako komanda nije data." #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #. (option) #: ../source/TortoiseGit_en.xml:14317 #: ../source/TortoiseGit_en.xml:14328 #: ../source/TortoiseGit_en.xml:14336 #: ../source/TortoiseGit_en.xml:14343 #: ../source/TortoiseGit_en.xml:14355 #: ../source/TortoiseGit_en.xml:14372 #: ../source/TortoiseGit_en.xml:14380 #: ../source/TortoiseGit_en.xml:14388 #: ../source/TortoiseGit_en.xml:14395 #: ../source/TortoiseGit_en.xml:14404 #: ../source/TortoiseGit_en.xml:14410 #: ../source/TortoiseGit_en.xml:14417 #: ../source/TortoiseGit_en.xml:14418 #: ../source/TortoiseGit_en.xml:14420 #: ../source/TortoiseGit_en.xml:14426 #: ../source/TortoiseGit_en.xml:14442 #: ../source/TortoiseGit_en.xml:14450 #: ../source/TortoiseGit_en.xml:14471 #: ../source/TortoiseGit_en.xml:14478 #: ../source/TortoiseGit_en.xml:14488 #: ../source/TortoiseGit_en.xml:14494 #: ../source/TortoiseGit_en.xml:14527 #: ../source/TortoiseGit_en.xml:14533 #: ../source/TortoiseGit_en.xml:14546 #: ../source/TortoiseGit_en.xml:14555 #: ../source/TortoiseGit_en.xml:14561 #: ../source/TortoiseGit_en.xml:14569 #: ../source/TortoiseGit_en.xml:14604 #: ../source/TortoiseGit_en.xml:14614 #: ../source/TortoiseGit_en.xml:14621 #: ../source/TortoiseGit_en.xml:14628 #: ../source/TortoiseGit_en.xml:14637 #: ../source/TortoiseGit_en.xml:14654 msgid "/path" msgstr "/putanja" #. (option) #. (option) #: ../source/TortoiseGit_en.xml:14320 #: ../source/TortoiseGit_en.xml:14496 msgid "/startrev:xxx" msgstr "/startrev:xxx" #. (option) #. (option) #: ../source/TortoiseGit_en.xml:14321 #: ../source/TortoiseGit_en.xml:14497 msgid "/endrev:xxx" msgstr "/endrev:xxx" #. (option) #: ../source/TortoiseGit_en.xml:14322 msgid "/strict" msgstr "/strict" #. (entry) #: ../source/TortoiseGit_en.xml:14316 msgid "Opens the log dialog. The specifies the file or folder for which the log should be shown. Three additional options can be set: , and " msgstr "Otvara dnevnik dijalog. specificira fajl ili imenik za koji dnevnik treba da bude prikazan. Tri dodatne opcije treba da budu podeene: , i " #. (option) #. (option) #: ../source/TortoiseGit_en.xml:14329 #: ../source/TortoiseGit_en.xml:14452 msgid "/url" msgstr "/url" #. (entry) #: ../source/TortoiseGit_en.xml:14327 msgid "Opens the checkout dialog. The specifies the target directory and the specifies the URL to checkout from." msgstr "Otvara dijalog preuzimanja. specificire ciljni imenik i specificire URL iz kog se preuzima." #. (entry) #: ../source/TortoiseGit_en.xml:14335 msgid "Opens the import dialog. The specifies the directory with the data to import." msgstr "Otvara dijalog uvoza. specificira imenik sa podacima za uvoz." #. (option) #: ../source/TortoiseGit_en.xml:14344 msgid "/rev" msgstr "/rev" #. (option) #: ../source/TortoiseGit_en.xml:14347 msgid "/rev:1234" msgstr "/rev:1234" #. (option) #: ../source/TortoiseGit_en.xml:14348 msgid "/nonrecursive" msgstr "/nonrecursive" #. (option) #: ../source/TortoiseGit_en.xml:14349 msgid "/ignoreexternals" msgstr "/ignoreexternals" #. (entry) #: ../source/TortoiseGit_en.xml:14342 msgid "Updates the working copy in to HEAD. If the option is given then a dialog is shown to ask the user to which revision the update should go. To avoid the dialog specify a revision number . Other options are and ." msgstr "Ažurira radnu kopiju u ka GLAVNOJ. Ako je opcija data tada je prikazani dijalog da pita korisnika ka kojoj reviziji ažuriranje treba da ide. Da bi se izbegao dijalog specificirajte broj revizije . Druge opcije su i ." #. (option) #. (option) #: ../source/TortoiseGit_en.xml:14357 #: ../source/TortoiseGit_en.xml:14454 msgid "/logmsg" msgstr "/logmsg" #. (option) #. (option) #: ../source/TortoiseGit_en.xml:14360 #: ../source/TortoiseGit_en.xml:14457 msgid "/logmsgfile:path" msgstr "/logmsgfile:path" #. (option) #. (option) #: ../source/TortoiseGit_en.xml:14361 #: ../source/TortoiseGit_en.xml:14458 msgid "path" msgstr "putanja" #. (option) #: ../source/TortoiseGit_en.xml:14365 msgid "/bugid:\"the bug id here\"" msgstr "/bugid:\"bag id ovde\"" #. (entry) #: ../source/TortoiseGit_en.xml:14354 msgid "Opens the commit dialog. The specifies the target directory or the list of files to commit. You can also specify the switch to pass a predefined log message to the commit dialog. Or, if you don't want to pass the log message on the command line, use , where points to a file containing the log message. To pre-fill the bug ID box (in case you've set up integration with bug trackers properly), you can use the to do that." msgstr "Otvara dijalog urezivanja. specificira ciljni imenik ili listu fajlova za ažuriranje. Možete takođe specificirati prekidač da provučete predefinisane dnevnik poruke u dijalog urezivanja. Svakako, ako ne želite da provučete dnevnik poruku na komandnoj liniji, koristite , gde ukazije na fajl koji sadrži dnevnik poruku. Da bi se pre-popunio bag ID (u slučaju da ste odgovarajuće podesili integraciju sa bag tragačem), možete koristiti da to uradite." #. (entry) #: ../source/TortoiseGit_en.xml:14371 msgid "Adds the files in to version control." msgstr "Dodaje fajlove u za kontrolu verzije." #. (entry) #: ../source/TortoiseGit_en.xml:14378 msgid "Reverts local modifications of a working copy. The tells which items to revert." msgstr "Vraća lokalne izmene radne kopije. kaže koje stavke vratiti." #. (entry) #: ../source/TortoiseGit_en.xml:14386 msgid "Cleans up interrupted or aborted operations and unlocks the working copy in ." msgstr "Čisti prekinute ili zaustavljene operacije i otključava radnu kopiju u ." #. (option) #. (option) #. (option) #: ../source/TortoiseGit_en.xml:14396 #: ../source/TortoiseGit_en.xml:14481 #: ../source/TortoiseGit_en.xml:14647 msgid "/noquestion" msgstr "/noquestion" #. (entry) #: ../source/TortoiseGit_en.xml:14393 msgid "Marks a conflicted file specified in as resolved. If is given, then resolving is done without asking the user first if it really should be done." msgstr "Označava konfliktne fajlove specificirane u kao rešene. Ako je dat, rešavanje je dato bez prethodnog pitanja korisnika da li da se to uradi." #. (entry) #: ../source/TortoiseGit_en.xml:14403 msgid "Creates a repository in " msgstr "Kreira spremište u " #. (entry) #: ../source/TortoiseGit_en.xml:14409 msgid "Opens the switch dialog. The specifies the target directory." msgstr "Otvara prekidač dijalog. specificira ciljni imenik." #. (entry) #: ../source/TortoiseGit_en.xml:14416 msgid "Exports the working copy in to another directory. If the points to an unversioned directory, a dialog will ask for an URL to export to the directory in ." msgstr "Izvozi radnu kopiju u za dugi imenik. Ako ukazuje na neverzionisani imenik, dijalog će vas pitati za URL za izvoz u imenik u ." #. (option) #. (option) #: ../source/TortoiseGit_en.xml:14429 #: ../source/TortoiseGit_en.xml:14432 msgid "/fromurl:URL" msgstr "/fromurl:URL" #. (option) #: ../source/TortoiseGit_en.xml:14430 msgid "/revrange:string" msgstr "/revrange:string" #. (option) #: ../source/TortoiseGit_en.xml:14433 msgid "/tourl:URL" msgstr "/tourl:URL" #. (option) #: ../source/TortoiseGit_en.xml:14434 msgid "/fromrev:xxx" msgstr "/fromrev:xxx" #. (option) #: ../source/TortoiseGit_en.xml:14435 msgid "/torev:xxx" msgstr "/torev:xxx" #. (entry) #: ../source/TortoiseGit_en.xml:14425 msgid "Opens the merge dialog. The specifies the target directory. For merging a revision range, the following options are available: , . For merging two repository trees, the following options are available: , , and . These pre-fill the relevant fields in the merge dialog." msgstr "Otvara dijalog stapanja. specificira ciljni imenik. Za stapanje opsega revizija sledeće opcije su dostupne: , . Za stapanja dva stabla spremišta sledeće opcije su dostupne: , , i . Ovo pre-popuni relevantna polja u dijalogu stapanja." #. (entry) #: ../source/TortoiseGit_en.xml:14441 msgid "Opens the merge all dialog. The specifies the target directory." msgstr "Otvara dijalog stapanja. specificira ciljni imenik." #. (entry) #: ../source/TortoiseGit_en.xml:14448 msgid "Brings up the branch/tag dialog. The is the working copy to branch/tag from. And the is the target URL. You can also specify the switch to pass a predefined log message to the branch/tag dialog. Or, if you don't want to pass the log message on the command line, use , where points to a file containing the log message." msgstr "Dovodi grana/znak dijalog. je radna kopija iz grana-znak. I je cilj URL. Možete takođe specificirati prekidač da provučete predefinisanu dnevnik poruku do grana/znak dijaloga. Ili, ako ne želite da provučete dnevnik poruku na komandnu liniju, koristite , gde ukazuje na fajl koji sadrži dnevnik poruku." #. (entry) #: ../source/TortoiseGit_en.xml:14464 msgid "Opens the settings dialog." msgstr "Otvara dijalog podešavanja." #. (entry) #: ../source/TortoiseGit_en.xml:14470 msgid "Removes the file(s) in from version control." msgstr "Uklanja fajl(ove) u iz kontrole verzija." #. (entry) #: ../source/TortoiseGit_en.xml:14477 msgid "Renames the file in . The new name for the file is asked with a dialog. To avoid the question about renaming similar files in one step, pass ." msgstr "Preimenuje fajl u . Novo ime za fajl pita dijalog. Da se izbegne pitanje o preimenovanju sličnih fajlova u jednom koraku, prevuci ." #. (option) #. (option) #. (option) #: ../source/TortoiseGit_en.xml:14490 #: ../source/TortoiseGit_en.xml:14492 #: ../source/TortoiseGit_en.xml:14498 msgid "/path2" msgstr "/path2" #. (option) #: ../source/TortoiseGit_en.xml:14498 msgid "/blame" msgstr "/krivac" #. (entry) #: ../source/TortoiseGit_en.xml:14486 msgid "Starts the external diff program specified in the TortoiseGit settings. The specifies the first file. If the option is set, then the diff program is started with those two files. If is omitted, then the diff is done between the file in and its BASE. To explicitly set the revision numbers use and . If is set and is not set, then the diff is done by first blaming the files with the given revisions." msgstr "Pokreće spoljašnji diff program specificiran u TortoiseGit podešavanju. specificira prvi fajl. Ako je opcija podešena, onda diff program počinje sa ta dva fajla. Ako je izostavljen, onda diffovi između fajlova u i njenu OSNOVU. Da se eksplicitno podesi broj revizije koristite i . Ako je podešen i nije podešen, onda je diff urađen najpre okrivljavanjem fajlova sa datim revizijama." #. (para) #: ../source/TortoiseGit_en.xml:14506 msgid "Depending on the URLs and revisions to compare, this either shows a unified diff (if the option is set), a dialog with a list of files that have changed or if the URLs point to files starts the diff viewer for those two files." msgstr "U zavisnosti od URLa i revizija za poređenje, ovo ili prikazuje diff (ako je opcija podešen), dijalog sa listom fajlova koji su izmenjeni ili ako URL ukazuju na fajlove koji pokreću diff pregledač za ta dva fajla." #. (para) #: ../source/TortoiseGit_en.xml:14513 msgid "The options , , and must be specified. The options , , and are optional." msgstr "Opcije , , i moraju biti specificirani. Opcije , , i su opcionalni." #. (entry) #: ../source/TortoiseGit_en.xml:14524 msgid "Starts the conflict editor specified in the TortoiseGit settings with the correct files for the conflicted file in ." msgstr "Pokreće konflikt uređivač specificiran u TortoiseGit podešavanju sa korektnim fajlovima za konfliktni fajl u ." #. (entry) #: ../source/TortoiseGit_en.xml:14532 msgid "Opens the relocate dialog. The specifies the working copy path to relocate." msgstr "Otvara dijalog relociranja. specificira putanju radne kopije za relociranje." #. (entry) #: ../source/TortoiseGit_en.xml:14539 msgid "Opens the help file." msgstr "Otvara fajl pomoći." #. (entry) #: ../source/TortoiseGit_en.xml:14545 msgid "Opens the check-for-modifications dialog. The specifies the working copy directory." msgstr "Otvara proveri-za-izmene dijalog. specificira imenik radne kopije." #. (option) #. (option) #: ../source/TortoiseGit_en.xml:14557 #: ../source/TortoiseGit_en.xml:14559 msgid "/rev:xxx" msgstr "/rev:xxx" #. (option) #: ../source/TortoiseGit_en.xml:14562 msgid "/projectpropertiespath:path/to/wc" msgstr "/projectpropertiespath:path/to/wc" #. (entry) #: ../source/TortoiseGit_en.xml:14552 msgid "Starts the repository browser dialog, pointing to the URL of the working copy given in or points directly to an URL. An additional option can be used to specify the revision which the repository browser should show. If the is omitted, it defaults to HEAD. If points to an URL, the specifies the path from where to read and use the project properties." msgstr "Pokreće dijalog pretraživača spremišta, ukazuje na URL radne kopije dat u ili ukazuju direktno na URL. Dodatna opcija može biti korišćen da specificira reviziju koju pretraživač spremišta treba da prikaže. Ako nedostaje, uobičajeno ide na GLAVNU. Ako ukazuje na URL, specificira putanju odakle se čita i koriste karakteristike projekta." #. (literal) #: ../source/TortoiseGit_en.xml:14570 msgid "svn:ignore" msgstr "svn:ignore" #. (entry) #: ../source/TortoiseGit_en.xml:14568 msgid "Adds all targets in to the ignore list, i.e. adds the property to those files." msgstr "Dodaje sve ciljeve u u listu zanemarivanja, tj. dodaje karakteristike tim fajlovima." #. (para) #: ../source/TortoiseGit_en.xml:14577 msgid "Opens the blame dialog for the file specified in ." msgstr "Otvara dijalog okrivljavanja za fajlove specificirane u ." #. (para) #: ../source/TortoiseGit_en.xml:14581 msgid "If the options and are set, then the dialog asking for the blame range is not shown but the revision values of those options are used instead." msgstr "Ako opcije i su podešeni, zatim se poziva dijalog za opseg okrivljavanja koji nije prikazan ali revizione vrednosti ovih opcija su korišćene umesto toga." #. (para) #: ../source/TortoiseGit_en.xml:14588 msgid "If the option is set, TortoiseBlame will open with the specified line number showing." msgstr "Ako je opcija podešena, TortoiseBLAME će se otvoriti sa prikazanim specifičnim brojevima linija." #. (para) #: ../source/TortoiseGit_en.xml:14593 msgid "The options , and are also supported." msgstr "Opcije , i su takođe podržani." #. (option) #: ../source/TortoiseGit_en.xml:14605 msgid "/savepath:path" msgstr "/savepath:path" #. (option) #: ../source/TortoiseGit_en.xml:14606 msgid "/revision:xxx" msgstr "/revision:xxx" #. (entry) #: ../source/TortoiseGit_en.xml:14602 msgid "Saves a file from an URL or working copy path given in to the location given in . The revision is given in . This can be used to get a file with a specific revision." msgstr "Čuva fajlove iz URL ili imenika radne kopije dat u ka lokaciji datoj u . Revizija je data u . Ovo može biti korišćeno da se dobije fajl sa specifičnom revizijom." #. (entry) #: ../source/TortoiseGit_en.xml:14612 msgid "Creates a patch file for the path given in ." msgstr "Kreira fajl zakrpu za putanju datu u ." #. (entry) #: ../source/TortoiseGit_en.xml:14619 msgid "Shows the revision graph for the path given in ." msgstr "Priakzuje revizioni graf za putanju datu u ." #. (entry) #: ../source/TortoiseGit_en.xml:14626 msgid "Locks a file or all files in a directory given in . The 'lock' dialog is shown so the user can enter a comment for the lock." msgstr "Zaključava fajl u imeniku datom u . 'Katanac' dijalog je prikazan tako da korisnik može unese urezivanje za katanac. " #. (entry) #: ../source/TortoiseGit_en.xml:14635 msgid "Unlocks a file or all files in a directory given in ." msgstr "Otključaj fajl ili sve fajlove u imeniku datom u ." #. (entry) #: ../source/TortoiseGit_en.xml:14642 msgid "Rebuilds the windows icon cache. Only use this in case the windows icons are corrupted. A side effect of this (which can't be avoided) is that the icons on the desktop get rearranged. To suppress the message box, pass ." msgstr "Prerađuje keš ikona prozora. Samo koristite ovo u slučaju da su ikone prozora uništene. Sporedni efekat ovoga je (koji može biti izbegnut) to da ikone na desktopu budu preuređene. Da se spreči boks poruke, provucite ." #. (entry) #: ../source/TortoiseGit_en.xml:14652 msgid "Shows the properties dialog for the path given in ." msgstr "Prikazuje dijalog karakteristika za putanju u ." #. (para) #: ../source/TortoiseGit_en.xml:14661 msgid "" "Examples (which should be entered on one line): \n" "TortoiseProc.exe /command:commit\n" " /path:\"c:\\svn_wc\\file1.txt*c:\\svn_wc\\file2.txt\"\n" " /logmsg:\"test log message\" /closeonend:0\n" "\n" "TortoiseProc.exe /command:update /path:\"c:\\svn_wc\\\" /closeonend:0\n" "\n" "TortoiseProc.exe /command:log /path:\"c:\\svn_wc\\file1.txt\"\n" " /startrev:50 /endrev:60 /closeonend:0\n" "" msgstr "" "Primer (koji će biti unet na jednoj liniji): \n" "TortoiseProc.exe /command:commit\n" " /path:\"c:\\svn_wc\\file1.txt*c:\\svn_wc\\file2.txt\"\n" " /logmsg:\"test log message\" /closeonend:0\n" "\n" "TortoiseProc.exe /command:update /path:\"c:\\svn_wc\\\" /closeonend:0\n" "\n" "TortoiseProc.exe /command:log /path:\"c:\\svn_wc\\file1.txt\"\n" " /startrev:50 /endrev:60 /closeonend:0\n" "" #. (title) #: ../source/TortoiseGit_en.xml:14677 msgid "TortoiseIDiff Commands" msgstr "TortozIDif komande" #. (para) #: ../source/TortoiseGit_en.xml:14684 msgid "The image diff tool has a few command line options which you can use to control how the tool is started. The program is called TortoiseIDiff.exe." msgstr "Slike diff alat ima nekoliko opcija komandnih linija koje možete koristiti da kontrolišete kako se alat pokreće. Program se zove TortoiseIDiff.exe." #. (para) #: ../source/TortoiseGit_en.xml:14689 msgid "The table below lists all the options which can be passed to the image diff tool on the command line." msgstr "Tabela koja sledi lista svih opcija koje mogu biti prenete u diff slike alatu na komandnoj liniji." #. (title) #: ../source/TortoiseGit_en.xml:14705 msgid "List of available options" msgstr "Lista raspoloživih opcija" #. (entry) #: ../source/TortoiseGit_en.xml:14711 msgid "Option" msgstr "Opcije" #. (entry) #: ../source/TortoiseGit_en.xml:14718 msgid "Path to the file shown on the left." msgstr "Putanja do fajla prikazanog levo." #. (entry) #. (entry) #: ../source/TortoiseGit_en.xml:14724 #: ../source/TortoiseGit_en.xml:14737 msgid "A title string. This string is used in the image view title instead of the full path to the image file." msgstr "String naslova. Ovaj string se koristi u naslovu pregledača slika umesto pune putanje fajlova slika." #. (entry) #: ../source/TortoiseGit_en.xml:14731 msgid "Path to the file shown on the right." msgstr "Putanja do fajla prikazanog desno." #. (entry) #: ../source/TortoiseGit_en.xml:14744 msgid "If specified, the image diff tool switches to the overlay mode (alpha blend)." msgstr "Ako je specificiran, dif alat slika prebacuje mod prekrivača (alfa mešavina)." #. (entry) #: ../source/TortoiseGit_en.xml:14751 msgid "If specified, the image diff tool fits both images together." msgstr "Ako je specificiran, diff alat slike uglavljuje obe slike zajedno." #. (entry) #: ../source/TortoiseGit_en.xml:14758 msgid "Shows the image info box." msgstr "Prikazuje info boks slike." #. (para) #: ../source/TortoiseGit_en.xml:14766 msgid "" "Example (which should be entered on one line): \n" "TortoiseIDiff.exe /left:\"c:\\images\\img1.jpg\" /lefttitle:\"image 1\"\n" " /right:\"c:\\images\\img2.jpg\" /righttitle:\"image 2\"\n" " /fit /overlay\n" "" msgstr "" "Primer (koji treba da bude unet na jednoj liniji): \n" "TortoiseIDiff.exe /left:\"c:\\images\\img1.jpg\" /lefttitle:\"image 1\"\n" " /right:\"c:\\images\\img2.jpg\" /righttitle:\"image 2\"\n" " /fit /overlay\n" "" #. (title) #: ../source/TortoiseGit_en.xml:14778 msgid "Command Line Interface Cross Reference" msgstr "Komandna Linija Interfejs Unakrsne Reference" #. (primary) #: ../source/TortoiseGit_en.xml:14781 msgid "command line client" msgstr "komand linija klijent" #. (primary) #: ../source/TortoiseGit_en.xml:14784 msgid "CLI" msgstr "CLI" #. (para) #: ../source/TortoiseGit_en.xml:14786 msgid "Sometimes this manual refers you to the main Git documentation, which describes Git in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations." msgstr "Ponekad ovo uputstvo ukazuje na glavne Subverzione dokumente, koji opisuju Subverziju u terminima Interfejsa Komandne Linije (IKL). Da bi vam se pomoglo da razumete šta TortoiseGit radi iza scene sastavili smo listu koja pokazuje ekvivalentne IKL komande za svaki TortoiseGit GUI." #. (para) #: ../source/TortoiseGit_en.xml:14795 msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does not call the CLI but uses the Git library directly." msgstr "Bez obzira što postoji IKL ekvivalent na ono što TortoiseGit radi setite se da TortoiseGit ne poziva IKL već koristi Subverzionu biblioteku direktno." #. (para) #: ../source/TortoiseGit_en.xml:14801 msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Git issues. This reference tells you which command to try." msgstr "Ako mislite da ste našli bag u TortoiseGit, možemo vam zatražiti da pokušate da reprodukujete to koristeći IKL, tako da možemo razdvojiti TortoiseGit odziv od Subverzionog odiva. Ove reference vam kažu sa kojim komandama da pokušate. " #. (title) #: ../source/TortoiseGit_en.xml:14809 msgid "Conventions and Basic Rules" msgstr "Konvencije i osnovna pravila" #. (para) #: ../source/TortoiseGit_en.xml:14810 msgid "In the descriptions which follow, the URL for a repository location is shown simply as URL, and an example might be http://TortoiseGit.tigris.org/svn/TortoiseGit/trunk. The working copy path is shown simply as PATH, and an example might be C:\\TortoiseGit\\trunk." msgstr "U opisu koji sledi, URL za lokaciju spremišta prikazan je jednostavno kao URL, i primer može biti http://TortoiseGit.tigris.org/svn/TortoiseGit/trunk. Putanja radne kopije je prikazana jednostavno kao PUTANJA, i primer može biti C:\\TortoiseGit\\trunk." #. (para) #: ../source/TortoiseGit_en.xml:14820 msgid "Because TortoiseGit is a Windows Shell Extension, it is not able to use the notion of a current working directory. All working copy paths must be given using the absolute path, not a relative path." msgstr "Pošto je TortoiseGit Vindouz Ekstenzija Školjke, nje moguće koristiti pojam tekućeg radnog direktorijuma. Sve putanje radne kopije moraju biti date koristeći apsulutnu putanju, ne realnu putanju." #. (para) #: ../source/TortoiseGit_en.xml:14827 msgid "Certain items are optional, and these are often controlled by checkboxes or radio buttons in TortoiseGit. These options are shown in [square brackets] in the command line definitions." msgstr "Neke stavke su opcionalne i one su često kontrolisane čekboksovima ili radio dugmićima u TortoiseGit. Ove opcije su prikazane u [srednjim zagradama] u definiciji komandne linije." #. (screen) #: ../source/TortoiseGit_en.xml:14837 #, no-wrap msgid "" "\n" "svn checkout [-N] [--ignore-externals] [-r rev] URL PATH\n" msgstr "" "\n" "svn checkout [-N] [--ignore-externals] [-r rev] URL PATH\n" #. (para) #: ../source/TortoiseGit_en.xml:14840 msgid "If Only checkout the top folder is checked, use the -N switch." msgstr "Ako je Preuzmi samo vršni imenik čekirano, koristite -N prekidač." #. (para) #. (para) #: ../source/TortoiseGit_en.xml:14844 #: ../source/TortoiseGit_en.xml:14887 msgid "If Omit externals is checked, use the --ignore-externals switch." msgstr "Ako je Izostavi spoljašnje čekirano, koristite --ignore-externals prekidač." #. (para) #: ../source/TortoiseGit_en.xml:14848 msgid "If you are checking out a specific revision, specify that after the URL using -r switch." msgstr "Ako preuzimate specifičnu reviziju, specificirajte to posle URL koristeći -r prekidač." #. (screen) #: ../source/TortoiseGit_en.xml:14855 #, no-wrap msgid "" "\n" "svn info URL_of_WC\n" "svn update [-r rev] PATH\n" msgstr "" "\n" "svn info URL_of_WC\n" "svn update [-r rev] PATH\n" #. (para) #: ../source/TortoiseGit_en.xml:14859 msgid "Updating multiple items is currently not an atomic operation in Git. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy." msgstr "Ažuriranjem višestrukih stavki trenutno nije atomik operacija u Sbverziji. TortoiseGit prvo nađe GLAVNU reviziju spremišta, zatim ažurira sve stavke ka tom posebnom revizionom broju da izbegne radnu kopiju pomešanih revizija." #. (para) #: ../source/TortoiseGit_en.xml:14866 msgid "If only one item is selected for updating or the selected items are not all from the same repository, TortoiseGit just updates to HEAD." msgstr "Ako je samo jedna stavka odabrana za ažuriranje ili odabrane stavke nisu sve iz istog spremišta, TortoiseGit samo ažurira do GLAVE." #. (para) #: ../source/TortoiseGit_en.xml:14871 msgid "No command line options are used here. Update to revision also implements the update command, but offers more options." msgstr "Ovde se ne koriste opcije komandne linije. Ažuriraj u reviziju takođe primenjuje komandu ažuriralja, ali često više opcija." #. (title) #: ../source/TortoiseGit_en.xml:14878 msgid "Update to Revision" msgstr "Ažuriraj prema reviziji..." #. (screen) #: ../source/TortoiseGit_en.xml:14879 #, no-wrap msgid "" "\n" "svn info URL_of_WC\n" "svn update [-r rev] [-N] [--ignore-externals] PATH\n" msgstr "" "\n" "svn info URL_of_WC\n" "svn update [-r rev] [-N] [--ignore-externals] PATH\n" #. (para) #: ../source/TortoiseGit_en.xml:14883 msgid "If Only update the top folder is checked, use the -N switch." msgstr "Ako je Samo ažuriraj vršni imenik čekirano, koristite -N prekidač." #. (para) #: ../source/TortoiseGit_en.xml:14894 msgid "In TortoiseGit, the commit dialog uses several Git commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit." msgstr "U TortoiseGit, dijalog urezivanja koristi više Subverzionih komandi. Prvi period je provera statusa koja određuje stavke u vašoj radnoj kopiji koje mogu biti potencijalno urezanje. Možete vratiti listu, diff fajlovi nasuprot OSNOVE i izabrati stavke koje želite da budu uključene u urezivanje." #. (screen) #. (screen) #. (screen) #: ../source/TortoiseGit_en.xml:14901 #: ../source/TortoiseGit_en.xml:15063 #: ../source/TortoiseGit_en.xml:15091 #, no-wrap msgid "" "\n" "svn status -v PATH\n" msgstr "" "\n" "svn status -v PATH\n" #. (para) #. (para) #: ../source/TortoiseGit_en.xml:14904 #: ../source/TortoiseGit_en.xml:14992 msgid "If Show unversioned files is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Git, as the svn status command does not descend into unversioned folders." msgstr "Ako je Prikaži neverzionisane fajlove čekirano, TortoiseGit će takođe prikazati sve neverzionisane fajlove i imenike u hijerarhiji radne kopije, uzimajući u obzir pravila zanemarivanja. Ova posebna osobina nema direktni ekvivalent u Subverziji, kao što < literal>svn status komanda ne silazi u neverzionisane imenike." #. (para) #: ../source/TortoiseGit_en.xml:14912 msgid "If you check any unversioned files and folders, those items will first be added to your working copy." msgstr "Ako proverite neke neverzionisane fajlove i imenike, te stavke će prvo biti dodate u vašu radnu kopiju." #. (screen) #. (screen) #: ../source/TortoiseGit_en.xml:14916 #: ../source/TortoiseGit_en.xml:15204 #, no-wrap msgid "" "\n" "svn add PATH...\n" msgstr "" "\n" "svn add PATH...\n" #. (para) #: ../source/TortoiseGit_en.xml:14919 msgid "When you click on OK, the Git commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (-N) must be used, and every path must be specified individually on the commit command line." msgstr "Kada kliknete OK, Subverziono urezivanje počinje. Ako ostavite sve selekcione čekboksove fajlova u njihovom uobičajenom stanju, TortoiseGit koristi jedno rekurzivno urezivanje radne kopije. Ako deselektujete neke fajlove, onda ne-rekurzivno urezivanje (-N) mora da bude uzeto, i svaka putanja mora biti specificirana individualno u komandnoj liniji urezivanja." #. (screen) #: ../source/TortoiseGit_en.xml:14927 #, no-wrap msgid "" "\n" "svn commit -m \"LogMessage\" [-N] [--no-unlock] PATH...\n" msgstr "" "\n" "svn commit -m \"LogMessage\" [-N] [--no-unlock] PATH...\n" #. (para) #. (para) #. (para) #: ../source/TortoiseGit_en.xml:14930 #: ../source/TortoiseGit_en.xml:15136 #: ../source/TortoiseGit_en.xml:15217 msgid "LogMessage here represents the contents of the log message edit box. This can be empty." msgstr "LogMessage ovde redstavlja sadržaj dnevnik poruke boksa uređenja. Ovo može biti prazno." #. (para) #: ../source/TortoiseGit_en.xml:14934 msgid "If Keep locks is checked, use the --no-unlock switch." msgstr "Ako je Keep locks čekirano, koristite --no-unlock prekidač." #. (screen) #: ../source/TortoiseGit_en.xml:14941 #, no-wrap msgid "" "\n" "svn diff PATH\n" msgstr "" "\n" "svn diff PATH\n" #. (para) #: ../source/TortoiseGit_en.xml:14944 msgid "If you use Diff from the main context menu, you are diffing a modified file against its BASE revision. The output from the CLI command above also does this and produces output in unified-diff format. However, this is not what TortoiseGit is using. TortoiseGit uses TortoiseMerge (or a diff program of your choosing) to display differences visually between full-text files, so there is no direct CLI equivalent." msgstr "Ako koristite Diff iz glavnog kontekst menija vi razlikujete izmenjene fajlove rema OSNOVNOJ reviziji. Izlaz iz IKL komande u ranijem tekstu takođe radi ovo i proizvodi izlaz u ujedinjeni-diff formatu. Međutim, ovo nije to što TortoiseGit koristi. TortoiseGit koristi ToroiseMerge (ili diff program koji ste izabrali) da prikaže razlike vizualno između pun-tekst fajlova, tako da nema IKL ekvivalenta. " #. (para) #: ../source/TortoiseGit_en.xml:14953 msgid "You can also diff any 2 files using TortoiseGit, whether or not they are version controlled. TortoiseGit just feeds the two files into the chosen diff program and lets it work out where the differences lie." msgstr "Možete takođe diff neka dva fajla koristeći TortoiseGit, da li su ili nisu pod kontrolom verzija. TTortoiseGit smo unese dva fajla u izabrani diff program i pušta ga da traži gde leže razlike." #. (screen) #: ../source/TortoiseGit_en.xml:14962 #, no-wrap msgid "" "\n" "svn log -v -r 0:N --limit 100 [--stop-on-copy] PATH\n" " or\n" "svn log -v -r M:N [--stop-on-copy] PATH\n" msgstr "" "\n" "svn log -v -r 0:N --limit 100 [--stop-on-copy] PATH\n" " or\n" "svn log -v -r M:N [--stop-on-copy] PATH\n" #. (para) #: ../source/TortoiseGit_en.xml:14967 msgid "By default, TortoiseGit tries to fetch 100 log messages using the --limit method. If the settings instruct it to use old APIs, then the second form is used to fetch the log messages for 100 repository revisions." msgstr "Uobičajeni, TortoiseGit pokušava da nađe 100 dnevnik poruka koristeći --limit metod. Ako podešavanje zahteva da se koristi stari API, onda druga forma se koristi da se nađe dnevnik poruka za 100 revizija spremišta." #. (para) #: ../source/TortoiseGit_en.xml:14973 msgid "If Stop on copy/rename is checked, use the --stop-on-copy switch." msgstr "Ako je Stop na kopiraj/preimenuj čekirano, koristite --stop-on-copy prekidač." #. (screen) #: ../source/TortoiseGit_en.xml:14980 #, no-wrap msgid "" "\n" "svn status -v PATH\n" " or\n" "svn status -u -v PATH\n" msgstr "" "\n" "svn status -v PATH\n" " or\n" "svn status -u -v PATH\n" #. (para) #: ../source/TortoiseGit_en.xml:14985 msgid "The initial status check looks only at your working copy. If you click on Check repository then the repository is also checked to see which files would be changed by an update, which requires the -u switch." msgstr "Početna provera statusa gleda samo u vašu radnu kopiju. Ako kliknete na Proveri spremište zatim se spremište takođe proveri da se vidi koji fajlovi će biti izmenjeni ažuriranjem, što zahteva -u prekidač." #. (title) #: ../source/TortoiseGit_en.xml:15002 msgid "Revision Graph" msgstr "Revizioni graf" #. (para) #: ../source/TortoiseGit_en.xml:15003 msgid "The revision graph is a feature of TortoiseGit only. There's no equivalent in the command line client." msgstr "Revizioni graf je mogućnost samo TortoiseGit. Nema ekvivalenta u klijentu komande linije." #. (para) #: ../source/TortoiseGit_en.xml:15007 msgid "" "What TortoiseGit does is an \n" "svn info URL_of_WC\n" "svn log -v URL\n" " where URL is the repository root and then analyzes the data returned." msgstr "" "Ono što TortoiseGit radi je \n" "svn info URL_of_WC\n" "svn log -v URL\n" " gde je URL spremište koren i onda analizira vraćene podatke." #. (title) #: ../source/TortoiseGit_en.xml:15018 msgid "Repo Browser" msgstr "Repo-pretraživač" #. (screen) #: ../source/TortoiseGit_en.xml:15019 #, no-wrap msgid "" "\n" "svn info URL_of_WC\n" "svn list [-r rev] -v URL\n" msgstr "" "\n" "svn info URL_of_WC\n" "svn list [-r rev] -v URL\n" #. (para) #: ../source/TortoiseGit_en.xml:15023 msgid "You can use svn info to determine the repository root, which is the top level shown in the repository browser. You cannot navigate Up above this level. Also, this command returns all the locking information shown in the repository browser." msgstr "Možete koristiti svn info da odredite koren spremišta, koji je na vršnom nivou prikazan u pretraživaču spremišta. Ne možete se kretati Gore iznad ovog nivoa. Takođe, ova komanda vraća sve informcije o zaključavanju prikazane u pretraživaču spremišta." #. (para) #: ../source/TortoiseGit_en.xml:15030 msgid "The svn list call will list the contents of a directory, given a URL and revision." msgstr "Poziv svn list će izlistati sadržaj imenika datog sa URL i revizijom." #. (para) #: ../source/TortoiseGit_en.xml:15037 msgid "This command has no CLI equivalent. It invokes TortoiseMerge or an external 3-way diff/merge tool to look at the files involved in the conflict and sort out which lines to use." msgstr "Ova komanda im IKL ekvivalent. Ona poziva TortoiseMerge ili neki spoljašnji 3-načina diff-stopi alat da vidi u fajlovima obuhvaćenih konfliktima i uređuje koje linije da se koriste." #. (title) #: ../source/TortoiseGit_en.xml:15044 msgid "Resolved" msgstr "Rešeno" #. (screen) #: ../source/TortoiseGit_en.xml:15045 #, no-wrap msgid "" "\n" "svn resolved PATH\n" msgstr "" "\n" "svn resolved PATH\n" #. (screen) #: ../source/TortoiseGit_en.xml:15051 #, no-wrap msgid "" "\n" "svn rename CURR_PATH NEW_PATH\n" msgstr "" "\n" "svn rename CURR_PATH NEW_PATH\n" #. (screen) #: ../source/TortoiseGit_en.xml:15057 #, no-wrap msgid "" "\n" "svn delete PATH\n" msgstr "" "\n" "svn delete PATH\n" #. (para) #: ../source/TortoiseGit_en.xml:15066 msgid "The first stage is a status check which determines the items in your working copy which can potentially be reverted. You can review the list, diff files against BASE and select the items you want to be included in the revert." msgstr "Prvi stepen je provera statusa koja određuje stavke u vašoj radnoj kopiji koje će potencijalno biti vraćene. Možete pregledati listu, diff fajlovi nasuprot OSNOVE, i izabrati stavke koje želite da uključite u vraćanje." #. (para) #: ../source/TortoiseGit_en.xml:15072 msgid "When you click on OK, the Git revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (-R) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line." msgstr "Kada kliknete OK, Subverziono vraćanje se dešava. Ako ostavite izbor fajlova čekboks u uobičajenom statusu, TortoiseGit koristi pojedinačno rekurzivno (-R) vraćanje radne kopije. Ako deselektujete neke fajlove, onda svaka putanja mora biti specificirana individualno u komandnoj liniji vraćanja. " #. (screen) #: ../source/TortoiseGit_en.xml:15079 #, no-wrap msgid "" "\n" "svn revert [-R] PATH...\n" msgstr "" "\n" "svn revert [-R] PATH...\n" #. (screen) #: ../source/TortoiseGit_en.xml:15085 #, no-wrap msgid "" "\n" "svn cleanup PATH\n" msgstr "" "\n" "svn cleanup PATH\n" #. (title) #: ../source/TortoiseGit_en.xml:15090 msgid "Get Lock" msgstr "Zaključaj" #. (para) #: ../source/TortoiseGit_en.xml:15094 msgid "The first stage is a status check which determines the files in your working copy which can potentially be locked. You can select the items you want to be locked." msgstr "Prva faza u proveri statusa koja određuje fajlove u vašoj radnij kopiji koji će potencijalno biti zaključani. Možete izabrati stavke koje želite da budu zaključane." #. (screen) #: ../source/TortoiseGit_en.xml:15099 #, no-wrap msgid "" "\n" "svn lock -m \"LockMessage\" [--force] PATH...\n" msgstr "" "\n" "svn lock -m \"LockMessage\" [--force] PATH...\n" #. (para) #: ../source/TortoiseGit_en.xml:15102 msgid "LockMessage here represents the contents of the lock message edit box. This can be empty." msgstr "LockMessage ovde predstavlja sadržaj katanac poruka boks uređenja. On može biti prazan." #. (para) #: ../source/TortoiseGit_en.xml:15106 msgid "If Steal the locks is checked, use the --force switch." msgstr "Ako je Ukrasti katance čekiran, koristite --force prekidače." #. (title) #: ../source/TortoiseGit_en.xml:15112 msgid "Release Lock" msgstr "Skini Katanac" #. (screen) #: ../source/TortoiseGit_en.xml:15113 #, no-wrap msgid "" "\n" "svn unlock PATH\n" msgstr "" "\n" "svn unlock PATH\n" #. (screen) #: ../source/TortoiseGit_en.xml:15119 #, no-wrap msgid "" "\n" "svn copy -m \"LogMessage\" URL URL\n" " or\n" "svn copy -m \"LogMessage\" URL@rev URL@rev\n" " or\n" "svn copy -m \"LogMessage\" PATH URL\n" msgstr "" "\n" "svn copy -m \"LogMessage\" URL URL\n" " or\n" "svn copy -m \"LogMessage\" URL@rev URL@rev\n" " or\n" "svn copy -m \"LogMessage\" PATH URL\n" #. (listitem) #: ../source/TortoiseGit_en.xml:15131 msgid "Specific revision in repository" msgstr "Određena revizija u spremištu" #. (para) #: ../source/TortoiseGit_en.xml:15126 msgid "The Branch/Tag dialog performs a copy to the repository. There are 3 radio button options: which correspond to the 3 command line variants above." msgstr "Grana/Znak dijalog omogućava kopiranje u spremište. Postoje 3 radio dugmeta opcija: koje odgovaraju 3 varijante komandnih linija gore." #. (screen) #: ../source/TortoiseGit_en.xml:15143 #, no-wrap msgid "" "\n" "svn info URL_of_WC\n" "svn switch [-r rev] URL PATH\n" msgstr "" "\n" "svn info URL_of_WC\n" "svn switch [-r rev] URL PATH\n" #. (screen) #: ../source/TortoiseGit_en.xml:15150 #, no-wrap msgid "" "\n" "svn merge [--dry-run] --force From_URL@revN To_URL@revM PATH\n" msgstr "" "\n" "svn merge [--dry-run] --force From_URL@revN To_URL@revM PATH\n" #. (para) #: ../source/TortoiseGit_en.xml:15153 msgid "The Dry run performs the same merge with the --dry-run switch." msgstr "Čist rad omogućava isto stapanje kao --dry-run prekidač." #. (screen) #: ../source/TortoiseGit_en.xml:15157 #, no-wrap msgid "" "\n" "svn diff From_URL@revN To_URL@revM\n" msgstr "" "\n" "svn diff From_URL@revN To_URL@revM\n" #. (para) #: ../source/TortoiseGit_en.xml:15160 msgid "The Unified diff shows the diff operation which will be used to do the merge." msgstr "Ujedinjene diff prikazuju diff operaciju koja će biti korišćena za stapanje." #. (screen) #: ../source/TortoiseGit_en.xml:15167 #, no-wrap msgid "" "\n" "svn export [-r rev] [--ignore-externals] URL Export_PATH\n" msgstr "" "\n" "svn export [-r rev] [--ignore-externals] URL Export_PATH\n" #. (para) #: ../source/TortoiseGit_en.xml:15170 msgid "This form is used when accessed from an unversioned folder, and the folder is used as the destination." msgstr "Ovaj oblik se koristi kada se pristupa iz neverzionisanog imenika, i imenik se koristi kao odredište." #. (para) #: ../source/TortoiseGit_en.xml:15174 msgid "Exporting a working copy to a different location is done without using the Git library, so there's no matching command line equivalent." msgstr "Izvozom radne kopije u različitu lokaciju dato je bez korišćenja Subverzione biblioteke, tako da nema odgovarajućeg ekvivalenta komandne linije." #. (para) #: ../source/TortoiseGit_en.xml:15179 msgid "What TortoiseGit does is to copy all files to the new location while showing you the progress of the operation. Unversioned files/folders can optionally be exported too." msgstr "Ono što TortoiseGit radi je da kopira sve fajlove u novu lokaciju dok prikazuje progres operacije. Neverzionisani fajlovi/imenici mogu neobavezno biti takođe izvezeni." #. (para) #: ../source/TortoiseGit_en.xml:15184 msgid "In both cases, if Omit externals is checked, use the --ignore-externals switch." msgstr "U oba slučaja, ako je Nedostaju eksternali čekiran, koristite --ignore-externals prekidač." #. (screen) #: ../source/TortoiseGit_en.xml:15192 #, no-wrap msgid "" "\n" "svn switch --relocate From_URL To_URL\n" msgstr "" "\n" "svn switch --relocate From_URL To_URL\n" #. (title) #: ../source/TortoiseGit_en.xml:15197 msgid "Create Repository Here" msgstr "Kreuraj spremište ovde" #. (screen) #: ../source/TortoiseGit_en.xml:15198 #, no-wrap msgid "" "\n" "svnadmin create --fs-type fsfs PATH\n" msgstr "" "\n" "svnadmin create --fs-type fsfs PATH\n" #. (para) #: ../source/TortoiseGit_en.xml:15207 msgid "If you selected a folder, TortoiseGit first scans it recursively for items which can be added." msgstr "Ako izaberete imenik, TortoiseGit prvo pregleda sve rekurzivno za stavke koje mogu biti dodate." #. (screen) #: ../source/TortoiseGit_en.xml:15214 #, no-wrap msgid "" "\n" "svn import -m LogMessage PATH URL\n" msgstr "" "\n" "svn import -m LogMessage PATH URL\n" #. (screen) #: ../source/TortoiseGit_en.xml:15224 #, no-wrap msgid "" "\n" "svn blame -r N:M -v PATH\n" "svn log -r N:M PATH\n" msgstr "" "\n" "svn blame -r N:M -v PATH\n" "svn log -r N:M PATH\n" #. (para) #: ../source/TortoiseGit_en.xml:15228 msgid "If you use TortoiseBlame to view the blame info, the file log is also required to show log messages in a tooltip. If you view blame as a text file, this information is not required." msgstr "Ako koristite TortoiseBlame da vidite info okrivljavanja, fajl dnevnik je takođe potreban da prikaže dnevnik poruke u alatsavetu. Ako vidite okrivljavanje kao tekst fajl ova informacija nije potrebna." #. (title) #: ../source/TortoiseGit_en.xml:15236 msgid "Add to Ignore List" msgstr "Dodaj u listu za zanemarivanje" #. (screen) #: ../source/TortoiseGit_en.xml:15237 #, no-wrap msgid "" "\n" "svn propget svn:ignore PATH > tempfile\n" "{edit new ignore item into tempfile}\n" "svn propset svn:ignore -F tempfile PATH\n" msgstr "" "\n" "svn propget svn:ignore PATH > tempfile\n" "{edit new ignore item into tempfile}\n" "svn propset svn:ignore -F tempfile PATH\n" #. (para) #: ../source/TortoiseGit_en.xml:15242 msgid "Because the svn:ignore property is often a multi-line value, it is shown here as being changed via a text file rather than directly on the command line." msgstr "Zato što svn:ignore osobina je često viš-linijska vrednost, to je ovde prikazano kao da je izmenjena preko tekat fajla radije nego direktno u komandnoj liniji." #. (screen) #: ../source/TortoiseGit_en.xml:15250 #, no-wrap msgid "" "\n" "svn diff PATH > patch-file\n" msgstr "" "\n" "svn diff PATH > patch-file\n" #. (para) #: ../source/TortoiseGit_en.xml:15253 msgid "TortoiseGit creates a patch file in unified diff format by comparing the working copy with its BASE version." msgstr "TortoiseGit kreira fajl zakrpu u ujedinjenom diff formatu poredeći radnu kopiju sa OSNOVNOM verzijom." #. (para) #: ../source/TortoiseGit_en.xml:15260 msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Git." msgstr "Primena zakrpa je trik posao sve dok zakrpa i radna kopija su iste revizije. Srećom za vas, možete koristiti TortoiseMerge, koji nema direktni ekvivalent u Subverziji." #. (title) #: ../source/TortoiseGit_en.xml:15274 msgid "Implementation Details" msgstr "Implementacioni detalji" #. (para) #: ../source/TortoiseGit_en.xml:15276 msgid "This appendix contains a more detailed discussion of the implementation of some of TortoiseGit's features." msgstr "Ovaj dodatak sadrži detaljniju disusiju primene nekih TortoiseGit mogućnosti." #. (primary) #: ../source/TortoiseGit_en.xml:15284 msgid "overlay priority" msgstr "prioritet prekrivanja" #. (para) #: ../source/TortoiseGit_en.xml:15289 msgid "Every file and folder has a Git status value as reported by the Git library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values." msgstr "Svaki fahl i imenik ima Subverzionu statusnu vrednost kako je objašnjeno u Subverzionoj biblioteci. U klijentima komandne linije, ovo je pretstavljeno jednim slovom koda, ali TortoiseGit ga prikazuje grafički koristeći prekrivač ikonu. Pošto je broj prekrivača ograničen, svaki prekrivač može prestavljati jednu od više statusnih vrednosti." #. (para) #: ../source/TortoiseGit_en.xml:15297 msgid " The Conflicted overlay is used to represent the conflicted state, where an update or switch results in conflicts between local changes and changes downloaded from the repository. It is also used to indicate the obstructed state, which can occur when an operation is unable to complete." msgstr " Konfliktan prekrivač se koristi da prikaže konfliktno stanje, gde ažuriranje ili prekidač daju konflikt između lokalnih izmena i izmena skinutih iz spremišta. To se takođe koristi da označi obstruktivno stanje, koje se može javiti kada je operacija nesposobna da se izvrši." #. (para) #: ../source/TortoiseGit_en.xml:15306 msgid " The Modified overlay represents the modified state, where you have made local modifications, the merged state, where changes from the repository have been merged with local changes, and the replaced state, where a file has been deleted and replaced by another different file with the same name." msgstr " Modifikovan prekrivač predstavlja modifikovano stanje, gde imate da uradite lokalne izmene, stopljeno stanje, gde su izmene u spremištu stopljene sa lokalnim izmenama, i zamenjeno stanje, gde je fajl obrisan i zamenjen sa drugim različitim fajlom istog imena." #. (para) #: ../source/TortoiseGit_en.xml:15316 msgid " The Deleted overlay represents the deleted state, where an item is scheduled for deletion, or the missing state, where an item is not present. Naturally an item which is missing cannot have an overlay itself, but the parent folder can be marked if one of its child items is missing." msgstr " Obrisan prekrivač predstavlja obrisano stanje, gde je stavka planirana za brisanje, ili nedostaje stanje, gde stavka nije prisutna. Priridno stavka koja nedostaje ne može imati prekrivač, ali predački imenik se može označiti ako jedan od njegovih potomaka nedostaje." #. (para) #: ../source/TortoiseGit_en.xml:15325 msgid " The Added overlay is simply used to represent the added status when an item has been added to version control." msgstr "Dodat prekrivač se jednostavno koristi da predstavi dodat status kada je stavka dodata u kontrolu verzija." #. (para) #: ../source/TortoiseGit_en.xml:15331 msgid " The In Git overlay is used to represent an item which is in the normal state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates." msgstr " U Subverziju prekrivač se koristi da prikaže stavku koja je u normalnoml stanju, ili verzionisana stavka čije stanje nije poznato. Pošto TortoiseGit koristi pozadinski kešing proces ujedini status to može uzeti nekoliko sekundi pre nego se prekrivač ažurira." #. (para) #: ../source/TortoiseGit_en.xml:15340 msgid " The Needs Lock overlay is used to indicate when a file has the svn:needs-lock property set. For working copies which were created using Git 1.4.0 and later, the svn:needs-lock status is cached locally by Git and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Git automatically upgrades working copies when you update them, although the caching of the svn:needs-lock property may not happen until the file itself is updated." msgstr " Traži Katanac prekrivač se koristi da označi kada fajl ima svn:needs-lock osobinu podešenu. Za radne kopije koje su kreirane korišćenjem Subverzije 1.4.9 i dalje, svn:needs-lock status je keširan lokalno pomoću Subverzije i on se koristi da odredi kada da prikaže ovaj prekrivač. Za radne kopije koje su u pre-1.4.h formatu, TortoiseGit prikazuje ovaj prekrivač kada fajl ima samo-čitanje status. Primetimo da Subverzija automatski dograđuje radne kopije kada ih ažurirate, takođe keširanje svn:needs-lock osobine se možda neće desiti dok sam fajl nije ažuriran." #. (para) #: ../source/TortoiseGit_en.xml:15354 msgid " The Locked overlay is used when the local working copy holds a lock for that file." msgstr " Zaključan prekrivač se koristi kada lokalna radna kopija drži katanac na fajlu." #. (para) #: ../source/TortoiseGit_en.xml:15359 msgid " The Ignored overlay is used to represent an item which is in the ignored state, either due to a global ignore pattern, or the svn:ignore property of the parent folder. This overlay is optional." msgstr " Zanemaren prekrivač se koristi da prikaže stavku koja je u zanemarenom stanju, ili zbog opšteg modela zanemarivanja, ili svn:ignore osobine predačkog imenika. Ovaj prekrivač je proizvoljan." #. (para) #: ../source/TortoiseGit_en.xml:15367 msgid " The Unversioned overlay is used to represent an item which is in the unversioned state. This is an item in a versioned folder, but which is not under version control itself. This overlay is optional." msgstr " Neverzionisan prekrivač se koristi da prikaže stavku koja je u neverzionisanom stanju. To je stavka u verzionisanom imeniku, ali koja sama nije pod kontrolom verzija. Ovaj prekrivač je proizvoljan." #. (para) #: ../source/TortoiseGit_en.xml:15375 msgid "If an item has Git status none (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the Ignored and Unversioned overlays then no overlay will be shown for those files either." msgstr "Ako stavka ima subverzioni status nijedan (stavka nije u radnoj kopiji) prekrivač onda neće biti prikazan za te fajlove." #. (para) #: ../source/TortoiseGit_en.xml:15382 msgid "An item can only have one Git status value. For example a file could be locally modified and it could be marked for deletion at the same time. Git returns a single status value - in this case deleted. Those priorities are defined within Git itself." msgstr "Stavka može imati samo jednu Subverzionu statusnu vrednost. Na primer fajl može biti lokalno izmenjen i može biti označen za brisanje u isto vreme. Subverzija vraća jediničnu statusnu vrednost - u ovom slučaju obrisan. Ovi prioriteti su definisani samom Subverzijom." #. (para) #: ../source/TortoiseGit_en.xml:15389 msgid "When TortoiseGit displays the status recursively (the default setting), each folder displays an overlay reflecting its own status and the status of all its children. In order to display a single summary overlay, we use the priority order shown above to determine which overlay to use, with the Conflicted overlay taking highest priority." msgstr "Kada TortoiseGit prikazuje status rekurzivno (uobičajeno podešavanje), svaki imenik prikazuje prekrivač koji reflektuje njegov lični status i status svih njegovih potomaka. Da bi prikazao pojedinačni rezultantni prekrivač, koristimo red prioriteta prikazan gore da odredimo koji prekrivač da koristimo, sa Konfliktan prekrivačem imamo najviši prioritet." #. (para) #: ../source/TortoiseGit_en.xml:15398 msgid "In fact, you may find that not all of these icons are used on your system. This is because the number of overlays allowed by Windows is limited to 15. Windows uses 4 of those, and the remaining 11 can be used by other applications. If there are not enough overlay slots available, TortoiseGit tries to be a Good Citizen (TM) and limits its use of overlays to give other apps a chance." msgstr "U stvari, ne možete naći sve te ikone da se koriste u vašem sistemu. Ovo je zato što brojni prekrivači koje dopušta Vindouz su ograničeni na 15. Vindouz koristi 4 od njih, i preostalih 11 se mogu koristiti sa drugim aplikacijama. Ako postoji dovoljno dozvoljenih prekrivačkih slotova, TortoiseGit pokušava da bude Dobar Građanin (TM) i ograničava svoje korišćenje prekrivača da da drugim aplikacijama šnsu." #. (para) #: ../source/TortoiseGit_en.xml:15409 msgid "Normal, Modified and Conflicted are always loaded and visible." msgstr "Normal, Izmenjen i Konfliktan su uvek uneti i vidljivi." #. (para) #: ../source/TortoiseGit_en.xml:15417 msgid "Deleted is loaded if possible, but falls back to Modified if there are not enough slots." msgstr "Obrisan je unet ako je moguće, ali ida nazad u Izmenjen ako nema dovoljno slotova." #. (para) #: ../source/TortoiseGit_en.xml:15424 msgid "Read-Only is loaded if possible, but falls back to Normal if there are not enough slots." msgstr "Samo-Čitanje je unet ako je moguće, ali pada nazad u Normalan ako nema dovoljno slotova." #. (para) #: ../source/TortoiseGit_en.xml:15431 msgid "Locked is only loaded if there are fewer than 13 overlays already loaded. It falls back to Normal if there are not enough slots." msgstr "Zaključan je samo unet ako je manje od 13 prekrivača uneto. Pada nazad u emphasis>Normalan ako nema dovoljno slotova." #. (para) #: ../source/TortoiseGit_en.xml:15439 msgid "Added is only loaded if there are fewer than 14 overlays already loaded. It falls back to Modified if there are not enough slots." msgstr "Dodat se samo unosi ako ima manje od 14 prekrivača već uneto. Pada nazad u Izmenjen ako nema dovoljno slotova." #. (title) #: ../source/TortoiseGit_en.xml:15450 msgid "Securing Svnserve using SSH" msgstr "Osiguranje Svnserva koristeći SSH" #. (para) #: ../source/TortoiseGit_en.xml:15452 msgid "This section provides a step-by-step guide to setting up Git and TortoiseGit to use the svn+ssh protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Git book. If you are not using SSH but would like to do so to protect your Git installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every Git user." msgstr "Ovo poglavlje obezbeđuje korak-po-korak vodič za podešavanje Subverzije i ToroiseSVN da koriste svn+ssh protokol. Ako već koristite autentifikovanu SSH vezu da se logujete na server, onda ste već tu i možete naći više detalja u Subverzionoj knjizi. Ako ne koristite SSH ali biste želeli da to radite da bi zaštitili vašu instalaciju Subverzije, ovaj vodič vam daje jednostavan metod koji ne obuhvata kreiranje posebnog SSH korisničkog naloga na serveru za svakog Subverzionog korisnika." #. (para) #: ../source/TortoiseGit_en.xml:15462 msgid "In this implementation we create a single SSH user account for all Git users, and use different authentication keys to differentiate between the real Git users." msgstr "U ovoj primeni kreiramo pojedinačnog SSH korisnika za sve subverzione korisnike, i koristimo različite autentifikacione ključeve da napravimo razliku između pravih Subverzionih korisnika." #. (para) #: ../source/TortoiseGit_en.xml:15467 msgid "In this appendix we assume that you already have the Git tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should not start svnserve as a service or daemon when used with SSH." msgstr "U ovom dodatku uzimamo da već imate subverzioni alat instaliran, i imate kreirano spremište kako je detaljno objašnjeno negde u ovom uputstvu. Primetimo da ne treba pokrenuti svserv kao servis ili daemon kada ga koristite sa SSH." #. (para) #: ../source/TortoiseGit_en.xml:15473 msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at www.logemann.org Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!" msgstr "Mnogo od informacija ovde dolazi od Mark Logemana, koje se mogu naći na www.logemann.org Dodatne informacije o podešavanju Vindouz servera obezbedio je Torston Miler. Hvala ljudi!" #. (title) #: ../source/TortoiseGit_en.xml:15484 msgid "Setting Up a Linux Server" msgstr "Podešavanje Linuks servera" #. (para) #: ../source/TortoiseGit_en.xml:15485 msgid "" "You need to have SSH enabled on the server, and here we assume that you will be using OpenSSH. On most distributions this will already be installed. To find out, type: \n" "ps xa | grep sshd\n" " and look for ssh jobs." msgstr "" "Potrebno je da imate SSH omogućen na serveru, i ovde uzimamo da koristite OtvorenSSH. U većini distribucija ovo će biti već instalirano. Da ga pronađete otkucajte: \n" "ps xa | grep sshd\n" " i potražite ssh poslove." #. (para) #: ../source/TortoiseGit_en.xml:15494 msgid "One point to note is that if you build Git from source and do not provide any argument to ./configure, Git creates a bin directory under /usr/local and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place /usr/local/bin into the PATH variable or create symbolic links of your binaries to the /usr/sbin directory, or to any other directory which is commonly in the PATH." msgstr "Da primetimo jedan momenat ako gradite Subverziju od izvornog koda i ne obezbedite neki argument za ./configure, Subverzija kreira bin imenik pod /usr/local i smešta svoje binarno stablo ovde. Ako želite da koristite tunel mod sa SSH, morate voditi računa da korisničko logovanje preko SSH traži da se izvrši svnserv program i neki od binarnih. Zbog ovog razloga, ili smestite /usr/local/bin u PATH promenljivu ili kreirajte simboličku vezu vaših binarnih programa sa /usr/sbin imenikom, ili ka nekom drugom imeniku koji je obično u PATH." #. (para) #: ../source/TortoiseGit_en.xml:15507 msgid "" "To check that everything is OK, login in as the target user with SSH and type: \n" "which svnserve\n" " This command should tell you if svnserve is reachable." msgstr "" "Da proverite da je sve OK, logujte se kao ciljani korisnik sa SSH i otkucajte: \n" "which svnserve\n" " Ova komanda vam treba reći ako je svnserve dostupan." #. (para) #: ../source/TortoiseGit_en.xml:15515 msgid "" "Create a new user which we will use to access the svn repository: \n" "useradd -m svnuser\n" " Be sure to give this user full access rights to the repository." msgstr "" "Kreirajte novog korisnika koga ćemo koristiti da pristupimo svn spremištu: \n" "useradd -m svnuser\n" " Budite sigurni da date korisniku pun pristup spremištu." #. (title) #: ../source/TortoiseGit_en.xml:15524 msgid "Setting Up a Windows Server" msgstr "Podešavanje Vindouz servera" #. (para) #: ../source/TortoiseGit_en.xml:15525 msgid "Install Cygwin SSH daemon as described here: http://pigtail.net/LRP/printsrv/cygwin-sshd.html" msgstr "Instalirajte Cigvin SSH daemon kako je opisano ovde: http://pigtail.net/LRP/printsrv/cygwin-sshd.html" #. (para) #: ../source/TortoiseGit_en.xml:15531 msgid "Create a new Windows user account svnuser which we will use to access the repository. Be sure to give this user full access rights to the repository." msgstr "Kreirajte novi račun Vindouz korisnika svnuser koji ćemo koristiti da pristupimo spremištu. Budite sigurni da date korisniku sva pristupna prava ka spremištu." #. (para) #: ../source/TortoiseGit_en.xml:15536 msgid "" "If there is no password file yet then create one from the Cygwin console using: \n" "mkpasswd -l > /etc/passwd\n" "" msgstr "" "Ako još nema fajla lozinki onda kreirajte jedan iz Cigvin konzole koristeći: \n" "mkpasswd -l > /etc/passwd\n" "" #. (title) #: ../source/TortoiseGit_en.xml:15544 msgid "SSH Client Tools for use with TortoiseGit" msgstr "SSJ klijent alat za korišćenje sa TortoiseGit" #. (para) #: ../source/TortoiseGit_en.xml:15545 msgid "Grab the tools we need for using SSH on the windows client from this site: http://www.chiark.greenend.org.uk/~sgtatham/putty/ Just go to the download section and get Putty, Plink, Pageant and Puttygen." msgstr "Zgrabite alate koji su nam potrebni za korišćenje SSH na vindouz klijentu sa sajta: http://www.chiark.greenend.org.uk/~sgtatham/putty/ Samo odite na daunload sekciju i uzmite Putty, Plink, Pageant i Puttygen." #. (title) #: ../source/TortoiseGit_en.xml:15558 msgid "Creating OpenSSH Certificates" msgstr "Kreiranje OpenSSH certifikata" #. (para) #: ../source/TortoiseGit_en.xml:15559 msgid "The next step is to create a key pair for authentication. There are two possible ways to create keys. The first is to create the keys with PuTTYgen on the client, upload the public key to your server and use the private key with PuTTY. The other is to create the key pair with the OpenSSH tool ssh-keygen, download the private key to your client and convert the private key to a PuTTY-style private key." msgstr "Sledeći korak je kreiranje para ključeva za autentifikaciju. Postoje dva moguća načina kreiranja ključeva. Najpre kreirati ključeve sa PuTTYgen kao klijent, unesite publik ključ na vaš server i koristite privatni ključ sa PuTTY. Drugo je kreirati par ključeva sa OpenSSH alatom ssh-keygen, skinite privatni ključ u vaš klijent i konvertujte privatni ključ u PuTTY-stil privatni ključ." #. (title) #: ../source/TortoiseGit_en.xml:15569 msgid "Create Keys using ssh-keygen" msgstr "Kreiranje tastera koristeći ssh-kijgen" #. (para) #: ../source/TortoiseGit_en.xml:15570 msgid "" "Login to the server as root or svnuser and type: \n" "ssh-keygen -b 1024 -t dsa -N passphrase -f keyfile\n" " substituting a real pass-phrase (which only you know) and key file. We just created a SSH2 DSA key with 1024 bit key-phrase. If you type \n" "ls -l keyfile*\n" " you will see two files, keyfile and keyfile.pub. As you might guess, the .pub file is the public key file, the other is the private one." msgstr "" "Logujte se na server kao root ili svnuser i otkucajte: \n" "ssh-keygen -b 1024 -t dsa -N passphrase -f keyfile\n" " substituting a real pass-phrase (which only you know) and key file. We just created a SSH2 DSA key with 1024 bit key-phrase. If you type \n" "ls -l keyfile*\n" " videćete dva fajla, keyfile i keyfile.pub. Kako možete pogoditi, .pub fajl je publik ključ fajl, drugi je privatni." #. (para) #: ../source/TortoiseGit_en.xml:15587 msgid "" "Append the public key to those in the .ssh folder within the svnuser home directory: \n" "cat keyfile.pub >> /home/svnuser/.ssh/authorized_keys\n" "" msgstr "" "Dodajte publik ključ na one u .ssh imenik u okviru svnuser kućni imenik: \n" "cat keyfile.pub >> /home/svnuser/.ssh/authorized_keys\n" "" #. (para) #: ../source/TortoiseGit_en.xml:15594 msgid "In order to use the private key we generated, we have to convert it to a putty format. This is because the private key file format is not specified by a standards body. After you download the private key file to your client PC, start PuTTYgen and use ConversionsImport key. Browse to your file keyfile which you got from the server the passphrase you used when creating the key. Finally click on Save private key and save the file as keyfile.PPK." msgstr "Da bismo mogli koristiti privatne ključeve koje smo generisali imamo da ih konvertujemo u putty format. Ovo je zato šzo privatni ključevi fajl format nije specificiran standardno. Kada skinete privatan ključ fajl u vaš PC, pokrenite PuTTYgen i koristite KonverzijeUvezi ključ. Pretražite za vaš fajl keyfile koji će vam dati sa servera prolaznufrazu koju koristite kada kreirate ključ. Na kraju kliknite na Sačuvajte privatan ključ i sačuvajte fajl kao keyfile.PPK." #. (title) #: ../source/TortoiseGit_en.xml:15611 msgid "Create Keys using PuTTYgen" msgstr "Kreiranje tastera korišćenjem PuTTIgen" #. (para) #: ../source/TortoiseGit_en.xml:15612 msgid "" "Use PuTTYgen to generate a public-key/private-key pair and save it. Copy the public key to the server and append it to those in the .ssh folder within the svnuser home directory: \n" "cat keyfile.pub >> /home/svnuser/.ssh/authorized_keys\n" "" msgstr "" "Koristite PuTTYgen da generišete publik-ključ/privatni-ključ par i sačuvajte ga. Kopirajte publik ključ na server i dodajte ga u .ssh imenik u okviru svnuser kućni imenik: \n" "cat keyfile.pub >> /home/svnuser/.ssh/authorized_keys\n" "" #. (title) #: ../source/TortoiseGit_en.xml:15624 msgid "Test using PuTTY" msgstr "Test koristeći PuTTI" #. (para) #: ../source/TortoiseGit_en.xml:15625 msgid "To test the connection we will use PuTTY. Start the program and on the Session tab set the hostname to the name or IP address of your server, the protocol to SSH and save the session as SvnConnection or whatever name you prefer. On the SSH tab set the preferred SSH protocol version to 2 and from Auth set the full path to the .PPK private key file you converted earlier. Go back to the Sessions tab and hit the Save button. You will now see SvnConnection in the list of saved sessions." msgstr "Da se testire veza koristićemo PuTTY. Pokrenite program i na Session tab podesite ime domaćina na ime IP adrese vašeg servera, uradite protokol do SSH i sačuvajte sesiju kao SvnConnection ili pod nekim imenom koje volite. Na SSH tab podesite željeni SSH protokol verziju na 2 iz Auth podesite punu putanju ka .PPK privatni ključ fajl koji ste ranije konvertovali. Vratite se na Sessions tab i pritisnite Save dugme. Sada ćete videti SvnConnection u listi sačuvanih sesija." #. (para) #: ../source/TortoiseGit_en.xml:15638 msgid "Click on Open and you should see a telnet style login prompt. Use svnuser as the user name and if all is well you should connect directly without being prompted for a password." msgstr "Kliknite na Otvori i treba da vidite login promt u telnet stilu. Koristite svnuser kao korisničko ime i ako je sve dobro treba da se konektujete direktno bez pitanja za lozinku." #. (para) #: ../source/TortoiseGit_en.xml:15644 msgid "" "You may need to edit /etc/sshd_config on the server. Edit lines as follows and restart the SSH service afterwards. \n" "PubkeyAuthentication yes\n" "PasswordAuthentication no\n" "PermitEmptyPasswords no\n" "ChallengeResponseAuthentication no\n" "" msgstr "" "Možete imati potrebu da uredite /etc/sshd_config na serveru. Uredite linije koje slede i restartujte SSH servis na kraju. \n" "PubkeyAuthentication yes\n" "PasswordAuthentication no\n" "PermitEmptyPasswords no\n" "ChallengeResponseAuthentication no\n" "" #. (title) #: ../source/TortoiseGit_en.xml:15656 msgid "Testing SSH with TortoiseGit" msgstr "Testiranje SSH sa TortoiseGit" #. (para) #: ../source/TortoiseGit_en.xml:15657 msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify /home/svnuser/.ssh/authorized_keys as follows to allow many Git authors to use the same system account, svnuser. Note that every Git author uses the same login but a different authentication key, thus you have to add one line for every author." msgstr "Tako sad imamo samo da testiramo to da se možete logovati koristeći SSH. Sada nam je potreno da osiguramo da SSH veza može stvarno izvršavati svnserve. Na serveru izmenite /home/svnuser/.ssh/authorized_keys kako sledi da omogućite da mnogi subverzioni autori koriste isti sistem nalog, svnuser. Primetimo da svaki subverzioni autor koristi isti login ali različit autentifikacioni ključ, tako da imate da dodate jednu liniju za sakog autora." #. (para) #: ../source/TortoiseGit_en.xml:15666 msgid "" "Note: This is all on one very long line. \n" "command=\"svnserve -t -r <ReposRootPath> --tunnel-user=<author>\",\n" " no-port-forwarding,no-agent-forwarding,no-X11-forwarding,\n" " no-pty ssh-rsa <PublicKey> <Comment>\n" " There are several values that you need to set according to your setup." msgstr "" "Primetimo: Ovo je sve u jednoj jako dugačkoj liniji. \n" "command=\"svnserve -t -r <ReposRootPath> --tunnel-user=<author>\",\n" " no-port-forwarding,no-agent-forwarding,no-X11-forwarding,\n" " no-pty ssh-rsa <PublicKey> <Comment>\n" " Postoji više vrednosti koje su vam potrebne da podesite u skladu sa vašim setapom." #. (para) #: ../source/TortoiseGit_en.xml:15675 msgid "<ReposRootPath> should be replaced with the path to the directory containing your repositories. This avoids the need to specify full server paths within URLs. Note that you must use forward slashes even on a Windows server, e.g. c:/svn/reposroot. In the examples below we assume that you have a repository folder within the repository root called repos." msgstr "<ReposRootPath> treba da bude zamenjen putanjom ka imeniku koji sadrži vaše spremište. Ovo uklanja potrebu da se specificira puna server putanja u okviru URL. Primetimo da morate koristiti inverzne kose crte čak i na Vindouz serveru, npr. c:/svn/reposroot. U primeru ispod uzeli smo da imate imenik spremišta u korenu spremišta zvani repos." #. (para) #: ../source/TortoiseGit_en.xml:15684 msgid "<author> should be replaced with the svn author that you want to be stored on commit. This also allows svnserve to use its own access rights within svnserve.conf." msgstr "<author> treba biti zamenjen sa svn autorom koga želite da sačuvate pri urezivanju. Ovo takođe omogućava svnserve da koristi svoja lična pristupna prava u okviru svnserve.conf." #. (para) #: ../source/TortoiseGit_en.xml:15689 msgid "<PublicKey> should be replaced with the public key that you generated earlier." msgstr "<PublicKey> treba biti zamenjen sa publik ključem koji ste generisali ranije." #. (para) #: ../source/TortoiseGit_en.xml:15693 msgid "<Comment> can be any comment you like, but it is useful for mapping an svn author name to the person's real name." msgstr "<Comment> može biti svaki komentar koji želite, ali korisno je za obeležavanje svn autor imena pravim imenom osobe." #. (para) #: ../source/TortoiseGit_en.xml:15697 msgid "" "Right click on any folder in Windows Explorer and select TortoiseGitRepo-Browser. You will be prompted to enter a URL, so enter one in this form: \n" "svn+ssh://svnuser@SvnConnection/repos\n" " What does this URL mean? The Schema name is svn+ssh which tells TortoiseGit how to handle the requests to the server. After the double slash, you specify the user to connect to the server, in our case svnuser. After the @ we supply our PuTTY session name. This session name contains all details like where to find the private key and the server's IP or DNS. Lastly we have to provide the path to the repository, relative to the repository root on the server, as specified in the authorized_keys file." msgstr "" "Desni klik na neki imenik Vindouz Eksplorera i izaberite TortoiseGitRepo-Pretraživač. Bićete pitani da unesete URL, tako uneste jedan u obliku: \n" "svn+ssh://svnuser@SvnConnection/repos\n" " Šta ovaj URL znači? Šema ime je svn+ssh koji kaže TortoiseGit kako da rukuje sa zahtevima ka serveru. Posle dvostruke kose linije, specificirajte korisnika koji se spaja na server, u našem slučaju svnuser. Posle @ mi dodajemo naš PuTTY ime sesije. Ime sesije sadrži sve detalje kao gde naći privatan ključ i serverov IP ili DNS. Na kraju imamo da dodamo putanju ka spremištu, relativno ka korenu spremišta na serveru, kako je specificirano u authorized_keys fajlu." #. (para) #: ../source/TortoiseGit_en.xml:15717 msgid "Click on OK and you should be able to browse the repository content. If so you now have a running SSH tunnel in conjunction with TortoiseGit." msgstr "Kliknite na OK i moćićete da pretražujete sadržaj spremišta. Ako je tako sada imate SSH tunel koji se izvršava zajedno sa TortoiseGit." #. (para) #: ../source/TortoiseGit_en.xml:15722 msgid "Note that by default TortoiseGit uses its own version of Plink to connect. This avoids a console window popping up for every authentication attempt, but it also means that there is nowhere for error messages to appear. If you receive the error Unable to write to standard output, you can try specifying Plink as the client in TortoiseGit's network settings. This will allow you to see the real error message generated by Plink." msgstr "Primetimo da uobičajeno TortoiseGit koristi svoju ličnu verziju Plink veze. Ovo onemoguava vindouz konzolu da iskače za svaki autentifikacioni pokušaj, ali to takođe znači da nema gde da se pojave poruke o grešci. Ako primite grešku Ne može da piše na standardni izlaz, možete pokušati da specificirate Plink kao klijent u TortoiseGit mrežnom podešavanju. Ovo će omogućiti da vidite prave poruke o grešci generisane sa Plink." #. (title) #: ../source/TortoiseGit_en.xml:15732 msgid "SSH Configuration Variants" msgstr "SSH konfiguracione varijante" #. (para) #: ../source/TortoiseGit_en.xml:15733 msgid "" "One way to simplify the URL in TortoiseGit is to set the user inside the PuTTY session. For this you have to load your already defined session SvnConnection in PuTTY and in the Connection tab set Auto login user to the user name, e.g. svnuser. Save your PuTTY session as before and try the following URL inside TortoiseGit: \n" "svn+ssh://SvnConnection/repos\n" " This time we only provide the PuTTY session SvnConnection to the SSH client TortoiseGit uses (TortoisePlink.exe). This client will check the session for all necessary details." msgstr "" "Jedan način da uprostite URL u TortoiseGit je da podesite korisnika unutar PuTTY sednica. Za ovo imate da unesete skoro definisane sednice SvnConnection u PuTTY i u Vezatab podesite Auto logovan korisnik imenu korisnika, npr. svnuser. Sačuvajte vašu PuTTY sednicu kao ranije i pokušajte da pratite URL unutar TortoiseGit: \n" "svn+ssh://SvnConnection/repos\n" " Ovog puta mi samo obezbeđujemo PuTTY sednicu SvnConnection da ga SSH klijent TortoiseGit koristi (TortoisePlink.exe). Klijent će proveriti sednicu za sve neophodne detalje." #. (para) #: ../source/TortoiseGit_en.xml:15748 msgid "At the time of writing PuTTY does not check all saved configurations, so if you have multiple configurations with the same server name, it will pick the first one which matches. Also, if you edit the default configuration and save it, the auto login user name is not saved." msgstr "U vreme pisanja PuTTY ne proverava sve sačuvane konfiguracije, tako ako imate više konfiguracija sa istim imenom servera, to će uzeti prvi koji nađe. Takođe, ako uređujete uobičajenu konfiguraciju i sačuvate je, auto login korisničko ime nije sačuvano." #. (para) #: ../source/TortoiseGit_en.xml:15755 msgid "Many people like to use Pageant for storing all their keys. Because a PuTTY session is capable of storing a key, you don't always need Pageant. But imagine you want to store keys for several different servers; in that case you would have to edit the PuTTY session over and over again, depending on the server you are trying to connect with. In this situation Pageant makes perfect sense, because when PuTTY, Plink, TortoisePlink or any other PuTTY-based tool is trying to connect to an SSH server, it checks all private keys that Pageant holds to initiate the connection." msgstr "Mnogi ljudi vole da koriste Pageant za skladištenje svojih ključeva. Pošto je PuTTY sednica sposobna da skladišti ključeve, ne možete uvek tražiti Pageant. Ali zamislimo da želite da skladištite ključeve raznih svnserva; u tom slučaju imate da uredite PuTTY sednicu opet i opet, u zavisnosti od servera na koji pokušavate da se povežete. U toj situaciji Pegeant čini izvanredan osećaj, zato što PuTTY, TortoiseGit, TortoisePlink ili svaki drugi PuTTY-zasnovan alat koji pokušava da se poveže na SSH server, on proverava privatne ključeve koje Pageant drži da inicira vezu." #. (para) #: ../source/TortoiseGit_en.xml:15766 msgid "For this task, simply run Pageant and add the private key. It should be the same private key you defined in the PuTTY session above. If you use Pageant for private key storage, you can delete the reference to the private key file in your saved PuTTY session. You can add more keys for other servers, or other users of course." msgstr "Za ovaj zadatak, jednostavno izvršite Pageanat i dodajte privatan ključ. To bi trebalo biti isti privatni ključ koji ste definisali u PuTTY sednici. Ako koristite Pageant za skladištenje privatnih ključeva, možete obrisati reference na privatne ključeve u vašoj uskladištenoj PuTTY sednici. Možete dodati više ključeva za druge servere, ili druge korisnike svakako." #. (para) #: ../source/TortoiseGit_en.xml:15773 msgid "If you don't want to repeat this procedure after every reboot of your client, you should place Pageant in the auto-start group of your Windows installation. You can append the keys with complete paths as command line arguments to Pageant.exe" msgstr "Ako ne želite da ponovite ovu proceduru posle svakog rebutovanja vašeg klijenta, treba da stavite Pageant u auto-start grupu vaše Vindouz instalacije. Možete dodati ključeve sa kompletnom putanjom kao argumente komandne linije u Pageant.egze" #. (para) #: ../source/TortoiseGit_en.xml:15779 msgid "" "The last way to connect to an SSH server is simply by using this URL inside TortoiseGit: \n" "svn+ssh://svnuser@100.101.102.103/repos\n" "svn+ssh://svnuser@mydomain.com/repos\n" " As you can see, we don't use a saved PuTTY session but an IP address (or domain name) as the connection target. We also supply the user, but you might ask how the private key file will be found. Because TortoisePlink.exe is just a modified version of the standard Plink tool from the PuTTY suite, TortoiseGit will also try all the keys stored in Pageant." msgstr "" "Poslednji način da se spojite na SSH server je jednostavno korišćenjem URL unutar TortoiseGit: \n" "svn+ssh://svnuser@100.101.102.103/repos\n" "svn+ssh://svnuser@mydomain.com/repos\n" " Kao što možete da vidite, ne koristimo zapamćenu PuTTY sednicu već IP adresu (ili ime domena) kao konekcioni cilj. Takođe snabdevamo korisnika, ali možete pitati kako će privatni ljuč fajl biti nađen. Pošto TortoisePlink.egze je upravo modifikovana verzija standardnog Plink alata iz PuTTY izdanja, TortoiseGit će takođe pokušati sve ključeve uskladištene u Pageant." #. (para) #: ../source/TortoiseGit_en.xml:15793 msgid "If you use this last method, be sure you do not have a default username set in PuTTY. We have had reports of a bug in PuTTY causing connections to close in this case. To remove the default user, simply clear HKEY_CURRENT_USER\\Software\\SimonTatham\\Putty\\Sessions\\Default%20Settings\\HostName" msgstr "Ako koristite poslednji metod, budite sigurni da nemate podrazumevano ime korisnika podešeno u PuTTY. Imali smo izveštaje o bagu u PuTTY koji su uzrokovali zatvaranje konekcije u ovom slučaju. Da uklonite podrazumevanog korisnika, jednostavno očistite HKEY_CURRENT_USER\\Software\\SimonTatham\\Putty\\Sessions\\Default%20Settings\\HostName" #. (title) #: ../source/TortoiseGit_en.xml:15805 msgid "Glossary" msgstr "Pojmovnik" #. (para) #: ../source/TortoiseGit_en.xml:15809 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 se koristi da doda fajl ili imenik u vašu radnu kopiju. Nova stavka je dodata u spremište kada urezujete." #. (glossterm) #: ../source/TortoiseGit_en.xml:15817 msgid "BASE revision" msgstr "OSNOVNA revizija" #. (para) #: ../source/TortoiseGit_en.xml:15819 msgid "The current base revision of a file or folder in your working copy. This is the revision the file or folder was in, when the last checkout, update or commit was run. The BASE revision is normally not equal to the HEAD revision." msgstr "Tekuća osnovna revizija fajla ili imenika u vašoj radnoj kopiji. Ovo je revizija fajla ili imenikakoja je unutra, kada poslednje preuzimanje, ažuriranje ili urezivanje radilo. OSNOVNA revizija normalno nije jednaka GLAVNOJ reviziji." #. (para) #: ../source/TortoiseGit_en.xml:15830 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 fajlove, i ona označava svaku liniju da prikaže reviziju spremišta u kojoj je poslednji put izmenjena, i utora koji je uradio izmenu. Naša GUI implementacija se zove TortoiseBlame i takođe prikazuje datum/vreme urezivanja i dnevnik poruku kada preletite mišem preko revizionog broja." #. (glossterm) #: ../source/TortoiseGit_en.xml:15840 msgid "BDB" msgstr "BDB" #. (para) #: ../source/TortoiseGit_en.xml:15842 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 pozadina spremišta, ona se ne može koristiti na mrežnoj podeli. Podrazumevana za pre 1.2 spremižta." #. (glossterm) #: ../source/TortoiseGit_en.xml:15849 msgid "Branch" msgstr "Grana" #. (para) #: ../source/TortoiseGit_en.xml:15851 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 cheap copy." msgstr "Termin često korišćen u kontrolnm sistemu revizija da opiše šta se dešava kada se razvoj razdvoji u nekoj tačci i prati 2 odvojene putanje. Možete kreirati granu van glavne razvojne linije tako kao da razvijate nove osobine bez da učinite glavnu liniju nestabilnom. Ili možete granati stabilnu realizaciju za koju ćete samo fiksirati bagove, dok novi razvoj nastavlja na nestabilnom debl. U Subverziji grana se implementira kao jeftina kopija." #. (para) #: ../source/TortoiseGit_en.xml:15866 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." #. (para) #: ../source/TortoiseGit_en.xml:15875 msgid "To quote from the Git book: Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a working copy locked error, run this command to remove stale locks and get your working copy into a usable state again. Note that in this context lock refers to local filesystem locking, not repository locking." msgstr "Citat iz Subverzione knjige: Rekurzivno čišćenje radne kopije, uklanjanjem katanaca i završavanjem nezavršenih operacija. Ako ikad dobijete radna kopija zaključana grešku, izvršite ovu komandu da uklonite ukradene katance i dobijete vašu radnu kopiju u korisnom stanju ponovo. Primetimo to da u ovom kontekstu katanac se odnosi na lokalni fajlsistem zaključavanje, ne na zaključavanje spremišta." #. (para) #: ../source/TortoiseGit_en.xml:15892 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 koja se koristi da pošalje izmene iz vaše lokalne radne kopije nazad u spremište, kreiranjem nove revizije spremišta." #. (glossterm) #: ../source/TortoiseGit_en.xml:15900 msgid "Conflict" msgstr "Konflikt" #. (para) #: ../source/TortoiseGit_en.xml:15902 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 stope sa lokalnim izmenama, ponekad se ove izmene javljaju u istim linijama. U tom slučaju Subverzija ne može automatski odrediti koju verziju da koristi i za fajl se kaže da je u konfliktu. Potrebno je da uredite fajl ručno i razrešite konflikt pre nego možete da urežete neke druge izmene." #. (glossterm) #: ../source/TortoiseGit_en.xml:15912 msgid "Copy" msgstr "Kopiraj" #. (para) #: ../source/TortoiseGit_en.xml:15914 msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as cheap copies which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made." msgstr "U Subverzionom spremištu možete kreirati kopiju pojedinačnog fajla ili celo stablo. Ovo se implementira kao jeftine kopije koje deluju skoro kao veze sa originalom u tome da skoro ne uzimaju prostora. Praveći kopije čuva se istorija stavke u kopiji, tako da možete pratiti urađene izmene pre nego je kopija urađena." #. (para) #: ../source/TortoiseGit_en.xml:15926 msgid "When you delete a versioned item (and commit the change) the item no longer exists in the repository after the committed revision. But of course it still exists in earlier repository revisions, so you can still access it. If necessary, you can copy a deleted item and resurrect it complete with history." msgstr "Kada obrišete verzionisanu stavku (i urežete izmene) stavka više ne postoji u spremištu posle urezane revizije. Ali, svakako, ona još postoji u ranijim revizijama spremišta, tako da joj još uvek možete pristupiti. Ako je neophodno, možete kopirati obrisanu stavku i vaskrsnuti ga kompletno sa istorijom." #. (para) #: ../source/TortoiseGit_en.xml:15938 msgid "Shorthand for Show Differences. Very useful when you want to see exactly what changes have been made." msgstr "Skraćenica za Prikaži razlike. Veoma korisna kada želite da vidite tačno šta se izmenilo." #. (para) #: ../source/TortoiseGit_en.xml:15947 msgid "This command produces a copy of a versioned folder, just like a working copy, but without the local .svn folders." msgstr "Komanda proizvodi kopiju verzionisanog imenika, upravo kao radna kopija, ali bez lokalnih .svn imenika." #. (glossterm) #: ../source/TortoiseGit_en.xml:15955 msgid "FSFS" msgstr "FSFS" #. (para) #: ../source/TortoiseGit_en.xml:15957 msgid "A proprietary Git filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories." msgstr "Fajlsistem u vlasništvu Subverzije u osnovi spremišta. Može se koristiti na mrežnim podelama. Podrazumevan za 1.2 i novija spremišta." #. (para) #: ../source/TortoiseGit_en.xml:15966 msgid "Group policy object" msgstr "Objekat grupne polise" #. (glossterm) #: ../source/TortoiseGit_en.xml:15972 msgid "HEAD revision" msgstr "GLAVNA Revizija" #. (para) #: ../source/TortoiseGit_en.xml:15974 msgid "The latest revision of a file or folder in the repository." msgstr "Poslednja revizija fajla ili imenika u spremištu." #. (para) #: ../source/TortoiseGit_en.xml:15982 msgid "Git command to import an entire folder hierarchy into the repository in a single revision." msgstr "Subverziona komanda za uvoz cele hijerarhije imenika u spremište u pojedinačnoj reviziji." #. (para) #: ../source/TortoiseGit_en.xml:15991 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 dobijete katanac na verzionisanu stavku, vi to označite u spremištu kao ne-urezujuća, osim iz radne kopije gde je katanac dobijen. " #. (glossterm) #: ../source/TortoiseGit_en.xml:15999 msgid "Log" msgstr "Dnevnik" #. (para) #: ../source/TortoiseGit_en.xml:16001 msgid "Show the revision history of a file or folder. Also known as History." msgstr "Prikazuje istoriju revizija fajla ili imenika. Takođe poznat kao Istorija." #. (glossterm) #: ../source/TortoiseGit_en.xml:16008 msgid "History" msgstr "Istorija" #. (para) #: ../source/TortoiseGit_en.xml:16010 msgid "Show the revision history of a file or folder. Also known as Log." msgstr "Prikazuje istoriju revizija fajla ili imenika. Takođe poznat kao Dnevnik." #. (para) #: ../source/TortoiseGit_en.xml:16019 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 kojim se izmene iz spremišta dodaju u vašu radnu kopiju bez uništavanja bilo kojih izmena koje ste već uradili lokalno. Ponekad ove izmene ne mogu biti usklađene automatski i za radnu kopiju se kaže da je u konfliktu." #. (para) #: ../source/TortoiseGit_en.xml:16025 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 vašu radnu kopiju. Možete stapati specifične izmen iz drugih grana koristeći TortoiseGit Stopi komandu." #. (glossterm) #: ../source/TortoiseGit_en.xml:16033 msgid "Patch" msgstr "Zakrpa" #. (para) #: ../source/TortoiseGit_en.xml:16035 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 Patch, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review." msgstr "Ako radna kopija ima izmene samo u tekst fajlovima, moguće je koristiti Subverzionu Diff komandu da se generiše jedan fajl pregled ovih izmena u Objedinjenom Diff formatu. Fajl ovog tipa se često navodi kao Zakrpa, i može biti poslat elektronskom poštom još nekome (ili na mejling listu) i da se primeni u drugoj radnoj kopiji. Neko bez pristupa za urezivanje može napraviti izmene i podneti fajl zakrpu autorizovanom urezivaču da ga primeni. Ili ako niste sigurni o izmenama možete podneti zakrpu drugima da je pregledaju." #. (glossterm) #: ../source/TortoiseGit_en.xml:16048 msgid "Property" msgstr "Svojstvo" #. (para) #: ../source/TortoiseGit_en.xml:16050 msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as properties to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as svn:eol-style. TortoiseGit has some too, such as tsvn:logminsize. You can add your own properties with any name and value you choose." msgstr "Uz verzionisanje vaših imenika i fajlova, Subverzija dopušta da se dodaju verzionisani metapodaci - na koje se pozivamo kao na osobine svakog od vaših verzionisanih imenika i fajlova. Svaka osobina ima ime i vrednost, slično kao regstarski ključevi. Subverzija ima neke specijalne osobine koje koristi interno, kao što je svn:eol-style. TortoiseGit ima neke takođe, kao tsvn:logminsize. Možete dodati vaše lične osobine sa bilo kojim imenom i vrednošću koju izaberete." #. (para) #: ../source/TortoiseGit_en.xml:16065 msgid "If your repository moves, perhaps because you have moved it to a different directory on your server, or the server domain name has changed, you need to relocate your working copy so that its repository URLs point to the new location." msgstr "Ako se vaše spremište pomeri, možda zato što ste ga pomerili u različit imenik na vašem serveru, ili ime domena servera je izmenjeno, potrebno je da relocirate vašu radnu kopiju tako da njen URL spremišta ukazuje na novu lokaciju." #. (para) #: ../source/TortoiseGit_en.xml:16071 msgid "Note: you should only use this command if your working copy is referring to the same location in the same repository, but the repository itself has moved. In any other circumstance you probably need the Switch command instead." msgstr "Primedba: vi treba da koristite ovu komandu samo ako vaša radna kopija ukazuje na istu lokaciju u istom spremištu, ali samo spremište je pomereno. U ostalim slučajevima vi verovatno imate potrebu za Prebaci komandu umesto toga." #. (glossterm) #: ../source/TortoiseGit_en.xml:16080 msgid "Repository" msgstr "Spremište" #. (para) #: ../source/TortoiseGit_en.xml:16082 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 centralno mesto gde se podaci skladište i održavaju. Spremište može biti mesto gde su višestruke baze podataka ili fajlovi locirani za raspodelu preko mreže, ili spremište može biti lokacija koja je direktno dostupna korisniku bez da putuje kroz mrežu." #. (para) #: ../source/TortoiseGit_en.xml:16093 msgid "When files in a working copy are left in a conflicted state following a merge, those conflicts must be sorted out by a human using an editor (or perhaps TortoiseMerge). This process is referred to as Resolving Conflicts. When this is complete you can mark the conflicted files as being resolved, which allows them to be committed." msgstr "Kada se fajlovi u radnoj kopiji ostave u konfliktnom stanju posle stapanja, ove konflikte moraju urediti ljudi koristeći uređivač (ili možda TortoiseMerge). Ovaj proces se označava kao Rešavanje Konflikata. Kada je to kompletno možete označiti konfliktne fajlove da su rešeni, što dozvoljava da budu urezani." #. (para) #: ../source/TortoiseGit_en.xml:16105 msgid "Git keeps a local pristine copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the revert command to go back to the pristine copy." msgstr "Subverzija čuva lokalnu čistu kopiju svakog fajla kao što je bio kada ste poslednji put ažurirali vašu radnu kopiju. Ako napravite izmene i odlučite da želite da ih poništite, možete koristiti vrati komandu da se vratite na čistu kopiju." #. (glossterm) #: ../source/TortoiseGit_en.xml:16114 msgid "Revision" msgstr "Revizija" #. (para) #: ../source/TortoiseGit_en.xml:16116 msgid "Every time you commit a set of changes, you create one new revision in the repository. Each revision represents the state of the repository tree at a certain point in its history. If you want to go back in time you can examine the repository as it was at revision N." msgstr "Svaki put kad urezujete skup izmena, vi kreirate jednu novu reviziju u spremištu. Svaka revizija predstavlja stanje stabla spremišta u izvsnoj tački u njegovoj istoriji. Ako želite da se vratite nazad u vremenu možete pregledati spremište kako je bilo u reviziji N." #. (para) #: ../source/TortoiseGit_en.xml:16123 msgid "In another sense, a revision can refer to the set of changes that were made when that revision was created." msgstr "U drugom smislu, revizija može da ukaže na skup izmena koje su urađene kada je revizja kreirana." #. (glossterm) #: ../source/TortoiseGit_en.xml:16130 msgid "Revision Property (revprop)" msgstr "Osobine revizije (revosob)" #. (para) #: ../source/TortoiseGit_en.xml:16132 msgid "Just as files can have properties, so can each revision in the repository. Some special revprops are added automatically when the revision is created, namely: svn:date svn:author svn:log which represent the commit date/time, the committer and the log message respectively. These properties can be edited, but they are not versioned, so any change is permanent and cannot be undone." msgstr "Isti kao što fajlovi imaju osobine to može imati i svaka revizija u spremištu. Neke specijalne revprop su dodate automatski kada je revizija kreirana, recimo: svn:date svn:author svn:log koji reprezentuju vreme/datum urezivanja, urezivača i dnevnik poruku respektivno. Ove osobine mogu biti uređeivane, ali one nisu verzionisane, tako da je svaka promenapermanentna i ne može biti poništena." #. (glossterm) #: ../source/TortoiseGit_en.xml:16144 msgid "SVN" msgstr "SVN" #. (para) #: ../source/TortoiseGit_en.xml:16146 msgid "A frequently-used abbreviation for Git." msgstr "Često-koriišćene skraćenice u Subverziji" #. (para) #: ../source/TortoiseGit_en.xml:16149 msgid "The name of the Git custom protocol used by the svnserve repository server." msgstr "Ime Subverzionog običnog protokola koji koristi svnserve server spremišta." #. (para) #: ../source/TortoiseGit_en.xml:16158 msgid "Just as Update-to-revision changes the time window of a working copy to look at a different point in history, so Switch changes the space window of a working copy so that it points to a different part of the repository. It is particularly useful when working on trunk and branches where only a few files differ. You can switch your working copy between the two and only the changed files will be transferred." msgstr "Isto kako Ažuriraj-do-revizije menja vremenski prozor radne kopije da gleda u rzličitu tačku istorije, tako Prebaci menja prostorni prozor radne kopije takoa da ukazuje na rzličit deo spremišta.To je parcijalno korisno kada rad na deblu i granama se razlikuje samo u nekoliko fajlova. Možete prebaciti vašu radnu kopiju između dva i samo izmenjeni fajlovi će biti preneti." #. (para) #: ../source/TortoiseGit_en.xml:16172 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 vuče zadnje promene iz spremišta u radnu kopiju, stapajući sve izmene napravljene od drugih sa lokalnim izenama u radnoj kopiji." #. (glossterm) #: ../source/TortoiseGit_en.xml:16180 msgid "Working Copy" msgstr "Radna kopija" #. (para) #: ../source/TortoiseGit_en.xml:16182 msgid "This is your local sandbox, the area where you work on the versioned files, and it normally resides on your local hard disk. You create a working copy by doing a Checkout from a repository, and you feed your changes back into the repository using Commit." msgstr "Ovo je vaš lokalni kutija za poštu, polje gde radite na verzionisanim fajlovima, i oni normalno obitavaju na vašem lokalnom tvrdom disku. Vi kreirate radnu kopiju izvršavajući Preuzmi iz spremišta, i pohranjujete vaše izmene nazad u spremište koristeći Ureži." #. Put one translator per line, in the form of NAME . #. (None) #: ../source/TortoiseGit_en.xml:0 msgid "translator-credits" msgstr "Milorad Popović" #. Place the translation of 'translation' here. #. (None) #: ../source/TortoiseGit_en.xml:0 msgid "translator-translation" msgstr "Prevod" #~ msgid "not" #~ msgstr "не" #~ msgid "!username" #~ msgstr "!имекорисника" #~ msgid "username" #~ msgstr "имекорисника" #~ msgid "" #~ "Git uses the / as the path delimiter in all " #~ "internal pathnames, and all pattern matching is done against this style " #~ "of path names. If you want to use a path delimiter in your ignore " #~ "pattern, be sure to use /, and not the Windows " #~ "backslash." #~ msgstr "" #~ "Субверзија користи / као ограничавач путање у свим " #~ "интерним именима путање, и сви модели спаривања су дати према том стилу " #~ "имена фајлова. Ако желите да користите ограничавач путање у моделу " #~ "занемаривања будите сигурни да користите /, а не " #~ "Виндоуз обратну косу црту." #~ msgid "" #~ "Git uses this pattern matching against every path presented to it " #~ "for action. These paths are generally relative to the directory being " #~ "acted upon for import, add, commit, etc. The matching pattern therefore " #~ "has to take account of the fact that there may or may not be path " #~ "components before the filename." #~ msgstr "" #~ "Субверзија користи модел спаривања према свакој путањи која јој се " #~ "прикаже за акцију. Ове путање су уопштено релативне на именик активиран " #~ "за увоз, додавање, урезивање, итд. Модел спаривања тада има да узме у " #~ "обзир чињеницу да може или не може бити компоненти путање пре имена фајла." #~ msgid "" #~ "If directory names are present in a path, the matching algorithm will not " #~ "trim them off, so pattern Fred.* will match " #~ "Fred.c but not subdir/Fred.c. This " #~ "is significant if you add a folder which contains some files that you " #~ "want to be ignored, because those filenames will be preceded with the " #~ "folder name when Git compares them with the ignore pattern." #~ msgstr "" #~ "Ако је име именика присутно у путањи алгоритам спаривања неће га скресати " #~ "тако да ће модел Fred.* спарити Fred.c али не subdir/Fred.c. Ово је значајно ако " #~ "додате именик који садржи неке фајлове које желите да буду занемарени, " #~ "јер та фајлимена су предвођена именом именика када их Субверзија пореди " #~ "са моделом занемаривања." #~ msgid "" #~ "The / character is not treated in any special way for " #~ "pattern matching purposes, so the pattern abc*xyz " #~ "would match abcdxyz but also abcdir/subdir/" #~ "anything/morexyz." #~ msgstr "" #~ "Каракте / се не третира на било који специјални начин " #~ "у сврхе модела спривања тако да модел abc*xyz спарује " #~ "abcdxyz али такође abcdir/subdir/anything/" #~ "morexyz." #~ msgid "" #~ "To ignore all CVS folders you should either specify a " #~ "pattern of *CVS or better, the pair CVS */" #~ "CVS. The first option works, but would also exclude something " #~ "called ThisIsNotCVS. Using */CVS " #~ "alone will not work on an immediate child CVS folder, " #~ "and CVS alone will not work on sub-folders." #~ msgstr "" #~ "Да би се занемарили сви CVS именици треба да " #~ "специфицирате модел *CVS или боље, пар CVS */" #~ "CVS. Прва опција ради, али ће такође искључити нешто као " #~ "ThisIsNotCVS. Користећи */CVS само " #~ "неће радити на директни потомак CVS именик, и " #~ "CVS сам неће радити на суб-именицима." #~ msgid "Replaced with the current time and date" #~ msgstr "Замењено са текућим временом и датумом" #~ msgid "Replaced with the current time and date in standard format" #~ msgstr "Замењено са текућим временом и датумом у стандардном формату" #~ msgid "Replaced with the lock date" #~ msgstr "Замењеном са датум кључем" #~ msgid "Hook Scripts" #~ msgstr "Закачиве Скрипте" #~ msgid "" #~ "Unlike the command line client, the merge dialog merges all revisions of " #~ "a range. For example, if you want to merge revisions 5-7, you have to " #~ "specify \"5-7\" or \"5,6,7\". With the command line client, you would " #~ "have to specify \"4-7\" to include revision 5 in the merge." #~ msgstr "" #~ "Супротно од клијента командне линије, дијалог стапања стапа све ревизије " #~ "у опсегу. На пример, ако желите да стопите ревизије 5-7 морате " #~ "специфицирати \"5-7\" или \"5,6,7\". Са клијентом командне линије, треба " #~ "да специфицирате \"4-7\" да укључите ревизију 5 у стапање."