# # Slovenian translation for TortoiseSVN # Copyright (C) 2004-2008 the TortoiseSVN team # This file is distributed under the same license as TortoiseSVN # # Last commit by: # $Author$ # $Date$ # $Rev$ # # Authors: # Matjaz Cepon , 2007 # msgid "" msgstr "" "Project-Id-Version: TortoiseSVN Documentation\n" "POT-Creation-Date: 2008-09-24 17:15 +0000\n" "PO-Revision-Date: 2008-10-02 19:43+0100\n" "Last-Translator: Matjaz Cepon \n" "Language-Team: TortoiseSVN translation team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Slovenian\n" "X-Poedit-Country: SLOVENIA\n" #. (title) #. (secondary) #: ../source/TortoiseSVN_en.xml:4 #: ../source/TortoiseSVN_en.xml:3023 msgid "TortoiseSVN" msgstr "TortoiseSVN" #. (subtitle) #: ../source/TortoiseSVN_en.xml:5 msgid "A Subversion client for Windows" msgstr "Odjemalec za Subversion v operacijskem sistemu Windows" #. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated #. (subtitle) #: ../source/TortoiseSVN_en.xml:6 msgid "Version $MajorVersion$.$MinorVersion$.$MicroVersion$" msgstr "Verzija $MajorVersion$.$MinorVersion$.$MicroVersion$" #. (edition) #: ../source/TortoiseSVN_en.xml:8 msgid "First" msgstr "Prva" #. (firstname) #: ../source/TortoiseSVN_en.xml:11 msgid "Stefan" msgstr "Stefan" #. (surname) #: ../source/TortoiseSVN_en.xml:12 msgid "Küng" msgstr "Küng" #. (firstname) #: ../source/TortoiseSVN_en.xml:15 msgid "Lübbe" msgstr "Lübbe" #. (surname) #: ../source/TortoiseSVN_en.xml:16 msgid "Onken" msgstr "Onken" #. (firstname) #: ../source/TortoiseSVN_en.xml:19 msgid "Simon" msgstr "Simon" #. (surname) #: ../source/TortoiseSVN_en.xml:20 msgid "Large" msgstr "Large" #. (title) #: ../source/TortoiseSVN_en.xml:27 msgid "Preface" msgstr "Predgovor" #. (para) #: ../source/TortoiseSVN_en.xml:35 msgid "Do you work in a team?" msgstr "Delate v teamu?" #. (para) #: ../source/TortoiseSVN_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 "Se vam je že kdaj zgodilo, da ste popravljali datoteko istočasno kot nekdo drug? Ste zaradi tega izgubili narejene spremembe?" #. (para) #: ../source/TortoiseSVN_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 "Ste že kdaj shranili datoteko in potem želeli spremembe preklicati? Ste si kdaj želeli, da bi lahko videli, kako je datoteka izgledala pred časom?" #. (para) #: ../source/TortoiseSVN_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 "Ste kdaj našli hrošča v svojem projektu in ste želeli izvedeti, kdaj se je prikradel tja?" #. (para) #: ../source/TortoiseSVN_en.xml:61 msgid "If you answered yes to one of these questions, then TortoiseSVN is for you! Just read on to find out how TortoiseSVN can help you in your work. It's not that difficult." msgstr "Če ste vsaj na eno vprašanje odgovorili z da, potem je TortoiseSVN za vas! Preberite si, kako vam lahko TortoiseSVN pomaga pri delu. Sploh ni težko." #. (title) #: ../source/TortoiseSVN_en.xml:71 msgid "Audience" msgstr "Komu je priročnik namenjen" #. (para) #: ../source/TortoiseSVN_en.xml:72 msgid "This book is written for computer literate folk who want to use Subversion to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseSVN is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it." msgstr "Kniga je napisana za računalniško pismene uporabnike, ki želijo uporabljati Subversion, vendar niso vešči dela preko ukazne vrstice. Ker je TortoiseSVN razširitev Windowsove lupine, predpostavljamo, da uporabnik pozna Raziskovalca in ga zna uporabljati." #. (title) #: ../source/TortoiseSVN_en.xml:84 msgid "Reading Guide" msgstr "Vodnik po knjigi" #. (para) #: ../source/TortoiseSVN_en.xml:85 msgid "This explains a little about the TortoiseSVN project, the community of people who work on it, and the licensing conditions for using it and distributing it." msgstr "V poglavju podamo nekaj podatkov o projektu TortoiseSVN, o skupnosti ljudi, ki dela na tem projektu ter o licenčnih pogojih uporabe in distribucije." #. (para) #: ../source/TortoiseSVN_en.xml:90 msgid "The explains what TortoiseSVN is, what it does, where it comes from and the basics for installing it on your PC." msgstr "V poglavju si pogledamo, kaj TortoiseSVN je, kaj lahko z njim naredimo, od kje prihaja in osnovna navodila za namestitev na vašem računalniku." #. (para) #: ../source/TortoiseSVN_en.xml:95 msgid "In we give a short introduction to the Subversion revision control system which underlies TortoiseSVN. This is borrowed from the documentation for the Subversion project and explains the different approaches to version control, and how Subversion works." msgstr "Poglavje poda nekaj osnov o sistemu za nadzor različic Subversion, ki je podlaga za TortoiseSVN. Ta del je izposojen iz dokumentacije Subversion in ponazori različne pristope k vodenju različic datotek in delovanje sistema Subversion." #. (para) #: ../source/TortoiseSVN_en.xml:102 msgid "Even most Subversion 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 "Čeprav večini uporabnikov sistema Subversion ne bo nikoli potrebno postavljati strežnika, naslednje poglavje opiše, kako se to naredi. Primerno je za skrbnike sistema." #. (para) #: ../source/TortoiseSVN_en.xml:107 msgid "The chapter on explains how to set up a local repository, which is useful for testing Subversion and TortoiseSVN using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server." msgstr "V poglavju razložimo, kako narediti krajevno skladišče, ki je uporabno za preizkušanje programov Subversion in TortoiseSVN z uporabo enega samega računalnika. Poleg tega opišemo osnove skrbništva skladišča, kar se nanaša tudi na skladišča na strežniku." #. (para) #: ../source/TortoiseSVN_en.xml:113 msgid "The is the most important section as it explains all the main features of TortoiseSVN 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 najpomembnejše poglavje, saj so v njem razložene vse glavne zmožnosti programa TortoiseSVN in njihova uporaba. Napisano je kot vodnik. Začne se z prevzemom delovne kopije, njenim spreminjanjem, nadaljuje pa z objavo narejenih sprememb. V nadaljevanju so razložene zahtevnejše tematike." #. (para) #: ../source/TortoiseSVN_en.xml:120 msgid " is a separate program included with TortoiseSVN 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 zunanji program, ki je vključen v paket TortoiseSVN. Z njegovo pomočjo lahko izluščimo informacije iz delovne kopije in jih zapišemo v datoteko. To je uporabno, če želimo v projekt vključiti informacijo o številki revizije." #. (para) #: ../source/TortoiseSVN_en.xml:125 msgid "The section answers some common questions about performing tasks which are not explicitly covered elsewhere." msgstr "Poglavje poda odgovore na nekatera pogosta vprašanje o nalogah, ki niso opisana v ostalih poglavjih." #. (para) #: ../source/TortoiseSVN_en.xml:129 msgid "The section on shows how the TortoiseSVN GUI dialogs can be called from the command line. This is useful for scripting where you still need user interaction." msgstr "Poglavje ponazori, kako lahko kličemo pogovorna okna TortoiseSVN iz ukazne vrstice. To je primerno za pisanje ukaznih datotek, v katerih še vedno želimo uporabnikove odzive." #. (para) #: ../source/TortoiseSVN_en.xml:134 msgid "The give a correlation between TortoiseSVN commands and their equivalents in the Subversion command line client svn.exe." msgstr "Poglavje poda seznam ukazov TortoiseSVN in njihovih sorodnih ukazov v odjemalcu Subversion za ukazno vrstico (svn.exe)." #. (title) #: ../source/TortoiseSVN_en.xml:144 msgid "TortoiseSVN is free!" msgstr "TortoiseSVN je brezplačen!" #. (para) #: ../source/TortoiseSVN_en.xml:145 msgid "TortoiseSVN 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 "Program TortoiseSVN je brezplačen. Za njegovo uporabo vam ni potrebno plačati. Uporabljate ga lahko, kakor želite. Razvit je pod licenco GNU General Public License (GPL)." #. (para) #: ../source/TortoiseSVN_en.xml:149 msgid "TortoiseSVN is an Open Source project. That means you have full access to the source code of this program. You can browse it on this link http://code.google.com/p/tortoisesvn/source/browse/. (Username:guest, for password hit enter) The most recent version (where we're currently working) is located under /trunk/ the released versions are located under /tags/." msgstr "TortoiseSVN je odptrokodni projekt. To pomeni, da imate popolnoma prost dostop do izvorne kode programa. Po njej lahko brskate, če kliknete na povezavo http://code.google.com/p/tortoisesvn/source/browse/. (Uporabniško ime: guest, geslo: <pustite prazno>). Najnovejša različica, na kateri trenutno delamo, se nahaja v mapi /trunk/, končne izdaje pa v mapi /tags/." #. (title) #: ../source/TortoiseSVN_en.xml:168 msgid "Community" msgstr "Skupnost" #. (para) #: ../source/TortoiseSVN_en.xml:169 msgid "Both TortoiseSVN and Subversion 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 "Projekta TortoiseSVN in Subversion razvija skupnost ljudi, ki prihajajo iz vseh koncev sveta in ki so se združili, da bi ustvarjali čudovite programe." #. (title) #: ../source/TortoiseSVN_en.xml:180 msgid "Acknowledgments" msgstr "Zasluge" #. (term) #: ../source/TortoiseSVN_en.xml:183 msgid "Tim Kemp" msgstr "Tim Kemp" #. (para) #: ../source/TortoiseSVN_en.xml:185 msgid "for founding the TortoiseSVN project" msgstr "za ustanovitev projekta TortoiseSVN" #. (term) #: ../source/TortoiseSVN_en.xml:191 msgid "Stefan Küng" msgstr "Stefan Küng" #. (para) #: ../source/TortoiseSVN_en.xml:193 msgid "for the hard work to get TortoiseSVN to what it is now" msgstr "za trdo delo, s katerim je pripomogel, da je TortoiseSVN danes to, kar je" #. (term) #: ../source/TortoiseSVN_en.xml:199 msgid "Lübbe Onken" msgstr "Lübbe Onken" #. (para) #: ../source/TortoiseSVN_en.xml:201 msgid "for the beautiful icons, logo, bug hunting, translating and managing the translations" msgstr "za čudovite ikone, logotip, iskanje napak, prevode in urejanje prevodov" #. (term) #: ../source/TortoiseSVN_en.xml:208 msgid "Simon Large" msgstr "Simon Large" #. (para) #: ../source/TortoiseSVN_en.xml:210 msgid "for helping with the documentation and bug hunting" msgstr "za pomoč pri dokumentaciji in iskanju napak" #. (term) #: ../source/TortoiseSVN_en.xml:216 msgid "The Subversion Book" msgstr "The Subversion Book" #. (para) #: ../source/TortoiseSVN_en.xml:218 msgid "for the great introduction to Subversion and its chapter 2 which we copied here" msgstr "za izvrsten uvod v sistem Subversion in poglavje številka dve, ki smo ga uporabili v tej knjigi" #. (term) #: ../source/TortoiseSVN_en.xml:225 msgid "The Tigris Style project" msgstr "The Tigris Style project" #. (para) #: ../source/TortoiseSVN_en.xml:227 msgid "for some of the styles which are reused in this documentation" msgstr "za nekatere stile, ki smo jih uporabili v tej dokumentaciji" #. (term) #: ../source/TortoiseSVN_en.xml:233 msgid "Our Contributors" msgstr "Zunanji sodelavci" #. (para) #: ../source/TortoiseSVN_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 popravke, poročila o napakah in nove ideje in za pomoč ostalim, podano preko naših dopisnih seznamov" #. (term) #: ../source/TortoiseSVN_en.xml:242 msgid "Our Donators" msgstr "Naši donatorji" #. (para) #: ../source/TortoiseSVN_en.xml:244 msgid "for many hours of joy with the music they sent us" msgstr "za številne ure užitkov ob poslušanju glasbe, ki so nam jo podarili" #. (title) #: ../source/TortoiseSVN_en.xml:255 msgid "Terminology used in this document" msgstr "Uporabljena terminologija" #. (para) #: ../source/TortoiseSVN_en.xml:256 msgid "To make reading the docs easier, the names of all the screens and Menus from TortoiseSVN are marked up in a different font. The Log Dialog for instance." msgstr "Da bi olajšali branje knjige, so imena vseh oken in menijev TortoiseSVN označena z drugo barvo, npr. Dnevnik." #. (para) #: ../source/TortoiseSVN_en.xml:261 msgid "A menu choice is indicated with an arrow. TortoiseSVNShow Log means: select Show Log from the TortoiseSVN context menu." msgstr "Izbira v meniju je prikazana s puščico. TortoiseSVNPokaži dnevnik pomeni: iz kontekstnega menija TortoiseSVN izberite Pokaži dnevnik." #. (para) #: ../source/TortoiseSVN_en.xml:270 msgid "Where a local context menu appears within one of the TortoiseSVN dialogs, it is shown like this: Context MenuSave As ..." msgstr "V primeru, ko se kontekstni meni pojavi znotraj enega od pogovornih oken sistema TortoiseSVN, je to prikazano takole: Kontekstni meniShrani kot ..." #. (para) #: ../source/TortoiseSVN_en.xml:278 msgid "User Interface Buttons are indicated like this: Press OK to continue." msgstr "Gumbi uporabniškega vmesnika so prikazani takole: Za nadaljevanje pritisnite V redu." #. (para) #: ../source/TortoiseSVN_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 "Uporabnikove akcije so nakazane z uporabo polkrepke pisave. ALT+A: pritisnite in držite tipko Alt na tipkovnici, hkrati pa pritisnite še tipko A. Desni poteg: pritisnite desno tipko na miški, jo držite in povlecite elemente na novo lokacijo." #. (para) #: ../source/TortoiseSVN_en.xml:290 msgid "System output and keyboard input is indicated with a different font as well." msgstr "Odgovor sistema in vnos preko tipkovnice sta prav tako ponazorjena z drugačno pisavo." #. (para) #: ../source/TortoiseSVN_en.xml:295 msgid "Important notes are marked with an icon." msgstr "Pomembne opombe so označene z ikono." #. (para) #: ../source/TortoiseSVN_en.xml:300 msgid "Tips that make your life easier." msgstr "Namigi za lažje delo." #. (para) #: ../source/TortoiseSVN_en.xml:305 msgid "Places where you have to be careful what you are doing." msgstr "Kjer morate biti previdni, kaj počnete." #. (para) #: ../source/TortoiseSVN_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 "Kjer morate biti še posebej previdni, saj lahko ob neupoštevanju pride do okvare podatkov ali ostalih hudih zapletov." #. (title) #. (title) #. (title) #: ../source/TortoiseSVN_en.xml:319 #: ../source/TortoiseSVN_en.xml:1482 #: ../source/TortoiseSVN_en.xml:2482 msgid "Introduction" msgstr "Uvod" #. (primary) #: ../source/TortoiseSVN_en.xml:322 msgid "version control" msgstr "nadzor različic" #. (para) #: ../source/TortoiseSVN_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 "Nadzor različic je umetnost vodenja sprememb informacij. Že dolgo je orodje izjemnega pomena za programerje, ki tipično porabijo veliko časa za male spremembe na programski opremi, naslednji dan pa nekatere izmed njih razveljavijo ali preverijo. Zamislite si ekipo razvijalcev programske opreme, ki dela sočasno na istih datotekah in videli boste, zakaj je potreben dober sistem za vodenje potencialnega nereda." #. (title) #: ../source/TortoiseSVN_en.xml:339 msgid "What is TortoiseSVN?" msgstr "Kaj je TortoiseSVN?" #. (para) #: ../source/TortoiseSVN_en.xml:340 msgid "TortoiseSVN is a free open-source client for the Subversion version control system. That is, TortoiseSVN 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 Subversion and version control systems in general as a sort of time machine." msgstr "TortoiseSVN je brezplačen odprtokodni odjemalec za sistem nadzora različic Subversion. TortoiseSVN upravlja datoteke in mape skozi čas. Datoteke so shranjene v centralnem skladišču. Skladišče je podobno običajnemu strežniku datotek, s to razliko, da si zapomni vse spremembe, ki so bile kadarkoli narejene na datotekah in mapah. To omogoča, da pridobite starejšo različico datoteke in pogledate skozi zgodovino, kako so se podatki spreminjali in kdo je spremembe naredil. Prav zato marsikdo smatra Subversion in tudi ostale sisteme za nadzor različic kot neke vrste časovni stroj." #. (para) #: ../source/TortoiseSVN_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. Subversion, 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 "Nekateri sistemi za nadroz različic so posebej prikrojeni za urejanje strukture izvorne kode in imajo veliko zmožnosti, ki so specifične za razvoj programske opreme - na primer razumevanje programskih jezikov ali dodatna orodja za njhovo gradnjo. To so sistemi SCM (software configuration management). Subversion ni tak sistem; je splošen sistem, ki omogoča urejanje katerokoli zbirke datotek, vključno z datotekami izvorne kode." #. (title) #: ../source/TortoiseSVN_en.xml:368 msgid "TortoiseSVN's History" msgstr "Zgodovina TortoiseSVN" #. (para) #: ../source/TortoiseSVN_en.xml:369 msgid "In 2002, Tim Kemp found that Subversion was a very good version control system, but it lacked a good GUI client. The idea for a Subversion client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS." msgstr "Leta 2002 je Tim Kemp ugotovil, da je Subversion zelo dober sistem za nadzor različic, a brez grafičnega uporabniškega vmesnika. Idejo za odjemalca kot lupino sistema Windows je dobil iz podobnega odjemalca za sistem CVS - TortoiseCVS." #. (para) #: ../source/TortoiseSVN_en.xml:375 msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseSVN. He then started the project, registered the domain tortoisesvn.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 Subversion and the source for TortoiseSVN. Since TortoiseSVN 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 preučil izvorno kodo aplikacije TortoiseCVS in jo uporabil kot osnovo za TortoiseSVN. Nato je začel s projektom, registriral domeno tortoisesvn.org in objavil izvorno kodo. Med tem časom je Stefan Küng iskal dober brezplačen sistem za nadzor različic in našel Subversion ter izvorno kodo za TortoiseSVN. Ker aplikacija še ni bila primerna za uporabo, se je pridružil projektu in začel programirati. Kmalu je na novo napisal večji del obstoječe kode in začel dodajati nove ukaze in zmožnosti. Prvotna koda je kmalu povsem izginila." #. (para) #: ../source/TortoiseSVN_en.xml:386 msgid "As Subversion became more stable it attracted more and more users who also started using TortoiseSVN as their Subversion 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 TortoiseSVN. And he takes care of the website and manages the translation." msgstr "Sistem Subversion je postajal vse bolj stabilen in je pridobival vedno več uporabnikov, ki so uporabljali TortoiseSVN kot odjemalca za Subversion. Število uporabnikov je hitro naraščalo (in raste še danes). Takrat je Lübbe Onken ponudil svojo pomoč in izdelal lepe ikone in logotip za TortoiseSVN. Ureja tudi spletno stran in prevode." #. (title) #: ../source/TortoiseSVN_en.xml:399 msgid "TortoiseSVN's Features" msgstr "Značilnosti TortoiseSVN" #. (para) #: ../source/TortoiseSVN_en.xml:400 msgid "What makes TortoiseSVN such a good Subversion client? Here's a short list of features." msgstr "Zakaj je TortoiseSVN tako dober odjemalec za Subversion? Tukaj je kratek seznam njegovih značilnosti." #. (term) #: ../source/TortoiseSVN_en.xml:406 msgid "Shell integration" msgstr "Integracija z lupino" #. (primary) #: ../source/TortoiseSVN_en.xml:409 msgid "Windows shell" msgstr "Lupina Windows" #. (primary) #: ../source/TortoiseSVN_en.xml:412 msgid "explorer" msgstr "raziskovalec" #. (para) #: ../source/TortoiseSVN_en.xml:414 msgid "TortoiseSVN 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 "TortoiseSVN se integrira v lupino operacijskega sistema Windows (v Raziskovalca). To pomeni, da lahko še naprej delate z orodji, ki jih poznate. In ni vam potrebno zamenjati aplikacije vsakič, ko želite uporabiti funkcije sistema za nadzor različic!" #. (para) #: ../source/TortoiseSVN_en.xml:421 msgid "And you are not even forced to use the Windows Explorer. TortoiseSVN'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 TortoiseSVN 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 "Pri tem pa vam ni nujno uporabljati ravno Raziskovalca. Kontekstni meniji TortoiseSVN delujejo v velikem številu upravljalnikov datotek, prav tako pa tudi v pogovornem oknu Datoteka/Odpri, ki se nahaja v vseh standardnih programih sistema Windows. Morate pa se vesčas zavedati, da je TortoiseSVN namenoma izdelan kot nadgradnja Raziskovalca. Zato je možno, da v drugih aplikacijah ne deluje popolnoma pravilno. Primer so težave pri prikazu prekrivnih ikon." #. (term) #: ../source/TortoiseSVN_en.xml:435 msgid "Icon overlays" msgstr "Prekrivne ikone" #. (para) #: ../source/TortoiseSVN_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 "Stanje vsake datoteke pod nadzorom različic nakazuje majhna prekrivna ikona. Tako lahko hitro vidite, kakšno je stanje vaše delovne kopije." #. (term) #: ../source/TortoiseSVN_en.xml:445 msgid "Easy access to Subversion commands" msgstr "Preprost dostop do ukazov sistema Subversion" #. (para) #: ../source/TortoiseSVN_en.xml:447 msgid "All Subversion commands are available from the explorer context menu. TortoiseSVN adds its own submenu there." msgstr "Vsi ukazi sistema Subversion so na razpolago v kontekstnem meniju Raziskovalca. TortoiseSVN doda tja svoj lasten pomeni." #. (para) #: ../source/TortoiseSVN_en.xml:454 msgid "Since TortoiseSVN is a Subversion client, we would also like to show you some of the features of Subversion itself:" msgstr "Ker je TortoiseSVN odjemalec za Subversion, vam bomo prikazali tudi nekaj značilnosti samega sistema Subversion:" #. (term) #: ../source/TortoiseSVN_en.xml:460 msgid "Directory versioning" msgstr "Vodenje različic map" #. (para) #: ../source/TortoiseSVN_en.xml:462 msgid "CVS only tracks the history of individual files, but Subversion 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 upravlja le zgodovino posameznih datotek, Subversion pa ima virtualni datotečni sistem pod nadzorom različic, ki upravlja spremembe na celotnem drevesu map. Pod nadzorom so datoteke in mape. Posledica tega je, da imamo na strani odjemalca na razpolago ukaza premakni in kopiraj, ki delujeta na datotekah in mapah." #. (term) #: ../source/TortoiseSVN_en.xml:475 msgid "Atomic commits" msgstr "Atomične objave" #. (para) #: ../source/TortoiseSVN_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 "Objava zapiše vse spremembe v skladišče ali pa jih sploh ne zapiše. To omogoča razvijalcem, da sestavijo in objavijo spremembe kot logične celote." #. (term) #: ../source/TortoiseSVN_en.xml:485 msgid "Versioned metadata" msgstr "Metapodatki pod nadzorom različic" #. (para) #: ../source/TortoiseSVN_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 "Vsaka datoteka in mapa ima prirejeno nevidno množico lastnosti. Lahko si izmislite kakršen koli par ključ/vrednost. Lastnosti so pod nadzorom različic, prav tako kot vsebina datoteke." #. (term) #: ../source/TortoiseSVN_en.xml:497 msgid "Choice of network layers" msgstr "Izbira plasti omrežja" #. (para) #: ../source/TortoiseSVN_en.xml:499 msgid "Subversion has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Subversion's advanced network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Subversion 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 Subversion server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh." msgstr "Subversion je vpeljal abstrakten koncept dostopa do skladišča, kar uporabnikom omogoča, da izdelajo nove omrežne mehanizme. Subversionov napredni mrežni strežnik je modul za spletni strežnik Apache, ki govori narečje protokola HTTP, imenovano WebDAV/DeltaV. To daje sistemu Subversion veliko prednosti s stališča stabilnosti in povezovanja, prinaša pa še številne dodatne zmožnosti, n. pr.: avtentikacijo, avtorizacijo, wire compression in brskanje po skladišču. Na razpolago pa je tudi manjši, samostojen strežnik za Subversion. Strežnik se pogovarja po prilagojenem protokolu, ki se ga preprosto preusmeri preko ssh." #. (term) #: ../source/TortoiseSVN_en.xml:516 msgid "Consistent data handling" msgstr "Konsistentno upravljanje s podatki" #. (para) #: ../source/TortoiseSVN_en.xml:518 msgid "Subversion 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 "Subversion zapisuje razlike med datotekami z dvojiškim algoritmom za razlikovanje, ki deluje tako na tekstovnih (uporabniku berljivih) kot na dvojiških (uporabniku neberljivih) datotekah. Datoteke obeh tipov so enako stisnjene in shranjene v skladišču, razlike pa se prenašajo v obeh smereh po mreži." #. (term) #: ../source/TortoiseSVN_en.xml:529 msgid "Efficient branching and tagging" msgstr "Učinkovita uporaba vej in oznak" #. (para) #: ../source/TortoiseSVN_en.xml:531 msgid "The cost of branching and tagging need not be proportional to the project size. Subversion 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 vej in oznak ni nujno sorazmerna z velikostjo projekta. Subversion ustvari veje in oznake tako, da projekt skopira z uporabo mehanizma, podobnega simbolnim povezavam. Tako ti operaciji trajata zelo kratek (konstanten) čas in zavzameta zelo malo prostora v skladišču." #. (term) #: ../source/TortoiseSVN_en.xml:542 msgid "Hackability" msgstr "Možnost vključevanja v druge aplikacije" #. (para) #: ../source/TortoiseSVN_en.xml:544 msgid "Subversion has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Subversion extremely maintainable and usable by other applications and languages." msgstr "Sistem Subversion nima zgodovine. Razvit je kot zbirka knjižnic v jeziku C z dobro definiranim programskim vmesnikom (API). Zato je Subversion zelo primeren za vzdrževanje in uporabo s strani ostalih aplikacij in jezikov." #. (title) #: ../source/TortoiseSVN_en.xml:558 msgid "Installing TortoiseSVN" msgstr "Namestitev TortoiseSVN" #. (title) #: ../source/TortoiseSVN_en.xml:560 msgid "System requirements" msgstr "Sistemske zahteve" #. (para) #: ../source/TortoiseSVN_en.xml:561 msgid "TortoiseSVN runs on Windows 2000 SP2, Windows XP or higher. Windows 98, Windows ME and Windows NT4 are no longer supported since TortoiseSVN 1.2.0, but you can still download the older versions if you really need them." msgstr "TortoiseSVN deluje na sistemih Windows 2000 SP2, Windows XP ali novejšem. Od verzije TortoiseSVN 1.2.0 ne podpiramo sistemov Windows 98, Windows ME in Windows NT4. Če želite uporabljati TortoiseSVN na teh sistemih, lahko na naši domači strani najdete starejše različice." #. (para) #: ../source/TortoiseSVN_en.xml:567 msgid "If you encounter any problems during or after installing TortoiseSVN please refer to first." msgstr "Če med namestitvijo TortoiseSVN ali po njej naletite na težave, se najprej obrnite na ." #. (title) #: ../source/TortoiseSVN_en.xml:575 msgid "Installation" msgstr "Namestitev" #. (primary) #: ../source/TortoiseSVN_en.xml:577 msgid "install" msgstr "namesti" #. (para) #: ../source/TortoiseSVN_en.xml:579 msgid "TortoiseSVN 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 "TortoiseSVN ima enostaven namestitveni program. Dvokliknite na namestitveno datoteko in sledite navodilom. Namestitveni program bo poskrbel za vse potrebno." #. (para) #: ../source/TortoiseSVN_en.xml:585 msgid "You need Administrator privileges to install TortoiseSVN." msgstr "Za namstitev TortoiseSVN potrebujete skrbniške pravice." #. (title) #: ../source/TortoiseSVN_en.xml:591 msgid "Language Packs" msgstr "Jezikovni paketi" #. (primary) #: ../source/TortoiseSVN_en.xml:593 msgid "language packs" msgstr "jezikovni paketi" #. (primary) #: ../source/TortoiseSVN_en.xml:596 msgid "translations" msgstr "prevodi" #. (para) #: ../source/TortoiseSVN_en.xml:598 msgid "The TortoiseSVN 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 "Uporabniški vmesnik TortoiseSVN je preveden v veliko jezikov, med drugim tudi v slovenščino. Jezikovne pakete najdete na tem naslovu. Če jezikovnega paketa za vaš jezik ni, se lahko pridružite naši ekipi in naredite lasten prevod ;-)" #. (para) #: ../source/TortoiseSVN_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 "Vsak jezikovni paket je na razpolago v obliki namestitvenega programa .exe. Poženite ga in sledite navodilom. Ob naslednjem zagonu programa bo TortoiseSVN uporabljal izbrani jezik." #. (title) #: ../source/TortoiseSVN_en.xml:616 msgid "Spellchecker" msgstr "Črkovalnik" #. (primary) #: ../source/TortoiseSVN_en.xml:618 msgid "spellchecker" msgstr "črkovalnik" #. (primary) #: ../source/TortoiseSVN_en.xml:621 msgid "dictionary" msgstr "slovar" #. (para) #: ../source/TortoiseSVN_en.xml:623 msgid "TortoiseSVN 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 "TortoiseSVN vsebuje črkovalnik, ki vam omogoča, da preverite sporočila v dnevniškem zapisu. To je še posebej pomembno, če na projektu uporabljate jezik, ki ni vaš materin jezik. Črkovalnik uporablja iste datoteke s slovarjem kot OpenOffice in Mozilla." #. (para) #: ../source/TortoiseSVN_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 TortoiseSVN's language packs. This will install the appropriate dictionary files as well as the TortoiseSVN local user interface. Next time you restart, the dictionary will be available too." msgstr "Namestitveni program samodejno doda slovarja za ameriško in britansko angleščino. Če želite črkovalnik za kak dodaten jezik, je najlažja možnost, da namestite jezikovni paket programa TortoiseSVN za ta jezik. Le-ta bo namestil ustrezen slovar, poleg tega pa tudi uporabniški vmesnik v izbranem jeziku. Ko boste ponovno zagnali sistem, vam bo na voljo tudi ta slovar." #. (para) #: ../source/TortoiseSVN_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 "Slovarje lahko namestite tudi sami. Če imate nameščene aplikacije OpenOffice ali Mozilla, lahko prekopirate njihove slovarje, ki se nahajajo v namestitvenih mapah teh aplikacij. V nasprotnem primeru morate prenesti zahtevane slovarje z naslova http://wiki.services.openoffice.org/wiki/Dictionaries" #. (filename) #: ../source/TortoiseSVN_en.xml:661 msgid "en_US.aff" msgstr "en_US.aff" #. (filename) #: ../source/TortoiseSVN_en.xml:666 msgid "en_US.dic" msgstr "en_US.dic" #. (para) #: ../source/TortoiseSVN_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 TortoiseSVN installation folder. Normally this will be C:\\Program Files\\TortoiseSVN\\bin. If you don't want to litter the bin sub-folder, you can instead place your spell checker files in C:\\Program Files\\TortoiseSVN\\Languages. If that folder isn't there, you have to create it first. The next time you start TortoiseSVN, the spell checker will be available." msgstr "Ko imate datoteke slovarjev, jih morate verjetno preimenovati, tako da vsebujejo le nize, ki označujejo jezik. Primer: Potem jih prekopirajte v podmapo bin namestitvene mape TortoiseSVN. Običajno je ta mapa C:\\Program Files\\TortoiseSVN\\bin. Če ne želite smetiti po podmapi bin, lahko datoteke črkovalnika namesitve v mapo C:\\Program Files\\TortoiseSVN\\Languages. Če ta mapa še ne obstaja, jo morate naprej ustvariti. Ko boste TortoiseSVN naslednjič zagnali, bo črkovalnik na voljo." #. (para) #: ../source/TortoiseSVN_en.xml:684 msgid "Check the tsvn:projectlanguage setting. Refer to for information about setting project properties." msgstr "Preveri nastavitev lastnosti tsvn:projectlanguage. Preberite za več informacij o nastavitvi projektnih lastnosti." #. (para) #: ../source/TortoiseSVN_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 "Če projektni jezik ni nastavljen ali nastavljeni jezik ni nameščen, poiskusi z jezikom sistema Windows." #. (para) #: ../source/TortoiseSVN_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 "Če jezik sistema Windows ne deluje, poizkusi z osnovnim jezikok. Primer: de_CH (švicarska nemščina) ima za osnovo de_DE (nemščino)." #. (para) #: ../source/TortoiseSVN_en.xml:705 msgid "If none of the above works, then the default language is English, which is included with the standard installation." msgstr "Če po zgornjih pravilih ne uspe najti slovarja, potem je privzeti jezik angleščina, ki se nahaja v standarnem namestitvenem paketu." #. (para) #: ../source/TortoiseSVN_en.xml:679 msgid "If you install multiple dictionaries, TortoiseSVN uses these rules to select which one to use. " msgstr "Če namestite več slovarjev, TortoiseSVN uporabi naslednja pravila, da ugotovi, katerega naj uporabi. " #. (title) #: ../source/TortoiseSVN_en.xml:722 msgid "Basic Concepts" msgstr "Osnovni principi" #. (primary) #: ../source/TortoiseSVN_en.xml:724 msgid "Subversion book" msgstr "Subversion book" #. (para) #: ../source/TortoiseSVN_en.xml:727 msgid "This chapter is a slightly modified version of the same chapter in the Subversion book. An online version of the Subversion book is available here: http://svnbook.red-bean.com/." msgstr "To poglavje je rahlo spremenjena verzija istega poglavja v knjigi The Subversion book. Spletna različica knjige je na voljo na tem naslovu: http://svnbook.red-bean.com/." #. (para) #: ../source/TortoiseSVN_en.xml:735 msgid "This chapter is a short, casual introduction to Subversion. 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 Subversion, and show some simple examples of Subversion in use." msgstr "To poglavje je kratek uvod v Subversion. Če se z nadzorom različic še niste srečali, potem je to poglavje za vas. Začnemo s splošnimi principi nadzora različic, pregledamo posebnosti sistema Subversion in na enostavnih primerih pogledamo, kako se Subversion uporablja." #. (para) #: ../source/TortoiseSVN_en.xml:743 msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Subversion can manage any sort of file collection - it's not limited to helping computer programmers." msgstr "Čeprav primeri v tem poglavju prikazujejo, kako si uporabniki delijo programsko izvorno kodo, upoštevajte, da lahko Subversion upravlja katerekoli datoteke - ni omejen samo na pomoč računalniškim programerjem." #. (title) #. (title) #. (title) #: ../source/TortoiseSVN_en.xml:751 #: ../source/TortoiseSVN_en.xml:1256 #: ../source/TortoiseSVN_en.xml:2945 msgid "The Repository" msgstr "Skladišče" #. (primary) #. (primary) #: ../source/TortoiseSVN_en.xml:753 #: ../source/TortoiseSVN_en.xml:3711 msgid "repository" msgstr "skladišče" #. (para) #: ../source/TortoiseSVN_en.xml:755 msgid "Subversion 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 "Subversion je centraliziran sistem za souporabo informacij. Njegovo bistvo je skladišče, centralno mesto za shranjevanje podatkov. Skladišče shranjuje informacije v obliki drevesne strukture datotečnega sistema, kar je tipična hierarhija datotek in map. S skladiščem se lahko poveže poljubno število odjemalcev in bere ali zapisuje datoteke. S pisanjem podatkov da odjemalec te podatke na voljo drugim; z branjem podatkov odjemalec dobi infomacije od drugih." #. (title) #: ../source/TortoiseSVN_en.xml:767 msgid "A Typical Client/Server System" msgstr "Tipičen sistem odjemalec/strežnik" #. (para) #: ../source/TortoiseSVN_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 Subversion 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 "Zakaj je to zanimivo? Po dosedanji razlagi izgleda to kot tipičen datotečni strežnik. In v resnici skladišče je neke vrste datotečni strežnik. Subversion je poseben zaradi dejstva, da si zapomni vsako spremembo, ki je bila kadarkoli zapisana: vsako spremembo vsake datoteke, pa tudi spremembe strukture map, n. pr. dodajanje, brisanje in preureditev datotek in map." #. (para) #: ../source/TortoiseSVN_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 "Ko odjemalec bere podatke iz skladišča, običajo gleda le zadnjo različico drevesne strukture map. Vendar ima odjemalec možnost videti tudi predhodnja stanja datotečnega sistema. Odjemalec lahko postavi vprašanja o zgodovini, n. pr. kaj je ta mapa vsebovala prešnjo sredo? ali kdo je zadnji avtor sprememb na tej datoteki in kakšne so te spremembe? Takšna vprašanja so osrčje kateregakoli sistema za nadzor različic. Ti sistemi so nareni za hranjenje in spremljanje sprememb podatkov skozi čas." #. (title) #: ../source/TortoiseSVN_en.xml:795 msgid "Versioning Models" msgstr "Modeli nadzora različic" #. (para) #: ../source/TortoiseSVN_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 "Vsi sistemi nadzora različic morajo rešiti isto osnovno težavo: kako bo sistem omogočal souporabo informacij, hkrati pa preprečil, da bi si uporabniki skakali v zelje. Vse prelahko je povoziti spremembe ostalih uporabnikov v skladišču." #. (title) #: ../source/TortoiseSVN_en.xml:805 msgid "The Problem of File-Sharing" msgstr "Težave souporabe datotek" #. (para) #: ../source/TortoiseSVN_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 "Zamislite si naslednji scenarij: imamo dva sodelavca, Harryja in Sally. Odločita se, da bosta spremenjala isto datoteko iz skladišča. Če spremembe najprej shrani Harry, potem je možno, da Sally (čez nekaj trenutkov) pomotoma prepiše te spremembe s svojo novo različico datoteke. Harryjeva datoteka sicer ne bo izgubljena, saj si sistem zapomni vsako spremembo, ne bodo pa te spremembe prisotne v Sallyjini datoteki, saj sploh ne ve zanje. Harryjevo delo je tako kljub vsemu izgubljeno - oziroma vsaj ni na voljo v zadnji različici - in to po vsej verjetnosti po pomoti. Takšnim situacijam se želimo izogniti." #. (title) #: ../source/TortoiseSVN_en.xml:822 msgid "The Problem to Avoid" msgstr "Težava, ki se ji je potrebno izogniti" #. (title) #. (title) #: ../source/TortoiseSVN_en.xml:827 #: ../source/TortoiseSVN_en.xml:843 msgid "The Lock-Modify-Unlock Solution" msgstr "Rešitev zakleni-spremeni-odkleni" #. (para) #: ../source/TortoiseSVN_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 "Veliko sistemov za nadzor različic uporablja model zakleni-spremeni-odkleni, kar predstavlja zelo enostavno rešitev problema. V takšnem sistemu lahko datoteko spreminja samo en uporabnik naenkrat. Pred spreminjanjem datoteke jo mora Harry zakleniti. Zaklepanje datoteke je podobno izposoji knjige v knjižnici; če Harry zaklene datoteko, potem Sally ne more narediti nobenih sprememb na tej datoteki. Če poskuša datoteko zakleniti, ji bo skladišče to onemogočilo. Datoteko lahko le bere in čaka, da jo bo Harry nehal urejati in sprostil zaklep. Potem ko Harry odklene datoteko, jo lahko zaklene Sally in jo začne urejati." #. (para) #: ../source/TortoiseSVN_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 "Model zakleni-spremeni-odkleni uporabnike omejuje in jih ovira pri delu:" #. (para) #: ../source/TortoiseSVN_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 "Zaklepanje lahko povzroča skrbniške težave. Včasih Harry zaklene datoteko in nanjo pozabi. Medtem je Sally, ki želi spremeniti isto datoteko, prisiljena čakati. Harry gre na počitnice, Sally pa mora po pomoč k skrbniku sistema, da ji odklene datoteko. Takšna situacija povzroči precej nepotrebnih zamud in izgube časa." #. (para) #: ../source/TortoiseSVN_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 "Zaklepanje lahko povzroči nepotrebno delo eden za drugim. Harry popravlja začetni del datoteke, Sally pa želi popravljati zadnji del iste datoteke. Te spremembe se ne prekrivajo. Oba uporabnika bi lahko datoteko spreminjala sočasno brez posledic, pod pogojem, da bi spremembe pravilno spojila skupaj. Nobene potrebe ni, da v takšni situaciji delata eden za drugim." #. (para) #: ../source/TortoiseSVN_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 "Zaklepanje ustvarja lažen občutek varnosti. Predstavljajte si, da Harry zaklene in spreminja datoteko A, Sally pa hkrati zaklene in spreminja datoteko B. Recimo, da sta datoteki A in B odvisni ena od druge, in spremembe, narejene na posamezni datoteki, so semantično nezdružljive. Kar naenkrat datoteki A in B skupaj ne funkcionirata pravilno. Sistem zaklepanja je nemočen pri preprečevanju težave - hkrati pa ustvarja lažen občutek varnosti. Harry in Sally si mislita, da z zaklepanjem datotek začenjata varno, izolirano operacijo, kar povzroči, da se sploh ne pogovarjata o možni nezdružljivosti datotek." #. (title) #. (title) #: ../source/TortoiseSVN_en.xml:894 #: ../source/TortoiseSVN_en.xml:922 msgid "The Copy-Modify-Merge Solution" msgstr "Rešitev kopiraj-spremeni-spoji" #. (para) #: ../source/TortoiseSVN_en.xml:895 msgid "Subversion, 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 "Subversion, CVS in še nekateri drugi sistemi za nadzor različic uporabljajo model kopiraj-spremeni-spoji kot alternativo zaklepanju datotek. Pri tem modelu ustvari vsak odjemalec osebno delovno kopijo datoteke ali projekta. Uporabniki delajo sočasno in spreminjajo krajevne kopije. Nazadnje se zasebne kopije spojijo skupaj v novo, končno verzijo. Sistem za nadzor različic pogosto pomaga pri spajanju, vendar je koncu za pravilno spajanje odgovoren uporabnik." #. (para) #: ../source/TortoiseSVN_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 "Poglejmo primer. Harry in Sally ustvarita delovni kopiji istega projekta, prenesenega iz skladišča. Delata istočasno in naredita spremembe v isti datoteki A v svojih delovnih kopijah. Sally prva shrani spremembe v skladišče. Ko Harry kasneje poskusi shraniti svoje spremembe, ga skladišče obvesti, da je njegova datoteka A zastarela. Z drugimi besedami: datoteka A se je od takrat, ko jo je Harry prevzel iz skladišča, spremenila. Zato Harry zahteva od svojega odjemalca, da nove spremembe v skladišču spoji z datoteko A v njegovi delovni kopiji. Mogoče se spremembe ne prepletajo. Ko ima obe verziji združeni, shrani datoteko v skladišče." #. (title) #: ../source/TortoiseSVN_en.xml:926 msgid "...Copy-Modify-Merge Continued" msgstr "...Kopiraj-spremeni-spoji (nadaljevanje)" #. (primary) #. (primary) #: ../source/TortoiseSVN_en.xml:930 #: ../source/TortoiseSVN_en.xml:4891 msgid "conflict" msgstr "spor" #. (para) #: ../source/TortoiseSVN_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 "Kaj pa, če se Sallyjine spremembe vseeno prekrivajo s Harryjevimi? Nastane sporna situacija, ki pa običajno ne povzroča problemov. Ko Harry zahteva od svojega odjemalca, naj spoji zadnje spremembe v delovno kopijo, je njegova datoteka A označena kot sporna: Harry bo lahko videl oba nabora spornih sprememb in imel možnost izbrati pravilne. Upoštevajte, da program ne more samodejno reševati sporov; samo ljudje smo sposobni razmišljati in narediti ustrezne inteligentne odločitve. Ko Harry ročno reši prekrivajoče se spremembe (mogoče se je ob tem moral celo posvetovati s Sally!), lahko varno shrani spojeno datoteko v skladišče." #. (para) #: ../source/TortoiseSVN_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 "Model kopiraj-spremeni-spoji se mogoče zdi nekoliko kompliciran, vendar se v praksi izkaže, da funkcionira zelo dobro. Uporabniki lahko delajo sočasno, nikoli jim ni potrebno čakati nekoga drugega. Izkaže se, da se v primerih, ko delajo na istih datotekah, večina sprememb ne prekriva. Spori so redki. In čas, ki ga uporabniki porabijo za reševanje sporov, je mnogo krajši, kot bi bila izguba časa zaradi sistema zaklepanja." #. (para) #: ../source/TortoiseSVN_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 koncu pridemo do enega samega ključnega dejavnika: komunikacija med uporabniki. Kjer se uporabniki malo pogovarjajo, se poveča število sintaktičnih in semantičnih sporov. Noben sistem ne more prisiliti uporabnikov, da bi idealno komunicirali med sabo in noben sistem ne more zaznati semantičnih sporov. Torej nima nobenega smisla živeti v lažnem prepričanju, da bo sistem zaklepanja preprečil spore. V praksi se izkaže, da zaklepanje zmanjša produktivnost bolj kot karkoli drugega." #. (para) #: ../source/TortoiseSVN_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 "Obstaja pa primer, v katerem se model zakleni-spremeni-odkleni izkaže za boljšega in sicer pri datotekah, ki se jih ne da spajati. Na primer: če vaše skladišče vsebuje grafične datoteke in dva uporabnika naredita spremembe na isti datoteki naenkrat, se teh dveh sprememb ne da združiti. Eden od obeh uporabnikov bo spremembe izgubil." #. (title) #: ../source/TortoiseSVN_en.xml:976 msgid "What does Subversion Do?" msgstr "Kaj naredi Subversion?" #. (para) #: ../source/TortoiseSVN_en.xml:977 msgid "Subversion 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, Subversion also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Subversion will still provide the features you need." msgstr "Subversion po privzetih nastavitvah uporablja model kopiraj-spremeni-spoji in v veliko primerih je to vse, kar potrebujete. Od različice 1.2 naprej pa Subversion podpira tudi zaklepanje datotek. Če torej delate na datotekah, ki se jih ne da spajati ali če ste takšen model prisiljeni uporabljati zaradi pravil, ki veljajo v vašem podjetju, vam Subversion ponuja možnosti, ki jih potrebujete." #. (title) #: ../source/TortoiseSVN_en.xml:989 msgid "Subversion in Action" msgstr "Subversion v akciji" #. (title) #: ../source/TortoiseSVN_en.xml:991 msgid "Working Copies" msgstr "Delovne kopije" #. (primary) #: ../source/TortoiseSVN_en.xml:993 msgid "working copy" msgstr "delovna kopija" #. (para) #: ../source/TortoiseSVN_en.xml:995 msgid "You've already read about working copies; now we'll demonstrate how the Subversion client creates and uses them." msgstr "O delovnih kopijah ste že brali. Sedaj bomo prikazali, kako jih odjemalec Subversion ustvari in uporablja." #. (para) #: ../source/TortoiseSVN_en.xml:1000 msgid "A Subversion 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: Subversion will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so." msgstr "Delovna kopija sistema Subversion je običajna struktura map na vašem krajevnem sistemu, ki vsebuje datoteke. Datoteke lahko poljubno spreminjate. Če so to datoteke izvorne kode, lahko iz njih povsem običajno prevedete program. Vaša delovna kopija je vaše zasebno delovno območje: Subversion ne bo v vašo delovno kopijo nikoli vnašal sprememb, ki so jih naredili drugi uporabniki, prav tako vaših sprememb ne bo dal na voljo drugim, razen ko boste to izrecno zahtevali od njega." #. (para) #: ../source/TortoiseSVN_en.xml:1010 msgid "After you've made some changes to the files in your working copy and verified that they work properly, Subversion 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, Subversion provides you with commands to merge those changes into your working directory (by reading from the repository)." msgstr "Ko ste naredili določene spremembe v datotekah v delovni kopiji in jih preverili, uporabite ukaze sistema Subversion, da spremembe objavite (s pisanjem v skladišče), tako da so vidne ostalim sodelavcem, ki delajo na projektu. Če ostali sodelavci naredijo spremembe na datotekah, vam Subversion omogoča, da te spremembe spojite v delovno kopijo (z branjem iz skladišča)." #. (para) #: ../source/TortoiseSVN_en.xml:1020 msgid "A working copy also contains some extra files, created and maintained by Subversion, 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 Subversion recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work." msgstr "Delovna kopija vsebuje tudi nekaj posebnih datotek, ki jih ustvari in vzdržuje Subversion za pomoč pri izvajanju ukazov. Vsak mapa znotraj delovne kopije vsebuje podmapo .svn, ki ji rečemu skrbniška mapa. Datoteke znotraj te mape pomagajo sistemu Subversion prepoznati datoteke, ki vsebujejo neobjavljene spremembe, in datoteke, ki so jih spreminjali drugi uporabniki in so tako zastarele." #. (para) #: ../source/TortoiseSVN_en.xml:1031 msgid "A typical Subversion 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 skladišče sistema Subversion pogosto vsebuje datoteke (ali izvorno kodo) za več projektov; običajno je vsak projekt podmapa v drevesni strukturi skladišča. Pri takšni ureditvi bo uporabnikova delovna kopija običajno ustrezala določenemu podrevesu skladišča." #. (para) #: ../source/TortoiseSVN_en.xml:1038 msgid "For example, suppose you have a repository that contains two software projects." msgstr "Recimo, da imate skladišče z dvema projektoma programske opreme." #. (title) #: ../source/TortoiseSVN_en.xml:1043 msgid "The Repository's Filesystem" msgstr "Datotečni sistem skladišča" #. (para) #: ../source/TortoiseSVN_en.xml:1046 msgid "In other words, the repository's root directory has two subdirectories: paint and calc." msgstr "Z drugimi besedami, korenska mapa skladišča ima dve podmapi: paint in calc." #. (para) #: ../source/TortoiseSVN_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 "Če želite ustvariti delovno kopijo, morate prevzeti neko poddrevo skladišča. (Prevzeti se morda sliši, kot da vir podatkov zaklenete ali rezervirate, v resnici pa si s tem izdelate zasebno kopijo projekta)." #. (para) #: ../source/TortoiseSVN_en.xml:1058 msgid "Suppose you make changes to button.c. Since the .svn directory remembers the file's modification date and original contents, Subversion can tell that you've changed the file. However, Subversion 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 "Recimo, da naredite spremembo na datoteki button.c. Ker si mapa .svn zapomni datum spremembe datoteke in izvirno vsebino, Subversion ve, da ste datoteko sprememenili. Vendar pa Subversion ne objavi sprememb, dokler mu tega ne ukažete. Temu rečemo objava (ali vrnitev) sprememb v skladišče." #. (para) #: ../source/TortoiseSVN_en.xml:1068 msgid "To publish your changes to others, you can use Subversion's commit command." msgstr "Da bi omogočili dostop do svojih sprememb ostalim, uporabite ukaz objavi." #. (para) #: ../source/TortoiseSVN_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 "Sedaj so spremembe v datoteki button.c objavljene v skladišču; če nek drug uporabnik prevzame delovno kopijo iz mape /calc, bo te spremembe videl v zadnji različici datoteke." #. (para) #: ../source/TortoiseSVN_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; Subversion only modifies working copies at the user's request." msgstr "Predpostavimo, da imate sodelavko Sally, ki je prevzela delovno kopijo /calc sočasno z vami. Ko objavite spremembe v datoteki button.c, se Sallyjina delovna kopija ne spremeni; Subversion spreminja delovne kopije le na zahtevo uporabnika." #. (para) #: ../source/TortoiseSVN_en.xml:1086 msgid "To bring her project up to date, Sally can ask Subversion to update her working copy, by using the Subversion 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 "Za posodobitev projekta Sally od sistema Subversion zahteva, da posodobi njeno delovno kopijo z uporabo ukaza update. Ta spoji vaše spremembe v njeno delovno kopijo, prav tako pa tudi vse ostale spremembe, ki so bile objavljene po njenem prevzemu." #. (para) #: ../source/TortoiseSVN_en.xml:1094 msgid "Note that Sally didn't need to specify which files to update; Subversion 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 "Upoštevajte, da Sally ni potrebno povedati, katere datoteke želi posodobiti; Subversion uporabi informacije v mapi .svn in dodatne informacije iz skladišča, da se odloči, katere datoteke je potrebno posodobiti." #. (title) #: ../source/TortoiseSVN_en.xml:1103 msgid "Repository URLs" msgstr "Naslovi URL skladišča" #. (para) #: ../source/TortoiseSVN_en.xml:1104 msgid "Subversion 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 "Do skladišč Subversion lahko dostopate na več različnih načinov - na krajevnem disku ali preko različnih omrežnih protokolov. Lokacija skladišča pa je vedno navedena z naslovom URL. Shema naslova URL pove način dostopa:" #. (title) #: ../source/TortoiseSVN_en.xml:1112 msgid "Repository Access URLs" msgstr "Naslovi URL za dostop do skladišča" #. (entry) #: ../source/TortoiseSVN_en.xml:1118 msgid "Schema" msgstr "Shema" #. (entry) #: ../source/TortoiseSVN_en.xml:1119 msgid "Access Method" msgstr "Način dostopa" #. (literal) #: ../source/TortoiseSVN_en.xml:1125 msgid "file://" msgstr "file://" #. (entry) #: ../source/TortoiseSVN_en.xml:1127 msgid "Direct repository access on local or network drive." msgstr "Neposreden dostop do skladišča na krajevnem ali omrežnem disku." #. (literal) #. (literal) #: ../source/TortoiseSVN_en.xml:1133 #: ../source/TortoiseSVN_en.xml:1144 msgid "http://" msgstr "http://" #. (entry) #: ../source/TortoiseSVN_en.xml:1135 msgid "Access via WebDAV protocol to Subversion-aware Apache server." msgstr "Dostop do strežnika Apache s sistemom Subversion preko protokola WebDAV." #. (literal) #: ../source/TortoiseSVN_en.xml:1141 msgid "https://" msgstr "https://" #. (entry) #: ../source/TortoiseSVN_en.xml:1143 msgid "Same as , but with SSL encryption." msgstr "Enako kot , vendar z enkripcijo SSL." #. (literal) #: ../source/TortoiseSVN_en.xml:1149 msgid "svn://" msgstr "svn://" #. (literal) #. (literal) #. (primary) #. (primary) #: ../source/TortoiseSVN_en.xml:1153 #: ../source/TortoiseSVN_en.xml:1162 #: ../source/TortoiseSVN_en.xml:2484 #: ../source/TortoiseSVN_en.xml:2623 msgid "svnserve" msgstr "svnserve" #. (entry) #: ../source/TortoiseSVN_en.xml:1151 msgid "Unauthenticated TCP/IP access via custom protocol to a server." msgstr "Dostop TCP/IP brez avtentikacije preko protokola po meri do strežnika " #. (literal) #: ../source/TortoiseSVN_en.xml:1158 msgid "svn+ssh://" msgstr "svn+ssh://" #. (entry) #: ../source/TortoiseSVN_en.xml:1160 msgid "authenticated, encrypted TCP/IP access via custom protocol to a server." msgstr "avtenticiran, enkriptiran dostop TCP/IP preko protokola po meri do strežnika " #. (para) #: ../source/TortoiseSVN_en.xml:1168 msgid "For the most part, Subversion'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 "V večini primerov se v sistemu Subversion za naslove URL uporablja standardna sintaksa, kar omogoča, da se ime strežnika in številka vrat pojavljata kot del naslova URL. Metoda dostopa file:// se običajno uporablja za lokalni dostop, možno pa jo je uporabljati tudi za poti UNC. URL je naslednje oblike: file://gostitelj/pat/do/skladišča. Za krajevne dostope dela gostitelj ne navedemo ali pa navedemo localhost. Iz tega razloga se krajevne poti običajno zapisujejo s tremi poševnicami: file:///pat/do/skladišča." #. (para) #: ../source/TortoiseSVN_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 "Poleg tega morajo uporabniki sheme file:// na operacijskem sistemu Windows uporabljati neuradno standardno sintakso za dostopanje do skladišč, ki so na istem računalniku, vendar na drugem pogonu, kot je trenutni delovni pogon odjemalca. Naslednji dve različici sintakse poti URL sta pravilni; X je pogon, na katerem se nahaja skladišče:" #. (screen) #: ../source/TortoiseSVN_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:/pot/do/skladišča\n" "...\n" "file:///X|/pot/do/skladišča\n" "...\n" #. (para) #: ../source/TortoiseSVN_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 "Upoštevajte, da se za naslove URL uporablja poševnica, čeprav je znak za ločitev posameznih delov poti v sistemu Windows obrnjena poševnica." #. (para) #: ../source/TortoiseSVN_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 "Do skladišč tipa FSFS lahko varno dostopate preko omrežnih map v skupni rabi, vendar na ta način ne morete dostopati do skladišč tipa BDB." #. (para) #. (para) #: ../source/TortoiseSVN_en.xml:1207 #: ../source/TortoiseSVN_en.xml:2610 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 ustvarjajte ali dostopajte do skladišč tipa Berkley DB v mapah skupne rabe v omrežju. Takšno skladišče ne more obstajati na oddaljenem datotečnem sistemu, četudi imate omrežni pogon preslikan v lokalni pogon. Če boste poskušali dostopati do skladišča tipa Berkley DB v omrežju, so rezultati nepredvidljivi - lahko se takoj pojavijo čudne napake, lahko pa traja mesece, preden boste opazili, da je vaša baza podatkov pokvarjena." #. (title) #: ../source/TortoiseSVN_en.xml:1219 msgid "Revisions" msgstr "Revizije" #. (primary) #. (primary) #: ../source/TortoiseSVN_en.xml:1221 #: ../source/TortoiseSVN_en.xml:9605 msgid "revision" msgstr "revizija" #. (para) #: ../source/TortoiseSVN_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 commit objavi spremembe poljubnega števila datotek in map v eni atomični transakciji. V delovni kopiji lahko spreminjate vsebine datotek, ustvarjate, brišete, preimenujete in kopirate datoteke in potem objavite celoten nabor sprememb kot celoto." #. (para) #: ../source/TortoiseSVN_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. Subversion retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions." msgstr "V skladišču se vsaka objava opravi kot atomična transakcija: upoštevane so vse spremembe v objavi ali pa nobena. Subversion poskuša ohraniti atomičnost zaradi sesutja aplikacij, sistema, težav z omrežjem in ostalih uporabnikov posredovanj." #. (para) #: ../source/TortoiseSVN_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 "Vsakokrat, ko skladišče sprejme objavo, se ustvari novo stanje drevesa dototečne strukture, imenovano revizija. Vsaki reviziji se predpiše unikatno naravno število, za eno večje od številke prejšnje revizije. Začetna revizija novo ustvarjenega skladišča ima številko 0 in vsebuje zgolj korensko mapo." #. (para) #: ../source/TortoiseSVN_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 "Dober način za predstavitev skladišča je vrsta dreves. Predstavljajte si polje številk revizij, ki se začne z 0 in se razteza od leve proti desni. Iz vsake številke revizije visi drevo datotečnega sistema in vsako drevo je posnetek izgleda skladišča po vsaki objavi." #. (title) #: ../source/TortoiseSVN_en.xml:1260 msgid "Global Revision Numbers" msgstr "Globalne številke revizij" #. (para) #: ../source/TortoiseSVN_en.xml:1261 msgid "Unlike those of many other version control systems, Subversion'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 Subversion 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 "Za razliko od mnogih drugih sistemov za nadzor različic se revizije v sistemu Subversion nanašajo na celotno drevo, ne na posamezne datoteke. Vsaka številka revizije izbere celotno drevo - določeno stanje skladišča po neki objavi sprememb. Drug način gledanja je ta, da revizija N predstavlja stanje skladišča po N-ti objavi. Ko v sistemu Subversion govorimo o ``reviziji 5 datoteke foo.c'', v resnici mislimo ``Datoteka foo.c, kot se nahaja v reviziji 5''. Upoštevajte, da se v splošnem reviziji N in M neke datoteke ne razlikujeta." #. (para) #: ../source/TortoiseSVN_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 "Pomembno je poudariti, da delovne kopije niso vedno odraz samo eno revizije v skladišču; vsebujejo lahko datoteke več različnih revizij. Primer: recimo, da prevzamete delovno kopijo iz skladišča, kjer zadnja shranjena revizija nosi številko 4:" #. (screen) #: ../source/TortoiseSVN_en.xml:1283 #, no-wrap msgid "" "\n" "calc/Makefile:4\n" " integer.c:4\n" " button.c:4\n" msgstr "" "\n" "calc/Makefile:4\n" " integer.c:4\n" " button.c:4\n" #. (para) #: ../source/TortoiseSVN_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 "V tem trenutku delovna kopija ustreza točno reviziji številka 4 v skladišču. Denimo, da naredite spremembe v datoteki button.c in objavite spremembo. Denimo, da se med tem niso zgodile nobene druge objave. Vaša objava bo ustvarila revizijo 5 v skladišču in vaša delovna kopija bo izgledala takole:" #. (screen) #: ../source/TortoiseSVN_en.xml:1296 #, no-wrap msgid "" "\n" "calc/Makefile:4\n" " integer.c:4\n" " button.c:5\n" msgstr "" "\n" "calc/Makefile:4\n" " integer.c:4\n" " button.c:5\n" #. (para) #: ../source/TortoiseSVN_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 "Denimo, da v tem trenutku Sally objavi spremembo datoteke integer.c in s tem ustvari revizijo 6. Če uporabite ukaz svn update, ki posodobi vašo delovno kopijo, bo le-ta izgledala takole:" #. (screen) #: ../source/TortoiseSVN_en.xml:1307 #, no-wrap msgid "" "\n" "calc/Makefile:6\n" " integer.c:6\n" " button.c:6\n" msgstr "" "\n" "calc/Makefile:6\n" " integer.c:6\n" " button.c:6\n" #. (para) #: ../source/TortoiseSVN_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 Subversion 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 "Sallyjine spremembe datoteke integer.c se bodo pojavile v vaši delovni kopiji in v datoteki button.c bodo še vedno vaše spremembe. V tem primeru je besedilo datoteke Makefile identično v revizijah 4, 5 in 6, vendar bo Subversion označil vašo delovno kopijo datoteke Makefile s številko revizije 6 in s tem povedal, je datoteka trenutna. Torej: ko boste naredili posodobitev vrhnje datoteke delovne kopije, bo le-ta ustrezala točno eni reviziji v skladišču." #. (title) #: ../source/TortoiseSVN_en.xml:1325 msgid "How Working Copies Track the Repository" msgstr "Kako delovne kopije spremljajo skladišče" #. (para) #: ../source/TortoiseSVN_en.xml:1326 msgid "For each file in a working directory, Subversion records two essential pieces of information in the .svn/ administrative area:" msgstr "Za vsako datoteko v delovni kopiji Subversion shrani dve pomembni informaciji v skrbniško področje .svn/:" #. (para) #: ../source/TortoiseSVN_en.xml:1332 msgid "what revision your working file is based on (this is called the file's working revision), and" msgstr "na kateri reviziji je osnovana vaša delovna datoteka (rečemo ji datotečna delovna revizija) in" #. (para) #: ../source/TortoiseSVN_en.xml:1339 msgid "a timestamp recording when the local copy was last updated by the repository." msgstr "časovni žig, ki pove, kdaj je bila krajevna kopija nazadnje posodobljena iz skladišča." #. (para) #: ../source/TortoiseSVN_en.xml:1345 msgid "Given this information, by talking to the repository, Subversion can tell which of the following four states a working file is in:" msgstr "S temi informacijami in komunikacijo s skladiščem lahko Subversion ugotovi, v katerem od štirih stanj se delovna datoteka nahaja:" #. (term) #: ../source/TortoiseSVN_en.xml:1352 msgid "Unchanged, and current" msgstr "Nespremenjeno in trenutno" #. (para) #: ../source/TortoiseSVN_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 "Datoteka je nespremenjena v delovni kopiji, prav tako pa od prevzema datoteke ni bila objavljene nobena sprememba v skladišču. Ukaz objavi ne bo storil ničesar, prav tako tudi ne ukaz posodobi." #. (term) #: ../source/TortoiseSVN_en.xml:1365 msgid "Locally changed, and current" msgstr "Krajevno spremenjeno in trenutno" #. (para) #: ../source/TortoiseSVN_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 "Datoteka v delovni kopiji je spremenjena, v skladišču pa ni bila objavljena nobena sprememba od osnovne revizije. Obstajajo krajevne spremembe, ki niso bile objavljene v skladišču, tako da bo ukaz objavi na datoteki objavil vaše spremembe, ukaz posodobi pa ne bo naredil ničesar." #. (term) #: ../source/TortoiseSVN_en.xml:1379 msgid "Unchanged, and out-of-date" msgstr "Nespremenjeno in zastarelo" #. (para) #: ../source/TortoiseSVN_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 "Datoteka ni bila spremenjena v delovni kopiji, se je pa spremenila v skladišču. Da bo datoteka enaka javni reviziji, jo je potrebno posodobiti. Ukaz objavi ne bo naredil ničesar, ukaz posodobi pa bo prenesel najnovejše spremembe iz skladišča v delovno kopijo." #. (term) #: ../source/TortoiseSVN_en.xml:1393 msgid "Locally changed, and out-of-date" msgstr "Krajevno spremenjeno in zastarelo" #. (para) #: ../source/TortoiseSVN_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 Subversion can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict." msgstr "Datoteka je bila spremenjena v delovni kopiji in v skladišču. Ukaz objavi ne bo uspel; prikazalo se bo sporočilo, da je datoteka zastarela. Datoteko je potrebno najprej posodobiti; ukaz posodobi bo poskušal javne spremembe spojiti s krajevnimi. Če Subversion ne more spojiti različic samodejno, reševanje spora prepusti uporabniku." #. (title) #: ../source/TortoiseSVN_en.xml:1412 msgid "Summary" msgstr "Povzetek" #. (para) #: ../source/TortoiseSVN_en.xml:1413 msgid "We've covered a number of fundamental Subversion concepts in this chapter:" msgstr "V tem poglavju smo pregledali nekaj osnovnih principov sistema Subversion:" #. (para) #: ../source/TortoiseSVN_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 "Predstavili smo koncept centralnega skladišča, delovne kopije na strani odjemalca in polja dreves revizij v skladišču." #. (para) #: ../source/TortoiseSVN_en.xml:1425 msgid "We've seen some simple examples of how two collaborators can use Subversion to publish and receive changes from one another, using the 'copy-modify-merge' model." msgstr "Videli smo nekaj primerov, kako lahko dva sodelavca uporabljata Subversion in model 'kopiraj-spremeni-spoji' za objavljanje sprememb in sprejemanje sprememb drug od drugega." #. (para) #: ../source/TortoiseSVN_en.xml:1432 msgid "We've talked a bit about the way Subversion tracks and manages information in a working copy." msgstr "Govorili smo o tem, kako Subversion sledi in upravlja informacije v delovni kopiji." #. (title) #: ../source/TortoiseSVN_en.xml:1445 msgid "Setting Up A Server" msgstr "Nameščanje strežnika" #. (para) #: ../source/TortoiseSVN_en.xml:1447 msgid "To use TortoiseSVN (or any other Subversion 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 "Za uporabo programa TortoiseSVN (ali kateregakoli drugega odjemalca za Subversion) potrebuteje prostor, kjer se bodo nahajala skladišča. Lahko jih namestite krajevno in dostopate do njih preko protokola file:// ali pa jih postavite na strežnik in dostopate do njih preko protokolov http:// ali svn://. Strežniška protokola sta lahko ekriptirana. Pri tem uporabite https:// ali svn+ssh://. V tem poglavju so podani koraki nameščanja strežnika na operacijskem sistemu Windows." #. (para) #: ../source/TortoiseSVN_en.xml:1458 msgid "More detailed information on the Subversion server options, and how to choose the best architecture for your situation, can be found in the Subversion book under Server Configuration." msgstr "Podrobnejše informacije o možnostih strežnika Subversion in izbiri pravilne arhitekture za vaš primer najdete v knjigi The Subversion Book, poglavje Server Configuration." #. (para) #: ../source/TortoiseSVN_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 "Če spletnega strežnika nimate in/ali če delate na projektu sami, potem je krajevno skladišče verjetno najboljša izbira. To poglavje lahko preskočite in greste neposredno na ." #. (para) #: ../source/TortoiseSVN_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 "Če ste razmišljali o skladišču za več uporabnikov na deljnejem omrežnem pogonu, o svoji odločitvi premislite. Preberite , kjer boste izbedeli, zakaj to ni dobra odločitev." #. (title) #: ../source/TortoiseSVN_en.xml:1480 msgid "Apache Based Server" msgstr "Strežnik na osnovi strežnika Apache" #. (primary) #: ../source/TortoiseSVN_en.xml:1484 msgid "Apache" msgstr "Apache" #. (para) #: ../source/TortoiseSVN_en.xml:1486 msgid "The most flexible of all possible server setups for Subversion is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:" msgstr "Najbolj prilagodljiv sistem za Subversion dobite pri uporabi strežnika Apache. Njegova namestitev je sicer nekoliko bolj zahtevna, vendar ima v primerjavi z ostalimi strežniki številne prednosti:" #. (primary) #. (term) #: ../source/TortoiseSVN_en.xml:1492 #: ../source/TortoiseSVN_en.xml:1496 msgid "WebDAV" msgstr "WebDAV" #. (para) #: ../source/TortoiseSVN_en.xml:1498 msgid "The Apache based Subversion 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 "Strežniki Subversion, postavljeni na strežniku Apache, uporabljajo protokol WebDAV, ki ga podpirajo številni ostali programi. Ta omogoča, da naprimer priklopite skladišče kot internetno mapo v Windowsovem Raziskovalcu in do nje dostopate kot do katerekoli druge mape v datotečnem sistemu" #. (term) #: ../source/TortoiseSVN_en.xml:1509 msgid "Browsing The Repository" msgstr "Brskanje po skladišču" #. (para) #: ../source/TortoiseSVN_en.xml:1511 msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Subversion client installed. This gives access to your data to a much wider circle of users." msgstr "V spletni brskalnik lahko vpišete naslov URL skladišča in brskate po vsebini, ne da bi imeli nameščenega odjemalca za Subversion. To omogoča dostop do podatkov precej širšemu krogu uporabnikov." #. (term) #. (title) #: ../source/TortoiseSVN_en.xml:1521 #: ../source/TortoiseSVN_en.xml:3640 msgid "Authentication" msgstr "Avtentikacija" #. (para) #: ../source/TortoiseSVN_en.xml:1523 msgid "You can use any authentication mechanism Apache supports, including SSPI and LDAP." msgstr "Uporabite lahko prav vse avtentikacijske mehanizme, ki jih podpira Apache, vključno z SSPI in LDAP." #. (term) #: ../source/TortoiseSVN_en.xml:1530 msgid "Security" msgstr "Varnost" #. (para) #: ../source/TortoiseSVN_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 "Ker je strežnik Apache zelo stabilen in varen, je prav tako varno tudi vaše skladišče. Uporabite lahko tudi enkripcijo SSL." #. (title) #: ../source/TortoiseSVN_en.xml:1542 msgid "Installing Apache" msgstr "Namestitev strežnika Apache" #. (para) #: ../source/TortoiseSVN_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 "Prosimo, upoštevajte, da lahko uporaba operacijskega sistema Windows XP brez prvega paketa popravkov (service pack 1) pripelje do nepravinih podatkov v omrežju in tako pokvari skladišče!" #. (para) #: ../source/TortoiseSVN_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 "Prenesite si zadnjo različico spletnega strežnika Apache z naslova http://httpd.apache.org/download.cgi. Poskrbite, da prenesete različico 2.2.x - različica 1.3.x.x ne bo delovala!" #. (para) #: ../source/TortoiseSVN_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 "Namestitveni program MSI za spletni strežnik Apache dobite, če kliknete na other files in greste na pot binaries/win32. Lahko izbere datoteko apache-2.2.x-win32-x86-openssl-0.9.x.msi (vključuje tudi OpenSSL)." #. (para) #: ../source/TortoiseSVN_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 "Ko ste prenesli namestitveni program za strežnik Apache 2, ga poženite in vodil vas bo skozi namestitveni proces. Preverite, da ste pravilno vnesli naslov URL strežnika (če strežnik nima imena DNS ali pa ga ne poznate, vnesite kar naslov IP strežnika). Priporočamo, da namestite Apache za vse uporabnike, na vrata 80, kot storitev (service). Opomba: če že imate nameščen IIS ali kakšen drug program, ki posluša port 80, je lahko namestitev neuspešna. Če se to zgodi, pojdite v namestitveno mapo strežnika Apache, običajno c:\\Program Files\\Apache Group\\Apache2\\conf in poiščite datoteko httpd.conf. Spremenite jo tako, da vrednost vrat v izrazu Listen 80 zamenjate z vrednostjo katerihkoli prostih vrat, na primer Listen 81. Potem namestitev ponovite - tokrat bi morala biti uspešna." #. (para) #: ../source/TortoiseSVN_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 "Sedaj preverite, če spletni strežnik Apache deluje pravilno. Usmerite svoj spletni brskalnik na stran http://localhost/ - pojaviti se mora prednastavljena spletna stran." #. (para) #: ../source/TortoiseSVN_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 "Če se odločite namestiti strežnik Apache kot storitev (service), upoštevajte, da se bo po privzetih nastavitvah pognal s krajevnim sistemskim računom (local system account). Bolj varen način je, da za poganjanje strežnika Apache ustvarite poseben račun." #. (para) #: ../source/TortoiseSVN_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 "Zagotovite, da ima račun, pod katerim teče strežnik Apache, v mapi, kjer se nahajajo skladišča, eksplicitno določene vse pravice (desni klik na mapo | lastnosti | varnost). V nasprotnem primeru uporabniki ne bodo mogli objavljati svojih sprememb." #. (para) #: ../source/TortoiseSVN_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 "Tudi če Apache teče pod sistemskim računom, morate pravico vseeno določiti (v tem primeru za račun SYSTEM)." #. (para) #: ../source/TortoiseSVN_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 "Če Apache tega dovoljenja nima, bodo uporabniki dobili opozorilo Dostop zavrnjen, ki je v dnevniku napak strežnika Apache predstavljen s številko 500." #. (para) #: ../source/TortoiseSVN_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 "Za namestitev strežnika Apache potrebujete računalnik s sistemom Windows 2000, Windows XP+SP1, Windows 2003, Vista ali Server 2008. " #. (title) #: ../source/TortoiseSVN_en.xml:1628 msgid "Installing Subversion" msgstr "Namestitev sistema Subversion" #. (para) #: ../source/TortoiseSVN_en.xml:1632 msgid "Download the latest version of the Subversion 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://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." msgstr "Prenesite zadnjo različico Win32 dvojiških datotek Subversion za Apache. Prepričajte se, da ste prenesli pravilno različico, drugače boste ob ponovnem zagonu dobili čudna sporočila o napakah. Če uporabljate Apache 2.2.x, uporabite povezavo http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100." #. (para) #: ../source/TortoiseSVN_en.xml:1644 msgid "Run the Subversion installer and follow the instructions. If the Subversion 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 "Poženite namestitveni program za Subversion in sledite navodilom. Če namestitveni program ugotovi, da imate nameščen strežnik Apache, ste že skoraj pri koncu. Če strežnika ne najde, potem vas čaka še nekaj korakov." #. (primary) #. (primary) #: ../source/TortoiseSVN_en.xml:1654 #: ../source/TortoiseSVN_en.xml:1983 msgid "mod_authz_svn" msgstr "mod_authz_svn" #. (para) #: ../source/TortoiseSVN_en.xml:1656 msgid "Using the windows explorer, go to the installation directory of Subversion (usually c:\\program files\\Subversion) 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 "Z Raziskovalcem pojdite v namestitveno mapo Subversion (običajno c:\\program files\\Subversion) in poiščite datoteki /httpd/mod_dav_svn.so in mod_authz_svn.so. Prekopirajte ti datoteki v podmapo modules namestitvene mape strežnika Apache (običajno c:\\program files\\apache group\\apache2\\modules )." #. (para) #: ../source/TortoiseSVN_en.xml:1669 msgid "Copy the file /bin/libdb*.dll and /bin/intl3_svn.dll from the Subversion installation directory to the Apache bin directory." msgstr "Prekopirajte datoteki /bin/libdb*.dll in /bin/intl3_svn.dll iz namestitvene mape Subversion v podmapo bin strežnika Apache." #. (para) #: ../source/TortoiseSVN_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 "Popravite konfiguracijsko datoteko strežnika Apache (ponavadi C:\\Program Files\\Apache Group\\Apache2\\conf\\httpd.conf) z urejevalnikom besedil (n. pr. z Beležko) in naredite naslednje spremembe:" #. (para) #: ../source/TortoiseSVN_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 "" "Odstranite komentar (oznako '#') izpred naslednjih vrstic:\n" "#LoadModule dav_fs_module modules/mod_dav_fs.so\n" "#LoadModule dav_module modules/mod_dav.so\n" " Dodajte naslednji vrstici na konec sekcije LoadModule. \n" "LoadModule dav_svn_module modules/mod_dav_svn.so\n" "LoadModule authz_svn_module modules/mod_authz_svn.so\n" "" #. (title) #. (term) #: ../source/TortoiseSVN_en.xml:1702 #: ../source/TortoiseSVN_en.xml:12335 msgid "Configuration" msgstr "Konfiguracija" #. (para) #: ../source/TortoiseSVN_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 \"Subversion repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" " This configures Apache so that all your Subversion 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 koncu datoteke Config dodajte naslednje vrstice: \n" "<Location /svn>\n" " DAV svn\n" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" " #SVNIndexXSLT \"/svnindex.xsl\"\n" " AuthType Basic\n" " AuthName \"Skladišča Subversion\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" " S tem nastavite strežnik Apache tako, da so vsa skladišča sistema Subversion znotraj mape D:\\SVN. Zunanjemu svetu so skladišča na voljo na naslovu http://MojStrežnik/svn/ . Dostop je omejen na uporabniška imena/gesla, ki so navedena v datoteki passwd." #. (para) #: ../source/TortoiseSVN_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 "" "Za ustvarjanje datoteke passwd ponovno odprite ukazno lupino (okno DOS), pojdite v mapo strežnika Apache2 (ponavadi c:\\program files\\apache group\\apache2) in z naslednjim ukazom ustvarite datoteko: \n" "bin\\htpasswd -c passwd <username>\n" " S tem ustvarite datoteko z imenom passwd, ki se uporablja za avtentikacijo. Dodatne uporabnike lahko vnesete z \n" "bin\\htpasswd geslo <uporabniško ime>\n" "" #. (para) #: ../source/TortoiseSVN_en.xml:1759 msgid "Restart the Apache service again." msgstr "Ponovno zaženite storitev (service) Apache." #. (para) #: ../source/TortoiseSVN_en.xml:1764 msgid "Point your browser to http://MyServer/svn/MyNewRepository (where MyNewRepository is the name of the Subversion 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 "Usmerite spletni brskalnik na http://MojStrežnik/svn/MojeNovoSkladišče (kjer je MojeNovoSkladišče ime skladišča Subversion, ki je ste ga predhodno ustvarili). Če je šlo vse po načrtih, potem vas mora pričakati vnosno polje za uporabnišo ime in geslo. Po vpisu lahko vidite vsebino skladišča." #. (para) #: ../source/TortoiseSVN_en.xml:1703 msgid "Now you have set up Apache and Subversion, but Apache doesn't know how to handle Subversion clients like TortoiseSVN yet. To get Apache to know which URL will be used for Subversion 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 "Apache in Subversion sta nameščena, vendar Apache še ne zna delati z odjemalci Subversion, kakršen je TortoiseSVN. Da poveste strežniku Apache, kateri naslovi URL bodo uporabljeni kot skladišča Subversion, morate popraviti njegovo konfiguracijsko datoteko (običajno se nahaja na c:\\program files\\apache group\\apache2\\conf\\httpd.conf) z urejevalnikom besedila (n. pr. z Beležko): " #. (primary) #: ../source/TortoiseSVN_en.xml:1777 msgid "SVNPath" msgstr "SVNPath" #. (primary) #. (literal) #. (primary) #: ../source/TortoiseSVN_en.xml:1780 #: ../source/TortoiseSVN_en.xml:1815 #: ../source/TortoiseSVN_en.xml:1951 msgid "SVNParentPath" msgstr "SVNParentPath" #. (title) #: ../source/TortoiseSVN_en.xml:1785 msgid "Apache httpd.conf Settings" msgstr "Nastavitve Apache httpd.conf" #. (entry) #: ../source/TortoiseSVN_en.xml:1791 msgid "Setting" msgstr "Nastavitev" #. (entry) #: ../source/TortoiseSVN_en.xml:1792 msgid "Explanation" msgstr "Razlaga" #. (systemitem) #: ../source/TortoiseSVN_en.xml:1800 msgid "http://MyServer/svn/" msgstr "http://MojStrežnik/svn/" #. (entry) #: ../source/TortoiseSVN_en.xml:1798 msgid "means that the Subversion repositories are available from the URL " msgstr "pomeni, da so skladišča sistema Subversion na voljo na naslovu URL " #. (entry) #: ../source/TortoiseSVN_en.xml:1805 msgid "tells Apache which module will be responsible to serve that URL - in this case the Subversion module." msgstr "pove strežniku Apache, kateri modul bo odgovoren za strežbo naslova URL - v tem primeru modul Subversion." #. (entry) #: ../source/TortoiseSVN_en.xml:1812 msgid "For Subversion version 1.3 and higher, this directive enables listing all the available repositories under ." msgstr "V različicah sistema Subversion 1.3 ali novejših ta ukaz omogoča izpis seznama vse razpoložljivih skladišč v mapi ." #. (filename) #: ../source/TortoiseSVN_en.xml:1822 msgid "D:\\SVN" msgstr "D:\\SVN" #. (entry) #: ../source/TortoiseSVN_en.xml:1820 msgid "tells Subversion to look for repositories below " msgstr "pove sistemu Subversion, naj skladišča išče v mapi " #. (entry) #: ../source/TortoiseSVN_en.xml:1827 msgid "Used to make the browsing with a web browser prettier." msgstr "Nastavitev za lepši izpis pri brskanju po skladiščih." #. (entry) #: ../source/TortoiseSVN_en.xml:1834 msgid "is to activate basic authentication, i.e. Username/password" msgstr "se uporablja za nastavitev osnovne avtentikacije, n. pr. uporabniško ime/geslo" #. (entry) #: ../source/TortoiseSVN_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 "se uporablja kot informacija ob prikazu pojavnega okna za avtentikacijo. Uporabniku pove, za kaj se avtentikacija uporablja." #. (entry) #: ../source/TortoiseSVN_en.xml:1848 msgid "specifies which password file to use for authentication" msgstr "določi datoteko z gesli, ki naj se uporabi za avtentikacijo" #. (entry) #: ../source/TortoiseSVN_en.xml:1854 msgid "Location of the Access file for paths inside a Subversion repository" msgstr "lokacija datoteke dostopov za poti v skladiščih Subversion" #. (entry) #: ../source/TortoiseSVN_en.xml:1861 msgid "specifies that only users who entered a correct username/password are allowed to access the URL" msgstr "določi, da lahko do naslova URL dostopajo le uporabniki, ki so navedli pravilno kombinacijo uporabniškega imena in gesla" #. (para) #: ../source/TortoiseSVN_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 "" "Če želite, da imajo pravico branja v vašem skladišču vsi uporabniki, pravico pisanja pa samo nekateri, spremenite vrstico \n" "Require valid-user\n" " v \n" "<LimitExcept GET PROPFIND OPTIONS REPORT>\n" "Require valid-user\n" "</LimitExcept>\n" "" #. (para) #: ../source/TortoiseSVN_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 Subversion access file. Apache will make sure that only valid users are able to access your /svn location, and will then pass the username to Subversion's AuthzSVNAccessFile module so that it can enforce more granular access based upon rules listed in the Subversion 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 "" "Z uporabno datoteke passwd lahko omejite oziroma dovolite dostop do vseh skladišč naenkrat. Če želite imeti več nadzora nad tem, kateri uporabnik ima pravice v določeni mapi skladišča, odkomentirajte vrstico \n" "#AuthzSVNAccessFile svnaccessfile\n" " in ustvarite datoteko dostopa. Apache poskrbi, da lahko samo veljavni uporabniki dostopajo do lokacije /svn, in potem posreduje uporabniško ime modulu AuthzSVNAccessFile, tako da lahko le-ta bolj podrobno ugotovi pravice glede na pravila, ki so zapisana v datoteki dostopa. Poti so zapisane v obliki skladišče:pot ali preprosto pot. Če ne določite skladišča, pravilo velja za vsa skladišča v mapi SVNParentPath. Oblika avtorizacijske datoteke, ki jo uporablja mod_authz_svn, je opisana v " #. (para) #: ../source/TortoiseSVN_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 bi polepšali izpis pri brskanju po skladišču, odkomentirajte naslednjo vrstico \n" "#SVNIndexXSLT \"/svnindex.xsl\"\n" " in dodajte datoteke svnindex.xsl, svnindex.css in menucheckout.ico v korensko mapo dokumentov na strežniku (ponavadi C:/Program Files/Apache Group/Apache2/htdocs). Mapa se nastavi z ukazom DocumentRoot v konfiguracijski datoteki strežnika Apache." #. (para) #: ../source/TortoiseSVN_en.xml:1928 msgid "You can get those three files directly from our source repository at http://tortoisesvn.googlecode.com/svn/trunk/contrib/svnindex. If you're asked for authentication for this link, enter guest as username and leave the password empty." msgstr "Te tri datoteke lahko prenesete neposredno iz našega skladišča na naslovu http://tortoisesvn.googlecode.com/svn/trunk/contrib/svnindex. Če se pojavi zahteva po avtentikaciji, vnesite guest za uporabniško ime in pustite polje za geslo prazno." #. (para) #: ../source/TortoiseSVN_en.xml:1937 msgid "The XSL file from the TortoiseSVN 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 TortoiseSVN checkout dialog is started for this URL." msgstr "Datoteka XSL skladišča TortoiseSVN ima koristen dodatek: če uporabljate za brskanje po skladišču spletni brskalnik, se ob vsaki mapi v skladišču izriše ikona na desni strani imena. Če kliknete nanjo, se prikaže pogovorno okno za prevzem za ta naslov URL." #. (para) #: ../source/TortoiseSVN_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 "Kratka obrazložitev pravkar vnesenega: Vendar je to le primer. Obstaja še zelo veliko stvari, ki jih lahko naredite s spletnim strežnikom Apache. " #. (title) #: ../source/TortoiseSVN_en.xml:1949 msgid "Multiple Repositories" msgstr "Več skladišč" #. (primary) #: ../source/TortoiseSVN_en.xml:1954 msgid "Index of projects" msgstr "Indeks projektov" #. (para) #: ../source/TortoiseSVN_en.xml:1956 msgid "If you used the SVNParentPath directive then you don't have to change the Apache config file every time you add a new Subversion 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 TortoiseSVN command TortoiseSVNCreate repository here... and a new project has a home..." msgstr "Če ste pri nameščanju nastavili ukaz SVNParentPath, potem vam ni treba spreminjati konfiguracijske datoteke Apache vsakič, ko dodate novo skladišče. Enostavno ustvarite novo skladišče na isti lokaciji, na kateri ste ustvarili prvo skladišče! V našem podjetju imamo neposreden dostop do te lokacije na strežniku preko SMB (običajen datotečni dostop sistema Windows). Tako enostavno na tej lokaciji ustvarimo novo mapo, uporabimo ukaz TortoiseSVNTukaj ustvari skladišče... in nov projekt ima svoj dom..." #. (para) #: ../source/TortoiseSVN_en.xml:1970 msgid "If you are using Subversion 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 "Če uporabljate Subversion 1.3 ali novejšo različico, lahko uporabite ukaz SVNListParentPath on. S tem dovolite strežniku Apache, da prikaže seznam vseh projektov, če v brskalnik vpišete korensko pot namesto določenega skladišča." #. (title) #: ../source/TortoiseSVN_en.xml:1978 msgid "Path-Based Authorization" msgstr "Avtorizacija na osnovi poti" #. (primary) #: ../source/TortoiseSVN_en.xml:1980 msgid "Authorization" msgstr "Avtorizacija" #. (para) #: ../source/TortoiseSVN_en.xml:1985 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 Subversion 1.3 it is available with svnserve as well." msgstr "Modul mod_authz_svn omogoča podrobno nastavitev pravic dostopa na osnovi uporabniških imen in poti skladišč. Možnost je na voljo pri uporabi strežnika Apache, od različice Subversion 1.3 naprej pa tudi pri uporabi svnserve." #. (para) #: ../source/TortoiseSVN_en.xml:1991 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 datoteke izgleda takole: \n" "[groups]\n" "skrbniki = john, kate\n" "razvijalci1 = john, rachel, sally\n" "razvijalci2 = kate, peter, mark\n" "dokumentaristi = bob, jane, mike\n" "tecajniki = zak\n" "# Privzeto pravilo za dostope za VSA skladišča\n" "# Vsi lahko berejo, skrbniki imajo pravice za pisanje,# Dan German nima nobenih pravic.\n" "[/]\n" "* = r\n" "@skrbniki = rw\n" "dangerman =\n" "# Dovoli razvijalcem popoln dostop do projektnih skladišč\n" "[proj1:/]\n" "@razvijalci1 = rw\n" "[proj2:/]\n" "@razvijalci2 = rw\n" "[bigproj:/]\n" "@razvijalci1 = rw\n" "@razvijalci2 = rw\n" "trevor = rw\n" "# Dodeli dokumentaristom pravice pisanja v vseh doc mapah\n" "[/trunk/doc]\n" "@dokumentaristi = rw\n" "# Dodeli tečajnikom pravice pisanja le v skladišču TrainingRepos\n" "[TrainingRepos:/]\n" "@tecajniki = rw\n" "" #. (para) #: ../source/TortoiseSVN_en.xml:2023 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 "Upoštevajte, da je preverjanje vsake poti lahko zelo potratna operacija, predvsem v primeru dnevnika. Strežnik preverja vsako spremenjeno pot v vsaki reviziji in preveri berljivost, kar je lahko zelo zamudno pri revizijah, kjer je spremenjeno veliko število datotek." #. (para) #: ../source/TortoiseSVN_en.xml:2030 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 "Avtentikacija in avtorizacija sta dva ločena procesa. Če želi uporabnik dobiti dostop do poti v skladišču, mora zadostiti obema pogojema: običajni zahtevi po avtentikaciji in avtorizacijski zahtevi za dostop do datoteke." #. (title) #: ../source/TortoiseSVN_en.xml:2038 msgid "Authentication With a Windows Domain" msgstr "Avtentikacija z domeno Windows" #. (primary) #: ../source/TortoiseSVN_en.xml:2040 msgid "Windows domain" msgstr "Domena Windows" #. (primary) #: ../source/TortoiseSVN_en.xml:2043 msgid "domaincontroller" msgstr "domenski kontroler" #. (para) #: ../source/TortoiseSVN_en.xml:2045 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 "Kot se verjetno opazili, morate narediti vnos uporabniškega imena in gesla v datoteko passwd za vsakega uporabnika posebej. In če želite, da vaši uporabniki (iz varnostnih razlogov) periodično spreminjajo geslo, morate te spremembe vnašati ročno." #. (para) #: ../source/TortoiseSVN_en.xml:2052 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 "Vendar obstaja rešitev problema - v primeru, če dostopate do skladišča iz krajevnega omrežja z domenskim kontrolerjem sistema Windows: mod_auth_sspi!" #. (primary) #: ../source/TortoiseSVN_en.xml:2058 msgid "SSPI" msgstr "SSPI" #. (primary) #: ../source/TortoiseSVN_en.xml:2061 msgid "NTLM" msgstr "NTLM" #. (para) #: ../source/TortoiseSVN_en.xml:2063 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 modul SSPI, vključno z izvorno kodo, je včasih ponujajo podjetje Syneapps. Vendar je razvoj že nekaj časa ustavljen. A ne obupajte, skupnost nadaljuje s projektom in ga izboljšuje. Nova lokacija projekta je SourceForge." #. (para) #: ../source/TortoiseSVN_en.xml:2074 msgid "Download the module which matches your apache version, then copy the file mod_auth_sspi.so into the Apache modules folder." msgstr "Prenesite modul, ki ustreza različi vašega strežnika Apache, prekopirajte datoteko mod_auth_sspi.so v podmapo modules namestitvene mape strežnika Apache." #. (para) #: ../source/TortoiseSVN_en.xml:2081 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 "" "Popravite konfiguracijsko datoteko strežnika Apache: dodajte vrstico \n" "LoadModule sspi_auth_module modules/mod_auth_sspi.so\n" " v sekcijo LoadModule. To vrstico morate vstaviti pred vrstico \n" "LoadModule auth_module modules/mod_auth.so\n" "" #. (para) #: ../source/TortoiseSVN_en.xml:2094 msgid "" "To make the Subversion 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 "" "Če želite, da Subversion uporablja ta tip avtentikacije, morate spremeniti vrstico \n" "AuthType Basic\n" " v \n" "AuthType SSPI\n" " in dodati \n" "SSPIAuth On\n" "SSPIAuthoritative On\n" "SSPIDomain <domaincontroller>\n" "SSPIOmitDomain on\n" "SSPIUsernameCase lower\n" "SSPIPerRequestAuth on\n" "SSPIOfferBasic On\n" " v blok <Location /svn>. Če nimate domenskega kontrolerja, pustite ime domenske kontrole na <domaincontroller>." #. (para) #: ../source/TortoiseSVN_en.xml:2120 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 "Če za avtentikacijo uporabljate SSPI, potem ne potrebujete več vrstice AuthUserFile za datoteko gesel. Apache avtenticira vaše uporabniško ime in geslo v domeni Windows. Morali pa boste posodobiti seznam uporabnikov v datoteki svnaccessfile, da bo le-ta vsebovala tudi uporabnike oblike DOMENA\\uporabniško ime." #. (para) #: ../source/TortoiseSVN_en.xml:2130 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 "Avtentikacija SSPI je na voljo le va varne (SSL) povezave (https). Če za dostop do strežnika uporabljate navadno (http) povezavo, stvar ne bo delovala." #. (para) #: ../source/TortoiseSVN_en.xml:2135 msgid "To enable SSL on your server, see the chapter: " msgstr "Za vklop varne povezave (SSL) na strežniku preberite " #. (para) #: ../source/TortoiseSVN_en.xml:2141 msgid "Subversion AuthzSVNAccessFile files are case sensitive in regard to user names (JUser is different from juser)." msgstr "Datoteke AuthzSVNAccessFile sistema Subversion so občutljive na velike in male črke pri navajanju uporabniških imen (beseda UPorabnik je torej drugačna kot uporabnik)." #. (para) #: ../source/TortoiseSVN_en.xml:2146 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 "V Microsoftovem svetu domene Windows in uporabniška imena ne ločijo velikih in malih črk. Kljub vsemu nekateri skrbniki sistema radi uporabljajo kamelji stil za uporabniške račune (n.pr. JUporabnik)." #. (para) #: ../source/TortoiseSVN_en.xml:2151 msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Subversion 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 "Ta razlika pa vam lahko ponagaja pri uporabi avtentikacije SSPI. Sistem Subversion dobi domeno Windows in uporabniško ime v natančno takšni obliki, kot ju je uporabnik vpisal. Internet Explorer pogosto pošlje uporabniško ime strežniku Apache v obliki, ki je bila uporabljena pri ustvarjanju računa." #. (para) #: ../source/TortoiseSVN_en.xml:2159 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 TortoiseSVN." msgstr "Rezultat tega je, da boste mogoče potrebovali vsaj dva vnosa v AuthzSVNAccessFile za vsakega uporabnika -- vnos z malimi črkami in vnos v enakem formatu, kot ga Internet Explorer pošlje strežniku Apache. Prav tako boste morali naučiti uporabnike, da vnašajo avtentikacijske podatke z malimi črkami, ko dostopajo do skladišč preko programa TortoiseSVN." #. (para) #: ../source/TortoiseSVN_en.xml:2167 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 Subversion'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 "Zapis dostopov in napak strežnika Apache sta vaša najboljša prijatelja, ko je potrebno reševati takšne težave. Pomagata vam ugotoviti natančen niz, ki ga dobi modul AuthzSVNAccessFile. Mogoče boste morali poskušati ugotoviti pravilno obliko niza v datoteki svnaccessfile (n. pr. DOMENA\\uporabnik oz. DOMEMA//uporabnik), preden bo sistem res deloval." #. (title) #: ../source/TortoiseSVN_en.xml:2181 msgid "Multiple Authentication Sources" msgstr "Avtentikacija iz več virov" #. (primary) #: ../source/TortoiseSVN_en.xml:2183 msgid "Multiple authentication" msgstr "Večkratna avtentikacija" #. (para) #: ../source/TortoiseSVN_en.xml:2185 msgid "It is also possible to have more than one authentication source for your Subversion 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 "Določiti je mogoče več virov za avtentikacijo skladišč Subversion. Da bi to delovalo, morate vsako avtentikacijo narediti neavtoritativno. S tem bo Apache pri več virih preveril, ali je sta uporabniško ime in geslo pravilna." #. (para) #: ../source/TortoiseSVN_en.xml:2191 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 "Pogosta je situacija, ko imamo avtentikacijo tako preko domene Windows kot preko datoteke passwd. Na ta način lahko omogočite dostop tudi uporabnikom, ki nimajo uporabniškega imena in gesla za domeno Windows." #. (para) #: ../source/TortoiseSVN_en.xml:2198 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 bi omogočili avtentikacijo preko domene Windows in datoteke passwd, dodajte naslednji vrstici znotraj bloka <Location> v konfiguracijski datoteki strežnika Apache: \n" "AuthBasicAuthoritative Off\n" "SSPIAuthoritative Off\n" "" #. (para) #: ../source/TortoiseSVN_en.xml:2209 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 \"Subversion 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 "" "Sledi celoten primer konfiguracije strežnika Apache za kombinacijo avtentikacije preko domene Windows in dateteke passwd: \n" "<Location /svn>\n" " DAV svn\n" " SVNListParentPath on\n" " SVNParentPath D:\\SVN\n" "\n" " AuthName \"Skladišča Subversion\"\n" " AuthzSVNAccessFile svnaccessfile.txt\n" "\n" "# Logiranje preko domen NT.\n" " AuthType SSPI\n" " SSPIAuth On\n" " SSPIAuthoritative Off\n" " SSPIDomain <domaincontroller>\n" " SSPIOfferBasic On\n" "\n" "# Logiranje preko datoteke passwd.\n" " AuthType Basic\n" " AuthBasicAuthoritative Off\n" " AuthUserFile passwd\n" "\n" " Require valid-user\n" "</Location>\n" "" #. (title) #: ../source/TortoiseSVN_en.xml:2239 msgid "Securing the server with SSL" msgstr "Zavarovanje strežnika z SSL" #. (primary) #: ../source/TortoiseSVN_en.xml:2241 msgid "SSL" msgstr "SSL" #. (para) #: ../source/TortoiseSVN_en.xml:2243 msgid "Even though Apache 2.2.x has OpenSSL support, it is not activated by default. You need to activate this manually." msgstr "Čeprav ima Apache 2.2.x podporo za OpenSSL, le-ta ob privzetih nastavitvah ni vključena. Vključiti jo morate ročno." #. (para) #: ../source/TortoiseSVN_en.xml:2249 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 "" "V konfiguracijski datoteki strežnika Apache odstranite komentar izpred naslednjih vrstic:\n" "#LoadModule ssl_module modules/mod_ssl.so\n" " in na koncu \n" "#Include conf/extra/httpd-ssl.conf\n" " nato spremenite vrstico (v eni vrstici) \n" "SSLMutex \"file:C:/Program Files/Apache Software Foundation/\\\n" "Apache2.2/logs/ssl_mutex\"\n" " v \n" "SSLMutex default\n" "" #. (para) #: ../source/TortoiseSVN_en.xml:2271 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 "" "Nato morate ustvariti certifikat SSL. Odprite ukazni poziv (okno DOS) in pojdite v namestitveno mapo strežnika Apache (n. pr. C:\\program files\\apache group\\apache2) in vpišite naslednji ukaz: \n" "bin\\openssl req -config conf\\openssl.cnf -new -out my-server.csr\n" " Vpisati boste morali šifrirno frazo. Ne uporabljajte enostavnih besed, ampak vpišite cel stavek, naprimer del pesmi. Daljša je fraza, boljša je. Vnesti morate še naslov URL vašega strežnika. Na ostala vprašanja vam ni nujno odgovoriti, vendar vam priporočamo, da vseeno odgovorite." #. (para) #: ../source/TortoiseSVN_en.xml:2286 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 "" "Običajno se datoteka privkey.pem ustvari samodejno, če pa se ne, morate vtipkati naslednji ukaz, da jo ustvarite:\n" "bin\\openssl genrsa -out conf\\privkey.pem 2048\n" "" #. (para) #: ../source/TortoiseSVN_en.xml:2294 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 "" "Nato vpišite naslednje ukaze \n" "bin\\openssl rsa -in conf\\privkey.pem -out conf\\server.key\n" " in (v eni vrstici) \n" "bin\\openssl req -new -key conf\\server.key -out conf\\server.csr \\\n" "-config conf\\openssl.cnf\n" " in nato (v eni vrstici) \n" "bin\\openssl x509 -in conf\\server.csr -out conf\\server.crt\n" " -req -signkey conf\\server.key -days 4000\n" " S tem ustvarite certifikat, ki bo potekel čez 4000 dni. Nato vpišite (v eni vrstici) še:\n" "bin\\openssl x509 -in conf\\server.cert -out conf\\server.der.crt\n" " -outform DER\n" " Ti ukazi ustvarijo nekaj datotek v konfiguracijski mapi (conf) strežnika Apache (server.der.crt, server.csr, server.key, .rnd, privkey.pem, server.cert)." #. (para) #: ../source/TortoiseSVN_en.xml:2326 msgid "Restart the Apache service." msgstr "Ponovno zaženite storitev Apache." #. (para) #: ../source/TortoiseSVN_en.xml:2331 msgid "Point your browser to https://servername/svn/project ..." msgstr "Usmerite vaš spletni brskalnik na https://servername/svn/project ..." #. (title) #: ../source/TortoiseSVN_en.xml:2339 msgid "SSL and Internet Explorer" msgstr "SSL in Internet Explorer" #. (para) #: ../source/TortoiseSVN_en.xml:2340 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 TortoiseSVN and any other Subversion client are still able to authenticate." msgstr "Če dostop do strežnika zavarujete s protokolom SSL in uporabite avtentikacijo z domeno Windows, boste ugotovili, da brskanje po skladiščih z Internet Explorerjem ne deluje več. Ne skrbite - samo Internet Explorer ni sposoben izvesti avtentikacije. Ostali brskalniki tega problema nimajo, TortoiseSVN in ostali odjemalci za Subversion še vedno lahko izvajajo avtentikacijo." #. (para) #: ../source/TortoiseSVN_en.xml:2354 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 Subversion won't be able to authenticate against that location." msgstr "v konfiguracijski datoteki Apache definirate ločen ukaz <Location /path> in dodate vrstico SSPIBasicPreferred On. To omogoči avtentikacijo preko Internet Explorerja, vendar pa ostali brskalniki in odjemalci za Subversion ne bodo mogli izvajati avtentikacije na tej lokaciji." #. (para) #: ../source/TortoiseSVN_en.xml:2364 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 tudi brskanje preko neenkriptirane avtentikacije (brez SSL). Začuda IE nima nobenih težav z avtentikacijo, če povezava ni zaščitena z SSL." #. (para) #: ../source/TortoiseSVN_en.xml:2372 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 "" "Pri \"standardni\" namestitvi SSL se v Apachejevem virtualnem gostitelju pogosto nahaja naslednji stavek: \n" "SetEnvIf User-Agent \".*MSIE.*\" \\\n" " nokeepalive ssl-unclean-shutdown \\\n" " downgrade-1.0 force-response-1.0\n" " Obstajajo (so obstajali?) dobri razlogi za takšno konfiguracijo, poglejte na http://www.modssl.org/docs/2.8/ssl_faq.html#ToC49 Toda če želite uporabiti avtentikacijo NTLM, morate uporabiti opcijo keepalive. Če odkomentirate celoten blok SetEnvIf, boste lahko uporabljali avtentikacijo IE z avtentikacijo sistema Windows preko protokola SSL in strežnika Apache na sistemu WIN32 z vključenim modulom mod_auth_sspi." #. (para) #: ../source/TortoiseSVN_en.xml:2349 msgid "If you still want to use IE to browse the repository you can either: " msgstr "Če še vedno želite uporabljati Internet Explorer za brskanje po skladišču, lahko: " #. (title) #: ../source/TortoiseSVN_en.xml:2395 msgid "Forcing SSL access" msgstr "Vsiljevanje dostopa SSL" #. (para) #: ../source/TortoiseSVN_en.xml:2396 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 Subversion <Location> block: SSLRequireSSL." msgstr "Če ste nastavili protokol SSL, da bi bili dostopi do skladišč bolj varni, onemogočite navaden - ne-SSL (http) dostop in dovolite le dostop https. To naredite tako, da dodate nov ukaz v Subversion blok <Location>: SSLRequireSSL." #. (para) #: ../source/TortoiseSVN_en.xml:2403 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 \"Subversion repositories\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" "" msgstr "" "Primer bloka <Location> izgleda takole: \n" "<Location /svn>\n" " DAV svn\n" " SVNParentPath D:\\SVN\n" " SSLRequireSSL\n" " AuthType Basic\n" " AuthName \"Skladišča Subversion\"\n" " AuthUserFile passwd\n" " #AuthzSVNAccessFile svnaccessfile\n" " Require valid-user\n" "</Location>\n" "" #. (title) #: ../source/TortoiseSVN_en.xml:2421 msgid "Using client certificates with virtual SSL hosts" msgstr "Uporaba certifikatov odjemalca z navideznimi gostitelji SSL" #. (para) #: ../source/TortoiseSVN_en.xml:2422 msgid "Sent to the TortoiseSVN mailing list by Nigel Green. Thanks!" msgstr "Prispevek je na dopisni seznam poslal Nigel Green. Hvala!" #. (para) #: ../source/TortoiseSVN_en.xml:2425 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 Subversion server." msgstr "V določenih primerih morate na enem strežniku ustvariti dva navidezna gostitelja SSL: prvega za javni dostop dostop preko interneta brez zahteve po certifikatu, drugega za varen dostop s certifikatom, ki poganja strežnik Subversion." #. (para) #: ../source/TortoiseSVN_en.xml:2431 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 "Če odseku per-server v konfiguraciji strežnika Apache (n. pr. izven blokov VirtualHost in Directory) dodate ukaz SSLVerifyClient Optional, strežnik prisilite, da ob prvem kontaktu v načinu SSL zahteva certifikat. Zaradi napake v modulu mod_ssl je pomembno certifikat zatevati na tem mestu, kajti stvar ob ponovnem vzpostavaljnju poveze SSL ne deluje." #. (para) #: ../source/TortoiseSVN_en.xml:2441 msgid "" "The solution is to add the following directive to the virtual host directory that you want to lock down for Subversion: \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 "" "Zagato rešimo tako, da dodano naslednji ukaz navideznemu gostitelju, ki ga želimo uporabljati za Subversion: \n" "SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " S tem dostop do mape dovolimo le uporabnjikom, ki so uporabili veljaven certifikat." #. (para) #: ../source/TortoiseSVN_en.xml:2450 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 SUBVERSION \n" "### (requiring a client certificate)\n" "<VirtualHost 127.0.0.1:443>\n" " <Directory \"subversion 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 "" "Za zakljkuček poglejmo pomembne dele konfiguracijske datoteke strežnika Apache: \n" "SSLVerifyClient Optional\n" "\n" "### Navidezni gostitelj za JAVEN dostop\n" "### (ne zahteva certifikata)\n" "\n" "<VirtualHost 127.0.0.1:443>\n" " <Directory \"potdokorenskemapezajavnidstop\">\n" " </Directory>\n" "</VirtualHost>\n" "\n" "### Navidezni gostitelj za SUBVERSION\n" "### (zahteva certifikat)\n" "<VirtualHost 127.0.0.1:443>\n" " <Directory \"korenska mapa za subversion\">\n" " SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n" " </Directory>\n" "\n" " <Location /svn>\n" " DAV svn\n" " SVNParentPath /potdoskladišča\n" " </Location>\n" "</VirtualHost>\n" "" #. (title) #: ../source/TortoiseSVN_en.xml:2480 msgid "Svnserve Based Server" msgstr "Strežnik svnserve" #. (para) #: ../source/TortoiseSVN_en.xml:2486 msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Subversion includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection." msgstr "Včasih strežnika Apache ne morete uporabiti. Na srečo Subversion vsebuje Svnserve - samostojen mini strežnik, ki uporablja protokol po meri preko običajne povezave TCP/IP." #. (para) #: ../source/TortoiseSVN_en.xml:2492 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 "V večini primerov je svnserve lažje namestiti in deluje hitreje kot strežniki Apache. Sedaj kot je na voljo podpora za SASL, pa je tudi enostavneje poskrbeti tudi za varnost." #. (title) #: ../source/TortoiseSVN_en.xml:2499 msgid "Installing svnserve" msgstr "Nameščanje svnserve" #. (para) #: ../source/TortoiseSVN_en.xml:2503 msgid "Get the latest version of Subversion from http://subversion.apache.org/getting.html. Alternatively get a pre-packaged installer from CollabNet at http://www.collab.net/downloads/subversion. 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 "Najnovejšo različico sistema Subversion prenesite z naslova http://subversion.apache.org/getting.html. Prenesete pa lahko tudi namestitveni program iz strežnika CollabNet na naslovu http://www.collab.net/downloads/subversion. Namestitveni program namesti svnserve kot storitev Windows, vsebuje pa tudi nekaj orodij, ki jih potrebujete za varno delovanje preko SASL." #. (para) #: ../source/TortoiseSVN_en.xml:2517 msgid "If you already have a version of Subversion installed, and svnserve is running, you will need to stop it before continuing." msgstr "Če je Subversion že nameščen in svnserve trenutno teče, ga morate pred nadaljevanjem zaustaviti." #. (para) #: ../source/TortoiseSVN_en.xml:2523 msgid "Run the Subversion installer. If you run the installer on your server (recommended) you can skip step 4." msgstr "Zaženite namestitvni program Subversion. Če nameščate Subversion na strežniku (priporočamo), lahko korak 4 preskočite." #. (para) #: ../source/TortoiseSVN_en.xml:2529 msgid "Open the windows-explorer, go to the installation directory of Subversion (usually C:\\Program Files\\Subversion) 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 "Odprite Raziskovalca, pojdite na namestitveno mapo Subversion (običajno C:\\Program Files\\Subversion) in v mapi bin poiščite datoteke svnserve.exe, intl3_svn.dll, libapr.dll, libapriconv.dll, libapriutil.dll, libdb*.dll, libeay32.dll in ssleay32.dll - prekopirajte jih ali pa prekopirajte celopno mapo bin v mapo na vašem strežniku, n. pr. c:\\svnserve" #. (title) #: ../source/TortoiseSVN_en.xml:2551 msgid "Running svnserve" msgstr "Poganjanje svnserve" #. (para) #: ../source/TortoiseSVN_en.xml:2552 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 "" "Sedaj, ko je svnserve nameščen, ga morate na strežniku zagnati. Najlažji način je, da v lupini DOS izvedete naslednji ukaz ali narediti bližnjico: \n" "svnserve.exe --daemon\n" " svnserve bo sedaj čakal na prihajajoče zahteve na vratih 3690. Stikalo --daemon pove, naj svnserve teče kot skriti proces, dokler ga ročno ne zaustavimo." #. (para) #: ../source/TortoiseSVN_en.xml:2563 msgid "If you have not yet created a repository, follow the instructions given with the Apache server setup ." msgstr "Če še niste ustvarili skladišča, sledite navodilom, podanim pri namestitvi strežnika Apache: ." #. (para) #: ../source/TortoiseSVN_en.xml:2568 msgid "To test that svnserve is working, use TortoiseSVNRepo-Browser to view a repository." msgstr "Če želite preveriti, ali svnserve teče, uporabite TortoiseSVNSkladiščni brskalnik - videti morate skladišče." #. (para) #: ../source/TortoiseSVN_en.xml:2576 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 "" "Če predpostavimo, da se skladišče nahaja v mapi c:\\sklad\\TestnoSkladišče, in je vašemu strežniku ime localhost, vpišite: \n" "svn://localhost/sklad/TestnoSkladišče\n" "ko dobite poziv brskalnika po skladišču." #. (para) #: ../source/TortoiseSVN_en.xml:2585 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 TortoiseSVN 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 "" "Z uporabo stikala --root lahko povečate varnost in prihranite čas pri vnašanju naslovov URL. S tem določite korensko lokacijo in omejite dostop na izbrano mapo na strežniku: \n" "svnserve.exe --daemon --root pogon:\\pot\\do\\skladišča\\root\n" " Če uporabimo prejšnji primer, se ukaz za zagon svnserve sedaj glasi: \n" "svnserve.exe --daemon --root c:\\sklad\n" " V skladiščnem brskalniku TortoiseSVN pa se naslov URL skrajša na: \n" "svn://localhost/TestnoSkladišče\n" " Upoštevajte, da morate stikalo --root uporabiti tudi takrat, ko se skladišče nahaja na drugi particiji ali pogonu kot svnserve." #. (para) #: ../source/TortoiseSVN_en.xml:2604 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 "Svnserve lahko streže poljubnemu številu skladišč. Postavite jih nekam pod korensko mapo, ki ste jo pravkar definirali, in dostopajte do njih z uporabo relativnega naslova URL glede na korenskega." #. (title) #: ../source/TortoiseSVN_en.xml:2621 msgid "Run svnserve as a Service" msgstr "Zaženite svnserve kot storitev" #. (para) #: ../source/TortoiseSVN_en.xml:2625 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 Subversion 1.4, svnserve can be installed as a native windows service." msgstr "Poganjanje svnserve kot nek uporabnik običajno ni najboljša rešitev. To pomeni, da mora biti uporabnik stalno prijavljen na strežniku, prav tako se mora uporabnik prijaviti po ponovnem zagonu. Boljši način je poganjanje svnserve kot storitev (service) Windows. Od različice Subversion 1.4 se svnserve lahko namesti kot domorodna storitev (native windows service)." #. (para) #: ../source/TortoiseSVN_en.xml:2632 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= \"Subversion\" 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\\Subversion\\bin\\svnserve.exe\\\"\n" " --service --root c:\\repos\" displayname= \"Subversion\" \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 \"Subversion server (svnserve)\"\n" "" msgstr "" "Za namestitev svnserve kot domorodno storitev (native windows service) izvršite naslednji ukaz v eni vrstici. S tem ustvarite storitev, ki se samodejno zažene ob zagonu sistema. \n" "sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n" " --root c:\\repos\" displayname= \"Subversion\" depend= tcpip \n" " start= auto\n" " Če katera od poti vsebuje presledke, morate uporabiti poševnice in navednice. Primer: \n" "sc create svnserve binpath= \"\n" " \\\"C:\\Program Files\\Subversion\\bin\\svnserve.exe\\\"\n" " --service --root c:\\repos\" displayname= \"Subversion\" \n" " depend= tcpip start= auto\n" " Ko ste storitev ustvarili, jih lahko dodate tudi opis. Le ta se potem pojavi v upravljalcu storitev (Windows Service Manager). \n" "sc description svnserve \"Strežnik Subversion (svnserve)\"\n" "" #. (para) #: ../source/TortoiseSVN_en.xml:2655 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 "Pazite na nekoliko nenavadno obliko ukaza sc. Pri podajanju parametrov ključ= vrednost ne sme biti med ključem in znakom = nobenega presledka, presledek pa se mora nahajati pred vrednostjo." #. (para) #: ../source/TortoiseSVN_en.xml:2662 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 Subversion 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 "" "Microsoft po novem priporoča, da se storitve poganjajo pod računom Lokalna storitev (Local Service) ali Omrežna storitev (Network Service). Preverite The Services and Service Accounts Security Planning Guide. Za ustvarjanje storitve pod računom Lokalna storitev dodajte zgornjemu primeru naslednjo vrstico. \n" "obj= \"NT AUTHORITY\\LocalService\"\n" " Upoštevajte, da morate dodati računu potrebne pravice za Subversion in skladišča, prav tako pa tudi za vse aplikacije, ki jih kličejo ukazne datoteke akcij. Vgrajena skupina za to se imenuje \"LOCAL SERVICE\"." #. (para) #: ../source/TortoiseSVN_en.xml:2679 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 "Ko ste namestili storitev, morate v urejevalnik storitev, da jo zaženete (samo tokrat; po ponovnem zagonu strežnika se bo pognala samodejno)." #. (para) #: ../source/TortoiseSVN_en.xml:2684 msgid "For more detailed information, refer to Windows Service Support for Svnserve." msgstr "Za ostale informacije kliknite na Windows Service Support for Svnserve." #. (para) #: ../source/TortoiseSVN_en.xml:2690 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 "" "Če ste predhodnjo različico svnserve namestili z uporabo ovoja SVNService, sedaj pa želite uporabiti storitev Windows, morate preklicati registracijo ovoja kot storitve (ne pozabiti storitve najprej zaustaviti!). Za odstranitev registracije iz registra uporabite naslednji ukaz: \n" "svnservice -remove\n" "" #. (title) #: ../source/TortoiseSVN_en.xml:2704 msgid "Basic Authentication with svnserve" msgstr "Osnovna avtentikacija s svnserve" #. (para) #: ../source/TortoiseSVN_en.xml:2705 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 TortoiseSVN to view the repository, but you won't be able to commit any changes." msgstr "Po privzetih nastavitvah svnserve omogoča anonimen dostop samo za branje. To pomeni, da lahko uporabite naslov svn:// za prevzem in posodobitev skladišča ali skladiščni brskalnik za pregledovanje skladišča, ne morete pa objavljati narejenih sprememb." #. (para) #: ../source/TortoiseSVN_en.xml:2711 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 omogočili pisanje v skladišče, morate popraviti datoteko conf/svnserve.conf v mapi skladišča. Ta datoteka vsebuje nastavitve svnserve, poleg tega pa tudi koristno dokumentacijo." #. (para) #: ../source/TortoiseSVN_en.xml:2717 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žnost pisanja anonimnim uporabnikom lahko omogočite z enostavno nastavitvijo: \n" "[general]\n" "anon-access = write\n" " Vendar pa v tem primeru ne veste, kdo je spremembe vpisal, saj bo lastnost svn:author prazna. Prav tako ne boste mogli določati, kdo lahko spremembe v skladišče zapisuje. To je nevarno!" #. (para) #: ../source/TortoiseSVN_en.xml:2728 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 "" "Rešitev problema je ustvarjanje baze gesel: \n" "[general]\n" "anon-access = none\n" "auth-access = write\n" "password-db = datotekauporabnikov\n" " datotekauporabnikov je datoteka, ki se nahaja v isti mapi kot datoteka svnserve.conf. Datoteka se lahko nahaja tudi drugje (kar je uporabno, če imate več skladišč, kjer potrebujete iste pravice za dostop) in jo navedete z absolutno potjo ali potjo, relativno na mapo conf. Če vključite pot, mora biti navedena /po/pravilih/sistema/unix. Uporaba znaka \\ ali črk pogona ni dovoljena. Datoteka datotekauporabnikov mora imeti naslednjo strukturo: \n" "[users]\n" "uporabniško ime = geslo\n" "...\n" " Ta primer prepove dostop vsem anonimnim uporabnikom (takšnim, ki se niso avtenticirali), uporabnikom, ki so navedeni v datoteki datotekauporabnikov, pa dovoli branje in pisanje po skladišču." #. (para) #: ../source/TortoiseSVN_en.xml:2756 msgid "If you maintain multiple repositories using the same password database, the use of an authentication realm will make life easier for users, as TortoiseSVN can cache your credentials so that you only have to enter them once. More information can be found in the Subversion book, specifically in the sections Create a 'users' file and realm and Client Credentials Caching" msgstr "Če vzdržujete več skladišč, bo uporaba iste baze gesel olajšala avtentikacijo uporabnikom, saj ima TortoiseSVN možnost, da uporabniško ime in geslo shrani v predpomnilnik. Tako ju je potrebno vnesti le enkrat. Več informacij o tem najdete v The Subversion book v poglavjih Create a 'users' file and realm in Client Credentials Caching" #. (title) #: ../source/TortoiseSVN_en.xml:2774 msgid "Better Security with SASL" msgstr "Boljša varnost s SASL" #. (primary) #: ../source/TortoiseSVN_en.xml:2776 msgid "SASL" msgstr "SASL" #. (title) #: ../source/TortoiseSVN_en.xml:2779 msgid "What is SASL?" msgstr "Kaj je SASL?" #. (para) #: ../source/TortoiseSVN_en.xml:2780 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 Subversion 1.5 and later, both the svnserve server and TortoiseSVN client know how to make use of this library." msgstr "The Cyrus Simple Authentication and Security Layer je odprtokodni projekt univerze Carnegie Mellon, ki kateremukoli protokolu doda generično avtentikacijo in enkripcijo. Od različice 1.5 naprej znata to knjižnico uporabljati tako svnserve kot odjemalec TortoiseSVN." #. (para) #: ../source/TortoiseSVN_en.xml:2788 msgid "For a more complete discussion of the options available, you should look at the Subversion 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 več informacij o možnostih, ki so na voljo, preberite The Subversion Book, poglavje Using svnserve with SASL. Če pa želite zgolj najti način, kako enostavno postaviti varno avtentikacijo in enkripcijo na strežniku Windows, tako da bo vaše skladišče varno dostopno preko interneta, berite naprej." #. (title) #: ../source/TortoiseSVN_en.xml:2801 msgid "SASL Authentication" msgstr "Avtentikacija SASL" #. (para) #: ../source/TortoiseSVN_en.xml:2802 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 "" "Za aktivacijo določenih mehanizmov SASL na strežniku morate narediti tri stvari. Najprej ustvarite sekcijo [sasl] v datoteki svnserve.conf, ki se nahaja znotraj skladišča, pri tem uporabite naslednjo vrednost: \n" "use-sasl = true\n" "" #. (para) #: ../source/TortoiseSVN_en.xml:2811 msgid "Second, create a file called svn.conf in a convenient location - typically in the directory where subversion is installed." msgstr "Nato ustvarite datoteko svn.conf na primerni lokaciji - ponavadi je to v namestitveni mapi Subversion." #. (para) #: ../source/TortoiseSVN_en.xml:2816 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 Subversion 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 "Nazadnje ustvarite vnose v registru, ki SASL povejo, kje naj najde stvari. Ustvarite vnos [HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library], vanj pa dodajte dve novi vrednosti (niz/string): SearchPath nastavite na mapo, ki vsebuje vtičnike sasl*.dll (običajno je to namestitvena mapa Subversion), in ConfFile nastavite na mapo, ki vsebuje datoteko svn.conf. Če ste za namestitev uporabili namestitveni program s strežnika CollabNet, imate te vnose že v registru." #. (para) #: ../source/TortoiseSVN_en.xml:2828 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:\\TortoiseSVN\\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 "" "Datoteki svn.conf dodajte naslednje besedilo: \n" "pwcheck_method: auxprop\n" "auxprop_plugin: sasldb\n" "mech_list: DIGEST-MD5\n" "sasldb_path: C:\\TortoiseSVN\\sasldb\n" " Zadnja vrstica prikazuje lokacijo avtentikacijske baze podatkov, ki se imenuje sasldb. Nahaja se lahko kjerkoli, vendar je najbolj primerna lokacija nadrejena mapa skladišča. Poskrbite, da ima storitev svnserve pravice za branje te datoteke." #. (para) #: ../source/TortoiseSVN_en.xml:2843 msgid "If svnserve was already running, you will need to restart it to ensure it reads the updated configuration." msgstr "Če storitev svnserve že teče, jo morate zaustaviti in zagnati pogovno, da prebere posodobljene namestitvene podatke." #. (para) #: ../source/TortoiseSVN_en.xml:2847 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:\\TortoiseSVN\\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 "" "Sedaj, ko je namestitev zaključena, lahko ustvarite uporabnike in gesla. Za to potrebujete program saslpasswd2. Če ste uporabili namestitveni program CollabNet, se ta program nahaja v namestitveni mapi. Uporabite naslednjo ukazno vrstico: \n" "saslpasswd2 -c -f C:\\TortoiseSVN\\sasldb -u realm uporabniškoime\n" " Stikalo -f pove, da podajate lokacijo baze podatkov, vrednost realm mora biti enaka vrednosti, ki ste jo navedli v datoteki svnserve.conf skladišča, uporabniškoime pa je željeno uporabniško ime uporabnika. Upoštevajte, da realm ne sme vsebovati presledkov." #. (para) #: ../source/TortoiseSVN_en.xml:2862 msgid "You can list the usernames stored in the database using the sasldblistusers2 program." msgstr "Seznam uporabniških imen v bazi lahko izpišete s programom sasldblistusers2." #. (title) #: ../source/TortoiseSVN_en.xml:2868 msgid "SASL Encryption" msgstr "Enkripcija SASL" #. (para) #: ../source/TortoiseSVN_en.xml:2869 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 "" "Za določanje različnih nivojev enkripcije lahko v datoteki svnserve.conf skladišča nastavite dve vrednosti: \n" "[sasl]\n" "use-sasl = true\n" "min-encryption = 128\n" "max-encryption = 256\n" "" #. (para) #: ../source/TortoiseSVN_en.xml:2880 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 "Vrednosti min-encryption in max-encryption določata nivo enkripcije, ki jo zahteva strežnik. Če želite enkripcijo onemogočiti, nastavite obe vrednosti na 0. Če želite omogočiti preverjanje kontrolne vsote (torej preprečiti spreminjanje in zagotoviti integriteto podatkov brez enkripcije), nastavite obema spremenljivkama vrednost 1. Če želite omogočiti (vendar ne zahtevati) enkripcijo, nastavite najmanjšo vrednost na 0, največjo pa na število bitov enkripcije. Za brezpogojno uporabo enkripcije nastavite obe spremenljivko na vrednoost več kot 1. V prejšnjem primeru zahtevamo vsaj 128 bitno enkripcijo, hkrati pa največ 256 bitno." #. (title) #: ../source/TortoiseSVN_en.xml:2897 msgid "Authentication with svn+ssh" msgstr "Avtentikacija s svn+ssh" #. (para) #: ../source/TortoiseSVN_en.xml:2898 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 "Drug način za avtentikacijo uporabnikov s strežnikom na osnovi svnserve je uporaba SSH (secure shell) za prenos zahtevkov s pomočjo tunelskega načina. Ta način ni tako enostaven kot SASL, vendar je lahko uporaben v določenih primerih." #. (para) #: ../source/TortoiseSVN_en.xml:2904 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 "S tem pristopom se svnserve ne zaganja kot skriti proces, ampak varnostna lupina zažene svnserve za vas, poganja pa ga kot avtenticiran uporabnik SSH. Na strežniku potrebujete skriti proces za varnostno lupino (secure shell daemon)." #. (para) #: ../source/TortoiseSVN_en.xml:2910 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 "Osnovna navodila za postavitev strežnika so podana v poglavju . Podrobnosti o SSH najdete v pogosto zastavljenih vprašanjih. Iščite niz SSH." #. (para) #: ../source/TortoiseSVN_en.xml:2916 msgid "Further information about svnserve can be found in the Version Control with Subversion." msgstr "Več informacij o svnserve lahko dobite na naslovu Version Control with Subversion." #. (title) #: ../source/TortoiseSVN_en.xml:2924 msgid "Path-based Authorization with svnserve" msgstr "Avtorizacija svnserve na osnovi poti" #. (para) #: ../source/TortoiseSVN_en.xml:2925 msgid "" "Starting with Subversion 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 "" "Od različice Subversion 1.3 najprej svnserve omogoča uporabo istega modula mod_authz_svn za avtorizacijo na osnovi poti, kot je na voljo v strežniku Apache. Spremeniti morate datoteko conf/svnserve.conf v mapi skladišča in dodati vrstico, ki pove, kje se nahaja avtorizacijska datoteka. \n" "[general]\n" "authz-db = authz\n" " authz je datoteka, ki jo ustvarite za določanje pravic dostopa. Za vsako skladišče lahko ustvarite svojo datoteko, lahko pa uporabite skupno datoteko za več skladišč. Preberite , kjer je opisana oblika datoteke." #. (para) #: ../source/TortoiseSVN_en.xml:2947 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 Subversion command line client or with TortoiseSVN." msgstr "Ne glede na uporabljen protokol za dostop do skladišča morate vedno ustvariti vsaj eno skladišče. To lahko storite preko ukazne vrstice (Subversion) ali preko grafičnega vmesnika (TortoiseSVN)." #. (para) #: ../source/TortoiseSVN_en.xml:2952 msgid "If you haven't created a Subversion repository yet, it's time to do that now." msgstr "Če še niste ustvarili skladišča Subversion, je sedaj čas, da to storite." #. (title) #: ../source/TortoiseSVN_en.xml:2960 msgid "Repository Creation" msgstr "Ustvarjanje skladišča" #. (primary) #: ../source/TortoiseSVN_en.xml:2962 msgid "create repository" msgstr "ustvari skladišče" #. (para) #: ../source/TortoiseSVN_en.xml:2964 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 Subversion book for more information." msgstr "Skladišče lahko ustvarite s sistemom FSFS ali s starejšim, vendar stabilnim sistemom Berkeley Database (BDB). Sistem FSFS je hitrejši in sedaj brez težav deluje na mapah skupne rabe v omrežju in sistemu Windows 98. Sistem BDB smo včasih smatrali za stabilnejšega zaradi daljše uporabe, vendar ta argument ne drži več, saj se FSFS uporablja že več let. Za več informacij preberite Choosing a Data Store v knjigi The Subversion Book." #. (title) #: ../source/TortoiseSVN_en.xml:2979 msgid "Creating a Repository with the Command Line Client" msgstr "Ustvarjanje skladišča z odjemalcem za ukazno vrstico" #. (primary) #. (primary) #: ../source/TortoiseSVN_en.xml:2981 #: ../source/TortoiseSVN_en.xml:3022 msgid "Create" msgstr "Ustvari" #. (secondary) #: ../source/TortoiseSVN_en.xml:2982 msgid "Command Line Client" msgstr "Odjemalec za ukazno vrstico" #. (para) #: ../source/TortoiseSVN_en.xml:2986 msgid "Create an empty folder with the name SVN (e.g. D:\\SVN\\), which is used as root for all your repositories." msgstr "Ustvarite prazno mapo z imenom SVN (n.pr. D:\\SVN\\), ki se uporablja kot korenska mapa za vsa vaša skladišča." #. (para) #: ../source/TortoiseSVN_en.xml:2993 msgid "Create another folder MyNewRepository inside D:\\SVN\\." msgstr "Ustvarite še eno mapo iz imenom MojeNovoSkladišče znotraj D:\\SVN\\." #. (para) #: ../source/TortoiseSVN_en.xml:3000 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 "" " Odprite ukazni poziv (ali okno DOS), spremenite trenutno mapo v D:\\SVN\\ in vtipkajte \n" "svnadmin create --fs-type bdb MojeNovoSkladišče\n" " ali \n" "svnadmin create --fs-type fsfs MojeNovoSkladišče\n" "" #. (para) #: ../source/TortoiseSVN_en.xml:3013 msgid "Now you've got a new repository located at D:\\SVN\\MyNewRepository." msgstr "Sedaj imate novo skladišče na lokaciji D:\\SVN\\MojeNovoSkladišče." #. (title) #: ../source/TortoiseSVN_en.xml:3020 msgid "Creating The Repository With TortoiseSVN" msgstr "Ustvarjanje skladišča s programom TortoiseSVN" #. (title) #: ../source/TortoiseSVN_en.xml:3027 msgid "The TortoiseSVN menu for unversioned folders" msgstr "Menu TortoiseSVN za datoteke brez različic" #. (para) #: ../source/TortoiseSVN_en.xml:3032 msgid "Open the windows explorer" msgstr "Odprite Raziskovalca" #. (para) #: ../source/TortoiseSVN_en.xml:3037 msgid "Create a new folder and name it e.g. SVNRepository" msgstr "Ustvarite novo mapo in jo poimenujte npr. SkladiščeSVN" #. (para) #: ../source/TortoiseSVN_en.xml:3043 msgid "Right-click on the newly created folder and select TortoiseSVNCreate Repository here...." msgstr "Na novo ustvarjeno mapo kliknite z desnim gumbom in izberite TortoiseSVNUstvari skladišče tukaj...." #. (para) #: ../source/TortoiseSVN_en.xml:3051 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 "Skladišče se ustvari znotraj nove mape. Datotek v v novi mapi ne urejajte sami!!!. Če se pojavijo kakšne napake, preverite, ali je mapa res prazna in da ni zaščitena proti pisanju." #. (para) #: ../source/TortoiseSVN_en.xml:3060 msgid "TortoiseSVN 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 TortoiseSVN due to compatibility issues between the different BDB versions." msgstr "TortoiseSVN ne ponuja več možnosti ustvarjanja skladišč BSB, lahko pa še vedno uporabite odjemalca ukazne vrstice in z njim ustvarite skladišče. Skladišča FSFS so na splošno lažja za vzdrževanje, prav tako pa nam razvijalcem programa TortoiseSVN olajšajo vzrževanje programa (zaradi težav s kompatibilnostjo različnih revizij BDB)." #. (para) #: ../source/TortoiseSVN_en.xml:3067 msgid "Future versions of TortoiseSVN 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 "Prihodnje različice TortoiseSVN ne bodo podpirale dostopa file:/// do BDB skladišč zaradi težav s kompatibilnostjo, bodo pa vedno podpirale ta format skladišča za dostope do strežnika preko protokolov svn://, http:// ali https://. Zato priporočamo, da za nova skladišča uporabite sistem FSFS, če želite do njih dostopati preko protokola file://." #. (para) #: ../source/TortoiseSVN_en.xml:3079 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 "Seveda priporočamo, da sploh ne uporabljate dostopa file://, razen za preizkušanje. Uporaba strežnika je bolj varna in zanesljiva, razen če skladišče uporablja en sam razvijalec." #. (title) #: ../source/TortoiseSVN_en.xml:3088 msgid "Local Access to the Repository" msgstr "Krajevni dostop do skladišča" #. (primary) #: ../source/TortoiseSVN_en.xml:3090 msgid "Access" msgstr "Dostop" #. (primary) #: ../source/TortoiseSVN_en.xml:3093 msgid "UNC paths" msgstr "Poti UNC" #. (para) #: ../source/TortoiseSVN_en.xml:3095 msgid "To access your local repository you need the path to that folder. Just remember that Subversion expects all repository paths in the form file:///C:/SVNRepository/. Note the use of forward slashes throughout." msgstr "Za dostop do krajevnega skladišča potrebujete le pot do skladišča. Zapomnite si, da Subversion pričakuje pot do skladišč oblike file:///C:/SkladiščeSVN/. Upoštevajte, da morate uporabljati poševnico in ne obrnjeno poševnico." #. (para) #: ../source/TortoiseSVN_en.xml:3101 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 "Za dostop do skladišča na mapi v skupni rabi v omrežju lahko uporabite preslikavo pogona ali pa pot UNC. Za poti UNC je oblika naslova URL file://ImeStrežnika/pot/do/skladišča/. Upoštevajte, da je potrebno na začetku uporabiti le dve poševnici." #. (para) #: ../source/TortoiseSVN_en.xml:3108 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 "Pred različico Subversion 1.2 so morale biti poti UNC podane v nekoliko bolj obskurni obliki file:///\\ImeStrežnika/pot/do/skladišča. Ta oblika je še vedno možna, vendar ni priporočljiva." #. (para) #: ../source/TortoiseSVN_en.xml:3115 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 ustvarjajte skladišč tipa Berkley DB v mapah skupne rabe v omrežju, prav tako ne dostopajte do njih. Takšno skladišče ne more obstajati na oddaljenem datotečnem sistemu, četudi imate omrežni pogon preslikan v lokalni pogon. Če boste poskušali dostopati do skladišča tipa Berkley DB v mapi v skupni rabi, so rezultati nepredvidljivi - lahko takoj vidite čudne napake, lahko pa traja mesece, preden boste opazili, da je vaša baza podatkov pokvarjena." #. (title) #: ../source/TortoiseSVN_en.xml:3126 msgid "Accessing a Repository on a Network Share" msgstr "Dostop do skladišča na deljenem omrežnem pogonu" #. (primary) #: ../source/TortoiseSVN_en.xml:3128 msgid "Network share" msgstr "Omrežni deljeni pogon" #. (para) #: ../source/TortoiseSVN_en.xml:3130 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 "Čeprav je teoretično možno postaviti skladišče FSFS na omrežnem deljenem pogonu in dovoliti uporabnikom dostop preko protokola file://, to ni priporočljivo. V bistvu ta način močno odsvetujemo in ga ne podpiramo." #. (para) #: ../source/TortoiseSVN_en.xml:3137 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 "Prva težava je, da uporabniku omogočite popoln dostop do skladišča, tako da ga lahko ta po pomoti izbriše ali pa ga pokvari s kakšno drugo operacijo." #. (para) #: ../source/TortoiseSVN_en.xml:3142 msgid "Secondly not all network file sharing protocols support the locking that Subversion 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 "Druga težava je, da vsi omrežni protokoli ne omogočajo zaklepanja datotek, ki ga Subversion za svoje delovanje potrebuje. Zato se skladišče lahko pokvari. Mogoče se to ne bo zgodilo takoj, vendar bosta slej ko prej dva uporabnika dostopala do skladišča istočasno." #. (para) #: ../source/TortoiseSVN_en.xml:3148 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 "Tretja težava je, da je potrebno nastaviti ustrezne pravice na datotekah. Na navadnem omrežnem pogonu sistema Windows bo to morda celo delovalo, pri uporabi strežnika SAMBA pa nastanejo težave." #. (para) #: ../source/TortoiseSVN_en.xml:3153 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 "Protokol file:// je namenjen krajevnemu dostopu za enega uporabnika, predvsem za testiranje in razhroščevanje. Če želite deliti skladišče, morate zares razmisliti o postavitvi strežnika. To pa sploh ni tako težko, kot se sliši. Za več informacij o izbiri in navodila za postavitev preberite ." #. (title) #: ../source/TortoiseSVN_en.xml:3163 msgid "Repository Layout" msgstr "Postavitev skladišča" #. (para) #: ../source/TortoiseSVN_en.xml:3164 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 "Preden uvozite podatke v skladišče, premislite, kako jih boste organizirali. Če uporabite katero od priporočenih postavitev, vam bo kasneje laže." #. (para) #: ../source/TortoiseSVN_en.xml:3170 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 "Obstaja nekaj standardnih, priporočenim načinov, kako organizirati skladišče Subversion. Večina ljudi naredi mapo trunk za glavno vejo razvoja, mapo branches za stranske veje in mapo tags, ki vsebuje oznake. Če se v skladišču nahaja samo en projekt, uporabniki pogosto ustvarijo naslednjo strukture vrhnjih map:" #. (screen) #: ../source/TortoiseSVN_en.xml:3179 #, no-wrap msgid "" "\n" "/trunk\n" "/branches\n" "/tags\n" msgstr "" "\n" "/trunk\n" "/branches\n" "/tags\n" #. (para) #: ../source/TortoiseSVN_en.xml:3184 msgid "If a repository contains multiple projects, people often index their layout by branch:" msgstr "Če skladišče vsebuje več projektov, uporabniki pogosto indeksirajo njihovo postavitev glede na veje:" #. (screen) #: ../source/TortoiseSVN_en.xml:3188 #, 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" "/branches/paint\n" "/branches/calc\n" "/tags/paint\n" "/tags/calc\n" #. (para) #: ../source/TortoiseSVN_en.xml:3196 msgid "...or by project:" msgstr "... ali po projektu:" #. (screen) #: ../source/TortoiseSVN_en.xml:3199 #, 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" "/calc/trunk\n" "/calc/branches\n" "/calc/tags\n" #. (para) #: ../source/TortoiseSVN_en.xml:3207 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 po projektih je smiselno, če projekti med sabo niso povezani in se prevzemajo neodvisno drug od drugega. Za povezane projekte, kjer želite narediti prevzem z eno potezo, ali pa v primeru, kjer so projekti povezani v en distribucijski paket, pa je indeksiranje po vejah pogosto boljša odločitev. V tem primeru imate le eno glavno vejo (trunk), relacije med podprojekti pa so lažje vidne." #. (para) #: ../source/TortoiseSVN_en.xml:3215 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 "Če izberete izgled /trunk /tags /branches, to ne pomeni, da morate prekopirati celotno glavno vejo za vsako vejo ali oznako, tako da ta struktura prinaša več prilagodljivosti." #. (para) #: ../source/TortoiseSVN_en.xml:3221 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 Subversion and TortoiseSVN projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers." msgstr "Za nepovezane projekte boste verjetno uporabili različna skladišča. Ko objavite spremembe, se spremeni številka revizije celotnega skladišča, ne številka revizije projekta. Če imate v enem skladišču dva projekta, lahko to vodi do velikih \"lukenj\" pri številkah revizij. Projekta Subversion in TortoiseSVN se nahajata na istem strežniku, vendar sta postavljena v različna skladišča, kar omogoča neodvisen razvoj in reši zmedo glede številk gradenj." #. (para) #: ../source/TortoiseSVN_en.xml:3231 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, TortoiseSVN can move or rename them however you wish." msgstr "Seveda vam teh postavitev ni treba upoštevati. Lahko naredite kakršnokoli variacijo, karkoli najbolj ustreza vam ali vaši ekipi sodelavcev. Postavitev, ki jo izberete, pa ni nujno trajna. Skladišče lahko kadarkoli na novo organizirate. Ker so veje in oznake navadne mape, jih lahko TortoiseSVN premakne ali preimenuje po vaših željah." #. (para) #: ../source/TortoiseSVN_en.xml:3239 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 "Sprememba iz enega načina postavitve v drugega se naredi z nizom premikov na strani strežnika. Če vam ni všeč, kako so stvari v skladišču organizirane, enostavno premaknite mape." #. (para) #: ../source/TortoiseSVN_en.xml:3256 msgid "create a new empty folder on your hard drive" msgstr "ustvarite novo prazno mapo na trdem disku" #. (para) #: ../source/TortoiseSVN_en.xml:3261 msgid "create your desired top-level folder structure inside that folder - don't put any files in it yet!" msgstr "ustvarite željeno strukturo map vrhnjega nivoja znotraj mape - zaenkrat ne vnašajte datotek!" #. (para) #: ../source/TortoiseSVN_en.xml:3267 msgid "import this structure into the repository via a right click on the folder and selecting TortoiseSVNImport... This will import your temp folder into the repository root to create the basic repository layout." msgstr "uvozite to strukturo v skladišče - desno kliknite na mapo in izberite TortoiseSVNUvozi... S tem uvozite začasno mapo v korensko mapo skladišča in ustvarite osnovno postavitev." #. (para) #: ../source/TortoiseSVN_en.xml:3245 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 "Če še niste ustvarili osnovne strukture map znotraj skladišča, je čas, da to storite sedaj. Ostajata dva načina. Če želite ustvariti le strukturo /trunk /tags /branches, lahko za to uporabite brskalnik po skladišču, kjer v posamičnih objavah naredite zgornje mape. Če želite izdelati globljo hierarhijo, potem je enostavneje, da strukturo map naredite na disku in jo nato v eni objavi uvozite: " #. (para) #: ../source/TortoiseSVN_en.xml:3282 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 "" "Upoštevajte, da se ime mape, ki jo uvažate, ne pojavi v skladišču, ampak le njena vsebina. Naprimer: ustvarite naslednjo strukturo: \n" "C:\\Temp\\New\\trunk\n" "C:\\Temp\\New\\branches\n" "C:\\Temp\\New\\tags\n" " Uvozite C:\\Temp\\New v korensko mapo skladišča, ki potem izgleda takole: \n" "/trunk\n" "/branches\n" "/tags\n" "" #. (title) #: ../source/TortoiseSVN_en.xml:3302 msgid "Repository Backup" msgstr "Varnostna kopija skladišča" #. (primary) #: ../source/TortoiseSVN_en.xml:3304 msgid "backup" msgstr "varnostna kopija" #. (para) #: ../source/TortoiseSVN_en.xml:3306 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 "Neglede na tip skladišča, ki ga uporabljate, je izjemno pomembno, da redno ustvarjate varnostne kopije in da jih tudi preverite. Če je s strežnikom kaj narobe, boste mogoče lahko dobili zadnjo verzijo datotek, vendar je brez skladišča zgodovina vaših datotek za vedno izgubljena." #. (para) #: ../source/TortoiseSVN_en.xml:3313 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 "Najbolj enostaven način (vendar ni priporočljiv) je, da mape in datoteke skladišča prekopirate na medij, ki ga uporabljate za varnostno shranjevanje. V tem primeru noben proces ne sme dostopati do podatkov v skladišču. Dostop pomeni kakršenkoli dostop. V skladišče tipa BDB se podatki zapisujejo tudi, ko operacija zahteva le branje, n. pr. pridobivanje stanja. Če se med kopiranjem zgodi dostop do podatkov (spletni brskalnik je ostal odprt, WebSVN in podobno), bo varnostna kopija neuporabna." #. (para) #: ../source/TortoiseSVN_en.xml:3323 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 "" "Priporočen način je uporaba ukaza \n" "svnadmin hotcopy pot/do/skladišča pot/do/varnostne/kopije --clean-logs\n" "S tem naredite kopijo skladišča na varen način. Potem naredite varnostno kopije kopije. Stikalo --clean-logs ni potrebno, vendar odstrani vse odvečne datoteke za logiranje, ko naredite varnostno kopijo skladišča BDB, s čemer lahko prihranite nekaj prostora." #. (para) #: ../source/TortoiseSVN_en.xml:3333 msgid "The svnadmin tool is installed automatically when you install the Subversion 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 Subversion command line client from http://subversion.apache.org/getting.html." msgstr "Orodje svnadmin se namesti samodejno ob namestitvi odjemalca Subversion za ukazno vrstico. Če nameščate odjemalca za ukazno vrstico na operacijskem sistemu Windows, je najbolje, da si prenesete namestitveni program. Stisnjen je bolj učinkovito kot različica .zip, tako da je prenos hitrejši, poleg tega pa namesto vas opravi nastavitve. Najnovejša različica odjemalca Subversion za ukazno vrstico se nahaja na naslovu http://subversion.apache.org/getting.html." #. (title) #: ../source/TortoiseSVN_en.xml:3348 msgid "Hook Scripts" msgstr "Ukazne datoteke akcij" #. (primary) #: ../source/TortoiseSVN_en.xml:3350 msgid "hooks" msgstr "akcije" #. (primary) #. (primary) #: ../source/TortoiseSVN_en.xml:3353 #: ../source/TortoiseSVN_en.xml:11999 msgid "hook scripts" msgstr "ukazne datoteke akcij" #. (primary) #: ../source/TortoiseSVN_en.xml:3356 msgid "server side hook scripts" msgstr "ukazne datoteke akcij na strežniku" #. (para) #: ../source/TortoiseSVN_en.xml:3358 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 Subversion Book for full details about the hooks which are implemented." msgstr "Ukazna datoteka akcije je program, ki ga sproži dogodek v skladišču, n. pr. nova revizija ali sprememba lastnosti brez različic. Vsaka akcija dobi dovolj informacij, da ve, za kateri dogodek gre, na katerih ciljih deluje in uporabniško ime osebe, ki je dogodek sprožila. Glede na rezultat akcije ali vrnjen status lahko skripta pusti, da se operacija nadaljuje, jo ustavi ali drugače prepreči njeno izvajanje. Preberite poglavje Hook Scripts v knjigi The Subversion Book, če želite izvedeti kaj več o akcijah, ki so na voljo." #. (para) #: ../source/TortoiseSVN_en.xml:3373 msgid "These hook scripts are executed by the server that hosts the repository. TortoiseSVN also allows you to configure client side hook scripts that are executed locally upon certain events. See for more information." msgstr "Ukazne datoteke akcij izvede strežnik, ki gosti skladišče. TortoiseSVN pa vam omogoča, da nastavite ukazne datoteke akcij na strani odjemalca. Te datoteke se izvedejo krajevno ob določenih dogodkih. Za več informacij poglejte ." #. (para) #: ../source/TortoiseSVN_en.xml:3379 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 "" "Primere ukaznih datotek akcij najdete v podmapi hooks skladišča. Ti primeri so narejeni za sisteme Unix/Linux, tako da jih morate prilagoditi, če uporabljate strežnik s sistemom Windows. Akcija je lahko paketna datoteka ali izvršna datoteka. Spodnji primer prikazuje skripto, ki jo lahko uporabite kot akcijo pre-revprop-change. \n" "rem Dovoli samo spremembe sporočil dnevniških zapisov.\n" "if \"%4\" == \"svn:log\" exit 0\n" "echo Lastnosti '%4' ne morete spremeniti >&2\n" "exit 1\n" " Upoštevajte, da se sporočila, ki jih pošljete na standardni izhod (stdout), ne prikažejo. Če želite, da se besedilo prikaže v oknu Objava zavrnjena, ga morate poslati na stderr. V sistemski skripti to dosežete z uporabo niza >&2 na koncu sporočila." #. (title) #: ../source/TortoiseSVN_en.xml:3399 msgid "Checkout Links" msgstr "Povezave za prevzem" #. (primary) #: ../source/TortoiseSVN_en.xml:3401 msgid "checkout link" msgstr "povezava za prevzem" #. (primary) #: ../source/TortoiseSVN_en.xml:3404 msgid "TortoiseSVN link" msgstr "povezava TortoiseSVN" #. (primary) #: ../source/TortoiseSVN_en.xml:3407 msgid "link" msgstr "povezava" #. (primary) #: ../source/TortoiseSVN_en.xml:3410 msgid "website" msgstr "spletna stran" #. (para) #: ../source/TortoiseSVN_en.xml:3412 msgid "If you want to make your Subversion 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 TortoiseSVN users." msgstr "Če želite ponuditi skladišče Subversion tudi ostalim uporabnikom, lahko povezavo vključite v svojo spletno stran. Da jo naredite bolj dostopno, lahko dodate prevzemno povezavo za uporabnike TortoiseSVN." #. (para) #: ../source/TortoiseSVN_en.xml:3418 msgid "When you install TortoiseSVN, it registers a new tsvn: protocol. When a TortoiseSVN user clicks on such a link, the checkout dialog will open automatically with the repository URL already filled in." msgstr "Ko namestite TortoiseSVN, ta registrira nov protokol tsvn:. Ko uporabnik klikne na takšno povezavo, se samodejno odpre okno za prevzem z že izpolnjenim naslovom URL skladišča." #. (programlisting) #: ../source/TortoiseSVN_en.xml:3427 #, no-wrap msgid "" "\n" "<a href=\"tsvn:https://tortoisesvn.tigris.org/svn/tortoisesvn/trunk\">\n" "</a>\n" msgstr "" "\n" "<a href=\"tsvn:https://tortoisesvn.tigris.org/svn/tortoisesvn/trunk\">\n" "</a>\n" #. (para) #: ../source/TortoiseSVN_en.xml:3424 msgid "To include such a link in your own html page, you need to add code which looks something like this: " msgstr "Če želite dodati takšno povezavo na svojo HTML stran, ji dodajte naslednjo kodo: " #. (programlisting) #: ../source/TortoiseSVN_en.xml:3439 #, no-wrap msgid "" "\n" "<a href=\"tsvn:https://tortoisesvn.tigris.org/svn/tortoisesvn/trunk\">\n" "<img src=TortoiseCheckout.png></a>\n" msgstr "" "\n" "<a href=\"tsvn:https://tortoisesvn.tigris.org/svn/tortoisesvn/trunk\">\n" "<img src=TortoiseCheckout.png></a>\n" #. (para) #: ../source/TortoiseSVN_en.xml:3432 msgid "Of course it would look even better if you included a suitable picture. You can use the TortoiseSVN logo or you can provide your own image. " msgstr "Seveda bo vse skupaj izgledalo še bolje, če dodate primerno sliko. Uporabite lahko logotip programa TortoiseSVN ali pa svojo sliko. " #. (title) #: ../source/TortoiseSVN_en.xml:3447 msgid "Daily Use Guide" msgstr "Dnevna uporaba" #. (para) #: ../source/TortoiseSVN_en.xml:3451 msgid "This document describes day to day usage of the TortoiseSVN client. It is not an introduction to version control systems, and not an introduction to Subversion (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 "Ta dokument opisuje dnevno uporabo odjemalca TortoiseSVN. To ni uvod v sisteme za nadzor različic, prav tako pa ni uvod v Subversion (SVN). To poglavje uporabite, ko veste, kaj želite narediti, vendar se ne spomnite natančno, kako se to naredi." #. (para) #: ../source/TortoiseSVN_en.xml:3459 msgid "If you need an introduction to version control with Subversion, then we recommend you read the fantastic book: Version Control with Subversion." msgstr "Če potrebujete uvod v nadzor različic s sistemom Subversion, vam priporočamo odlično knjigo: Version Control with Subversion." #. (para) #: ../source/TortoiseSVN_en.xml:3466 msgid "This document is also a work in progress, just as TortoiseSVN and Subversion 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 TortoiseSVN in our free time." msgstr "Tako kot programa TortoiseSVN in Subversion je tudi ta dokument \"v delu\". Če najdete kakšne napake, jih sporočite na dopisni seznam, da bomo lahko dokumentacijo dopolnili. Nekateri posnetki zaslonov v Dnevni uporabi so lahko drugačni, kot so trenutno v aplikaciji. Prosimo, oprostite. Aplikacijo TortoiseSVN razvijamo v svojem prostem času." #. (para) #: ../source/TortoiseSVN_en.xml:3478 msgid "You should have installed TortoiseSVN already." msgstr "morate imeti TortoiseSVN že nameščen," #. (para) #: ../source/TortoiseSVN_en.xml:3483 msgid "You should be familiar with version control systems." msgstr "morate poznati sisteme za nadzor različic," #. (para) #: ../source/TortoiseSVN_en.xml:3488 msgid "You should know the basics of Subversion." msgstr "morate poznati osnove sistema Subversion," #. (para) #: ../source/TortoiseSVN_en.xml:3493 msgid "You should have set up a server and/or have access to a Subversion repository." msgstr "imeti morate nameščen strežnik in/ali dostop do skladišča Subversion." #. (para) #: ../source/TortoiseSVN_en.xml:3474 msgid "In order to get the most out of the Daily Use Guide: " msgstr "Da bi se čimveč naučili iz poglavja Dnevna uporaba: " #. (title) #: ../source/TortoiseSVN_en.xml:3504 msgid "Getting Started" msgstr "Kako začeti" #. (title) #. (title) #. (title) #: ../source/TortoiseSVN_en.xml:3506 #: ../source/TortoiseSVN_en.xml:5014 #: ../source/TortoiseSVN_en.xml:15002 msgid "Icon Overlays" msgstr "Prekrivne ikone" #. (title) #. (title) #: ../source/TortoiseSVN_en.xml:3509 #: ../source/TortoiseSVN_en.xml:5023 msgid "Explorer showing icon overlays" msgstr "Raziskovalec prikaže prekrivne ikone" #. (para) #: ../source/TortoiseSVN_en.xml:3507 msgid " One of the most visible features of TortoiseSVN 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 " Ena izmed vizuelno najbolj opaznih zmožnosti TortoiseSVN so prekrivne ikone, ki se pojavijo na datotekah v delovni kopiji. Z njihovo pomočjo že na prvi pogled vidite, katere datoteke so spremenjene. Preberite za več informacij o tem, kaj različne ikone predstavljajo." #. (title) #: ../source/TortoiseSVN_en.xml:3520 msgid "Context Menus" msgstr "Kontekstni meni" #. (primary) #: ../source/TortoiseSVN_en.xml:3522 msgid "context menu" msgstr "kontekstni meni" #. (primary) #: ../source/TortoiseSVN_en.xml:3525 msgid "right-click" msgstr "desni klik" #. (title) #: ../source/TortoiseSVN_en.xml:3529 msgid "Context menu for a directory under version control" msgstr "Kontekstni meni za mapo pod nadzorom različic" #. (para) #: ../source/TortoiseSVN_en.xml:3527 msgid " All TortoiseSVN 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 TortoiseSVN menu as part of the Explorer file menu." msgstr " Vsi ukazi TortoiseSVN se kličejo iz kontekstnega menija Raziskovalca. Večina je vidna, ko desno kliknete na datoteko ali mapo. Ukazi, ki so na voljo, so odvisni od tega, ali je datoteka ali mapa oziroma njihova nadrejena mapa pod nadzorom različic ali ne. Meni TortoiseSVN lahko vidite tudi kot del glavnega menija Datoteka v Raziskovalcu." #. (para) #: ../source/TortoiseSVN_en.xml:3539 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 "Nekateri zelo redko uporabljeni ukazi so na voljo v razširjenem kontekstnem meniju, ki ga prikažete tako, da držite pritisnjeno tipko Shift in desno kliknete." #. (title) #: ../source/TortoiseSVN_en.xml:3548 msgid "Explorer file menu for a shortcut in a versioned folder" msgstr "Kontekstni meni v Raziskovalcu za bližnjico v mapi pod nadzorom različic" #. (para) #: ../source/TortoiseSVN_en.xml:3545 msgid "In some cases you may see several TortoiseSVN 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 TortoiseSVN. 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 "V nekaterih primerih lahko vidite več elementov TortoiseSVN. To ni napaka! Ta primer opisuje bližnjico za datoteke brez različic. Znotraj mape pod nadzorom in v meniju Raziskovalca so trije elementi sistema TortoiseSVN. Eden je za mapo, eden za bližnjico samo in tretji za objekt, na katerega bližnjica kaže. Da bi lažje ločevali med njimi, imajo ikone v spodnjem desnem kotu indikator, ki pove, ali se element menija nanaša na datoteko, mapo, bližnico ali na več elementov." #. (para) #: ../source/TortoiseSVN_en.xml:3559 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 "Če uporabljate operacijski sistem Windows 2000, boste opazili, da so v kontekstnem meniju vnosi prikazani le tekstovno, brez ikon, ki jih vidite na zgornji sliki. Zavedamo se, da je prikaz ikon v prejšnjih različicah deloval. Microsoft je spremenil način dela z ikonami v operacijskem sistemu Windows Vista, zato smo morali uporabiti drugačen način prikaza ikon, ki pa na žalost ne deluje v operacijskem sistemu Windows 2000." #. (title) #. (title) #: ../source/TortoiseSVN_en.xml:3568 #: ../source/TortoiseSVN_en.xml:4499 msgid "Drag and Drop" msgstr "Povleci in spusti" #. (primary) #: ../source/TortoiseSVN_en.xml:3570 msgid "drag handler" msgstr "držalo za poteg" #. (primary) #: ../source/TortoiseSVN_en.xml:3573 msgid "drag-n-drop" msgstr "povleci-in-spusti" #. (primary) #: ../source/TortoiseSVN_en.xml:3576 msgid "right drag" msgstr "poteg z desnim gumbom" #. (title) #. (title) #: ../source/TortoiseSVN_en.xml:3580 #: ../source/TortoiseSVN_en.xml:6781 msgid "Right drag menu for a directory under version control" msgstr "Meni ob premikanju mape, ki je pod nadzorom različic" #. (para) #: ../source/TortoiseSVN_en.xml:3578 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 " Drugi ukazi so na voljo kot meni, ko z desnim gumbom povlečete datoteke ali mape na novo lokacijo znotraj delovne kopije ali ko z desnim gumbom povlečete datoteko ali mapo brez različic v mapo, ki je pod nadzorom." #. (title) #: ../source/TortoiseSVN_en.xml:3590 msgid "Common Shortcuts" msgstr "Pogoste bližnjice" #. (term) #: ../source/TortoiseSVN_en.xml:3597 msgid "F1" msgstr "F1" #. (para) #: ../source/TortoiseSVN_en.xml:3599 msgid "Help, of course." msgstr "Pomoč, seveda." #. (term) #: ../source/TortoiseSVN_en.xml:3605 msgid "F5" msgstr "F5" #. (para) #: ../source/TortoiseSVN_en.xml:3607 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ži trenutni pogled. To je verjetno najbolj uporaben ukaz, ki ga lahko izvršite z eno tipko. Na primer: v Raziskovalcu boste s tem osvežili prekrivne ikone v delovni kopiji. V oknu za objave se bo s tem ponovno pregledala delovna kopija, v okno pa se bodo dodale najdene spremembe. V oknu dnevniških zapisov bo to povzročilo ponovno kontaktiranje skladišča in preverjanje, če obstajajo novejši zapisi." #. (term) #: ../source/TortoiseSVN_en.xml:3619 msgid "Ctrl-A" msgstr "Ctrl-A" #. (para) #: ../source/TortoiseSVN_en.xml:3621 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 "Izberi vse. To lahko uporabite, če se pojavi sporočilo o napaki in ga želite prekopirati in prilepiti v elektronsko pošto. Uporabite Ctrl-A, če želite izbrati sporočilo o napaki in potem..." #. (term) #: ../source/TortoiseSVN_en.xml:3629 msgid "Ctrl-C" msgstr "Ctrl-C" #. (para) #: ../source/TortoiseSVN_en.xml:3631 msgid "... Copy the selected text." msgstr "... Kopirajte izbrano besedilo" #. (para) #: ../source/TortoiseSVN_en.xml:3591 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 "Nekatere pogoste operacije imajo znane bližnjice sistema Windows, vendar se ne pojavljajo na gumbih ali v menijih. Če vam ne uspe ugotoviti, kako se naredi kaj preprostega, n. pr. kako se osveži pogled, poglejte sem. " #. (primary) #: ../source/TortoiseSVN_en.xml:3642 msgid "authentication" msgstr "avtentikacija" #. (title) #: ../source/TortoiseSVN_en.xml:3648 msgid "Authentication Dialog" msgstr "Okno za avtentikacijo" #. (para) #: ../source/TortoiseSVN_en.xml:3656 msgid "svn.simple contains credentials for basic authentication (username/password)." msgstr "svn.simple vsebuje podatke o osnovni avtentikaciji (uporabniško ime/geslo)." #. (para) #: ../source/TortoiseSVN_en.xml:3662 msgid "svn.ssl.server contains SSL server certificates." msgstr "svn.ssl.server vsebuje certificate strežnika SSL" #. (para) #: ../source/TortoiseSVN_en.xml:3668 msgid "svn.username contains credentials for username-only authentication (no password needed)." msgstr "svn.username vsebuje avtentikacijske podatke za avtentikacijo samo z uporabniškim imenom (brez gesla)." #. (para) #: ../source/TortoiseSVN_en.xml:3644 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 TortoiseSVN store the credentials in Subversion's default directory: %APPDATA%\\Subversion\\auth in three subdirectories: " msgstr "Če je skladišče, do katerega želite dostopati, zaščiteno z geslom, se prikaže avtentikacijsko pogovorno okno. Vpišite svoje uporabniško ime in geslo. Potrditveno polje pove programu TortoiseSVN, naj avtentikacijske podatke shrani v privzeto mapo: %APPDATA%\\Subversion\\auth v tri podmape: " #. (para) #: ../source/TortoiseSVN_en.xml:3675 msgid "If you want to clear the authentication cache for all servers, you can do so from the Saved Data page of TortoiseSVN's settings dialog. That button will clear all cached authentication data from the Subversion auth directories, as well as any authentication data stored in the registry by earlier versions of TortoiseSVN. Refer to ." msgstr "Če želite izbrisati avtentikacijski predpomnilnik za vse strežnike, lahko to storite v nastavitvah TortoiseSVN - stran Splošno. Ta gumb bo izbrisal vse avtentikacijske podatke iz map auth, prav tako pa tudi vse podatke iz registra (iz prejšnjih različic TortoiseSVN). Preberite ." #. (para) #: ../source/TortoiseSVN_en.xml:3684 msgid "For more information on how to set up your server for authentication and access control, refer to " msgstr "Za več informacij, kako namestiti strežnik za avtentikacijo in nadzor dostopov, si oglejte " #. (title) #: ../source/TortoiseSVN_en.xml:3691 msgid "Maximizing Windows" msgstr "Povečevanje oken" #. (primary) #: ../source/TortoiseSVN_en.xml:3693 msgid "maximize" msgstr "povečaj" #. (para) #: ../source/TortoiseSVN_en.xml:3695 msgid "Many of TortoiseSVN'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 "Kar nekaj pogovornih oken TortoiseSVN prikaže veliko informacij. Pogosto je uporabno, če povečate le širino ali le višino, namesto da povečate okno na celo stran. Z lažje prilagajanje je tu gumb Razpni. Uporabite srednji miškin gumb za podaljšanje navpične stranice na višino zaslona in desni miških gumb za podaljšanje vodoravne stranice na širino zaslona." #. (title) #: ../source/TortoiseSVN_en.xml:3706 msgid "Importing Data Into A Repository" msgstr "Uvažanje podatkov v skladišče" #. (primary) #: ../source/TortoiseSVN_en.xml:3708 msgid "import" msgstr "uvoz" #. (primary) #: ../source/TortoiseSVN_en.xml:3714 msgid "add files to repository" msgstr "dodaj datoteke v skladišče" #. (title) #. (entry) #. (title) #. (glossterm) #: ../source/TortoiseSVN_en.xml:3718 #: ../source/TortoiseSVN_en.xml:13769 #: ../source/TortoiseSVN_en.xml:14933 #: ../source/TortoiseSVN_en.xml:15694 msgid "Import" msgstr "Uvoz" #. (primary) #: ../source/TortoiseSVN_en.xml:3720 msgid "temporary files" msgstr "začasne datoteke" #. (para) #: ../source/TortoiseSVN_en.xml:3722 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 "Če uvažate v obstoječo skladišče, ki že vsebuje projekte, potem je struktura map že določena. Če uvažate podatke v novo skladišče, potem je koristno vložiti nekaj dodatnega časa in razmisliti o strukturi. Preberite za dodatne napotke." #. (para) #: ../source/TortoiseSVN_en.xml:3736 msgid "There is no way to select files and folders to include, aside from using the global ignore settings." msgstr "Datotek in map, ki jih želite vključiti, ne morete izbrati, lahko pa si pomagate z nastavitvami splošnega vzorca prezrtih elemetov." #. (para) #: ../source/TortoiseSVN_en.xml:3742 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 "Uvožena mapa ne postane delovna kopija. Narediti morate prevzem datotek iz strežnika." #. (para) #: ../source/TortoiseSVN_en.xml:3748 msgid "It is easy to import to the wrong folder level in the repository." msgstr "Povsem preprosto je uvoziti v napačno mapo znotraj hierarhije skladišča." #. (para) #: ../source/TortoiseSVN_en.xml:3730 msgid "This section describes the Subversion 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 "To podpoglavje opisuje ukaz Uvozi, katerega namen je uvažanje strukture map v skladišče v eni potezi. Čeprav opravi svoje delo, pa ima nekaj pomanjkljivosti: Zato priporočamo, da tega ukaza ne uporabljate, ampak uporabite postopek v dveh korakih, opisan v . Ker pa ste že ravno tukaj, si vseeno poglejmo, kako uvažanje deluje..." #. (para) #: ../source/TortoiseSVN_en.xml:3762 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 "Odstraniti vse datoteke, ki niso potrebne za gradnjo projekta (začasne datoteke, datoteke, ki jih generira prevajalnik, n. pr. *.obj, prevedene dvojiške datoteke...)." #. (para) #: ../source/TortoiseSVN_en.xml:3770 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 "Organizirajte datoteke v mape in podmape. Čeprav je možno preimenovanje/premikanje tudi kasneje, je zelo priporočljivo, da postavite strukturo projekta pred uvažanjem." #. (para) #: ../source/TortoiseSVN_en.xml:3758 msgid "Before you import your project into a repository you should: " msgstr "Preden projekt uvozite v skladišče, morate: " #. (title) #: ../source/TortoiseSVN_en.xml:3790 msgid "The Import dialog" msgstr "Okno za uvažanje" #. (para) #: ../source/TortoiseSVN_en.xml:3779 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 TortoiseSVNImport... which brings up a dialog box: " msgstr "Sedaj izberite vrhnjo datoteko vašega projekta v Raziskovalcu in desno kliknite. S tem odprete kontekstni meni. Izberite ukaz TortoiseSVNUvozi..., ki prikaže naslednje okno: " #. (para) #: ../source/TortoiseSVN_en.xml:3794 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 "" "V tem pogovornem oknu vpišete naslov URL skladišča, kamor želite uvoziti svoj projekt. Zavedati se morate, da krajevna mapa, ki jo uvažate, ne postane del skladišča; v skladišče se uvozi le njena vsebina. Primer: če imate naslednjo strukturo map: \n" "C:\\Projekti\\Widget\\source\n" "C:\\Projekti\\Widget\\doc\n" "C:\\Projekti\\Widget\\images\n" " in uvozite C:\\Projekti\\Widget v http://mojadomena.com/svn/trunk, boste morda presenečeni ugotovili, da se vse vaše podmape nahajajo v podmapi trunk in ne v podmapi Widget. Podmapo morate navesti kot del naslova URL: http://mojadomena.com/svn/trunk/Widget-X. Uvažanje samodejno ustvari podmape znotraj skladišča, če le-te še ne obstajajo." #. (para) #: ../source/TortoiseSVN_en.xml:3815 msgid "The import message is used as a log message." msgstr "Sporočilo uvoza se uporabi kot sporočilo dnevniškega zapisa." #. (para) #: ../source/TortoiseSVN_en.xml:3818 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 "Po privzetih nastavitvah se datoteke in mape, ki ustrezajo splošnemu vzorcu prezrtih elementov, ne uvozijo. Če želite to pri posameznem uvozu spremeniti, potrdite potrditveno polje Vključi prezrte datoteke. Preberite za več informacij o nastavljanju splošnih vzorcev prezrtih elementov." #. (para) #: ../source/TortoiseSVN_en.xml:3825 msgid "As soon as you press OK TortoiseSVN 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 "Ko pritisnete gumb V redu, TortoiseSVN uvozi celotno strukturo map, vključno z vsemi datotekami, v skladišče. Projekt je sedaj shranjen v skladišču pod nadzorom različic. Upoštevajte, da mapa, ki ste jo uvozili, NI pod nadzorom različic! Da bi dobili delovno kopijo datotek pod nadzorom, morate narediti prevzem verzije, ki ste jo pravkat uvozili. Ali pa berite naprej, da izveste, kako uvoziti mapo na mestu." #. (title) #: ../source/TortoiseSVN_en.xml:3837 msgid "Import in Place" msgstr "Uvažanje na mestu" #. (primary) #: ../source/TortoiseSVN_en.xml:3839 msgid "import in place" msgstr "uvažanje na mestu" #. (para) #: ../source/TortoiseSVN_en.xml:3846 msgid "Use the repository browser to create a new project folder directly in the repository." msgstr "Uporabite brskalnik po skladišču, da ustvarite novo projektno mapo neposredno v skladišču." #. (para) #: ../source/TortoiseSVN_en.xml:3852 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 "Prevzemite novo mapo na mapi, ki jo želite uvoziti. Dobili boste obvestilo, da krajevna mapa ni prazna. Sedaj imate vrhnjo mapo pod nadzorom različic, medtem ko njena vsebina ni pod nadzorom." #. (para) #: ../source/TortoiseSVN_en.xml:3859 msgid "Use TortoiseSVNAdd... 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 "Uporabite TortoiseSVNDodaj... na mapi pod nadzorom. S tem lahko dodate delno ali celotno vsebino, dodate ali odstranite datoteke, nastavite lastnosti svn:ignore na mapah in naredite vse ostale spremembe, ki so potrebne." #. (para) #: ../source/TortoiseSVN_en.xml:3871 msgid "Commit the top level folder, and you have a new versioned tree, and a local working copy, created from your existing folder." msgstr "Objavite vrhnjo mapo in dobili ste novo drevo pod nadzorom in krajevno delovno kopijo, ustvarjeno iz obstoječe mape." #. (para) #: ../source/TortoiseSVN_en.xml:3841 msgid "Assuming you already have a repository, and you want to add a new folder structure to it, just follow these steps: " msgstr "Ob predpostavki, da skladišče že imate in želite dodati vanj novo drevesno strukturo, naredite naslednje: " #. (title) #: ../source/TortoiseSVN_en.xml:3880 msgid "Special Files" msgstr "Posebne datoteke" #. (primary) #: ../source/TortoiseSVN_en.xml:3882 msgid "special files" msgstr "posebne datoteke" #. (para) #: ../source/TortoiseSVN_en.xml:3884 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 "Včasih imate v sistemu različic datoteko, ki vsebuje podatke, specifične za uporabnika. To pomeni, da imate datoteko, ki jo mora vsak uporabnik urediti, da ustreza njegovi/njeni namestitvi. Imeti takšno datoteko pod nadzorom je težko, ker bi vsak uporabnik ob vsaki objavi objavil svoje spremembe te datoteke." #. (para) #: ../source/TortoiseSVN_en.xml:3891 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 "V takšnih primerih priporočamo uporabo predlog. Ustvarite datoteko, ki vsebuje vse podatke, ki jih razvijalci potrebujejo, jo dodajte v sistem nadzora različic in pustite, da jo razvijalci prevzamejo. Nato si vsak razvijalec naredi kopijo te datoteke in jo preimenuje. Po tem spreminjanje kopije ni več problematično." #. (para) #: ../source/TortoiseSVN_en.xml:3899 msgid "As an example, you can have a look at TortoiseSVN'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 "Za primer si poglejte ukazno datoteko za gradnjo TortoiseSVN. Ta kliče datoteko TortoiseVars.bat, ki ne obstaja v skladišču. Obstaja le datoteka TortoiseVars.tmpl. TortoiseVars.tmpl je predloga datoteke. Vsak uporabnik si izdela svojo kopijo in jo preimenuje v TortoiseVars.bat. V datoteko smo dodali komentarje, da uporabniki vidijo, katere vrstice morajo spremeniti v skladu s svojo namestitvijo, da bo stvar delovala." #. (para) #: ../source/TortoiseSVN_en.xml:3910 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 Subversion property svn:ignore to include that filename. That way it won't show up as unversioned on every commit." msgstr "Da ne bi motili uporabnikov, smo dodali datoteko TortoiseVars.bat na listo prezrtih elementov v nadrejeni mapi, to pomeni, da smo nastavili lastnost svn:ignore, ki vsebuje to datoteko. Tako se ta datoteka ne bo pojavila v oknu za objave kot datoteka brez različic." #. (title) #: ../source/TortoiseSVN_en.xml:3919 msgid "Referenced Projects" msgstr "Povezani projekti" #. (primary) #: ../source/TortoiseSVN_en.xml:3921 msgid "external repositories" msgstr "zunajnja skladišča" #. (primary) #. (primary) #: ../source/TortoiseSVN_en.xml:3924 #: ../source/TortoiseSVN_en.xml:13351 msgid "externals" msgstr "zunanji" #. (para) #: ../source/TortoiseSVN_en.xml:3926 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 "Včasih je koristno izdelati delovno kopijo, ki je sestavljena iz več različnih prevzemov. Primer: narediti želite delovno kopijo, kjer podmape prihajajo iz različnih lokacij v skladišču ali mogoce celo iz različnih skladišč. Če želite, da ima vsak uporabnik isto postavitev, lahko definirate lastnosti svn:externals." #. (para) #: ../source/TortoiseSVN_en.xml:3934 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 Subversion 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, Subversion 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 "" "Denimo, da prevzamete delovno kopijo projekta /projekt1 v D:\\dev\\projekt. Izberite mapo D:\\dev\\projekt1, desno kliknite in iz kontekstnega menija izberite Windows MenuLastnosti. Pojavi se okno Lastnosti. Pojdite na zavihek Subversion. Tu lahko nastavite lastnosti. Kliknite Dodaj.... Iz spustnega seznama izberite lastnost svn:externals in vpišite v polje naslov URL skladišča v obliki ime url ali če želite nastaviti določeno revizijo: ime -rREV url Dodate lahko več zunanjih projektov, po enega v vrstico. Upoštevajte, da morate uporabiti pravilne znake za naslov URL, sicer lastnosti ne bodo delovale pravilno. Na primer: vsak presledek morate zamenjati s %20. Upoštevajte, da ne morete uporabljati map, ki vsebujejo presledke. Denimo, da ste nastavili na D:\\dev\\projekt1 naslednje lastnosti: \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" " Sedaj kliknite Nastavi in objavite spremembe. Ko boste (ali pa kak drug uporabniki) posodobili delovno kopijo, bo Subversion ustvaril podmapo D:\\dev\\projekt1\\sounds in prevzel projekt Sounds, podmapo D:\\dev\\projekt1\\quick graphs s projektom Graphics in nazadnje še vgnezdeno podmapo D:\\dev\\projekt1\\skins\\toolkit z revizijo 21 projekta Skin-maker." #. (para) #: ../source/TortoiseSVN_en.xml:3974 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 "Priporočamo, da pri navajanju naslovov skladišč za zunanje projekte uporabljate tudi številke revizij, kot je opisano zgoraj. S tem si zagotovite, da se boste sami odločili, kdaj boste uporabili drug posnetek zunanjega projekta in natančno katerega. Poleg logičnega pogleda na stvar - da ne boste presenečeni nad spremembami v zunanjem projektu, nad katerim nimate nadzora - to prinaša tudi prednost pri posodabljanju na staro revizijo. V tem primeru se bodo zunanji projekti posodobili na natančno takšno revizijo, ki ustreza reviziji vaših projektov. Pri projektih razvoja programske opreme to pomeni uspešno oziroma neuspešno gradnjo stare različice kompleksnega projekta." #. (para) #. (para) #: ../source/TortoiseSVN_en.xml:3993 #: ../source/TortoiseSVN_en.xml:13383 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 "Če se zunanji projekt nahaja v istem skladišču, bodo vse spremembe v njem tudi na seznamu za objavo, ko boste objavljali spremembe v glavnem projektu." #. (para) #. (para) #: ../source/TortoiseSVN_en.xml:3998 #: ../source/TortoiseSVN_en.xml:13388 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 "Če se zunanji projekt nahaja v drugem skladišču, bodo vse spremembe, ki jih naredite na zunanjem projektu, prikazane, ko boste objavili glavni projekt, vendar morate zunanje spremembe objaviti posebej." #. (para) #: ../source/TortoiseSVN_en.xml:4004 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 "Če uporabljate absolutne naslove URL v definicijah svn:externals in morate delovno kopijo premestiti (n. pr. če se spremeni naslov skladišča), se zunanji ne bodo spremenili in morda ne bodo več delovali." #. (para) #: ../source/TortoiseSVN_en.xml:4010 msgid "To avoid such problems, Subversion 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 "V izogib tem težavam odjemalci Subversion verzije 1.5 ali novejše podpirajo relativne zunanje naslove URL. Na voljo so štirje načini podajanja relativnega naslova URL. V naslednjih primerih predpostavljamo, da imamo dve skladišči: enega na naslovu http://primer.com/svn/sklad-1 in drugega na naslovu http://primer.com/svn/sklad-2. Prevzem naslova http://primer.com/svn/sklad-1/projekt/trunk naredimo v mapo C:\\Delo, lastnost svn:externals pa je nastavljena na glavno vejo (trunk)." #. (term) #: ../source/TortoiseSVN_en.xml:4025 msgid "Relative to parent directory" msgstr "Relativno na nadrejeno mapo" #. (para) #: ../source/TortoiseSVN_en.xml:4027 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 "" "Ti naslovi se vedno začnejo s predpono ../. Primer: \n" "../../widgets/foo common/foo-widget\n" " S tem se naslov http://primer.com/svn/sklad-1/widgets/foo razširi v C:\\Delo\\common\\foo-widget." #. (para) #: ../source/TortoiseSVN_en.xml:4038 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 "Upoštevajte, da je naslov URL relativen na naslov URL mape, ki ima nastavljeno lastnost svn:externals in ne na mapo, kjer se zunanji elementi nahajajo." #. (term) #: ../source/TortoiseSVN_en.xml:4046 msgid "Relative to repository root" msgstr "Relativno na korensko pot skladišča" #. (para) #: ../source/TortoiseSVN_en.xml:4048 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 "" "Ti naslovi se vedno začnejo z ^/. Primer: \n" "^/widgets/foo common/foo-widget\n" " Naslov http://primer.com/svn/sklad-1/widgets/foo ustreza C:\\Delo\\common\\foo-widget." #. (para) #: ../source/TortoiseSVN_en.xml:4059 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 "" "S tem se enostavno sklicujete na skladišča, ki imajo enako lastnost SVNParentPath (skupna mapa, ki vsebuje več skladišč). Primer: \n" "^/../sklad-2/hammers/claw common/claw-hammer\n" " Naslov http://primer.com/svn/sklad-2/hammers/claw ustreza C:\\Delo\\common\\claw-hammer." #. (term) #: ../source/TortoiseSVN_en.xml:4074 msgid "Relative to scheme" msgstr "Relativno na shemo" #. (para) #: ../source/TortoiseSVN_en.xml:4076 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 "" "Naslovi URL, ki se začnejo z nizom //, prekopirajo le shemo naslova URL. To je uporabno, kadar je potrebno gostitelja dosegati z različnimi shemami, odvisno od mrežne lokacije; n. pr. odjemalci v intranetu uporabijo http://, medtem kot zunanji odjemalci uporabijo svn+ssh://. Primer: \n" "//primer.com/svn/sklad-1/widgets/foo common/foo-widget\n" " ustreza http://primer.com/svn/sklad-1/widgets/foo ali svn+ssh://primer.com/svn/sklad-1/widgets/foo, odvisno od metode, ki je bila uporabljena za prevzem mape C:\\Delo." #. (term) #: ../source/TortoiseSVN_en.xml:4096 msgid "Relative to the server's hostname" msgstr "Relativno na naslov strežnika" #. (para) #: ../source/TortoiseSVN_en.xml:4098 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 "" "Naslovi URL, ki se začnejo z nizom /, prekopirajo shemo in gostitelja naslova URL, n. pr. \n" "/svn/sklad-1/widgets/foo common/foo-widget\n" " ustreza http://primer.com/svn/sklad-1/widgets/foo v C:\\Delo\\common\\foo-widget. Če ste delovno kopijo prevzeli iz drugega strežnika na naslovu svn+ssh://drug.strežnik.net/svn/sklad-1/projekt1/trunk, zunanje reference ustrezajo svn+ssh://drug.strežnik.net/svn/sklad-1/widgets/foo." #. (para) #: ../source/TortoiseSVN_en.xml:4116 msgid "If you need more information how TortoiseSVN handles Properties read ." msgstr "Če želite izvedeti več o tem, kako Subversion obravnava lastnosti, preberite ." #. (para) #: ../source/TortoiseSVN_en.xml:4120 msgid "To find out about different methods of accessing common sub-projects read ." msgstr "Za pregled različnih načinov dostopa do skupnih projektov si preberite ." #. (title) #: ../source/TortoiseSVN_en.xml:4127 msgid "Checking Out A Working Copy" msgstr "Prevzemanje delovne kopije" #. (primary) #: ../source/TortoiseSVN_en.xml:4129 msgid "checkout" msgstr "prevzem" #. (primary) #: ../source/TortoiseSVN_en.xml:4132 msgid "create working copy" msgstr "ustvari delovno kopijo" #. (para) #: ../source/TortoiseSVN_en.xml:4135 msgid "To obtain a working copy you need to do a checkout from a repository." msgstr "Da bi ustvarili delovno kopijo, morate narediti prevzem iz skladišča." #. (title) #: ../source/TortoiseSVN_en.xml:4149 msgid "The Checkout dialog" msgstr "Okno za prevzem" #. (para) #: ../source/TortoiseSVN_en.xml:4139 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 TortoiseSVNCheckout..., 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 "V Raziskovalcu izberite mapo, kjer želite imeti delovno kopijo. Z desnim klikom prikličite kontekstni meni in izberite ukaz TortoiseSVNPrevzemi..., ki ponudi naslednje pogovorno okno: Če vnesete ime mape, ki še ne obstaja, se le-ta pred prevzemom samodejno ustvari." #. (title) #: ../source/TortoiseSVN_en.xml:4156 msgid "Checkout Depth" msgstr "Globina prevzema" #. (term) #: ../source/TortoiseSVN_en.xml:4164 msgid "Fully recursive" msgstr "Popolnoma rekurzivno" #. (para) #: ../source/TortoiseSVN_en.xml:4166 msgid "Checkout the entire tree, including all child folders and sub-folders." msgstr "Prevzemi celotno drevo, vključno z mapami in podmapami." #. (term) #: ../source/TortoiseSVN_en.xml:4173 msgid "Immediate children, including folders" msgstr "Takojšnji nasledniki, vključno z mapami" #. (para) #: ../source/TortoiseSVN_en.xml:4175 msgid "Checkout the specified directory, including all files and child folders, but do not populate the child folders." msgstr "Prevzemi določeno mapo vključno z datotekami in podmapami, vendar brez vsebine podmap." #. (term) #: ../source/TortoiseSVN_en.xml:4182 msgid "Only file children" msgstr "Samo podrejene datoteke" #. (para) #: ../source/TortoiseSVN_en.xml:4184 msgid "Checkout the specified directory, including all files but do not checkout any child folders." msgstr "Prevzemi izbrano mapo, vključno z vsemi datotekami, vendar brez podmap." #. (term) #: ../source/TortoiseSVN_en.xml:4191 msgid "Only this item" msgstr "Samo ta element" #. (para) #: ../source/TortoiseSVN_en.xml:4193 msgid "Checkout the directory only. Do not populate it with files or child folders." msgstr "Prevzemi le mapo. Ne prenašaj vsebine (datetok in podmap)." #. (term) #. (term) #. (listitem) #: ../source/TortoiseSVN_en.xml:4200 #: ../source/TortoiseSVN_en.xml:8079 #: ../source/TortoiseSVN_en.xml:14850 msgid "Working copy" msgstr "Delovna kopija" #. (para) #: ../source/TortoiseSVN_en.xml:4202 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 "Ohrani globino, določeno v delovni kopiji. Ta možnost se ne uporablja v oknu za prevzem, ampak je privzeta nastavitev v vseh ostalih oknih, kjer je mogoče nastaviti globino." #. (para) #: ../source/TortoiseSVN_en.xml:4157 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 "Lahko določite tudi globino prevzema. Ta označuje, kako globoko v mape deluje prevzem. Če želite prevzeti le nekatere mape velikega drevesa, prevzemite le vrhnjo mapo, nato pa rekurzivno posodobite posamezne izbrane mape. " #. (para) #: ../source/TortoiseSVN_en.xml:4212 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 "Če prevzamete delno delovno kopijo (za globino prevzema izberete karkoli razen popolnoma rekurzivno), lahko dodatne podmape prevzamete z uporabno brskalnika po skladišču () ali pogovornega okna \"preveri spremembe\" ()." #. (para) #: ../source/TortoiseSVN_en.xml:4219 msgid "In the repository browser, Right click on the checked out folder, then use TortoiseSVNRepo-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 "V brskalniku po skladišču desno kliknite na prevzeto mapo in izberite TortoiseSVNBrskalnik po skladišču. Poiščite podmapo, ki jo želite dodati v delovno kopijo, nato pa uporabite Kontekstni meniPosodobi element na revizijo Ta meni je na voljo le če izberete element, ki se še ne nahaja v vaši delovni kopiji, obstaja pa njegova nadrejena mapa." #. (para) #: ../source/TortoiseSVN_en.xml:4235 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 "V pogovornem oknu za preverjanje sprememb najprej kliknite gumb Preveri skladišče. Pogovorno okno prikaže vse datoteke in mape, ki se nahajajo v skladišču, pa niso prevezete, kot dodane oddaljeno. Desno kliknite na mape, ki jih želite dodati v delovno kopijo, nato uporabite Kontekstni meniPosodobi." #. (para) #: ../source/TortoiseSVN_en.xml:4247 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 "Ta zmožnost je uporabna, kadar želite prevzeti dele velikega drevesa, hkrati pa ohraniti udobje posodabljanja ene same delovne kopije. Denimo, da imate veliki drevo s podmapami Projekt01 do Projekt99, prevzeti pa želite le mape Projekt03, Projekt25 and Projekt76/Podprojekt. Naredite naslednje korake:" #. (para) #: ../source/TortoiseSVN_en.xml:4260 msgid "Checkout the parent folder with depth Only this item You now have an empty top level folder." msgstr "Prevzemite nadrejeno mapo z globino Samo ta element. S tem ste ustvarili prazno vrhnjo mapo." #. (para) #: ../source/TortoiseSVN_en.xml:4267 msgid "Select the new folder and use TortoiseSVNRepo browser to display the repository content." msgstr "Za prikaz vsebine skladišča izberite novo mapo in uporabite TortoiseSVNBrskalnik po skladišču." #. (para) #: ../source/TortoiseSVN_en.xml:4277 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 "Desno kliknite na mapo Projekt03 in izberite Kontekstni meniPosodobi element na revizijo.... Uporabite prevzete nastavitve in kliknite na gumb V redu. S tem ste prevzeli vsebino mape." #. (para) #: ../source/TortoiseSVN_en.xml:4287 msgid "Repeat the same process for Project25." msgstr "Isti postopek ponovite za mapo Projekt25." #. (para) #: ../source/TortoiseSVN_en.xml:4292 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. Subversion has created the intermediate folders for you without populating them." msgstr "Pojdite na Projekt76/Podprojekt in ponovite postopek. Mapa Projekt76 nima vsebine - izjema je le mapa Podprojekt, katere vsebina je prenešena. Subversion je ustvaril vmesne mapi brez prenašanja vsebine." #. (title) #: ../source/TortoiseSVN_en.xml:4302 msgid "Working copy depth cannot be reduced" msgstr "Globine delovne kopije ni mogoče zmanjšati" #. (para) #: ../source/TortoiseSVN_en.xml:4303 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 Subversion." msgstr "Potem ko ste prevzeli delovno kopijo do določene globine, lahko to globino povečate, da dobite dodatne vsebine. Globine pa ni mogoče zmanjšati in s tem brisati vsebino. Ta zmožnost bo mogoče dodana v prihodnjih različicah sistema Subversion." #. (title) #: ../source/TortoiseSVN_en.xml:4311 msgid "Using an older server" msgstr "Uporaba starejšega strežnika" #. (para) #: ../source/TortoiseSVN_en.xml:4312 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 "Strežniki pred različico 1.5 ne poznajo koncepta globine delovne kopije, zato teh zahtev ne znajo vedno učinkovito izvrševati. Ukaz bo še vedno deloval, vendar bo starejši strežnik verjetno poslal vse podatke, ki jih bo odjemalec nato sfiltriral in odstranil nepotrebno vsebino. To pa pomeni veliko mrežnega prometa. Če je le mogoče, nadgradite strežnik na različico 1.5." #. (para) #: ../source/TortoiseSVN_en.xml:4322 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 "Če projekt vsebuje reference na zunanje projekte, ki jih ne želite prevzeti istočasno, uporabite potrditveno polje Izpusti zunanje." #. (para) #: ../source/TortoiseSVN_en.xml:4328 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 TortoiseSVNUpdate to Revision... instead of TortoiseSVNUpdate. The standard update will include all externals and keep the existing depth." msgstr "Če je možnost Izpusti zunanje potrjena ali če želite povečati globino, morate narediti posodobitev delovne kopije z uporabo ukaza TortoiseSVNPosodobi na revizijo... namesto ukaza TortoiseSVNPosodobi. Standardna posodobitev vključuje vse zunanje projekte in obdrži obstoječo globino." #. (para) #: ../source/TortoiseSVN_en.xml:4344 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 "Priporočamo, da prevzamete samo trunk del strukture map ali manj. Če uporabite vrhnjo mapo, se vam lahko zgodi, da boste imeli povsem poln trdi disk, saj boste prevzeli prav vsako kopijo drevesne strukture, vključno z vsemi vejami in oznakami vašega projekta!" #. (title) #: ../source/TortoiseSVN_en.xml:4352 msgid "Exporting" msgstr "Izvažanje" #. (para) #: ../source/TortoiseSVN_en.xml:4353 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 "Včasih potrebujete krajevno kopijo brez map .svn, n. pr. če želite zapakirati svojo izvorno kodo. Več o tem si preberite v ." #. (title) #: ../source/TortoiseSVN_en.xml:4362 msgid "Committing Your Changes To The Repository" msgstr "Objavljanje sprememb v skladišču" #. (primary) #: ../source/TortoiseSVN_en.xml:4364 msgid "commit" msgstr "objava" #. (primary) #: ../source/TortoiseSVN_en.xml:4367 msgid "send changes" msgstr "pošlji spremembe" #. (primary) #: ../source/TortoiseSVN_en.xml:4370 msgid "check in" msgstr "objavi" #. (para) #: ../source/TortoiseSVN_en.xml:4373 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 TortoiseSVNUpdate directly. Or you can use TortoiseSVNCheck for Modifications first, to see which files have changed locally or on the server." msgstr "Pošiljanje sprememb, ki ste jih naredili na delovni kopiji, se imenuje objava sprememb. Preden pa spremembe objavite, se morate prepričati, da je vaša delovna kopija posodobljena. Uporabite lahko ukaz TortoiseSVNPosodobi. Lahko pa uporabite ukaz TortoiseSVNPreveri spremembe, da vidite, katere datoteke so bile spremenjene v delovni kopiji ali v skladišču." #. (title) #: ../source/TortoiseSVN_en.xml:4390 msgid "The Commit Dialog" msgstr "Okno objave" #. (title) #: ../source/TortoiseSVN_en.xml:4400 msgid "The Commit dialog" msgstr "Okno objave" #. (para) #: ../source/TortoiseSVN_en.xml:4391 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 TortoiseSVNCommit.... " msgstr "Če je delovna kopija sodobna in brez sporov, ste pripravljeni, da spremembe objavite. Izberite datoteke in/ali mape, ki jih želite objaviti, in izberite TortoiseSVNObjavi.... " #. (para) #: ../source/TortoiseSVN_en.xml:4404 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 "Okno za objave pokaže vsako spremenjeno datoteko, vključno z dodanimi, izbrisanimi in datotekami brez različic. Če ne želite, da se spremembe določene datoteke objavijo, izklopite potrditveno polje pred to datoteko. Če želite vključiti datoteko brez različic, potrdite potrditveno polje - s tem jo dodate v objavo." #. (para) #. (para) #: ../source/TortoiseSVN_en.xml:4411 #: ../source/TortoiseSVN_en.xml:5245 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 "Elementi, ki so bili preklopljeni na drugo pot v skladišču, so označeni z znakom (s). Lahko da ste kakšen element preklopili, ko ste delali na neki veji in ga pozabili preklopiti nazaj. To je opozorilo!" #. (title) #: ../source/TortoiseSVN_en.xml:4418 msgid "Commit files or folders?" msgstr "Naj objavim datoteke ali mape?" #. (para) #: ../source/TortoiseSVN_en.xml:4419 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 "Ko objavljate datoteke, pogovorno okno prikaže le datoteke, ki ste jih izbrali. Ko objavljate mapo, pogovorno okno izbere spremenjene datoteke samodejno. Če ste pozabili na novo datoteko, jo okno pri objavljanju mape vseeno najde. Objava mape ne pomeni, da se vse datoteke označijo kot spremenjene, ampak vam le olajša delo, saj ga opravi namesto vas." #. (para) #: ../source/TortoiseSVN_en.xml:4429 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 "Če ste spreminjali datoteke, ki so vključene iz drugega skladišča z uporabo lastnosti svn:externals, teh sprememb ne morete objaviti v isti atomični objavi. Če se to zgodi, se pod seznamom datotek pojavi opozorilni simbol, namig pa vam pojasni, da morajo biti zunanje datoteke objavljene posebej." #. (title) #: ../source/TortoiseSVN_en.xml:4437 msgid "Many unversioned files in the commit dialog" msgstr "Veliko datotek brez različic v oknu objave" #. (para) #: ../source/TortoiseSVN_en.xml:4444 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 "dodate datoteko (ali končnico) na seznam izločenih datotek, kar storite v nastavitvah. To vpliva na vse delovne kopije, ki jih imate." #. (para) #: ../source/TortoiseSVN_en.xml:4451 msgid "add the file to the svn:ignore list using TortoiseSVNAdd 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 "dodate datoteko na seznam prezrtih (svn:ignore) z uporabo ukaza TortoiseSVNDodaj na seznam prezrtih Ta nastavitev vpliva le na mapo, v kateri ste nastavili lastnost svn:ignore. Z uporabo okna Lastnosti lahko lastnost mape spremenite." #. (para) #: ../source/TortoiseSVN_en.xml:4438 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 "Če se vam zdi, da okno za objavo prikaže preveliko število datotek brez različic (generirane datoteke razvojnega okolja, varnostne datoteke), obstaja več načinov, da situacijo popravite. Lahko: Za več informacij preberite ." #. (para) #: ../source/TortoiseSVN_en.xml:4468 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 "Dvoklik na spremenjeno datoteko v oknu objav požene zunanje orodje za razlikovanje in vam prikaže spremembe. Kontekstni meni vam ponuja še več možnosti, kar je razvidno iz posnetka zaslona. Poleg tega lahko iz okna potegnete in prenesete datoteke v ostale aplikacije, npr. v urejevalnik besedil ali ravojno okolje (IDE)." #. (para) #: ../source/TortoiseSVN_en.xml:4475 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 "Izbiro elementov naredite s potrditvijo polja pred posameznim elementom. Za mape lahko uporabite označevanje s tipko Shift-izbira, s čemer naredite akcijo rekurzivno." #. (para) #: ../source/TortoiseSVN_en.xml:4480 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 "Stolpci v spodnjem delu okna so povsem prilagodljivi. Z desnim klikom na glavo kateregakoli stolpca prikličete kontekstni meni, ki vam omogoča izbiro stolpcev, ki jih želite prikazati. Prav tako lahko spremenite širino stolpcev. To storite tako, da rob stolpca premaknete, ko je miška na meji med dvema stolpcema. Prilagoditve se ohranijo, tako da boste naslednjič videli enako postavitev." #. (para) #: ../source/TortoiseSVN_en.xml:4489 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 Subversion configuration file. Read for information on how to edit the Subversion configuration file." msgstr "Če imate nastavljene privzete nastavitve in naredite objavo sprememb, se vsi zaklepi v vaši lasti sprostijo takoj po uspešno izvedeni objavi. Če želite zaklepe ohraniti, potrdite polje Ohrani zaklepe. Privzeto stanje tega polja je definirano v konfiguracijski datoteki sistema Subversion z možnostjo no_unlock. Za več informacij o urejanju konfiguracijske datoteke Subversion si preberite ." #. (para) #: ../source/TortoiseSVN_en.xml:4500 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 "Datoteke lahko povlečete in spustite v okno za objavo od drugod pod pogojem, da ste delovne kopije prevzeli iz istega skladišča. Primer: imato ogromno delovno kopijo in uporabljate več Raziskovalcev, ki ima nastavljene različne trenutne mape znotraj delovne kopije. Če se želite izogniti objavljanju vrhnje mape (kar bi pomenilo dolgo iskanje spremenjenih datotek), lahko okno za objave odprete v neki mapi, nato pa iz različnih Raziskovalcev povlečete v okno datoteke, ki jih želite istočasno objaviti." #. (para) #: ../source/TortoiseSVN_en.xml:4510 msgid "You can drag unversioned files which reside within a working copy into the commit dialog, and they will be SVN added automatically." msgstr "Datoteke brez različic lahko povlečete v pogovorno okno za objavo in bodo samodejno dodane v sistem Subversion." #. (title) #. (title) #: ../source/TortoiseSVN_en.xml:4516 #: ../source/TortoiseSVN_en.xml:5317 msgid "Repairing External Renames" msgstr "Popravljanje zunanjih preimenovanj" #. (para) #. (para) #: ../source/TortoiseSVN_en.xml:4517 #: ../source/TortoiseSVN_en.xml:5318 msgid "Sometimes files get renamed outside of Subversion, 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 Subversion 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 "Včasih datoteke preimenujete zunaj sistema Subversion, zato se v seznamu sprememb pojavita manjkajoča datoteka in datoteka brez različic. Da bi preprečili izgubo zgodovine, morate sistemu Subversion povedati, da med datotekama obstaja povezava. Enostavno izberite tako staro ime (manjkajoče) kot novo ime (brez različic) in uporabite Kontekstni meniPopravi premik in s tem povežete datoteki v preimenovanje." #. (title) #. (title) #: ../source/TortoiseSVN_en.xml:4532 #: ../source/TortoiseSVN_en.xml:5363 msgid "Change Lists" msgstr "Seznami sprememb" #. (para) #: ../source/TortoiseSVN_en.xml:4533 msgid "The commit dialog supports Subversion's changelist feature to help with grouping related files together. Find out about this feature in ." msgstr "Okno za objave omogoča uporabo seznamov sprememb, kar pomaga pri združevanju sprememb v logične skupine. Za več informacij o tej zmožnosti preberite ." #. (title) #: ../source/TortoiseSVN_en.xml:4540 msgid "Excluding Items from the Commit List" msgstr "Izključevanje elementov iz okna objav" #. (para) #: ../source/TortoiseSVN_en.xml:4541 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 "Včasih se v skladišču nahajajo datoteke, ki se pogosto spreminjajo, vendar jih ne želite vedno znova objavljati. Včasih to pomeni napako v procesu gradnje projekta - zakaj so te datoteke sploh pod nadzorom različic? Mogoče bi morali uporabljati predloge? Včasih pa je takšna situacija neizogibna. Primer: razvojno okolje spremeni časovni žig datoteke pri vsaki gradnji. Projektna datoteka mora biti pod nadzorom, saj vsebuje nastavitve za gradnjo, vendar ni potrebe, da jo objavljamo ob vsaki spremembi časovnega žiga." #. (para) #: ../source/TortoiseSVN_en.xml:4551 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 olajšali delo v tašnih primerih, smo izdelali poseben seznam sprememb, ki se imenuje ignore-on-commit. Datoteke na tem seznamu so samodejno izključene iz izbora v oknu objav. Spremembe lahko še vedno objavite, vendar morate ročno izbrati takšno datoteko." #. (title) #: ../source/TortoiseSVN_en.xml:4560 msgid "Commit Log Messages" msgstr "Sporočila dnevniških zapisov objav" #. (para) #: ../source/TortoiseSVN_en.xml:4561 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 "Vedno vnesite sporočilo dnevniškega zapisa, ki opisuje spremembe, ki jih objavljate. S tem pri pregledovanju dnevniških zapisov vidite, kaj se je spremenilo in kdaj. Sporočilo je lahko poljubne dolžine. Veliko projektov natančno določa, kaj je potrebno vpisati, v katerem jeziku, včasih pa je določena zelo natančna oblika zapisa." #. (para) #: ../source/TortoiseSVN_en.xml:4569 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 "Sporočilom dnevniških zapisov lahko dodate enostavno oblikovanje, podobno tistemu, ki ga uporabljate pri elektronski pošti. Če želite besedilu dodati oblikovanje, uporabite *besedilo* za polkrepko pisavo, _besedilo_ za podčrtano pisavo in ^besedilo^ za poševno pisavo." #. (title) #: ../source/TortoiseSVN_en.xml:4579 msgid "The Commit Dialog Spellchecker" msgstr "Črkovalnik v oknu objave" #. (para) #: ../source/TortoiseSVN_en.xml:4577 msgid " TortoiseSVN 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 " TortoiseSVN vsebuje črkovalnik, ki vam pomaga pri pravilnem pisanju sporočil dnevniških zapisov. Označil bo vse nepravilno črkovane besede. Uporabite kontekstni meni za dostop do predlaganih popravkov. Seveda ne pozna prav vseh tehničnih terminov, tako bodo pravilno črkovane besede včasih označene kot napačne. Ne skrbite. Z uporabo kontekstnega menija jih lahko dodate v osebni slovar." #. (para) #: ../source/TortoiseSVN_en.xml:4589 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 TortoiseSVN are held in the TortoiseSVN installation bin folder. You can also define your own regexes and store them in %APPDATA%\\TortoiseSVN\\autolist.txt. Of course your private autolist will not be overwritten when you update your installation of TortoiseSVN. 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 "Okno za vnos sporočila dnevniškega zapisa pozna možnost samozaključevanja imen datotek in funkcij. Ta uporablja regularne izraze, da izlušči imena razredov in funkcij iz besedilnih datotek, ki jih objavljate, prav tako pa tudi sama imena datotek. Če beseda, ki jo tipkate, ustreza besedi v seznamu (potem, ko ste vpisali vsaj tri znake ali pritisnili tipko Ctrl+Space), se pojavi spustni meni, ki vam omogoča, da izberete cel izraz. Regularni izrazi, ki so na voljo, se nahajajo v podmapi bin namestitvene mape sistema TortoiseSVN. Definirate pa lahko tudi svoje regularne izraze in jih shranite v datoteko %APPDATA%\\TortoiseSVN\\autolist.txt. Seveda se pri nadgranji sistema TortoiseSVN ta zasebni seznam ohrani. Če regularnih izrazov ne poznate, si lahko ogledate dokumentacijo na spletu na naslovih http://en.wikipedia.org/wiki/Regular_expression in http://www.regular-expressions.info/." #. (para) #: ../source/TortoiseSVN_en.xml:4610 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 TortoiseSVN settings dialog." msgstr "Predhodno vnesena sporočila dnevniških zapisov lahko ponovno uporabite. Enostavno kliknite na Zadnja sporočila in prikaže se vam nekaj zadnjih sporočil, ki ste jih vnesli v tej delovni kopiji. Število shranjenih sporočil lahko nastavite v oknu za nastavitve TortoiseSVN." #. (para) #: ../source/TortoiseSVN_en.xml:4616 msgid "You can clear all stored commit messages from the Saved data page of TortoiseSVN's settings, or you can clear individual messages from within the Recent messages dialog using the Delete key." msgstr "Shranjena sporočila lahko izbrišete na strani Shranjeni podatki v oknu za nastavitve TortoiseSVN, posamezna sporočila pa lahko izbrišete iz okna Zadnja sporočila, če držite pritisnjeno tipko Delete." #. (title) #: ../source/TortoiseSVN_en.xml:4623 msgid "Special Folder Properties" msgstr "Posebne lastnosti map" #. (para) #: ../source/TortoiseSVN_en.xml:4624 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 "Obstaja več posebnih lastnosti za mape, ki vam omogočajo več nadzora nad oblikovanjem sporočil dnevniških zapisov in jezikom, ki se uporabi za preverjanje črkovanja. Več o tem pove ." #. (title) #: ../source/TortoiseSVN_en.xml:4632 msgid "Integration with Bug Tracking Tools" msgstr "Integracija s sistemi za sledenje hroščev" #. (para) #: ../source/TortoiseSVN_en.xml:4633 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 "Če uporabljate sistem za sledenje zadev, lahko v vnosno polje ID hrošča / št. zadeve: vpišete eno ali več številk zadev. Če vpišete več številk, naj bodo ločene z vejico. Druga možnost je, da uporabljate podporo sistem za sledenje zadev na osnovi regularnih izrazov. V tem primeru lahko številko zadeve navedete nekje znotraj sporočila dnevniškega zapisa. Več o tem vam pove ." #. (title) #: ../source/TortoiseSVN_en.xml:4644 msgid "Commit Progress" msgstr "Napredek objave" #. (title) #: ../source/TortoiseSVN_en.xml:4649 msgid "The Progress dialog showing a commit in progress" msgstr "Okno napredka prikazuje napredovanje objave" #. (para) #: ../source/TortoiseSVN_en.xml:4645 msgid "After pressing OK, a dialog appears displaying the progress of the commit. " msgstr "Po pritisku na gumb V redu se pojavi okno napredka objave. " #. (term) #. (term) #: ../source/TortoiseSVN_en.xml:4658 #: ../source/TortoiseSVN_en.xml:5183 msgid "Blue" msgstr "Modra" #. (para) #: ../source/TortoiseSVN_en.xml:4660 msgid "Committing a modification." msgstr "Objavljanje spremembe." #. (term) #. (term) #. (term) #: ../source/TortoiseSVN_en.xml:4666 #: ../source/TortoiseSVN_en.xml:4733 #: ../source/TortoiseSVN_en.xml:5191 msgid "Purple" msgstr "Škrlatna" #. (para) #: ../source/TortoiseSVN_en.xml:4668 msgid "Committing a new addition." msgstr "Objavljanje novega elementa." #. (term) #. (term) #. (term) #: ../source/TortoiseSVN_en.xml:4674 #: ../source/TortoiseSVN_en.xml:4741 #: ../source/TortoiseSVN_en.xml:5203 msgid "Dark red" msgstr "Temno rdeča" #. (para) #: ../source/TortoiseSVN_en.xml:4676 msgid "Committing a deletion or a replacement." msgstr "Objavljanje brisanja ali zamenjave." #. (term) #. (term) #. (term) #: ../source/TortoiseSVN_en.xml:4682 #: ../source/TortoiseSVN_en.xml:4768 #: ../source/TortoiseSVN_en.xml:5231 msgid "Black" msgstr "Črna" #. (para) #: ../source/TortoiseSVN_en.xml:4684 msgid "All other items." msgstr "Ostali elementi." #. (para) #: ../source/TortoiseSVN_en.xml:4653 msgid "The progress dialog uses colour coding to highlight different commit actions " msgstr "Okno napredka uporablja barvno kodiranje za označevanje različnih operacij objave. " #. (para) #. (para) #. (para) #: ../source/TortoiseSVN_en.xml:4691 #: ../source/TortoiseSVN_en.xml:4778 #: ../source/TortoiseSVN_en.xml:5240 msgid "This is the default colour scheme, but you can customise those colours using the settings dialog. Read for more information." msgstr "To je privzeta barvna shema, vendar lahko barve poljubno nastavite v oknu za nastavitve. Za več informacij preberite ." #. (title) #: ../source/TortoiseSVN_en.xml:4699 msgid "Update Your Working Copy With Changes From Others" msgstr "Posodobite delovno kopijo s spremembami ostalih uporabnikov" #. (primary) #. (primary) #: ../source/TortoiseSVN_en.xml:4701 #: ../source/TortoiseSVN_en.xml:13110 msgid "update" msgstr "posodobitev" #. (primary) #: ../source/TortoiseSVN_en.xml:4704 msgid "fetch changes" msgstr "dobi spremembe" #. (title) #: ../source/TortoiseSVN_en.xml:4708 msgid "Progress dialog showing finished update" msgstr "Okno napredka prikazuje končano posodobitev" #. (para) #: ../source/TortoiseSVN_en.xml:4706 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 TortoiseSVNUpdate 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 " Ob določenih časovnih razmakih morate poskrbeti, da se spremembe, ki jih na projektu naredijo drugi uporabniki, vnesejo v vašo delovno kopijo. Procesu prenosa sprememb iz strežnika v delovno kopijo rečemo posodabljanje. Posodobite lahko posamezne datoteke, skupino izbranih datotek ali celotno hierarhijo map. Ko želite izvesti posodobitev, izberite datoteke in/ali mape in iz kontekstnga menija zaženite TortoiseSVNPosodobi. Pojavi se okno, ki prikazuje napredek posodobitve. Spremembe, ki so jih naredili ostali uporabniki, se spojijo v vašo delovno kopijo, pri tem pa se vaše spremembe ohranijo. V skladišču se s posodobitvijo delovne kopije ne zgodi nobena sprememba." #. (para) #: ../source/TortoiseSVN_en.xml:4735 msgid "New item added to your WC." msgstr "Nov element dodan v delovno kopijo." #. (para) #: ../source/TortoiseSVN_en.xml:4743 msgid "Redundant item deleted from your WC, or missing item replaced in your WC." msgstr "Odvečen element brisan iz delovne kopije ali manjkajoč element zamenjan v delovni kopiji." #. (term) #. (term) #: ../source/TortoiseSVN_en.xml:4750 #: ../source/TortoiseSVN_en.xml:5211 msgid "Green" msgstr "Zelena" #. (para) #: ../source/TortoiseSVN_en.xml:4752 msgid "Changes from repository successfully merged with your local changes." msgstr "Spremembe iz skladišča so bile uspešno spojene s krajevnimi spremembami." #. (term) #. (term) #: ../source/TortoiseSVN_en.xml:4759 #: ../source/TortoiseSVN_en.xml:5221 msgid "Bright red" msgstr "Svetlo rdeča" #. (para) #: ../source/TortoiseSVN_en.xml:4761 msgid "Changes from repository merged with local changes, resulting in conflicts which you need to resolve." msgstr "Spremembe iz skladišča, spojene s krajevnimi spremembami, so povzročile spore, ki jih morate rešiti." #. (para) #: ../source/TortoiseSVN_en.xml:4770 msgid "Unchanged item in your WC updated with newer version from the repository." msgstr "Nespremenjem element v delovni kopiji, posodobljen iz nove verzije v skladišču." #. (para) #: ../source/TortoiseSVN_en.xml:4728 msgid "The progress dialog uses colour coding to highlight different update actions " msgstr "Okno napredka uporablja barvno označevanje različnih akcij posodobitev " #. (para) #: ../source/TortoiseSVN_en.xml:4783 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 "Če med posodabljanjem nastanejo spori (to se lahko zgodi, če je nek drug uporabnik spremenil iste vrstice v datoteki kot vi, vendar so spremembe različne od vaših), okno pokaže spore v rdeči barvi. Z dvoklikom na te vrtsice zaženete zunanje orodje za spajanje, s katerim lahko spore rešite." #. (para) #: ../source/TortoiseSVN_en.xml:4790 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 "Ko je posodobitev končana, dialog napredka pod seznamom datotek pokaže povzetek - število posodobljenih, dodanih, odstranjenih, spornih... elementov. Povzetek lahko skopirate na odložišče s kombinacijo tipk Ctrl+C." #. (para) #: ../source/TortoiseSVN_en.xml:4797 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 TortoiseSVNUpdate 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 "Ukaz Posodobi ne omogoča nobenih nastavitev, ampak le posodobi vašo delovno kopijo na zadnjo (HEAD) revizijo v skladišču. To je tudi najbolj pogosta uporaba posodobitve. Če želite imeti več nadzora nad procesom posodabljanja, uporabite ukaz TortoiseSVNPosodobi na revizijo.... Ta vam omogoča, da delovno kopijo posodobite na neko določeno revizijo, ne samo na zadnjo. Denimo, da ste naredili delovno kopijo iz revizije 100, sedaj pa želite pogledati stanje, kot je bilo v reviziji 50 - preprosto posodobite vašo delovno kopijo na revizijo 50. V istem pogovornem oknu lahko izberete tudi globino, do katere se izvede posodobitev na trenutni mapi. Za definicijo uporabljenih izrazov poglejte v . Privzeta globina je delovna kopija, ki ohrani obstoječo nastavitev globine. Izberete lahko tudi, ali želite pri posodabljanju prezreti zunanje projekte (projekte, ki imajo nastavljeno lastnost svn:externals)." #. (para) #: ../source/TortoiseSVN_en.xml:4819 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 "Če datoteko ali mapo posodobite na neko določeno revizijo, na teh elementih ne smete delati sprememb. Če boste spremembe poskusili objaviti, boste dobili obvestilo, da so datoteke oziroma mape zastarele! Če želite razveljaviti spremembe na datoteki in začeti znova iz zgodnejše revizije, se lahko zavrtite nazaj na prejšnjo revizijo iz dnevnika. Preberite za nadaljnje informacije in druge metode." #. (para) #: ../source/TortoiseSVN_en.xml:4829 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 "Ukaz Posodobi na revizijo je včasih uporaben, če želite pogledati, kako je projekt izgledal v nekem trenutku v svoji zgodovini. V splošnem pa posodabljanje posameznih datotek na starejšo revizijo ni najboljše, saj je s tem vaša delovna kopija v nekonsistentnem stanju. Če je bila datoteka, ki jo posodabljate, preimenovana, se vam lahko zgodi, da preprosto izgine iz delovne kopije, ker v stari reviziji datoteka s takšnim imenom ni obstajala. Če želite le krajevno kopijo starejše revizije datoteke, je bolje iz dnevnika izbrati ukaz Kontekstni meniShrani revizijo v...." #. (title) #: ../source/TortoiseSVN_en.xml:4848 msgid "Multiple Files/Folders" msgstr "Več datotek/map" #. (para) #: ../source/TortoiseSVN_en.xml:4849 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. TortoiseSVN 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 "Če v Raziskovalcu izberete več datotek in map in potem uporabite ukaz Posodobi, bodo vse datoteke/mape posodobljene ena za drugo. TortoiseSVN poskrbi, da se vse datoteke/mape, ki se nahajajo v istem skladišču, posodobijo na natančno isto revizijo, tudi če se med procesom posodabljanja v skladišču zgodi nova objava!" #. (title) #: ../source/TortoiseSVN_en.xml:4861 msgid "Local File Already Exists" msgstr "Krajevna datoteka že obstaja" #. (para) #: ../source/TortoiseSVN_en.xml:4862 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 Subversion tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Subversion 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 "Včasih posodabljanje ni uspešno in dobite obvestilo, da v delovni kopiji že obstaja datoteka z enakim imenom. To se zgodi takrat, ko želi Subversion prevzeti iz skladišča novo dodano datoteko in ugotovi, da v delovni kopiji že obstaja datoteka z enakim imenom. Subversion nikoli ne prepiše datoteke, ki ni pod nadzorom - lahko vsebuje nekaj, na čemer delate in ima slučajno povsem enako ime, kot ga je nek drug uporabnik uporabil za novo dodano datoteko." #. (para) #: ../source/TortoiseSVN_en.xml:4871 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 "Če se pojavi takšna napaka, jo lahko rešite tako, da preimenujete krajevno datoteko brez različic. Po posodobitvi lahko preverite, če je preimenovana datoteka še potrebna." #. (para) #: ../source/TortoiseSVN_en.xml:4876 msgid "If you keep getting error messages, use TortoiseSVNCheck for Modifications instead to list all the problem files. That way you can deal with them all at once." msgstr "Če se sporočila o napakah ponavljajo, raje uporabite TortoiseSVNPreveri spremembe, da dobite seznam težavnih datotek. Na ta način se lotite reševanja vseh naenkrat." #. (title) #: ../source/TortoiseSVN_en.xml:4889 msgid "Resolving Conflicts" msgstr "Reševanje sporov" #. (primary) #: ../source/TortoiseSVN_en.xml:4894 msgid "resolve" msgstr "reši" #. (term) #: ../source/TortoiseSVN_en.xml:4917 msgid "filename.ext.mine" msgstr "imedatoteke.kon.mine" #. (para) #: ../source/TortoiseSVN_en.xml:4919 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 "To je vaša datoteka v delovni kopiji, preden ste jo posodobili - ne vsebuje oznak sporov. Datoteka vsebuje zgolj vaše zadnje spremembe." #. (term) #: ../source/TortoiseSVN_en.xml:4928 msgid "filename.ext.rOLDREV" msgstr "imedatoteke.kon.rSTARAREVIZIJA" #. (para) #: ../source/TortoiseSVN_en.xml:4930 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 "To je datoteka prevzete revizije (BASE), preden ste posodobili delovno kopijo. Torej datoteka, ki ste jo prevzeli, preden ste naredili zadnje spremembe." #. (term) #: ../source/TortoiseSVN_en.xml:4939 msgid "filename.ext.rNEWREV" msgstr "imedatoteke.kon.rNOVAREVIZIJA" #. (para) #: ../source/TortoiseSVN_en.xml:4941 msgid "This is the file that your Subversion client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository." msgstr "To je datoteka, ki jo je odjemalec Subversion pri posodabljanju delovne kopije prejel od strežnika. Ta datoteka ustreza reviziji HEAD v skladišču." #. (para) #: ../source/TortoiseSVN_en.xml:4896 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 Subversion 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 Subversion places three additional files in your directory: " msgstr "" "Občasno se pri posodabljanju delovne kopije iz skladišča pojavijo spori. Spor se pojavi, ko več uporabnikov spremeni iste vrstice v datoteki. Ker Subversion o vašem projektu ne ve nič, prepusti reševanje sporov uporabnikom. Ko dobite sporočilo o sporu, morate sporno datoteko odpreti in poiskati vrstice, ki imajo na začetku niz <<<<<<<. Sporno območje je označeno takole: \n" "<<<<<<< ime datoteke\n" " vaše spremembe\n" "=======\n" " koda, spojena iz skladišča\n" ">>>>>>> revizija\n" " Poleg tega Subversion za vsako sporno datoteko doda v mapo tri dodatne datoteke: " #. (para) #: ../source/TortoiseSVN_en.xml:4951 msgid "You can either launch an external merge tool / conflict editor with TortoiseSVNEdit 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 "Uporabite lahko zunanje orodje za spajanje / urejanje sporov z ukazom TortoiseSVNUredi spore ali pa uporabite katerikoli urejevalnik besedil in ročno rešite spor. Odločiti se morate, kako mora koda izgledati, narediti ustrezne spremembe in shraniti datoteko." #. (para) #: ../source/TortoiseSVN_en.xml:4962 msgid "Afterwards execute the command TortoiseSVNResolved 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 "Nato uporabite ukaz TortoiseSVNRešen in objavite svoje spremembe v skladišču. Upoštevajte, da ukaz Reši ne reši sporov, ampak le odstrani datoteki imedatoteke.kon.mine in imedatoteke.kon.r*, da lahko spremembe objavite." #. (para) #: ../source/TortoiseSVN_en.xml:4975 msgid "If you have conflicts with binary files, Subversion 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 "Če se pojavijo spori pri dvojiških datotekah, Subversion ne poskuša sam spajati datotek. Krajevna datoteka ostane nespremenjena (natančno takšna kot ob vaši zadnji spremembi), pojavijo pa se datoteke imedatoteke.kon.r*. Če želite preklicati svoje spremembe in uporabiti različico datoteke iz skladišča, uporabite ukaz Povrni. Če želite obdržati vašo različico in povoziti različico v skladišču, uporabite ukaz Rešen, nato pa objavite spremembe." #. (para) #: ../source/TortoiseSVN_en.xml:4985 msgid "You can use the Resolved command for multiple files if you right click on the parent folder and select TortoiseSVNResolved... This will bring up a dialog listing all conflicted files in that folder, and you can select which ones to mark as resolved." msgstr "Ukaz Rešen lahko uporabite tudi za več datotek, če kliknete na nadrejeno mapo in izberete TortoiseSVNRešen... Pokaže se okno s seznamom spornih datotek v mapi, v katerem izberete datoteke, ki jih želite označiti kot rešene." #. (title) #: ../source/TortoiseSVN_en.xml:4998 msgid "Getting Status Information" msgstr "Pridobivanje informacije o stanju" #. (primary) #. (primary) #: ../source/TortoiseSVN_en.xml:5000 #: ../source/TortoiseSVN_en.xml:5149 msgid "status" msgstr "stanje" #. (primary) #: ../source/TortoiseSVN_en.xml:5003 msgid "view changes" msgstr "poglej spremembe" #. (primary) #: ../source/TortoiseSVN_en.xml:5006 msgid "working copy status" msgstr "stanje delovna kopija" #. (para) #: ../source/TortoiseSVN_en.xml:5008 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 "Ko delate na delovni kopiji, pogosto želite vedeti, katere datoteke ste spremenili/dodali/odstranili ali preimenovali oziroma celo, katere datoteke so spremenili in objavili ostali uporabniki." #. (primary) #. (primary) #: ../source/TortoiseSVN_en.xml:5016 #: ../source/TortoiseSVN_en.xml:15007 msgid "overlays" msgstr "prekrivki" #. (primary) #: ../source/TortoiseSVN_en.xml:5019 msgid "icons" msgstr "ikone" #. (para) #: ../source/TortoiseSVN_en.xml:5027 msgid "Now that you have checked out a working copy from a Subversion repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseSVN is so popular. TortoiseSVN adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Subversion status of the file the overlay icon is different." msgstr "Ko prevzamete delovno kopijo iz skladišča Subversion, imajo datoteke v Raziskovalcu spremenjene ikone. To je razlog za veliko popularnost programa TortoiseSVN. TortoiseSVN doda datotekam prekrivno ikono, ki se prekriva z originalno ikono. Prekrivna ikona je odvisna od statusa datoteke." #. (para) #: ../source/TortoiseSVN_en.xml:5035 msgid " A fresh checked out working copy has a green checkmark as overlay. That means the Subversion status is normal." msgstr " Sveže prevzeta delovna kopija ima zeleno prekrivno ikono. To pomeni, da je status datoteke/mape običajno." #. (para) #: ../source/TortoiseSVN_en.xml:5040 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 " Ko začnete datoteko urejati, se njen status spremeni v spremenjeno, prekrivna ikona pa se spremeni v rdeč klicaj. Tako hitro vidite, katere datoteke so se od zadnje posodobitve spremenile in jih je potrebno objaviti." #. (para) #: ../source/TortoiseSVN_en.xml:5048 msgid " If during an update a conflict occurs then the icon changes to a yellow exclamation mark." msgstr " Če se pri posodabljanju pojavi spor, se ikona spremeni v rumen klicaj." #. (para) #: ../source/TortoiseSVN_en.xml:5053 msgid " If you have set the svn:needs-lock property on a file, Subversion 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 " Če ste datoteki nastavili lastnost svn:needs-lock, Subversion napravi to datoteko samo za branje, dokler za datoteko ne pridobite zaklepa. Datoteke, ki so namenjene samo za branje, imajo takšno ikono, da lahko hitro vidite, da morate pred urejanjem datoteke zanjo pridobiti zaklep." #. (para) #: ../source/TortoiseSVN_en.xml:5060 msgid " If you hold a lock on a file, and the Subversion 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 " Če ste lastnik zaklepa datoteke, ki ima stanje običajno, vas ta ikona opominja, da morate zaklep sprostiti, če ga ne uporabljate, da lahko tudi drugi uporabniki objavijo spremembe na tej datoteki." #. (para) #: ../source/TortoiseSVN_en.xml:5067 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 " Ta ikona pove, da so nekatere datoteke ali mape znotraj trenutne mape označene za brisanje iz nadzora različic ali pa da se datoteka, ki je pod nadzorom, ne nahaja v mapi." #. (para) #: ../source/TortoiseSVN_en.xml:5073 msgid " The plus sign tells you that a file or folder has been scheduled to be added to version control." msgstr " Znak plus pomeni, da je datoteka ali mapa označena za dodajanje v nadzor različic." #. (para) #: ../source/TortoiseSVN_en.xml:5078 msgid " The bar sign tells you that a file or folder is ignored for version control purposes. This overlay is optional." msgstr " Znak pomeni, da je datoteka ali mapa v nadzoru različic prezrta. Prikaz te prekrivne ikone je možno vključiti ali izključiti." #. (para) #: ../source/TortoiseSVN_en.xml:5084 msgid " This icon shows files and folders which are not under version control, but have not been ignored. This overlay is optional." msgstr " Ta ikona označuje datoteke in mape, ki niso pod nadzorom, prav tako pa niso prezrte. Uporabo te ikone lahko izključite." #. (para) #: ../source/TortoiseSVN_en.xml:5090 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. TortoiseSVN tries to be a Good Citizen (TM) and limits its use of overlays to give other apps a chance too." msgstr "Lahko celo ugotovite, da omenjene ikone niso vse na voljo na vašem sistemu. Razlog je v omejitvi števila prekrivnih ikon sistema Windows in če uporabljate tudi starejšo različico programa TortoiseCVS, potem ni več dovolj prostih prekrivnih ikon. TortoiseSVN poskuša biti pošten državljan (TM) in ne uporablja veliko prekrivnih ikon, da ostane prostor tudi za ostale aplikacije." #. (para) #: ../source/TortoiseSVN_en.xml:5098 msgid "Now that there are more Tortoise clients around (TortoiseCVS, TortoiseHG, ...) the icon limit becomes a real problem. To work around this, the TortoiseSVN 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 "Na trgu je več odjemalcev tipa Tortoise (TortoiseCVS, TortoiseHG, ...), tako da je omejitev števila prekrivnih resna težava. Zato je projekt TortoiseSVN predstavil skupni nabor ikon, zbranih v knjižnici DLL, ki jo lahko uporabljajo vsi odjemalci tipa Tortoise. Preverite, ali vaš odjemalec že uporablja to knjižnico :-)" #. (para) #: ../source/TortoiseSVN_en.xml:5105 msgid "For a description of how icon overlays correspond to Subversion status and other technical details, read ." msgstr "Za opis, kakšnemu statusu v sistemu Subversion ustrezajo prekrivne ikone in ostale tehnične podrobnosti preberite ." #. (title) #: ../source/TortoiseSVN_en.xml:5112 msgid "TortoiseSVN Columns In Windows Explorer" msgstr "Stolpci TortoiseSVN v Raziskovalcu" #. (primary) #: ../source/TortoiseSVN_en.xml:5114 msgid "Explorer Columns" msgstr "Stolpci v Raziskovalcu" #. (para) #: ../source/TortoiseSVN_en.xml:5116 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, ki jih dajejo prekrivne ikone (in še veliko več), je možno prikazati z dodatnimi stolpci v podrobnem pogledu Raziskovalca." #. (para) #: ../source/TortoiseSVN_en.xml:5121 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 "Enostavno desnokliknite na eno od glav stolpcev in iz kontekstnega menija izberite Več.... Pojavi se pogovorno okno, kjer lahko določite stolpce in njihov vrstni red, ki se prikaže v pogledu Detajli. Poiščite stolce, katerih imena se začnejo s SVN. Označite tiste, ki jih želite prikazati in zaprite okno s klikom na gumb V redu. Stolpci se dodajo na desni strani. Z metodo povleci in spusti lahko spremenite vrstni red, prav tako pa jim lahko spremenite širino, tako da ustreza vašim potrebam." #. (para) #: ../source/TortoiseSVN_en.xml:5133 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 "Dodatni stolci v Raziskovalcu na operacijskem sistemu Vista niso na voljo. Microsoft se je odločil, da dodatnih stolcev ne dopušča več za vse datoteke, ampak le za določene vrste datotek." #. (para) #: ../source/TortoiseSVN_en.xml:5139 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 "Če želite, da se trenutni razpored prikaže v vseh delovnih kopijah, lahko ta pogled nastavite kot privzet." #. (title) #: ../source/TortoiseSVN_en.xml:5147 msgid "Local and Remote Status" msgstr "Krajevno in oddaljeno stanje" #. (primary) #: ../source/TortoiseSVN_en.xml:5152 msgid "modifications" msgstr "spremembe" #. (title) #. (title) #: ../source/TortoiseSVN_en.xml:5156 #: ../source/TortoiseSVN_en.xml:14697 msgid "Check for Modifications" msgstr "Preveri posodobitve" #. (para) #: ../source/TortoiseSVN_en.xml:5154 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 TortoiseSVNCheck 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 " Pogosto je zelo koristno, če veste, katere datoteke ste spremenili in katere datoteke so spremenili vaši sodelavci. Takrat pride prav ukaz TortoiseSVNPreveri posodobitve.... To pogovorno okno prikaže vse datoteke, ki so se kakorkoli spremenile, prav tako pa tudi vse datoteke brez različic." #. (para) #: ../source/TortoiseSVN_en.xml:5171 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 "Če kliknete na gumb Preveri skladišče, lahko vidite, katere spremembe so se zgodile v skladišču. Tako lahko pred posodobitvijo preverite, če obstaja potencialen spor. Lahko pa tudi posodobite izbrane datoteke iz skladišča, ne da bi posodobili celotno mapo." #. (para) #: ../source/TortoiseSVN_en.xml:5185 msgid "Locally modified items." msgstr "Krajevno spremenjeni elementi." #. (para) #: ../source/TortoiseSVN_en.xml:5193 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 "Dodani elementi. Elementi, ki so bili dodani z zgodovino, imajo pred v stolpcu Stanje besedila znak +, namig pa pokaže, od kje je bil element skopiran." #. (para) #: ../source/TortoiseSVN_en.xml:5205 msgid "Deleted or missing items." msgstr "Izbrisani ali manjkajoči elementi." #. (para) #: ../source/TortoiseSVN_en.xml:5213 msgid "Items modified locally and in the repository. The changes will be merged on update. These may produce conflicts on update." msgstr "Elementi so spremenjeni krajevno in v skladišču. Ob posodobitvi bodo spremembe spojene. Situacija lahko povzroči spore pri posodobitvi." #. (para) #: ../source/TortoiseSVN_en.xml:5223 msgid "Items modified locally and deleted in repository, or modified in repository and deleted locally. These will produce conflicts on update." msgstr "Elementi, ki so bili krajevno spremenjeni in izbrisani v skladišču ali spremenjeni v skladišču in izbrisani krajevno. Ob posodobitvi se spori bodo pojavili." #. (para) #: ../source/TortoiseSVN_en.xml:5233 msgid "Unchanged and unversioned items." msgstr "Nespremenjeni elementi in elementi brez različic." #. (para) #: ../source/TortoiseSVN_en.xml:5179 msgid "The dialog uses colour coding to highlight the status. " msgstr "Pogovorno okno uporablja barvno kodiranje, da poudari stanje. " #. (para) #: ../source/TortoiseSVN_en.xml:5251 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 kontekstnega menija lahko prikažete spremembe. Z uporabo Kontekstni meniPrimerjaj z osnovo preverite spremembe, ki ste jih naredili vi. Z ukazom Kontekstni meniPokaži razlike kot poenotene razlike preverite spremembe, ki so jih v skladišču naredili drugi uporabniki ." #. (para) #: ../source/TortoiseSVN_en.xml:5264 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 "Posameznim datotekam lahko povrnete spremembe. Če ste pomotoma izbrisali datoteko, bo le-ta označena kot manjkajoča, zato lahko uporabite ukaz Povrni, da jo pridobite nazaj." #. (para) #: ../source/TortoiseSVN_en.xml:5269 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 "Datoteke brez različic in prezrte datoteke lahko pošljete v Koš z ukazom Kontekstni meniZbriši. Če želite datoteke zbrisati trajno (brez pošiljanja v Koš), ob kliku na Zbriši držite pritisnjeno tipko Shift." #. (para) #: ../source/TortoiseSVN_en.xml:5278 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 "Če želite podrobno pregledati datoteko, jo lahko od tu povlečete v drugo aplikacijo, npr. urejevalnik besedil ali razvojno okolje (IDE)." #. (para) #: ../source/TortoiseSVN_en.xml:5282 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 "Stolpci so prilagodljivi. Če desno kliknete na glavo stolpca, se pojavi kontekstni meni, ki vam omogoča izbiro prikazanih stolpcev. Spremenite lahko tudi širino stolpcev z uporabo potega ročaja, ki se pojavi, ko greste z miško čez mejo stolpca. Spremembe se shranijo, tako da boste prilagojen pogled videli tudi naslednjič." #. (para) #: ../source/TortoiseSVN_en.xml:5291 msgid "If you are working on several unrelated tasks at once, you can also group files together into changelists. Read for more information." msgstr "Če delate na več nepovezanih nalogah hkrati, lahko sestavljate datoteke skupaj v sezname sprememb. Za več informacij preberite ." #. (para) #: ../source/TortoiseSVN_en.xml:5296 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 okna vidite povzetek območja revizij, ki jih uporabljate v delovni kopiji. To so objavljene revizije, ne posodobljene revizije; predstavljajo območje revizij, v katerih so bile datoteke nazadnje objavljene in ne revizije, pri katerih je bila narejena posodobitev delovne kopije. Območje revizij se nanaša le na prikazane elemente, ne na celovno delovno kopijo. Će želite, da se povzetek nanaša na celotno delovno kopijo, potrdite polje Prikaži nespremenjene datoteke." #. (para) #: ../source/TortoiseSVN_en.xml:5307 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 "Če želite videti ploski pogled delovne kopije (vse datoteke in mape na vseh nivojih hierarhije), to najlažje dosežete s pogovornim oknom Preveri spremembe. Edino, kar morate storiti, je, da potrdite polje Prikaži nespremenjene datoteke." #. (title) #: ../source/TortoiseSVN_en.xml:5333 msgid "Viewing Diffs" msgstr "Pregledovanje razlik" #. (primary) #: ../source/TortoiseSVN_en.xml:5335 msgid "diffing" msgstr "razlikovanje" #. (para) #: ../source/TortoiseSVN_en.xml:5337 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 TortoiseSVN'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 "Pogosto želite pogledati, kaj ste v datoteki spremenili. To storite z izbiro željene datoteke in uporabo ukaza Razlikuj iz kontekstnega menija. S tem poženete zunanji pregledovalnik razlik, ki bo primerjal trenutno datoteko z osnovno datoteko (revizija BASE), ki se je shranila, ko ste naredili zadnji prevzem ali posodobitev." #. (para) #: ../source/TortoiseSVN_en.xml:5347 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 "Tudi ko ne delate na delovni kopiji ali ko imate več verzij iste datoteke v mapi, lahko prikažete razlike:" #. (para) #: ../source/TortoiseSVN_en.xml:5351 msgid "Select the two files you want to compare in explorer (e.g. using Ctrl and the mouse) and choose Diff from TortoiseSVN'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 "V Raziskovalcu izberite datoteki, ki ju želite primerjati (n. pr. z uporabo tipke Ctrl in miške) in iz kontekstnega menija TortoiseSVN izberite Razlikuj. Datoteka, na katero ste kliknili nazadnje (datoteka, ki ima fokus oziroma datoteka s pikčasto obrobo) se bo obravnavala kot novejša." #. (primary) #: ../source/TortoiseSVN_en.xml:5365 msgid "changelist" msgstr "seznam sprememb" #. (para) #: ../source/TortoiseSVN_en.xml:5367 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 "V idealnem svetu delate naenkrat na eni zadevi in vaša delovna kopija vsebuje le en skupek logičnih sprememb. V redu, nazaj v realnost. Večkrat se zgodi, da morate delati na več nepovezanih nalogah naenkrat in ko pogledate v okno za objave, vidite vse spremembe skupaj. Zmožnost seznam sprememb vam pomaga združiti datoteke v skupine. Tako lažje vidite, kaj delate. Seveda je to možno le, če se spremembe ne prekrivajo. Če dve različni nalogi zahtevata spremembo iste datoteke, sprememb ni mogoče ločiti." #. (para) #: ../source/TortoiseSVN_en.xml:5378 msgid "The changelist feature in TortoiseSVN 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 "Možnost uporabe seznamov sprememb v programu TortoiseSVN je na voljo le v operacijskem sistemu Windows XP ali novejšem, ker uporablja možnosti lupine, ki v sistemu Windows 2000 ne obstajajo. Oprostite, ampak sistem Windown 2000 je že precej star, zato vas prosimo, da se ne pritožujete." #. (para) #: ../source/TortoiseSVN_en.xml:5385 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 "Seznami sprememb se uporabljajo na več mestih, najbolj pa so pomembni pri preverjanju sprememb in pri objavi le-teh. Začnimo z oknom za preverjanje sprememb, ki po delu na več zmožnostih in več spremenjenih datotekah pokaže dolg seznam datotek. Sedaj želite spremenjene dodateke urediti in jih glede nato, katerim novostim pripadajo, postavtiti v ustrezne skupine." #. (para) #: ../source/TortoiseSVN_en.xml:5393 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 "Izberite eno ali več datotek in jih premaknite v seznam sprememb z uporabo ukaza Kontekstni meniPremakni v seznam sprememb. Na začetku ni nobenega seznama sprememb, zato ga boste morali ob prvi uporabi ukaza ustvariti. Poimenujte ga smiselno glede na uporabo in kliknite gumb V redu. Okno za objave se spremeni in prikazuje skupine elementov." #. (para) #: ../source/TortoiseSVN_en.xml:5405 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 "Ko ste ustvarili seznam sprememb, lahko vanj dodate elemente. Vzamete jih lahko iz drugega seznama sprememb ali pa kar iz Raziskovalca. Dodajanje iz Raziskovalca je uporabno, saj lahko dodajate datoteke preden le-te sploh spremenite. To lahko naredite tudi neposredno iz okna za preverjanje sprememb, vendar le, če imate vključeno možnost prikaza datotek brez različic." #. (title) #: ../source/TortoiseSVN_en.xml:5414 msgid "Commit dialog with Changelists" msgstr "Okno za objave s seznami sprememb" #. (para) #: ../source/TortoiseSVN_en.xml:5412 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 " V pogovornem oknu za objave vidite iste datoteke, združene v sezname sprememb. Poleg vizualnega pregleda lahko skupine uporabljate tudi za hitro izbiro datotek za objavo s izbirom glave skupine." #. (para) #: ../source/TortoiseSVN_en.xml:5421 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 "V sistemu Windows XP je ob desnem kliku na glavo skupine na voljo kontekstni meni, ki omogoča potrditev ali izklop vseh elementov skupine. V sistemu Windows Vista ta meni ni obvezen. Kliknite na glavo skupine. S tem izberete vse elemente. Nato potrdite en element - s tem potrdite vse izbrane elemente." #. (para) #: ../source/TortoiseSVN_en.xml:5427 msgid "TortoiseSVN 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 "TortoiseSVN si rezervira en seznam sprememb za lastno uporabo in sicer ignore-on-commit. Seznam se uporablja za datoteke, ki jih skoraj nikoli ne objavljate, čeprav imajo krajevne spremembe. Ta zmožnost je opisana v poglavju ." #. (para) #: ../source/TortoiseSVN_en.xml:5433 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 "Ob objavi datotek iz seznama sprememb običajno želite, da se te odstranijo iz seznama, tako da je to privzeta možnost pri vsaki objavi. Če želite, da datoteke ostanejo del seznama sprememb, potrdite polje Ohrani sezname sprememb na dnu pogovornega okna." #. (para) #: ../source/TortoiseSVN_en.xml:5441 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 "Seznami sprememb so povsem stvar odjemalca. Ustvarjanje in odstranjevanje seznamov sprememb ne vpliva na skladišče, prav tako pa tudi ne na delovne kopije drugih uporabnikov. Seznami sprememb so priročna možnost organiziranja spremenjenih datotek." #. (title) #: ../source/TortoiseSVN_en.xml:5449 msgid "Revision Log Dialog" msgstr "Pogovorno okno Dnevnik" #. (primary) #: ../source/TortoiseSVN_en.xml:5451 msgid "log" msgstr "dnevnik" #. (primary) #: ../source/TortoiseSVN_en.xml:5454 msgid "history" msgstr "zgodovina" #. (primary) #: ../source/TortoiseSVN_en.xml:5457 msgid "commit messages" msgstr "sporočila objav" #. (primary) #: ../source/TortoiseSVN_en.xml:5460 msgid "log messages" msgstr "sporočilo objave" #. (para) #: ../source/TortoiseSVN_en.xml:5463 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 vsako objavljeno spremembo vnesite sporočilo dnevniškega zapisa. Tako lahko kasneje ugotovite, katere spremembe ste kdaj naredili in imate podroben pregled celotnega razvojnega procesa." #. (para) #: ../source/TortoiseSVN_en.xml:5475 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 "Zgornji del prikazuje seznam revizij, kjer je bila datoteka/mapa objavljena. Povzetek vsebuje čas in datum, avtorja objavljene spremembe in začetni del sporočila dnevnika." #. (para) #: ../source/TortoiseSVN_en.xml:5481 msgid "Lines shown in blue indicate that something has been copied to this development line (perhaps from a branch)." msgstr "Vrstice, obarvane z modro barvo, pomenijo, da je bil nek element prekopiran na to vejo razvoja (mogoče iz druge veje)." #. (para) #: ../source/TortoiseSVN_en.xml:5487 msgid "The middle pane shows the full log message for the selected revision." msgstr "Srednji del prikazuje sporočilo dnevniškega zapisa za izbrano revizijo." #. (para) #: ../source/TortoiseSVN_en.xml:5493 msgid "The bottom pane shows a list of all files and folders that were changed as part of the selected revision." msgstr "Spodnji del prikazuje seznam datotek in map, ki so bile spremenjene v izbrani reviziji." #. (para) #: ../source/TortoiseSVN_en.xml:5469 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 "Pogovorno okno dnevnika pridobi dnevniške zapise in jih prikaže. Zaslon je razdeljen na tri dele. Pogovorno okno pa naredi še veliko več - ponudi vam kontekstni meni, ki prinaša še več informacij o zgodovini projekta." #. (title) #: ../source/TortoiseSVN_en.xml:5504 msgid "Invoking the Revision Log Dialog" msgstr "Klicanje pogovornega okna dnevniških zapisov" #. (title) #: ../source/TortoiseSVN_en.xml:5507 msgid "The Revision Log Dialog" msgstr "Okno dnevnika" #. (para) #: ../source/TortoiseSVN_en.xml:5513 msgid "From the TortoiseSVN context submenu" msgstr "Iz kontekstnega podmenija TortoiseSVN" #. (para) #: ../source/TortoiseSVN_en.xml:5518 msgid "From the property page" msgstr "Iz strani lastnosti" #. (para) #: ../source/TortoiseSVN_en.xml:5523 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 pogovornega okna napredka po posodobitvi delovne kopije. V tem primeru Dnevnik prikaže le tiste revizije, ki so se spremenile od zadnje posodobitve." #. (para) #: ../source/TortoiseSVN_en.xml:5505 msgid " There are several places from where you can show the Log dialog: " msgstr " Obstaja veliko mest, od koder lahko lahko pokličete okno dnevnika: " #. (title) #: ../source/TortoiseSVN_en.xml:5533 msgid "Revision Log Actions" msgstr "Akcije dnevnika" #. (para) #: ../source/TortoiseSVN_en.xml:5534 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 "Zgornji del okna vsebuje stolpec Dejanja z ikonami, ki povzemajo, kaj se je v določeni reviziji zgodilo. Obstajajo štiri različne ikone, vsaka je prikazana v svojem stopcu." #. (para) #: ../source/TortoiseSVN_en.xml:5539 msgid " If a revision modified a file or directory, the modified icon is shown in the first column." msgstr " Če je v reviziji prišlo do spremembe datoteke ali mape, se v prvem stolpcu prikaže ikona spremenjeno." #. (para) #: ../source/TortoiseSVN_en.xml:5544 msgid " If a revision added a file or directory, the added icon is shown in the second column." msgstr " Če je bila v reviziji dodana datoteka ali mapa, se v drugem stolpcu prikaže ikona dodano." #. (para) #: ../source/TortoiseSVN_en.xml:5549 msgid " If a revision deleted a file or directory, the deleted icon is shown in the third column." msgstr " Če je bila v reviziji izbrisana datoteka ali mapa, se v tretjem stolpcu prikaže ikona zbrisano." #. (para) #: ../source/TortoiseSVN_en.xml:5554 msgid " If a revision replaced a file or directory, the replaced icon is shown in the fourth column." msgstr " Če je revizija zamenjala datoteko ali mapo, se v četrtem stolcu prikaže ikona zamenjano." #. (title) #: ../source/TortoiseSVN_en.xml:5561 msgid "Getting Additional Information" msgstr "Pridobivanje dodatnih informacij" #. (title) #: ../source/TortoiseSVN_en.xml:5564 msgid "The Revision Log Dialog Top Pane with Context Menu" msgstr "Zgornji del Dnevnika s kontekstnim menijem" #. (para) #: ../source/TortoiseSVN_en.xml:5573 msgid "Compare the selected revision with your working copy. The default Diff-Tool is TortoiseMerge which is supplied with TortoiseSVN. 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 "Primerjate izbrane revizije z delovno kopijo. Privzeto orodje za razlikovanje je TortoiseMerge, ki je del paketa TortoiseSVN. Če ste zahtevali dnevnik za mapo, se bo prikazal seznam spremenjenih datotek, vi pa boste lahko pregledali narejene spremembe za vsako datoteko posebej." #. (para) #: ../source/TortoiseSVN_en.xml:5583 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 "Pogledate spremembe v izbranih revizijah v obliki poenotene različice (oblika popravkov GNU). Prikaže le razlike in nekaj bližnjih vrstic. Ta oblika je težje berljiva kot vizualna primerjava, vendar prikaže vse spremembe v datoteki v zgoščeni obliki." #. (para) #: ../source/TortoiseSVN_en.xml:5592 msgid "Compare the selected revision with the previous revision. This works in a similar manner to comparing with your working copy." msgstr "Primerjate izbrano revizijo s prejšnjo revizijo. Deluje podobno kot primerjava z delovno kopijo." #. (para) #: ../source/TortoiseSVN_en.xml:5599 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 "Okrivite izbrano revizijo in datoteko v delovni osnovi z vizualno primerjavo razlik. Za podrobnejše informacije preberite . (velja le za datoteke)." #. (para) #: ../source/TortoiseSVN_en.xml:5607 msgid "Blame the selected revision, and the previous revision, and compare the results using a visual diff tool. (folders only)." msgstr "Okrivite izbrano revizijo in predhodne revizije in primerjate rezultate z vizualnim orodjem za razlikovanje. (velja le za mape)." #. (para) #: ../source/TortoiseSVN_en.xml:5614 msgid "Save the selected revision to a file so you have an older version of that file. (files only)." msgstr "Shranite izbrano revizijo datoteke, tako da imate starejšo različico te datoteke. (velja le za datoteke)." #. (para) #: ../source/TortoiseSVN_en.xml:5620 msgid "Open the selected file, either with the default viewer for that file type, or with a program you choose. (files only)." msgstr "Odprete izbrano datoteko s privzetim pregledovalnikom ali programom po lastni izbiri. (velja le za datoteke)." #. (para) #: ../source/TortoiseSVN_en.xml:5626 msgid "Blame the file up to the selected revision. (files only)." msgstr "Okrivite datoteko do izbrane revizije (velja le za datoteke)." #. (para) #: ../source/TortoiseSVN_en.xml:5631 msgid "Open the repository browser to examine the selected file or folder in the repository as it was at the selected revision." msgstr "Odprete brskalnik po skladišču za ogled izbrane datoteke ali mape, kakršna je bila ob izbrani reviziji." #. (para) #: ../source/TortoiseSVN_en.xml:5637 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 "Ustvarite vejo/oznako iz izbrane revizije. To je uporabno, če pozabite ustvariti oznako, vendar ste že naredili nove objave, ki pa niso predvidene za to izdajo." #. (para) #: ../source/TortoiseSVN_en.xml:5645 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 "Posodobite delovno kopijo na izbrano revizijo. Uporabno, če želite, da vaša delovna kopija odraža stanje projekta ob določenem času v preteklosti. Najboljše je, da posodobite celotno delovno kopijo, ne samo ene datoteke, v nasprotnem primeru bo vaša delovna kopija nekonsistentna in zato ne boste mogli objavljati sprememb." #. (para) #: ../source/TortoiseSVN_en.xml:5655 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 "Povrnete spremembe, ki ste jih naredili v delovni kopiji. Spremembe se povrnejo v delovni kopiji, tako da ta operacija ne vpliva na skladišče! Upoštevajte, da bo ta operacija povrnila spremembe le iz izbrane revizije, ne bo zamenjala datoteke v delovni kopiji s kopijo datoteke iz izbrane revizije. To je uporabno, če želite povrniti neko spremembo, vendar so bile kasneje narejene še druge - nepovezane - spremembe. Če imate v krajevni datoteki spremembe, bo ta ukaz spremembe iz skladišča spojil s spremembami v delovni kopiji. " #. (para) #: ../source/TortoiseSVN_en.xml:5669 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 "Povrnite na zgodnejšo revizijo. Če ste naredili več sprememb in potem ugotovili, da se hočete vrniti nazaj na revizijo N, potrebujete ta ukaz. Ponovno upoštevajte, da se spremembe zgodijo na delovni kopiji, tako da ta operacija ne vpliva na skladišče, dokler sprememb ne objavite. Upoštevajte, da bo operacija razveljavila vse spremembe, ki ste jih naredili po izbrani reviziji, tako da zamenja datoteke/mape z zgodnejšo različico. Če ste naredili krajevne spremembe, bo ta ukaz spojil te spremembe v delovno kopijo." #. (para) #: ../source/TortoiseSVN_en.xml:5683 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 "Spojite izbrane revizije v drugo delovno kopijo. Pojavi se pogovorno okno, ki omogoča izbiro mape, kamor želite opraviti spajanje, vendar po tem ni nobenega potrditvenega okna ali možnosti za poskusno izvedbo. Priporočamo, da spajanje opravljate v nespremenjeno delovno kopijo, tako da lahko ob nepravilnih rezultatih naredite povrnitev! To je uporabna zmožnost, če želite spojiti izbrane revizije iz ene veje v drugo." #. (para) #: ../source/TortoiseSVN_en.xml:5695 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 "Naredite svež prevzem izbrane mape in izbrane revizije. S tem se prikaže okno, v katerem potrdite naslov URL in revizijo in izberete lokacijo za prevzem." #. (para) #: ../source/TortoiseSVN_en.xml:5702 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 "Izvozite izbrane datoteke/mape v izbrani reviziji. Pokaže se pogovorno okno z naslovom URL in revizijo, kjer vnesete še lokacijo izvoza." #. (para) #: ../source/TortoiseSVN_en.xml:5709 msgid "Edit the log message or author attached to a previous commit. Read to find out how this works." msgstr "Uredite sporočilo dnevniškega zapisa in avtoja v predhodni objavi. Za dodatne informacije preberite ." #. (para) #: ../source/TortoiseSVN_en.xml:5716 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 "Prekopirate podrobnosti dnevnika izbranih revizij na odložišče. S tem prekopirate številko revizije, avtorja, datum, sporočilo in seznam spremenjenih elementov za vsako revizijo." #. (para) #: ../source/TortoiseSVN_en.xml:5723 msgid "Search log messages for the text you enter. This searches the log messages that you entered and also the action summaries created by Subversion (shown in the bottom pane). The search is not case sensitive." msgstr "Iščete po sporočilih dnevniških zapisov. Iskanje poteka po dnevniških zapisih, ki jih vnesete, in po povzetkih akcij, ki jih ustvari Subversion in so prikazani v spodnjem delu okna. Iskanje ni občutljivo na velike in male črke." #. (para) #: ../source/TortoiseSVN_en.xml:5562 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 " Zgornja polovica Dnevnika ponuja kontekstni meni, ki vam omogoča dostop do veliko informacij. Nekateri vnosi v meniju so na voljo le pri datotekah, drugi le pri mapah. " #. (title) #: ../source/TortoiseSVN_en.xml:5734 msgid "Top Pane Context Menu for 2 Selected Revisions" msgstr "Kontekstni meni v zgornjem delu okna v primeru dveh izbranih revizij" #. (para) #: ../source/TortoiseSVN_en.xml:5742 msgid "Compare the two selected revisions using a visual difference tool. The default Diff-Tool is TortoiseMerge which is supplied with TortoiseSVN." msgstr "Primerjate izbrani reviziji z grafičnim orodjem za razlikovanje. Privzeto orodje je TortoiseMerge, ki se namesti hkrati z orodjem TortoiseSVN." #. (para) #: ../source/TortoiseSVN_en.xml:5747 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 "Če izberete to možnost za mapo, se pojavi novo okno, ki vsebuje seznam datotek, za katere lahko pogledate spremembe. Več o primerjanju revizij si lahko preberete v ." #. (para) #: ../source/TortoiseSVN_en.xml:5755 msgid "Blame the two revisions and compare the blame reports using a visual difference tool. Read for more detail." msgstr "Okrivite dve reviziji in primerjate rezultate z grafičnim orodjem za razlikovanje. Za več informacij preberite ." #. (para) #: ../source/TortoiseSVN_en.xml:5762 msgid "View the differences between the two selected revisions as a Unified-Diff file. This works for files and folders." msgstr "Pogledate razlike med izbranima revizijama v obliki poenotene razlike. Deluje za datoteke in mape." #. (para) #: ../source/TortoiseSVN_en.xml:5768 msgid "Copy log messages to clipboard as described above." msgstr "Skopirate sporočila dnevniških zapisov na odložišče, kot je to opisano zgoraj." #. (para) #: ../source/TortoiseSVN_en.xml:5773 msgid "Search log messages as described above." msgstr "Iščete med sporočili dnevniških zapisov, kot je opisano zgoraj." #. (para) #: ../source/TortoiseSVN_en.xml:5732 msgid " If you select two revisions at once (using the usual Ctrl-modifier), the context menu changes and gives you fewer options: " msgstr "Če izberete dve reviziji naenkrat (z uporabo tipke Ctrl), se kontekstni meni spremeni in ponudi manj možnosti. Lahko: " #. (para) #: ../source/TortoiseSVN_en.xml:5779 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 "Če izberete več revizij (z uporabo tipk Ctrl ali Shift), se v kontekstnem meniju pojavi možnost, ki vam omogoča povrnitev vseh sprememb, ki so bile narejene v teh revizijah. To je najlažji način, kako povrniti spremembe iz večih revizij v eni potezi." #. (para) #: ../source/TortoiseSVN_en.xml:5786 msgid "You can also choose to merge the selected revisions to another working copy, as described above." msgstr "Izberete pa lahko tudi spajanje izbranih revizij v drugo delovno kopijo, kot je opisano zgoraj." #. (title) #: ../source/TortoiseSVN_en.xml:5792 msgid "The Log Dialog Bottom Pane with Context Menu" msgstr "Kontekstni meni spodnjega dela Dnevnika" #. (para) #: ../source/TortoiseSVN_en.xml:5798 msgid "Show changes made in the selected revision for the selected file. This context menu is only available for files shown as modified." msgstr "Prikažete spremembe, ki so bile narejene v izbrani reviziji izbrane datoteke. Ta možnost je na razpolago le za spremenjene datoteke." #. (para) #: ../source/TortoiseSVN_en.xml:5805 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 "Okrivite izbrano revizijo in predhodnjo revizijo izbrane datoteke in prikažete razlike z grafičnim orodjem za razlikovanje. Za več informacij preberite ." #. (para) #. (para) #: ../source/TortoiseSVN_en.xml:5813 #: ../source/TortoiseSVN_en.xml:9440 msgid "Open the selected file, either with the default viewer for that file type, or with a program you choose." msgstr "Odprete izbrano datoteko s privzetim pregledovalnikom ali programom po lastni izbiri." #. (para) #: ../source/TortoiseSVN_en.xml:5819 msgid "Revert the changes made to the selected file in that revision." msgstr "Povrnte spremembe, narejene na izbrani datoteki izbrane revizije." #. (para) #: ../source/TortoiseSVN_en.xml:5824 msgid "View the Subversion properties for the selected item." msgstr "Pogledate lastnosti Subversion za izbran element." #. (para) #: ../source/TortoiseSVN_en.xml:5829 msgid "Show the revision log for the selected single file." msgstr "Prikažete dnevnik za izbrano datoteko." #. (para) #: ../source/TortoiseSVN_en.xml:5834 msgid "Save the selected revision to a file so you have an older version of that file." msgstr "Shranite izbrano revizijo datoteke, tako da imate starejšo različico te datoteke." #. (para) #: ../source/TortoiseSVN_en.xml:5790 msgid " The bottom pane of the Log dialog also has a context menu that allows you to " msgstr " Spodnji del dnevnika prav tako vsebuje kontekstni meni, s katerim lahko " #. (para) #: ../source/TortoiseSVN_en.xml:5842 msgid "You may notice that sometimes we refer to changes and other times to differences. What's the difference?" msgstr "Mogoče ste opazili, da uporabljamo izraza razlike in spremembe. Kakšna je razlika?" #. (para) #: ../source/TortoiseSVN_en.xml:5846 msgid "Subversion 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 "Številke revizij v sistemu Subversion pomenijo dve stvari. Revizija predstavlja stanje skladišča v nekem trenutku, predstavlja pa tudi seznam sprememb, ki so ustvarile to revizijo. N. pr. Narejeno v r1234 pomeni, da spremembe, narejene v reviziji 1234, ustvarijo funkcionalnost X. Da ponazorimo, kateri pomen imamo v mislih, uporabljamo dva izraza." #. (para) #: ../source/TortoiseSVN_en.xml:5855 msgid "If you select two revisions N and M, the context menu will offer to show the difference between those two revisions. In Subversion terms this is diff -r M:N." msgstr "Če izberete revizijo N in M, vam kontekstni meni ponuja možnost prikaza razlik med tema dvema revizijama. Ekvivalenten ukaz pri delu z odjemalcem za ukazno vrstivo je diff -r M:N." #. (para) #: ../source/TortoiseSVN_en.xml:5861 msgid "If you select a single revision N, the context menu will offer to show the changes made in that revision. In Subversion terms this is diff -r N-1:N or diff -c N." msgstr "Če izberete samo revizijo N, vam kontekstni meni ponuja prikaz sprememb, opravljenih v tej reviziji. Ekvivalentna ukaza pri uporabi odjemalca za ukazno vrstico sta diff -r N-1:N in diff -c N." #. (para) #: ../source/TortoiseSVN_en.xml:5867 msgid "The bottom pane shows the files changed in all selected revisions, so the context menu always offers to show changes." msgstr "Spodnja polovica prikazuje vse spremenjene datoteke v vseh izbranih revizijah. Kontekstni meni ponuja prikaz sprememb." #. (title) #: ../source/TortoiseSVN_en.xml:5874 msgid "Getting more log messages" msgstr "Pridobivanje dodatnih dnevniških zapisov" #. (para) #: ../source/TortoiseSVN_en.xml:5880 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 TortoiseSVNSettings ()," msgstr "V večjih skladiščih se lahko nahaja stotine ali tisoče sprememb. Pridobivanje informacij o vseh spremembah lahko traja dolgo časa. Običajno pa vas zanimajo le zadnje spremembe. Privzeta nastavitev števila dnevniških zapisov za prikaz je 100, vendar lahko to vrednost spremenite v TortoiseSVNNastavitve ()," #. (para) #: ../source/TortoiseSVN_en.xml:5895 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 "Če je potrjeno polje Ustavi ob kopiranju/preimenovanju, Dnevnik prikaže le revizije do trenutka, ko je bila izbrana datoteka ali mapa prekopirana iz neke druge lokacije v skladišču. To je uporabno, kadar pregledujete veje (ali oznake), saj se prikažejo le spremembe, ki so bile narejene na tej veji." #. (para) #: ../source/TortoiseSVN_en.xml:5904 msgid "Normally you will want to leave this option unchecked. TortoiseSVN remembers the state of the checkbox, so it will respect your preference." msgstr "Običajno boste to možnost pustili izklopljeno. TortoiseSVN si zapomni stanje potrditvenih polj, tako da bo upošteval vaše nastavitve." #. (para) #: ../source/TortoiseSVN_en.xml:5909 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 "Kadar je okno Prikaži dnevnik prikazano iz okna za spajanje, je to polje vedno potrjeno. Vzrok je v tem, da spajanje večinoma deluje na spremembah na vejah, zato uporaba map pred korensko mapo v tem primeru nima nobenega smisla." #. (para) #: ../source/TortoiseSVN_en.xml:5916 msgid "Note that Subversion 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 "Upoštevajte, da Subversion izvaja preimenovanje s parom kopirane in izbrisane datoteke, zato bo preimenovanje datoteke ali mape povzročilo, da se v tem primeru dnevniški zapis ustavi, če je ta možnost vklopljena." #. (para) #: ../source/TortoiseSVN_en.xml:5875 msgid "The Log dialog does not always show all changes ever made for a number of reasons: " msgstr "Okno Dnevnik ne pokaže vedno vseh sprememb. Razlogi so naslednji: " #. (para) #: ../source/TortoiseSVN_en.xml:5925 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 "Če želite videti več dnevniških zapisov, kliknite na gumb Naslednjih 100 in prikazalo se bo naslednjih 100 zapisov. Postopek lahko ponovite poljubno mnogokrat." #. (para) #: ../source/TortoiseSVN_en.xml:5930 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 "Zraven tega gumba se nahaja večfunkcijski gumb, ki si zapomni zadnjo akcijo, za katero je bil uporabljen. Kliknite na puščico, če želite videti še ostale akcije, ki so vam na razpolago." #. (para) #: ../source/TortoiseSVN_en.xml:5935 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 "Uporabite gumb Pokaži obseg..., če želite videti le določen obseg revizij. V okno boste vnesli začetno in končno revizijo." #. (para) #: ../source/TortoiseSVN_en.xml:5940 msgid "Use Show All if you want to see all log messages from HEAD right back to revision 1." msgstr "Uporabite gumb Prikaži vse, če želite videti vse dnevniške zapise od končne revizije HEAD do revizije 1." #. (title) #: ../source/TortoiseSVN_en.xml:5946 msgid "Merge Tracking Features" msgstr "Zmožnosti sledenja spajanja" #. (primary) #: ../source/TortoiseSVN_en.xml:5948 msgid "merge tracking log" msgstr "zapis sledenja spajanja" #. (para) #: ../source/TortoiseSVN_en.xml:5950 msgid "Subversion 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 "Subversion 1.5 uvaja sledenje spajanja z uporabo lastnosti. To nam omogoča pridobiti podrobnejšo zgodovino spojenih sprememb. Primer: če na posebni veji razvijate neko novo zmožnost programa in potem spremembe spojite na glavno vejo, boste na glavni veji to novo zmožnost videli kot eno objavo, čeprav ste pri razvoju te lastnosti na posebni veji naredili tisoč objav." #. (title) #: ../source/TortoiseSVN_en.xml:5959 msgid "The Log Dialog Showing Merge Tracking Revisions" msgstr "Dnevnik prikazuje sledenje spajanja revizij" #. (para) #: ../source/TortoiseSVN_en.xml:5962 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 "Če želite videti, katere revizije so bile spojene kot del objave, uporabite potrditveno polje Vključi spojene revizije. Dnevniška sporočila se bodo ponovno prenesla, tokrat bodo vključeni tudi zapisi revizij, iz katerih je bilo narejeno spajanje. Spojene revizije so prikazane v sivi barvi, saj predstavljajo spremembe, narejene na drugi veji." #. (para) #: ../source/TortoiseSVN_en.xml:5970 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 "Spajanje seveda nikoli ni enostavno! Med razvojem na veji boste na vejo občasno spajali spremembe iz glavne veje. Torej bo zgodovina spajanja glavne veje vsebovala dodaten nivo zgodovine spajanja. Različni nivoji spajanja so v dnevniku prikazani z zamikanjem." #. (title) #: ../source/TortoiseSVN_en.xml:5980 msgid "Changing the Log Message and Author" msgstr "Spreminjanje sporočila dnevniškega zapisa in avtorja" #. (primary) #: ../source/TortoiseSVN_en.xml:5982 msgid "edit log/author" msgstr "popravljanje zapisa/avtorja" #. (para) #: ../source/TortoiseSVN_en.xml:5984 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 "Včasih želite spremeniti vnešeno sporočilo dnevniškega zapisa - zaradi napake v črkovanju, ker boste želeli izboljšati komentar ali zaradi kakega drugega razloga. Ali pa boste želeli spremeniti avtorja objave, ker ste si nastavili napačno avtentikacijo ali pa..." #. (para) #: ../source/TortoiseSVN_en.xml:5991 msgid "Subversion 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 Subversion Book for details about how to do that. Read to find some further notes on implementing hooks on a Windows machine." msgstr "Subversion vam omogoča kadarkoli po objavi spremeniti tako sporočilo dnevniškega zapisa kot tudi avtorja objave. Ker pa se teh sprememb ne na povrniti (niso pod nadzorom različic), s privzetimi nastavitvami ta možnost ni vključena. Nastaviti morate ukazno datoteko akcije pre-revprop-change. Poglejte v poglavje Hook Scripts v knjiigi The Subversion Book, če želite izvedeti več o tem. Preberite , če želite informacije o nastavljanju ukaznih datotek akcij v operacijskem sistemu Windows." #. (para) #: ../source/TortoiseSVN_en.xml:6004 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." msgstr "Ko ste na strežniku nastavili zahtevane akcije, lahko spremenite tako avtorja kot sporočilo dnevniškega zapisa katerekoli revizije z uporabo kontekstnega menija v zgornejm delu Dnevnika." #. (para) #: ../source/TortoiseSVN_en.xml:6010 msgid "Because Subversion'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 "Lastnosti revizij v sistemu Subversion so brez različic, zato bo sprememba lastnosti (n. pr. lastnost svn:log za sporočilo objave) za vedno prepisala predhodno vrednosti te lastnosti." #. (title) #: ../source/TortoiseSVN_en.xml:6020 msgid "Filtering Log Messages" msgstr "Filtriranje dnevniških zapisov" #. (primary) #: ../source/TortoiseSVN_en.xml:6022 msgid "filter" msgstr "filter" #. (para) #: ../source/TortoiseSVN_en.xml:6024 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 "Če želite omejiti izpise na le tiste, ki vas zanimajo, in se tako izogniti brskanju po seznamu, lahko uporabite možnosti filtriranja na vrhu okna. Začetni in končni datum vam omogočata omejitev vpisov na omejeno časovno območje, polje za iskanje pa vam omogoča izpis le tistih revizij, ki vsebujejo iskani niz." #. (para) #: ../source/TortoiseSVN_en.xml:6033 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/." msgstr "Kliknite na ikono za iskanje ter izberite, po kateri informaciji želite iskati, ter način iskanja regex. Običajno potrebujete le preprosto iskanje po besedilu, če pa želite več prilagodljivosti, uporabite regularne izraze. Če miško za trenutek pridržite na polju, se prikaže namig z opisom uporabe regularnih izrazov. Na naslovu http://www.regular-expressions.info/ pa sta na voljo dokumentacija in učbenik o regularnih izrazih." #. (para) #: ../source/TortoiseSVN_en.xml:6045 msgid "Note that these filters act on the messages already retrieved. They do not control downloading of messages from the repository." msgstr "Upoštevajte, da filter deluje na sporočilih, ki so že na razpolago. Filter ne nadzira prenosa sporočil iz skladišča." #. (para) #: ../source/TortoiseSVN_en.xml:6049 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 "Poti lahko filtrirate s potrditvijo polja Skrij nepovezane spremenjene poti. Povezane poti so tiste, ki vsebujejo pot, ki je bila uporabljena za prikaz Dnevnika. Če pogledte dnevnik za neko mapo, potem to pomeni vsebino te mape. Pri datotekah to pomeni le izbrano datoteko. Potrditveno polje ima tri stanja: prikažete lahko vse poti, posivite nepovezane ali povsem skrijete nepovezane poti." #. (para) #: ../source/TortoiseSVN_en.xml:6058 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 "Včasih delo na projektu zahteva uporabo predpisane oblike sporočila dnevniškega zapisa, kar pomeni, da besedilo, ki opisuje spremembe, ni vidno pri skrajšanem povzetku, ki se prikaže v zgornjem delu okna. Lastnost tsvn:logsummary lahko uporabite, da izvlečete del besedila, ki se prikaže kot povzetek. Za več informacij o tej lastnosti reberite ." #. (title) #: ../source/TortoiseSVN_en.xml:6070 msgid "Statistical Information" msgstr "Statistične informacije" #. (primary) #: ../source/TortoiseSVN_en.xml:6072 msgid "statistics" msgstr "statistika" #. (para) #: ../source/TortoiseSVN_en.xml:6074 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 "Klik na gumb Statistika postreže z nekaj zanimivimi statističnimi informacijami o revizijah, prikazanih v oknu dnevnika. Prikazano je, koliko avtorjev je sodelovalo, koliko objav so naredili, napredek po tednih in še veliko več. Sedaj lahko enostavno vidite, kdo je delal največ in kdo je zabušaval;)" #. (title) #: ../source/TortoiseSVN_en.xml:6083 msgid "Statistics Page" msgstr "Statistika" #. (para) #: ../source/TortoiseSVN_en.xml:6084 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 "Ta stran vam pokaže vse mogoče številke, predvsem časovno območje in število revizij ter nekatere ekstremne in povprečne vrednosti." #. (title) #: ../source/TortoiseSVN_en.xml:6091 msgid "Commits by Author Page" msgstr "Stran objav glede na avtorja" #. (title) #: ../source/TortoiseSVN_en.xml:6094 msgid "Commits-by-Author Histogram" msgstr "Histogram objav glede na avtorja" #. (title) #: ../source/TortoiseSVN_en.xml:6101 msgid "Commits-by-Author Pie Chart" msgstr "Potični graf objav glede na avtoja" #. (para) #: ../source/TortoiseSVN_en.xml:6092 msgid " This graph shows you which authors have been active on the project as a simple histogram, stacked histogram or pie chart. " msgstr " Ta graf prikazuje, kateri avtorji so bili aktivni na projektu v obliki preprostega histograma, zloženega stolpičnega diagrama ali potičnega diagrama. " #. (para) #: ../source/TortoiseSVN_en.xml:6105 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 "Kadar na projektu sodeluje nekaj glavnih avtorjev in veliko takih, ki prispevajo občasno, veliko majhnih segmentov naredi graf bolj nečitljiv. Drsnik na dnu omogoča nastaviti mejo (v obliki odstotkov). Avtorji, katerih aktivnost je manjša od meje, so združeni v skupino Ostali." #. (title) #: ../source/TortoiseSVN_en.xml:6114 msgid "Commits by date Page" msgstr "Objave po datumu" #. (title) #: ../source/TortoiseSVN_en.xml:6117 msgid "Commits-by-date Graph" msgstr "Objave po datumu" #. (para) #: ../source/TortoiseSVN_en.xml:6115 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 " Na tej strani je grafično prikazana projektna aktivnost: število objav in avtor. To vam pove, kdaj se na projektu dela in kdo je kdaj delal." #. (para) #: ../source/TortoiseSVN_en.xml:6125 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 "Kadar sodeluje veliko število avtorjev, bo na grafu prikazano veliko število črt. Na voljo sta dva pogleda: normalen, kjer je avtorjeva aktivnost relativna na osnovno linijo, in zložen, kjer je avtorjeva aktivnost relativna glede na črto pod njim. Ta možnost onemogoča križanje črt, kar olajša branje grafa, vendar je pri tem težje oceniti rezultat posameznega avtorja." #. (para) #: ../source/TortoiseSVN_en.xml:6135 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 "Po privzetih nastavitvah je analiza občutljiva na male in velike črke, torej se uporabnika PeterEgan in PeteRegan obravnavata kot različna avtorja. Vendar pa v veliko primerih uporabniška imena niso občutljiva na male in velike črke in so zato včasih vnešena nekonsistentno. Zato v takšnih primerih želite imeni DavidMorgan in davidmorgan obravnavati kot isto osebo. Za nastavitev tega obnašanja uporabite potrditveno polje Za avtorje ni razlikovanja velikih/malih črk." #. (para) #: ../source/TortoiseSVN_en.xml:6145 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 "Statistika pokriva isto časovno območje kot okno dnevnika. Če le-to prikazuje le eno revizijo, potem vam statistika ne pove prav veliko." #. (title) #: ../source/TortoiseSVN_en.xml:6153 msgid "Offline Mode" msgstr "Nepovezan način" #. (para) #: ../source/TortoiseSVN_en.xml:6154 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 "Če strežnik ni dosegljiv, imate pa omogočeno predpomnenje dnevniških zapisov, lahko dnevnik in graf revizij uporabljate v nepovezanem načinu. S tem uporabljate podatke iz predpomnilnika in nadaljujete s svojim delom, čeprav podatki morda niso povsem sodobni ali popolni." #. (title) #. (title) #: ../source/TortoiseSVN_en.xml:6162 #: ../source/TortoiseSVN_en.xml:9857 msgid "Refreshing the View" msgstr "Osveževanje pogleda" #. (para) #: ../source/TortoiseSVN_en.xml:6163 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 "Če želite preveriti, ali obstajajo na strežniku novejši zapisi v dnevniku, lahko pogled osvežite z uporabe tipke F5. Če uporabljate predpomnilnik dnevnika (privzeta nastavitev), s tem preverite skladišče in prenesete le najnovejše zapise. Če ste pred delali v nepovezanem načinu, bo TortoiseSVN poskušal vzpostaviti povezavo." #. (para) #: ../source/TortoiseSVN_en.xml:6171 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 "Če uporabljate predpomnilnik dnevnika in menite, da se je sporočilo dnevniškega zapisa ali avtor spremenil, lahko za ponoven prenos prikazanih sporočil iz strežnika in posodobitev predpomnilnika uporabite Shift-F5 ali Ctrl-F5. Upoštevajte, da s tem osvežite le trenutno prikazana sporočila in ne celotnega predpomnilnika za trenutno skladišče." #. (title) #: ../source/TortoiseSVN_en.xml:6182 msgid "Viewing Differences" msgstr "Pregledovanje razlik" #. (primary) #. (primary) #: ../source/TortoiseSVN_en.xml:6184 #: ../source/TortoiseSVN_en.xml:9033 msgid "diff" msgstr "razlika" #. (primary) #: ../source/TortoiseSVN_en.xml:6187 msgid "compare" msgstr "primerjaj" #. (para) #: ../source/TortoiseSVN_en.xml:6189 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. TortoiseSVN provides a built-in tool named TortoiseMerge for viewing differences of text files. For viewing differences of image files, TortoiseSVN also has a tool named TortoiseIDiff. Of course, you can use your own favourite diff program if you like." msgstr "Ena izmed najbolj pogostih zahtev v razvoju projekta je videti spremembe. Mogoče želite videti razlike med dvema revizijama iste datoteke ali razlike med dvema različnima datotekama. TortoiseSVN vsebuje orodje TortoiseMerge za pregledovanje razlik besedilnih datotek. Za pregledovanje razlik grafičnih datotek TortoiseSVN ponuja TortoiseIDiff. Seveda pa lahko uporabite tudi programe po lastni izbiri." #. (title) #: ../source/TortoiseSVN_en.xml:6203 msgid "File Differences" msgstr "Spremembe v datoteki" #. (term) #: ../source/TortoiseSVN_en.xml:6206 msgid "Local changes" msgstr "Krajevne spremembe" #. (para) #: ../source/TortoiseSVN_en.xml:6208 msgid "If you want to see what changes you have made in your working copy, just use the explorer context menu and select TortoiseSVNDiff." msgstr "Če želite videti spremembe, ki ste jih naredili vi, uporabite kontekstni meni v Raziskovalcu in izberite TortoiseSVNRazlikuj." #. (term) #: ../source/TortoiseSVN_en.xml:6220 msgid "Difference to another branch/tag" msgstr "Razlike v primerjavi z drugo vejo/oznako" #. (para) #: ../source/TortoiseSVN_en.xml:6222 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 TortoiseSVNDiff with URL. In the following dialog, specify the URL in the repository with which you want to compare your local file to." msgstr "Če želite videti, kaj se je spremenilo na glavni veji (če delate na stranski veji) ali na določeni veji (če delate na glavni veji), lahko uporabite kontekstni meni Raziskovalca. Med desnim klikom na datoteko držite pritisnjeno tipko Shift. Potem izberite TortoiseSVNRazlikuj z URL. V okno vnesite naslov URL skladišča, s katerim želite primerjati krajevno datoteko. " #. (para) #: ../source/TortoiseSVN_en.xml:6235 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 "Lahko uporabite tudi brskalnik po skladišču in izberete dve drevesi, ki ju želite primerjati, mogoče dve oznaki ali vejo/oznako in glavno vejo. Kontekstni meni vam omogoča primerjanje z ukazom Primerjaj reviziji. Več o tem razloži ." #. (term) #: ../source/TortoiseSVN_en.xml:6245 msgid "Difference from a previous revision" msgstr "Razlike v primerjavi s prejšnjo revizijo" #. (para) #: ../source/TortoiseSVN_en.xml:6247 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 "Če želite videti razlike med določeno revizijo in delovno kopijo, uporabite Dnevnik, izberite revizijo, ki vas zanima, in iz kontekstnega menija izberite Primerjaj z delovno kopijo." #. (para) #: ../source/TortoiseSVN_en.xml:6254 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 TortoiseSVNDiff 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 "Če želite videti razliko med zadnjo objavljeno revizijo in svojo delovno kopijo, ki ni spremenjena, desno kliknite na datoteko. Nato izberite TortoiseSVNRazlikuj s prejšno verzijo. Izvedla se bo primerjava med revizijo pred zadnjo objavo (ki je zabeležena v vaši delovni kopiji) in delovno osnovo (BASE). Vidite zadnjo spremembo, narejeno na datoteki, ki je ustvarila vašo delovno kopijo. Spremembe, novejše kot je vaša delovna kopija, niso prikazane." #. (term) #: ../source/TortoiseSVN_en.xml:6271 msgid "Difference between two previous revisions" msgstr "Razlike med dvema prejšnjima razlikama" #. (para) #: ../source/TortoiseSVN_en.xml:6273 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 "Če želite videti razlike med dvema že objavljenima revizijama, uporabite Dnevnik in izberite reviziji, ki ju želite primerjati (uporabite tipko Ctrl). Potem iz kontekstnega menija izberite Primerjaj reviziji." #. (para) #: ../source/TortoiseSVN_en.xml:6281 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 "Če to storite v Dnevniku za mapo, potem pogovorno okno Primerjaj reviziji prikaže seznam spremenjenih datotek v mapi. Več o tem pove ." #. (term) #: ../source/TortoiseSVN_en.xml:6290 msgid "All changes made in a commit" msgstr "Vse spremembe, narejeni pri objavi" #. (para) #: ../source/TortoiseSVN_en.xml:6292 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 "Če želite videti spremembe na vseh datotekah v določeni reviziji v enem pogledu, lahko izberete obliko poenotena razlika (oblika popravkov GNU). Ta prikaže le razlike skupaj z nekaj bližnjimi vrsticami. Ta oblika je težje berljiva kot vizuelna, vendar lahko vidite vse spremembe skupaj. Iz Dnevnika izberite revizijo in iz kontekstnega menija zaženite ukaz Prikaži razlike kot poenotene razlike." #. (term) #: ../source/TortoiseSVN_en.xml:6306 msgid "Difference between files" msgstr "Razlika med datotekami" #. (para) #: ../source/TortoiseSVN_en.xml:6308 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 TortoiseSVNDiff." msgstr "Če želite videti razlike med dvema različnima datotekama, lahko to storite neposredno iz Razskovalca, tako da izberete obe datoteki (z uporabo gumba Ctrl). Potem iz kontekstnega menija Raziskovalca izberite TortoiseSVNRazlikuj." #. (term) #: ../source/TortoiseSVN_en.xml:6321 msgid "Difference between WC file/folder and a URL" msgstr "Razlika med datoteko/mapo v delovni kopiji in na naslovu URL" #. (para) #: ../source/TortoiseSVN_en.xml:6323 msgid "If you want to see the differences between a file in your working copy, and a file in any Subversion 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 TortoiseSVNDiff 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 "Če želite videti razlike med datoteko v delovni kopiji in datoteko v skladišču Subversion, lahko to storite neposredno iz Raziskovalca. Izberite datoteko, pritisnite tipko Shift in desno kliknite, da se pojavi kontekstni meni. Izberite TortoiseSVNRazlikuj z URL. Enako lahko storite na delovni kopiji. TortoiseMerge prikaže razlike enako kot pri prikazu datoteke popravkov - seznam spremenjenih datotek, ki jih lahko pregledujete eno za drugo." #. (term) #: ../source/TortoiseSVN_en.xml:6341 msgid "Difference with blame information" msgstr "Razlike z informacijami o krivdi" #. (para) #: ../source/TortoiseSVN_en.xml:6343 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 "Če želite poleg razlik videti tudi avtorja, številko revizije in datum sprememb, lahko rezultat razlikovanja in okrivljenja združite. Več o tem si lahko preberete v ." #. (term) #: ../source/TortoiseSVN_en.xml:6352 msgid "Difference between folders" msgstr "Razlika med mapama" #. (para) #: ../source/TortoiseSVN_en.xml:6354 msgid "The built-in tools supplied with TortoiseSVN 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 "Orodja, ki jih dobite zraven programa TortoiseSVN, ne omogočajo pregledovanja razlik med strukturami map. Če imate zunanje orodje, ki to omogoča, ga lahko uporabite. pove nekaj o orodjih, ki jih uporabljamo." #. (para) #: ../source/TortoiseSVN_en.xml:6364 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 "Če ste nastavili zunanje orodje za razlikovanje, lahko uporabite Shift ob izbiri ukaza Razlikuj in tako poženete zunanje orodje. O nastavljanju zunanjih orodij lahko več preberete v ." #. (title) #: ../source/TortoiseSVN_en.xml:6373 msgid "Line-end and Whitespace Options" msgstr "Nastavitev zaključkov vrstic in presledkov" #. (para) #: ../source/TortoiseSVN_en.xml:6374 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 "Med delom na projektu včasih zamenjate zaključke vrstic - namesto CRLF uporabite LF. Mogoče pa spremenite zamikanje v nekem delu datoteke. S tem žal povzročite, da je veliko vrstic označenih kot spremenjenih, čeprav se vsebina vrstic dejansko ni spremenila. Naslednje možnosti vam omogočajo obvladovanje takšnih sprememb pri primerjanju ali nameščanju popravkov. Nastavitve so na voljo v pogovornih oknih Spoji in Okrivi, prav tako pa tudi v nastavitvah programa TortoiseMerge." #. (para) #: ../source/TortoiseSVN_en.xml:6385 msgid "Ignore line endings excludes changes which are due solely to difference in line-end style." msgstr "Možnost Prezri zaključke vrstic izloči vse spremembe, ki so posledica sprememb zgolj zaradi različnih zaključkov vrstic." #. (para) #: ../source/TortoiseSVN_en.xml:6389 msgid "Compare whitespaces includes all changes in indentation and inline whitespace as added/removed lines." msgstr "Z možnostjo Primerjaj presledke povzročite, da so vse vrstice, ki vsebuje spremembe presledkov, prikazane kot dodane/odstranjene." #. (para) #: ../source/TortoiseSVN_en.xml:6394 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 "Možnost Prezri razlike presledkov izključi spremembe, ki so posledica spremembe količine ali vrste presledkov, n. pr. spreminjanje zamikanja ali uporaba presledkov namesto tabulatorjev. Dodajanje presledkov, kjer jih prej ni bilo, in popolna odstranitev presledkov se še vedno štejeta kot spremembe." #. (para) #: ../source/TortoiseSVN_en.xml:6402 msgid "Ignore all whitespaces excludes all whitespace-only changes." msgstr "Možnost Prezri vse presledke izloči vse spremembe, ki so posledica spremembe presledkov." #. (para) #: ../source/TortoiseSVN_en.xml:6406 msgid "Naturally, any line with changed content is always included in the diff." msgstr "Seveda so kot spremenjene prikazane vse vrstice s spremenjeno vsebino." #. (title) #: ../source/TortoiseSVN_en.xml:6412 msgid "Comparing Folders" msgstr "Primerjanje map" #. (primary) #: ../source/TortoiseSVN_en.xml:6414 msgid "compare revisions" msgstr "primerjaj revizije" #. (primary) #: ../source/TortoiseSVN_en.xml:6417 msgid "export changes" msgstr "izvozi spremembe" #. (title) #: ../source/TortoiseSVN_en.xml:6421 msgid "The Compare Revisions Dialog" msgstr "Okno za primerjanje revizij" #. (para) #: ../source/TortoiseSVN_en.xml:6419 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 " Ko v brskalniku po skladišču izberete dve drevesi ali ko izberete dve reviziji mape v dnevniku, lahko uporabite Kontekstni meniPrimerjaj reviziji." #. (para) #: ../source/TortoiseSVN_en.xml:6431 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 "To pogovorno okno prikaže seznam vseh datotek, ki ste jih spremenili, in omogoča posamično primerjavo ali okrivljanje s pomočjo kontekstnega menija." #. (para) #: ../source/TortoiseSVN_en.xml:6435 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 "Seznam spremenjenih datotek lahko izvozite v besedilno datoteko, lahko pa izvozite tudi spremenjene datoteke v mapo. Ta operacija deluje le na izbranih datotekah, tako da morate izbrati datoteke, ki vas zanimajo - ponavadi so to kar vse." #. (para) #: ../source/TortoiseSVN_en.xml:6441 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 "Če želite izvoziti seznam datotek in dejanj (spremenjeno, dodano, zbrisano), lahko to storite z uporabo kombinacije Ctrl-A za izbiro vseh vnosov in Ctrl-C za kopiranje podrobnega seznama na odložišče." #. (para) #: ../source/TortoiseSVN_en.xml:6447 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 "Gumb na vrhu omogoča spremembo smeri primerjave. Lahko prikažete spremembe iz A v B, ali, če vam je lažje, iz B v A." #. (para) #: ../source/TortoiseSVN_en.xml:6452 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 "Gumbi, ki vsebujejo številke revizij, se uporabljajo za spreminjanje območja revizij. Ko območje spremenite, se seznam elementov, ki se razlikujejo med revizijama, samodejno posodobi." #. (para) #: ../source/TortoiseSVN_en.xml:6457 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 "Če je seznam datotek zelo dolg, lahko uporabite polje za iskanje in tako prikažete le datoteke, ki vsebujejo iskane znake. Uporablja se preprosto iskanje, zato za izpis vseh datotek izvorne kode v jeziku C vpišite .c in ne *.c." #. (title) #: ../source/TortoiseSVN_en.xml:6466 msgid "Diffing Images Using TortoiseIDiff" msgstr "Razlikovanje slik z uporabo programa TortoiseIDiff" #. (primary) #: ../source/TortoiseSVN_en.xml:6468 msgid "image diff" msgstr "razlike slike" #. (primary) #: ../source/TortoiseSVN_en.xml:6471 msgid "TortoiseIDiff" msgstr "TortoiseIDiff" #. (para) #: ../source/TortoiseSVN_en.xml:6473 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 "Obstaja veliko orodij za razlikovanje besedilnih datotek, vključno z našim lastnim orodjem TortoiseMerge. Pogosto pa želimo videti tudi, kako so se spreminjale slike. Zato smo ustvarili orodje TortoiseIDiff." #. (title) #: ../source/TortoiseSVN_en.xml:6480 msgid "The image difference viewer" msgstr "Pregledovalnik razlik med slikami" #. (para) #: ../source/TortoiseSVN_en.xml:6478 msgid "TortoiseSVNDiff 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 "Uporaba ukaza TortoiseSVNRazlikuj na datoteki kateregakoli običajnega slikovnega formata zažene program TortoiseIDiff, ki prikaže razlike med slikama. Po privzetih nastavitvah se sliki prikažeta ena ob drugi, v meniju Pogled pa lahko izberete tudi način prikaza ena slika pod drugo ali celo ena slika čez drugo." #. (para) #: ../source/TortoiseSVN_en.xml:6493 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 "Seveda lahko sliko povečate in pomanjšate ter jo premikate. Premikate lahko tudi s potegom z levim miškinim gumbom. Če izberete možnost Poveži slike, so kontrole za premikanje (drsni trak, kolešček na miški) povezane." #. (para) #: ../source/TortoiseSVN_en.xml:6499 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 "Okno Informacije o sliki prikaže podrobnosti o slikovni datoteki, n. pr. velikost v slikovnih točkah, resolucijo in barvno globino. Če vam je okno v napoto, lahko uporabite PogledInformacije o sliki. S tem okno skrijete. Iste informacije se prikažejo v namigu, če z miško mirujete v naslovni vrstici." #. (para) #: ../source/TortoiseSVN_en.xml:6511 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 "Ko se sliki prekrivata, lahko relativno intenzivnost slik (alpha blend) nastavljate z drsnikom na levi strani. Če kliknete kjerkoli na drsniku, boste neposredno nastavili vrednost, lahko pa drsnik potegnete in tako nastavite vrednost interaktivno. Za spreminjanje vrednosti lahko uporabite tudi Ctrl-Shift-Zasuk miškinega koleščka." #. (para) #: ../source/TortoiseSVN_en.xml:6518 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 "Gumb nad drsnikom se uporablja za preklapljanje med dvema prednastavljenima vrednostima, ki ju določata označbi na obeh straneh drsnika. Po privzetih nastavitvah je ena označba na vrhu, druga pa na dnu drsnika, torej gumb preklaplja med prikazom ene in druge slike. Označbi lahko premaknete in s tem določite vrednosti, med katerima preklapljate z gumbom." #. (para) #: ../source/TortoiseSVN_en.xml:6525 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 "Včasih želite namesto združene (prekrite) slike raje videti razlike, n. p.r če imate dve reviziji sheme tiskanega vezja in želite izvedeti, katere linije so se spremenile. Če izklopite spajanje (alpha blend) slik, se razlike prikažejo kot ekskluzivni ALI barvnih vrednosti točk. Nespremenjena območja bodo bela, spremembe pa bodo obarvane." #. (title) #: ../source/TortoiseSVN_en.xml:6535 msgid "External Diff/Merge Tools" msgstr "Zunanja orodja za razlikovanje/spajanje" #. (primary) #: ../source/TortoiseSVN_en.xml:6537 msgid "diff tools" msgstr "orodja za razlikovanje" #. (primary) #: ../source/TortoiseSVN_en.xml:6540 msgid "merge tools" msgstr "orodja za spajanje" #. (para) #: ../source/TortoiseSVN_en.xml:6542 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 "Če orodja, ki jih ponujamo v paketu, ne zadostujejo vašim potrebam, lahko poskusite številne odprtokodne ali komercialne programe. Vsakdo ima svoje priljubljeno orodje in ta seznam vsekakor ni popoln, vseeno pa poda nekaj imen aplikacij, ki jih lahko uporabite:" #. (term) #: ../source/TortoiseSVN_en.xml:6550 msgid "WinMerge" msgstr "WinMerge" #. (para) #: ../source/TortoiseSVN_en.xml:6552 msgid "WinMerge is a great open-source diff tool which can also handle directories." msgstr "WinMerge je odlično odprtokodno orodje za razlikovanje, ki zna delati tudi z mapami." #. (term) #: ../source/TortoiseSVN_en.xml:6562 msgid "Perforce Merge" msgstr "Perforce Merge" #. (para) #: ../source/TortoiseSVN_en.xml:6564 msgid "Perforce is a commercial RCS, but you can download the diff/merge tool for free. Get more information from Perforce." msgstr "Perforce je komercialna različica sistema RCS, vendar lahko njihovo orodje za razlikovanje uporabljate brezplačno. Za več informacij uporabite tole povezavo." #. (term) #: ../source/TortoiseSVN_en.xml:6574 msgid "KDiff3" msgstr "KDiff3" #. (para) #: ../source/TortoiseSVN_en.xml:6576 msgid "KDiff3 is a free diff tool which can also handle directories. You can download it from here." msgstr "KDiff3 je brezplačno orodje za razlikovanje, ki zna delati z mapami. Dobite ga tukaj." #. (term) #: ../source/TortoiseSVN_en.xml:6586 msgid "ExamDiff" msgstr "ExamDiff" #. (para) #: ../source/TortoiseSVN_en.xml:6588 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 "ExamDiff Standard je brezplačen progam. Zna delati z datotekami, ne pa tudi z mapami. ExamDiff Pro je preizkusni program (shareware) in ima v primerjavi z brezplačno različico veliko dodatkov, vključno z možnostjo razlikovanja in urejanja map. Od verzije 3.2 naprej znata obe različici delati z datotekami tipa unicode. Na voljo sta na strani podjetja PrestoSoft." #. (term) #: ../source/TortoiseSVN_en.xml:6603 msgid "Beyond Compare" msgstr "Beyond Compare" #. (para) #: ../source/TortoiseSVN_en.xml:6605 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 "Podobno kot ExamDiff Pro je tudi to odličen preizkusni program (shareware) za razlikovanje, ki zna delati z mapami in datotekami tipa unicode. Dobite ga na strani podjetja Scooter Software." #. (term) #: ../source/TortoiseSVN_en.xml:6616 msgid "Araxis Merge" msgstr "Araxis Merge" #. (para) #: ../source/TortoiseSVN_en.xml:6618 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 "Araxis Merge je uporabno komercialno orodje za razlikovanje in spajanje tako datotek kot map. Uporablja tristransko primerjavo pri spajanju in ima možnost sinhronizacijskih povezav v primeru spremembe vrstnega reda funkcij. Dobite ga na strani podjetja Araxis." #. (term) #: ../source/TortoiseSVN_en.xml:6630 msgid "SciTE" msgstr "SciTE" #. (para) #: ../source/TortoiseSVN_en.xml:6632 msgid "This text editor includes syntax colouring for unified diffs, making them much easier to read. Download it from Scintilla." msgstr "Ta urejevalnik besedil uporablja barvno kodiranje za poenotene različice, kar precej olajša branje. Prevzamete ga lahko iz naslova Scintilla." #. (term) #: ../source/TortoiseSVN_en.xml:6642 msgid "Notepad2" msgstr "Notepad2" #. (para) #: ../source/TortoiseSVN_en.xml:6644 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 zasnovan kot zamenjava za standardno beležko operacijskega sistema Windows in je narejen na osnovi odprtokodne kontrole za urejanje besedil Scintilla. Poleg tega, da je zelo primeren za pregledovanje poenotenih razlik, je za večino operacij precej boljši od Windowsove Beležke. Brezplačno si ga lahko prenesete iz avtorjeve strani." #. (para) #: ../source/TortoiseSVN_en.xml:6657 msgid "Read for information on how to set up TortoiseSVN to use these tools." msgstr "Preberite , če želite izvedeti več o uporabi teh orodij." #. (title) #: ../source/TortoiseSVN_en.xml:6664 msgid "Adding New Files And Directories" msgstr "Dodajanje novih datotek in map" #. (primary) #: ../source/TortoiseSVN_en.xml:6666 msgid "add" msgstr "dodaj" #. (primary) #: ../source/TortoiseSVN_en.xml:6669 msgid "version new files" msgstr "poglej nove datoteke" #. (title) #. (title) #: ../source/TortoiseSVN_en.xml:6674 #: ../source/TortoiseSVN_en.xml:6842 msgid "Explorer context menu for unversioned files" msgstr "Kontekstni menu v Raziskovalcu za datoteke brez različic" #. (para) #: ../source/TortoiseSVN_en.xml:6672 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 TortoiseSVNAdd." msgstr " Če ste med razvojem ustvarili nove datoteke in/ali mape, jih morate dodati v nadzor različic. Izberite datoteke in map in uporabite ukaz TortoiseSVNDodaj." #. (para) #: ../source/TortoiseSVN_en.xml:6686 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 "Potem ko ste datoteke/mape dodali v nadzor različic, so označene z ikono dodano, kar pomeni, da morate delovno kopijo objaviti, preden so dodane datoteke/mape na razplago ostalim uporabnikom. Zgolj dodajanje datoteke/mape ne vpliva na skladišče!" #. (title) #: ../source/TortoiseSVN_en.xml:6695 msgid "Many Adds" msgstr "Veliko dodanih elementov" #. (para) #: ../source/TortoiseSVN_en.xml:6696 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 "Ukaz Dodaj lahko uporabite tudi na mapi, ki je že pod nadzorom različic. V tem primeru se bodo v pogovnornem oknu za dodajanje pojavile vse datoteke brez različic. To vam pomaga, če imate veliko novih datotek, ki jih želite dodati naenkrat." #. (para) #: ../source/TortoiseSVN_en.xml:6709 msgid "select the files you want to add" msgstr "izberite datoteke, ki jih želite dodati" #. (para) #. (para) #: ../source/TortoiseSVN_en.xml:6714 #: ../source/TortoiseSVN_en.xml:7158 msgid "right-drag them to the new location inside the working copy" msgstr "povlecite jih z desnim miškinim gumbom na novo mesto znotraj delovne kopije" #. (para) #. (para) #: ../source/TortoiseSVN_en.xml:6720 #: ../source/TortoiseSVN_en.xml:7164 msgid "release the right mouse button" msgstr "sprostite gumb miške" #. (para) #: ../source/TortoiseSVN_en.xml:6725 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 "izberite Kontekstni meniSVN - Dodaj datoteke v to delovno kopijo. S tem datoteke prekopirate v delovno kopijo in jih dodate v nadzor različic." #. (para) #: ../source/TortoiseSVN_en.xml:6704 msgid "To add files from outside your working copy you can use the drag-and-drop handler: " msgstr "Če želite dodati datoteke, ki se ne nahajajo v delovni kopiji, uporabite metodo povleci in spusti: " #. (para) #: ../source/TortoiseSVN_en.xml:6737 msgid "You can also add files within a working copy simply by left-dragging and dropping them onto the commit dialog." msgstr "Datoteke, ki se nahajajo v delovni kopiji, lahko dodate tudi tako, da jih povlečete iz Raziskovalca v okno za objave." #. (para) #: ../source/TortoiseSVN_en.xml:6741 msgid "If you add a file or folder by mistake, you can undo the addition before you commit using TortoiseSVNUndo add...." msgstr "Če datoteko ali mapo dodate po pomoti, lahko dodajanje pred objavo prekličete z ukazom TortoiseSVNPrekliči dodajanje...." #. (title) #: ../source/TortoiseSVN_en.xml:6751 msgid "Copying/Moving/Renaming Files and Folders" msgstr "Kopiranje/premikanje/preimenovanje obstoječih datotek in map" #. (primary) #: ../source/TortoiseSVN_en.xml:6753 msgid "copy files" msgstr "kopiraj datoteke" #. (primary) #: ../source/TortoiseSVN_en.xml:6756 msgid "rename files" msgstr "preimenuj datoteke" #. (primary) #: ../source/TortoiseSVN_en.xml:6759 msgid "move files" msgstr "premakni datoteke" #. (primary) #. (primary) #: ../source/TortoiseSVN_en.xml:6762 #: ../source/TortoiseSVN_en.xml:7979 msgid "branch" msgstr "veja" #. (primary) #. (primary) #: ../source/TortoiseSVN_en.xml:6765 #: ../source/TortoiseSVN_en.xml:7982 msgid "tag" msgstr "oznaka" #. (para) #: ../source/TortoiseSVN_en.xml:6767 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 Subversion." msgstr "Pogosto se zgodi, da nekatere datoteke že imate v skladišču v okviru drugega projekta in jih želite prekopirati. Lahko jih preprosto prekopirate in dodate v nadzor različic, kot je opisano v prejšnjem razdelku, vendar v tem primeru izgubite zgodovino datoteke. Če kasneje odkrijete in popravite napako v originalnih datotekah, lahko spremembe samodejno spojite le, če med originalnimi in novimi datotekami obstaja povezava v sistemu Subversion." #. (para) #: ../source/TortoiseSVN_en.xml:6775 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 "Najlažji način kopiranja datotek in map znotraj delovne kopije je z uporabo kontekstnega menija, ki se pojavi v primeru potega z desnim miškinim gumbom. Ko datoteko ali mapo povlečete z desnim miškinim gumbom iz ene delovne kopije v drugo, ali pa celo znotraj iste mape, se ob sprostitvi miškinega gumba prikaže kontekstni meni. Sedaj lahko obstoječe elemente pod nadzorom prekopirate na drugo lokacijo in jih po potrebi istočasno preimenujete." #. (para) #: ../source/TortoiseSVN_en.xml:6787 msgid "You can copy files and folders from your working copy to another location in the repository using TortoiseSVNBranch/Tag. Refer to to find out more." msgstr "Datoteke in mape lahko prekopirate na drugo lokacijo v skladišču z uporabo ukaza TortoiseSVNVeja/oznaka. Preberite ." #. (para) #: ../source/TortoiseSVN_en.xml:6796 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 "Starejšo različico datoteke ali mape lahko poiščete v dnevniku in jo skopirate na novo lokacijo v skladišču z uporabo ukaza Kontekstni meniUstvari vejo/oznako iz revizije. Za več informacij preberite ." #. (para) #: ../source/TortoiseSVN_en.xml:6806 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 "Brskalnik po skladišču pa lahko uporabite tudi za iskanje željene vsebine, ki jo lahko prekopirate v delovno kopijo neposredno iz skladišča ali pa jo kopirate med dvema lokacijama v skladišču. Za več informacij preberite ." #. (title) #: ../source/TortoiseSVN_en.xml:6813 msgid "Cannot copy between repositories" msgstr "Kopiranje med skladišči ni mogoče" #. (para) #: ../source/TortoiseSVN_en.xml:6814 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 TortoiseSVN. 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 "Kopiranje datotek in map znotraj skladišča je mogoče, kopiranje ali premikanje elementov med različnimi skladišči pa ne. V takšnem primeru obvezno izgubimo zgodovino, tudi če se skladišči nahajata na istem strežniku. Vse, kar lahko naredite, je, da prekopirate vsebino v trenutnem stanju in jo dodate kot novo vsebino v drugo skladišče." #. (para) #: ../source/TortoiseSVN_en.xml:6822 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 "Če niste prepričani, ali dva naslova URL na istem strežniku kažeta na isto skladišče ali na dve različni skladišči, uporabite brskalnik po skladišču. Odprite prvi naslov URL in poiščite njegov koren. Če v enem brskalniku po skladišču vidite obe lokaciji, se obe lokaciji nahajata v istem skladišču." #. (title) #: ../source/TortoiseSVN_en.xml:6832 msgid "Ignoring Files And Directories" msgstr "Dodajanje datotek in map na seznam prezrtih elementov" #. (primary) #: ../source/TortoiseSVN_en.xml:6834 msgid "ignore" msgstr "prezri" #. (primary) #: ../source/TortoiseSVN_en.xml:6837 msgid "unversioned files/folders" msgstr "datoteke/mape brez različic" #. (para) #: ../source/TortoiseSVN_en.xml:6840 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, TortoiseSVN 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 " V večini projektov obstajajo datoteke in mape, ki jih ne dajemo pod nadzor različic. To so datoteke, ki jih naredi prevajalnik (*.obj, *.lst), mape, kamor se shranjujejo izvršne datoteke. Ko objavljate spremembe, TortoiseSVN prikaže datoteke brez različic, kar napolni seznam v oknu za objave. Seveda lahko prikaz datotek brez različic izklopite, vendar lahko to povzroči, da pozabite dodati nove izvorne datoteke v skladišče." #. (para) #: ../source/TortoiseSVN_en.xml:6853 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 "Tem problemom se najlažje izognete, če dodate generirane datoteke na projektni seznam prezrtih elementov. Na ta način se te datoteke ne bodo pojavile v oknu za objave, medtem ko boste tam še vedno videli izvorne datoteke brez različic." #. (para) #: ../source/TortoiseSVN_en.xml:6859 msgid "If you right click on a single unversioned file, and select the command TortoiseSVNAdd 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 "Če desno kliknete na posamezno datoteko brez različic in iz kontekstnega menija izberete ukaz TortoiseSVNDodaj na seznam prezrtih, se pojavi podmeni, ki vam omogoča, da izberete le izbrano datoteko ali pa vse datoteke z isto končnico. Če izberete več datotek, se podmeni ne pojavi in lahko dodate na seznam prezrtih elementov le izbrane datoteke." #. (para) #: ../source/TortoiseSVN_en.xml:6871 msgid "If you want to remove one or more items from the ignore list, right click on those items and select TortoiseSVNRemove 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 "Če želite iz seznama prezrtih odstraniti enega ali več elementov, desno kliknite na elemente in izberite TortoiseSVNOdstrani s seznama prezrtih Dostopate pa lahko tudi neposredno do lastnosti svn:ignore določene mape. To vam omogoča, da določite bolj splošne vzorce za preziranje, kar je opisano spodaj. Za neposredno nastavljanje lastnosti preberite . Upoštevajte, da je vsak vzorec za prezrte datoteke potrebno vpisati v svojo vrstico. Ločevanje s presledki ne deluje." #. (title) #: ../source/TortoiseSVN_en.xml:6886 msgid "The Global Ignore List" msgstr "Splošni seznam prezrtih elementov" #. (para) #: ../source/TortoiseSVN_en.xml:6887 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 Subversion 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 "Drug način, kako prezreti datoteke, je dodajanje na splošni seznam prezrtih elementov. Razlika je v tem, da je splošen seznam lastnost odjemalca. Velja za vse projekte v sistemu Subversion, vendar le na računalniku, kjer je nameščen odjemalec. Kjer je to le mogoče, je v splošnem bolje uporabiti lastnost svn:ignore, ker jo lahko nastavimo na določene dele projekta, poleg tega pa velja za vse uporabnike, ki prevzamejo projekt. Za več informacij preberite ." #. (title) #: ../source/TortoiseSVN_en.xml:6900 msgid "Ignoring Versioned Items" msgstr "Dodajanje elementov pod nadzorom različic na seznam prezrtih" #. (para) #: ../source/TortoiseSVN_en.xml:6901 msgid "Versioned files and folders can never be ignored - that's a feature of Subversion. If you versioned a file by mistake, read for instructions on how to unversion it." msgstr "Datotek in map pod nadzorom različic ni mogoče prezreti. Če ste dali datoteko pod nadzor različic po pomoti, preberite , kjer je opisano, kako jo iz sistema nadzora odstranite." #. (title) #: ../source/TortoiseSVN_en.xml:6909 msgid "Pattern Matching in Ignore Lists" msgstr "Iskanje vzorcev v seznamu prezrtih elementov" #. (primary) #: ../source/TortoiseSVN_en.xml:6911 msgid "globbing" msgstr "vzorci" #. (primary) #: ../source/TortoiseSVN_en.xml:6914 msgid "pattern matching" msgstr "iskanje vzorcev" #. (term) #: ../source/TortoiseSVN_en.xml:6923 msgid "*" msgstr "*" #. (para) #: ../source/TortoiseSVN_en.xml:6925 msgid "Matches any string of characters, including the empty string (no characters)." msgstr "Poišče katerikoli niz znakov ali prazen niz (brez znakov)." #. (term) #: ../source/TortoiseSVN_en.xml:6932 msgid "?" msgstr "?" #. (para) #: ../source/TortoiseSVN_en.xml:6934 msgid "Matches any single character." msgstr "Poišče katerikoli znak." #. (term) #: ../source/TortoiseSVN_en.xml:6940 msgid "[...]" msgstr "[...]" #. (para) #: ../source/TortoiseSVN_en.xml:6942 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 "Poišče katerikoli znak, ki je podan v oglatem oklepaju. Par znakov znotraj oklepajev, ločen z -, pomeni katerikoli znak med tema dvema znakoma. Primer: [AGm-p] išče kateregakoli izmed naslednjih znakov: A, G, m, n, o ali p." #. (para) #: ../source/TortoiseSVN_en.xml:6916 msgid "Subversion'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 "Iskanje vzorcev v sistemu Subversion uporablja tehniko, ki izvira iz sistema Unix in se uporablja za določanje datotek z uporabo meta-znakov. Naslednji znaki imajo poseben pomen: " #. (para) #: ../source/TortoiseSVN_en.xml:6956 msgid "Subversion 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 "Subversion v vseh notranjih imenih poti uporablja znak / za ločevanje poti, zato se ta oblika zapisa uporablja tudi pri iskanju vzorcev. Če želite v svojih vzorcih uporabiti znak za ločevanje poti, morate uporabiti / in ne \\, ki se uporablja v sistemu Windows." #. (para) #: ../source/TortoiseSVN_en.xml:6962 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 "Iskanje vzorcev je občutljivo na velike in male črke, kar lahko v sistemu Windows povzroča težave. Neobčutljivost lahko vsilite s podvajanjem znakov. Primer: za prezrtje *.tmp ne glede na uporabo velikih in malih črk uporabite vzorec *.[Tt][Mm][Pp]." #. (para) #: ../source/TortoiseSVN_en.xml:6969 msgid "Subversion 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 "Subversion uporablja iskanje vzorcev za vse poti, ki jih uporabimo pri ukazih. Te poti so v splošnem relativne na mapo, na kateri ukaz deluje (n. pr. pri uvažanju, dodajanju, objavi). Iskanje vzorcev mora zato upoštevati, da je pred imenom datoteke lahko naveden del poti." #. (para) #: ../source/TortoiseSVN_en.xml:6976 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 Subversion compares them with the ignore pattern." msgstr "Če je v imenu datoteke navedena tudi pot, je algoritem za iskanje vzorcev ne bo odrezal. Vzorec Fred.* bo našel niz Fred.c, ne pa tudi niza subdir/Fred.c. To je pomembno, če želite dodati mapo, ki vsebuje določene datoteke, ki jih želite prezreti. Te datoteke bodo namreč navedene z delom poti pred imenom in takšen niz se bo uporabil pri iskanju vzorcev." #. (para) #: ../source/TortoiseSVN_en.xml:6985 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 "Znak / pri iskanju vzorcev nima posebnega pomena, tako da vzorec abc*xyz najde tako abcdxyz kot tudi abcmapa/podmapa/nekaj/šenekajxyz." #. (para) #: ../source/TortoiseSVN_en.xml:6991 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 "Za dodajanje vseh map CVS na seznam uporabite vzorec *CVS ali še bolje: par CVS */CVS. Prva možnost sicer deluje, vendar preskoči naprimer element ToNiCVS. Samo uporaba vzorca */CVS ne deluje na neposrednih podmapah, samo uporaba vzorca CVS pa ne deluje na podmapah." #. (para) #: ../source/TortoiseSVN_en.xml:7000 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 "Če vas zanima uradna definicija iskanja vzorcev v datotekah, jo najdete v Specifikaciji IEEE za ukaze lupine Pattern Matching Notation." #. (title) #: ../source/TortoiseSVN_en.xml:7010 msgid "Deleting, Moving and Renaming" msgstr "Brisanje, preimenovanje in premikanje" #. (title) #: ../source/TortoiseSVN_en.xml:7016 msgid "Explorer context menu for versioned files" msgstr "Konteksni meni v Raziskovalcu za datotek pod nadzorom različic" #. (para) #: ../source/TortoiseSVN_en.xml:7011 msgid "Unlike CVS, Subversion allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseSVN submenu. " msgstr "V nasprotju s sistemom CVS Subversion dovoljuje preimenovanje in premikanje datotek in map. Zato se v podmeniju TortoiseSVN nahajajo ukazi za brisanje in preimenovanje. " #. (title) #: ../source/TortoiseSVN_en.xml:7021 msgid "Deleting files and folders" msgstr "Brisanje datotek in map" #. (primary) #: ../source/TortoiseSVN_en.xml:7023 msgid "delete" msgstr "izbriši" #. (primary) #: ../source/TortoiseSVN_en.xml:7026 msgid "remove" msgstr "odstrani" #. (para) #: ../source/TortoiseSVN_en.xml:7028 msgid "Use TortoiseSVNDelete to remove files or folders from subversion." msgstr "Za brisanje datotek ali map iz sistema Subversion uporabite TortoiseSVNIzbriši." #. (para) #: ../source/TortoiseSVN_en.xml:7036 msgid "When you TortoiseSVNDelete 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 TortoiseSVNRevert on the parent folder." msgstr "Ko uporabite ukaz TortoiseSVNIzbriši na datoteki, se ta takoj izbriše iz delovne kopije, prav tako pa se označi za brisanje v skladišču. Brisanje se bo zgodilo ob naslednji objavi. Nadrejena mapa datoteke ima ikono izbrisano. Dokler sprememb ne objavite, lahko izbrisano datoteko pridobite nazaj z uporabo ukaza TortoiseSVNPovrni, ki ga izvedete na nadrejeni mapi." #. (para) #: ../source/TortoiseSVN_en.xml:7052 msgid "When you TortoiseSVNDelete 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 TortoiseSVNRevert on the folder itself. This difference in behaviour between files and folders is a part of Subversion, not TortoiseSVN." msgstr "Ko uporabite ukaz TortoiseSVNIzbriši na mapi, ta ostane v delovni kopiji, njena ikona pa se spremeni in nakazuje, da je mapa označena za brisanje. Dokler sprememb ne objavite, lahko mapo pridobite nazaj z uporabo ukaza TortoiseSVNPovrni na mapi sami. Vzrok za razliko pri obnašanju je v delovnaju sistema Subversion, ne sistema TortoiseSVN." #. (para) #: ../source/TortoiseSVN_en.xml:7069 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 "Če želite izbrisati element iz skladišča, vendar ga želite obdržati krajevno kot datoteko/mapo brez različic, uporabite ukaz Razširjeni kontekstni meniIzbriši (ohrani krajevno). Za prikaz razširjenega kontekstnega menija morate držati tipko Shift ob desnem kliku na element v Raziskovalcu." #. (para) #: ../source/TortoiseSVN_en.xml:7080 msgid "If a file is deleted via the explorer instead of using the TortoiseSVN 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, Subversion 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 TortoiseSVNDelete so that Subversion doesn't have to guess what you really want to do." msgstr "Če datoteko izbrišete iz Raziskovalca, namesto da bi uporabili ukaz iz kontekstnega menija TortoiseSVN, vam okno za objave to datoteko prikaže in vam omogoča, da jo pred objavo odstranite tudi iz sistema različic. Če pa delovno kopijo posodobite, bo Subversion manjkajočo krajevno datoteko nadomestil z zadnjo različico te datoteke v skladišču. Če želite izbrisati datoteko pod nadzorom različic, vedno uporabite ukaz TortoiseSVNIzbriši, da sistemu Subversion ne bo potrebno ugibati, kaj pravzaprav želite." #. (para) #: ../source/TortoiseSVN_en.xml:7094 msgid "If a folder is deleted via the explorer instead of using the TortoiseSVN context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Subversion will replace the missing folder with the latest version from the repository and you can then delete it the correct way using TortoiseSVNDelete." msgstr "Če mapo izbrišete iz Raziskovalca, namesto da bi uporabili ukaz iz kontekstnega menija TortoiseSVN, bo vaša delovna kopija pokvarjena in sprememb ne boste mogli objavljati. Če delovno kopijo posodobite, bo Subversion manjkajočo mapo nadomestil z najnovejšo različico mape iz skladišča. Potem jo lahko izbrišete na pravilen način z ukazom TortoiseSVNIzbriši." #. (title) #: ../source/TortoiseSVN_en.xml:7107 msgid "Getting a deleted file or folder back" msgstr "Kako dobiti nazaj izbrisane datoteke ali mape" #. (para) #: ../source/TortoiseSVN_en.xml:7108 msgid "If you have deleted a file or a folder and already committed that delete operation to the repository, then a normal TortoiseSVNRevert 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 "Če ste datoteko ali mapo izbrisali in spremembe že objavili, potem ne morete uporabiti ukaza TortoiseSVNPovrni, da bi jo dobili nazaj. Datoteka ali mapa pa seveda ni izgubljena. Če poznate številko revizije, v kateri je bila datoteka ali mapa izbrisana (če je ne poznate, jo poiščite v Dnevniku), odprite brskalnik po skladišču in preklopite na to revizijo. Potem izberite datoteko ali mapo in izvedite Kontekstni meniKopiraj v..., kot cilj kopiranja pa izberite pot v delovni kopiji." #. (title) #: ../source/TortoiseSVN_en.xml:7130 msgid "Moving files and folders" msgstr "Premikanje datotek in map" #. (primary) #. (primary) #. (primary) #: ../source/TortoiseSVN_en.xml:7132 #: ../source/TortoiseSVN_en.xml:9403 #: ../source/TortoiseSVN_en.xml:13011 msgid "rename" msgstr "preimenuj" #. (primary) #: ../source/TortoiseSVN_en.xml:7135 msgid "move" msgstr "premakni" #. (para) #: ../source/TortoiseSVN_en.xml:7138 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 "Če želite datoteko preimenovati, uporabite Kontekstni meni Preimenuj... Vpišite novo ime za element in preimenovanje je opravljeno." #. (para) #: ../source/TortoiseSVN_en.xml:7153 msgid "select the files or directories you want to move" msgstr "izberite datoteke ali mape, ki jih želite premakniti" #. (para) #: ../source/TortoiseSVN_en.xml:7169 msgid "in the popup menu select Context MenuSVN Move versioned files here" msgstr "v meniju izberite Kontekstni meniSVN - Premakni datoteke pod nadzorom sem" #. (para) #: ../source/TortoiseSVN_en.xml:7147 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 "Če želite datoteke premakniti znotraj delovne kopije, naprimer v drugo podmapo, uporabite poteg z desnim miškinim gumbom: " #. (title) #: ../source/TortoiseSVN_en.xml:7180 msgid "Commit the parent folder" msgstr "Objavi nadrejeno mapo" #. (para) #: ../source/TortoiseSVN_en.xml:7181 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 "Ker je preimenovanje izvedeno kot zaporedni operaciji brisanja in dodajanja, morate narediti objavo na nadrejeni mapi datoteke, da se bo tudi izbrisana datoteka prikazala v oknu za objavo. Če izbrisane datoteke ne objavite, bo le-ta ostala v skladišču in ne bo odstanjena iz delovnih kopij vaših sodelavcev, ko bodo ti posodabljali mapo. V delovni kopiji bodo obe datoteki - tako novo kot staro." #. (para) #: ../source/TortoiseSVN_en.xml:7191 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 "Preimenovanje mape morate objaviti preden začnete spreminjati njeno vsebino, v nasprotnem primeru lahko lahko pride do okvare delovne kopije." #. (para) #: ../source/TortoiseSVN_en.xml:7197 msgid "You can also use the repository browser to move items around. Read to find out more." msgstr "Za premikanje elementov lahko uporabite tudi brskalnik po skladišču. Za več informacij preberite ." #. (title) #: ../source/TortoiseSVN_en.xml:7202 msgid "Do Not SVN Move Externals" msgstr "Zunanjih elementov ne premikajte z ukazi Subversion" #. (para) #: ../source/TortoiseSVN_en.xml:7203 msgid "You should not use the TortoiseSVN 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 "Ukazov Premakni in Preimenuj ne uporabljajte na mapah, ki imajo nastavljeno lastnost svn:externals. To bi povzročilo izbris zunanjega elementa iz nadrejene mape, kar bi najbrž razjezilo precej uporabnikov. Če želite premakniti zunanjo mapo, uporabite premikanje v Raziskovalcu, nato pa uskladite lastnosti svn:externals nadrejenih map vira in cilja." #. (title) #: ../source/TortoiseSVN_en.xml:7218 msgid "Changing case in a filename" msgstr "Spreminjanje velikih in malih črk v imenih datotek" #. (primary) #: ../source/TortoiseSVN_en.xml:7220 msgid "case change" msgstr "spremembe velikih in malih črk" #. (para) #: ../source/TortoiseSVN_en.xml:7223 msgid "Making case-only changes to a filename is tricky with Subversion 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 "Spreminjanje imena, ki se od starega razlikuje le v velikih in malih črkah, je na sistemu Windows malce nerodno. Med preimenovanjem morata namreč za kratek čas obstajati obe datoteki. Ker pa datotečni sistema operacijskega sistema Windows ne loči med velikimi in malimi črkami, ukaza Preimenuj ne morete uporabiti." #. (para) #: ../source/TortoiseSVN_en.xml:7229 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 subversion. Just renaming in the explorer will corrupt your working copy!" msgstr "Na srečo obstajata (vsaj) dve možni rešitvi, kako preimenovati datoteko brez izgube zgodovine. Pomembno je, da jo preimenujete v sistemu Subversion. Preimenovanje v Raziskovalcu pokvari delovno kopijo!" #. (para) #: ../source/TortoiseSVN_en.xml:7239 msgid "Commit the changes in your working copy." msgstr "Objavite spremembe v delovni kopiji." #. (para) #: ../source/TortoiseSVN_en.xml:7244 msgid "Rename the file from UPPERcase to upperCASE directly in the repository using the repository browser." msgstr "Datoteko preimenujete (zamenjajte ustrezne velike in male črk) neposredno v skladišču s pomočjo brskalnika po skladišču." #. (para) #: ../source/TortoiseSVN_en.xml:7250 msgid "Update your working copy." msgstr "Posodobite delovno kopijo" #. (para) #: ../source/TortoiseSVN_en.xml:7235 msgid "Solution A) (recommended) " msgstr "Rešitev A) (priporočena) " #. (para) #: ../source/TortoiseSVN_en.xml:7260 msgid "Rename from UPPERcase to UPPERcase_ with the rename command in the TortoiseSVN submenu." msgstr "Preimenujte datoteko, tako da uporabite ukaz Preimenuj iz kontekstnega menija TortoiseSVN. Novo ime naj bo enako staremu, dodajte mu le znak _ na koncu." #. (para) #. (para) #: ../source/TortoiseSVN_en.xml:7266 #: ../source/TortoiseSVN_en.xml:7276 msgid "Commit the changes." msgstr "Objavite spremembe" #. (para) #: ../source/TortoiseSVN_en.xml:7271 msgid "Rename from UPPERcase_ to upperCASE." msgstr "Preimenujte datoteko (zamenjajte ustrezne velike in male črke)." #. (para) #: ../source/TortoiseSVN_en.xml:7256 msgid "Solution B) " msgstr "Rešitev B) " #. (title) #: ../source/TortoiseSVN_en.xml:7284 msgid "Dealing with filename case conflicts" msgstr "Obravnava težav pri imenih datotek zaradi velikih in malih črk" #. (para) #: ../source/TortoiseSVN_en.xml:7285 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 Subversion supports case-sensitive filenames, Windows does not." msgstr "Če se v skladišču že nahajata dve datoteki, ki se razlikujeta samo v velikih in malih črkah (n. pr. TEST.TXT in test.txt), mape, kjer se ti dve datoteki nahajata, na sistemu Windows ne morete posodobiti ali prevzeti. Subversion namreč omogoča ločevanje imen, ki se razlikujejo samo v velikih in malih črkah, sistem Windows pa ne." #. (para) #: ../source/TortoiseSVN_en.xml:7293 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 "Ta situacija je možna, če dva uporabnika iz dveh različnih delovnih kopij objavita datoteko, ki se razlikuje le v velikih in malih črkah. Možna pa je tudi takrat, ko uporabniki uporabljajo operacijski sistem, ki v datotečnem sistemu ločuje velike in male črke, n. pr. Linux." #. (para) #: ../source/TortoiseSVN_en.xml:7300 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 "V takšnem primeru se morate odločiti, katero izmed dveh datotek boste obdržali, drugo pa morate v skladišču izbrisati ali premenovati." #. (title) #: ../source/TortoiseSVN_en.xml:7305 msgid "Preventing two files with the same name" msgstr "Kako preprečiti dve datoteki z enakima imenoma" #. (para) #: ../source/TortoiseSVN_en.xml:7306 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 "Na naslovu http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/ je na razpolago ukazna datoteka akcije, ki prepreči objave, ki vodijo do spora zaradi velikih in malih črk." #. (title) #: ../source/TortoiseSVN_en.xml:7316 msgid "Repairing File Renames" msgstr "Popravljanje preimenovanj datotek" #. (para) #: ../source/TortoiseSVN_en.xml:7317 msgid "Sometimes your friendly IDE will rename files for you as part of a refactoring exercise, and of course it doesn't tell Subversion. If you try to commit your changes, Subversion 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 Subversion does not know the files are related." msgstr "Včasih vaše prijazno razvojno orodje preimenuje datoteke kot del refaktoriranja in seveda tega ne pove sistemu Subversion. Če poskusite takšne spremembe objaviti, vidite staro datoteko kot manjkajočo in novo kot datoteko brez različic. Lahko bi enostavno dodali datoteko brez različic, vendar bi v tem primeru izgubili zgodovino, saj Subversion ne ve, da sta datoteki povezani." #. (para) #: ../source/TortoiseSVN_en.xml:7325 msgid "A better way is to notify Subversion 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 "Boljši način je, da sistemu Subversion poveste, da gre v tem primeru dejansko za preimenovanje datoteke in sicer lahko to storite v oknih Objavi in Preveri posodobitve. Enostavno izberite tako staro datoteko (manjkajočo) kot novo (brez različic) in uporabite Kontekstni meniPopravi premik. S tem datoteki povežete v preimenovanje." #. (title) #: ../source/TortoiseSVN_en.xml:7339 msgid "Deleting Unversioned Files" msgstr "Brisanje datotek brez različic" #. (para) #: ../source/TortoiseSVN_en.xml:7340 msgid "Usually you set your ignore list such that all generated files are ignored in Subversion. 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čajno nastavite sezname prezrtih elementov v sistemu v Subversion tako, da se prezrejo vse generirane datoteke. Kaj pa, če želite počistiti vse prezrte datoteke, da bi naredili čisto gradnjo? Običajno naredite to v skripti makefile, če pa to skripto razhroščujete ali delate spremembe v sistemu gradnje, je koristno, če lahko delovno kopijo počistite." #. (para) #: ../source/TortoiseSVN_en.xml:7347 msgid "TortoiseSVN 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 "TortoiseSVN vam ponuja to možnost z uporabo ukaza Razširjeni kontekstni meniIzbriši datoteke brez različic.... Da vidite razširjeni kontekstni meni, med desnim klikom na mapo v Raziskovalcu držite pritisnjeno tipko Shift. Prikazalo se bo pogovorno okno s seznamom vseh datotek brez različic v delovni kopiji. Izberete lahko tiste, ki jih želite izbrisati." #. (para) #: ../source/TortoiseSVN_en.xml:7359 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 "Pri brisanju elementov se le-te premakne v Koš, tako da jih lahko v primeru napake še vedno pridobite nazaj." #. (title) #: ../source/TortoiseSVN_en.xml:7367 msgid "Undo Changes" msgstr "Razveljavljanje sprememb" #. (primary) #. (primary) #: ../source/TortoiseSVN_en.xml:7369 #: ../source/TortoiseSVN_en.xml:13139 msgid "revert" msgstr "povrni" #. (primary) #: ../source/TortoiseSVN_en.xml:7372 msgid "undo" msgstr "razveljavi" #. (title) #: ../source/TortoiseSVN_en.xml:7387 msgid "Revert dialog" msgstr "Okno za povrnitev" #. (para) #: ../source/TortoiseSVN_en.xml:7374 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 TortoiseSVNRevert 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 "Če želite v datoteki povrniti vse spremembe, ki ste jih naredili od zadnje posodobitve, desno kliknite, da se pojavi kontekstni meni in izberite ukaz TortoiseSVNPovrni Pojavi se pogovorno okno s seznamom vseh spremenjenih datotek, ki jih lahko povrnete. Izberite tiste, ki jih želite povrniti in kliknite na gumb V redu. " #. (para) #: ../source/TortoiseSVN_en.xml:7391 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 "Če želite preklicati brisanje ali preimenovanje, morate ukaz Prekliči uporabiti na nadrejeni mapi, saj izbrisane datoteke na obstajajo in tako ne morete desno klikniti nanje." #. (para) #: ../source/TortoiseSVN_en.xml:7396 msgid "If you want to undo the addition of an item, this appears in the context menu as TortoiseSVNUndo add.... This is really a revert as well, but the name has been changed to make it more obvious." msgstr "Če želite preklicati dodajanje elementa, lahko iz kontekstnega menija izberete ukaz TortoiseSVNPrekliči dodajanje.... Dejansko se izvede ukaz Povrni, ki pa smo ga preimenovali, da je njegovo dejanje bolj očitno." #. (para) #. (para) #: ../source/TortoiseSVN_en.xml:7406 #: ../source/TortoiseSVN_en.xml:9080 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 "Stolpce v tem oknu lahko prilagodite enako kot stolpce v oknu Preveri spremembe. Za več informacij preberite ." #. (title) #: ../source/TortoiseSVN_en.xml:7412 msgid "Undoing Changes which have been Committed" msgstr "Povrnitev sprememb, ki so že bile objavljene" #. (para) #: ../source/TortoiseSVN_en.xml:7413 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 "Z ukazom Povrni lahko povrnete le spremembe, ki jih še niste objavili, ne pa tudi sprememb, ki ste jih že objavili. Če želite povrniti vse spremembe, ki ste jih objavili v določeni reviziji, preberite ." #. (title) #: ../source/TortoiseSVN_en.xml:7424 msgid "Revert is Slow" msgstr "Povrnitev je počasna" #. (para) #: ../source/TortoiseSVN_en.xml:7425 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 TortoiseSVN's settings." msgstr "Povrnitev krajevnih sprememb lahko traja dalj časa, kot mogoče pričakujete. To se zgodi, ker TortoiseSVN spremenjeno različico datoteke pošlje v Koš, tako da jo lahko pridobite, če ste ukaz Povrni izvedli po pomoti. Če je Koš poln, potrebuje operacijski sistem več časa, da najde prostor, kamor datoteko shrani. Rešitev je enostavna: izpraznite Koš ali pa v nastavitvah izklopite polje Pri uporabi ukaza Povrni uporabi koš." #. (title) #. (entry) #. (title) #. (glossterm) #: ../source/TortoiseSVN_en.xml:7438 #: ../source/TortoiseSVN_en.xml:13757 #: ../source/TortoiseSVN_en.xml:14802 #: ../source/TortoiseSVN_en.xml:15587 msgid "Cleanup" msgstr "Čiščenje" #. (primary) #: ../source/TortoiseSVN_en.xml:7440 msgid "cleanup" msgstr "počisti" #. (para) #: ../source/TortoiseSVN_en.xml:7442 msgid "If a Subversion 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 TortoiseSVNCleanup on the folder. It is a good idea to do this at the top level of the working copy." msgstr "Če se nek ukaz sistema Subversion ne more izvesti uspešno, denimo zaradi težav s strežnikom, lahko vaša delovna kopija ostane v nekonsistentnem stanju. V tem primeru morate na mapi uporabiti ukaz TortoiseSVNPočisti. Najbolje, da to storite na vrhnji mapi delovne kopije." #. (para) #: ../source/TortoiseSVN_en.xml:7453 msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Subversion 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 še en uporaben stranski učinek. Če se datum datoteke spremeni, njena vsebina pa ne, lahko Subversion ugotovi, ali gre za dejansko spremembo vsebine le s popolno primerjavo trenutne datoteke z začetno datoteko. Če imate v delovni kopiji veliko datotek s spremenjenim datumom, lahko pridobivanje dejanskega stanja datotek poteka zelo dolgo, kar upočasni odzivnost pogovornih oken. Če na delovni kopiji izvedete ukaz Počisti, bo le-ta popravil datoteke z nepravilnim časovnim žigom in s tem povečal hitrost pridobivanja stanja datotek." #. (title) #: ../source/TortoiseSVN_en.xml:7464 msgid "Use Commit Timestamps" msgstr "Uporabi časovni žig objave" #. (para) #: ../source/TortoiseSVN_en.xml:7465 msgid "Some earlier releases of Subversion 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 "Nekatere starejše različice sistema Subversion so vsebovale napako, ki je povzročila nepravilne časovne žige datotek v primeru uporabe možnosti Uporabi časovni žig objave. Uporabite ukaz Počisti, da pohitrite odzivnost takšne delovne kopije." #. (title) #: ../source/TortoiseSVN_en.xml:7475 msgid "Project Settings" msgstr "Nastavitve projekta" #. (primary) #: ../source/TortoiseSVN_en.xml:7477 msgid "properties" msgstr "lastnosti" #. (title) #: ../source/TortoiseSVN_en.xml:7481 msgid "Explorer property page, Subversion tab" msgstr "Stran Lastnosti v Raziskovalcu, zavihek Subversion" #. (para) #: ../source/TortoiseSVN_en.xml:7479 msgid " Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Subversion 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 TortoiseSVN submenu!). In the properties dialog box TortoiseSVN has added a new property page for files/folders under Subversion control, where you can see all relevant information about the selected file/directory." msgstr " Včasih hočete o datoteki/mapi izvedeti več, kot pove prekrivna ikona. Vse informacije, ki jih Subversion poda, lahko najdete v oknu Lastnosti. V Raziskovalcu izberite datoteko in v kontekstnem meniju izberite Meni WindowsLastnosti (pazite: to je običajno okno Lastnosti, ki ga prikaže Raziskovalec, ne tisti v podmeniju TortoiseSVN!). V to okno za datoteke/mape pod nadzorom različic TortoiseSVN doda zavihek Subversion, kjer dobite vse potrebne informacije o izbrani datoteki/mapi." #. (title) #: ../source/TortoiseSVN_en.xml:7501 msgid "Subversion Properties" msgstr "Lastnosti Subversion" #. (primary) #: ../source/TortoiseSVN_en.xml:7503 msgid "Subversion properties" msgstr "lastnosti Subversion" #. (title) #: ../source/TortoiseSVN_en.xml:7509 msgid "Subversion property page" msgstr "Lastnosti v sistemu Subversion" #. (para) #: ../source/TortoiseSVN_en.xml:7507 msgid " You can read and set the Subversion properties from the Windows properties dialog, but also from TortoiseSVNproperties and within TortoiseSVN's status lists, from Context menuproperties." msgstr " Lastnosti Subversion lahko preberete in nastavite v oknu Lastnosti, ki ga prikaže sistem Windows. Poleg tega vidite te lastnosti tudi, če uporabite ukaz TortoiseSVNLastnosti. V pogovornih oknih TortoiseSVN, kjer se izpišejo seznami datotek, lahko lastnosti prikažete z ukazom Kontekstni meniLastnosti." #. (para) #: ../source/TortoiseSVN_en.xml:7524 msgid "You can add your own properties, or some properties with a special meaning in Subversion. These begin with svn:. svn:externals is such a property; see how to handle externals in ." msgstr "Dodate lahko svoje lastne lastnosti ali nekatere lastnosti, ki imajo v sistemu Subversion poseben pomen. Te se začnejo s svn:. Takšna lastnost je svn:externals; kako se uporablja zunanje elemente, si poglejte v ." #. (title) #: ../source/TortoiseSVN_en.xml:7531 msgid "svn:keywords" msgstr "svn:keywords" #. (primary) #: ../source/TortoiseSVN_en.xml:7533 msgid "keywords" msgstr "ključne besede" #. (primary) #: ../source/TortoiseSVN_en.xml:7536 msgid "expand keywords" msgstr "razširi ključne besede" #. (para) #: ../source/TortoiseSVN_en.xml:7546 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 zadnje znane objave glede na informacije iz zadnje posodobitve delovne kopije. Ne preverja, če so v skladišču novejše spremembe." #. (para) #: ../source/TortoiseSVN_en.xml:7557 msgid "Revision of last known commit." msgstr "Revizija zadnje znane objave." #. (para) #: ../source/TortoiseSVN_en.xml:7565 msgid "Author who made the last known commit." msgstr "Avtor zadnje znane objave." #. (para) #: ../source/TortoiseSVN_en.xml:7573 msgid "The full URL of this file in the repository." msgstr "Celoten naslov URL te datoteke v skladišču." #. (para) #: ../source/TortoiseSVN_en.xml:7581 msgid "A compressed combination of the previous four keywords." msgstr "Stisnjena kombinacija prejšnjih štirih ključnih besed." #. (para) #: ../source/TortoiseSVN_en.xml:7538 msgid "Subversion supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: " msgstr "Subversion omogoča (podobno kot sistem CVS) razširitev ključnih besed, ki se lahko uporabljajo za vstavljanje imena datoteke in številke revizije v vsebino datoteke. Trenutno so podprte naslednje ključne besede: " #. (para) #: ../source/TortoiseSVN_en.xml:7589 msgid "To find out how to use these keywords, look at the svn:keywords section in the Subversion book, which gives a full description of these keywords and how to enable and use them." msgstr "O uporabi teh ključnih besed si lahko več preberete v poglavju svn:keywords section knjige The Subversion Book. Tam dobite popoln opis ključnih besed in njihove uporabe." #. (para) #: ../source/TortoiseSVN_en.xml:7599 msgid "For more information about properties in Subversion see the Special Properties." msgstr "Več informacij o lastnostih v sistemu Subversion dobite na naslovu Special Properties." #. (title) #: ../source/TortoiseSVN_en.xml:7606 msgid "Adding and Editing Properties" msgstr "Dodajanje in urejanje lastnosti" #. (title) #: ../source/TortoiseSVN_en.xml:7609 msgid "Adding properties" msgstr "Dodajanje lastnosti" #. (para) #: ../source/TortoiseSVN_en.xml:7607 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 " Če želite dodati novo lastnost, najprej kliknite na gumb Dodaj.... Iz spustnega menija izberite zahtevano lastnost ali vpišite ime svoje lastnosti, nato pa v vnosno polje vpišite vrednost. Pri lastnostih, ki dopuščajo več vrednosti, n. pr. seznam prezrtih elementov, vnesite po eno vrednost v vrstico. S klikom na gumb V redu dodate lastnost na seznam." #. (para) #: ../source/TortoiseSVN_en.xml:7619 msgid "If you want to apply a property to many items at once, select the files/folders in explorer, then select Context menuproperties" msgstr "Če želite lastnost nastaviti več elementom naenkrat, v Raziskovalcu izberite datoteke/mape, nato pa pokličite ukaz Kontekstni meniLastnosti" #. (para) #: ../source/TortoiseSVN_en.xml:7627 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 "Če želite nastaviti lastnost vsaki datoteki in mapi v hierarhiji pod trenutno mapo, uporabite potrditveno polje Rekurzivno." #. (para) #: ../source/TortoiseSVN_en.xml:7632 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 "Nekatere lastnosti, n. pr. svn:needs-lock, lahko nastavite le na datotekah, tako da se ime lastnosti ne pojavi v spustnih menijih pri mapah. Še vedno lahko takšno lastnost nastavite rekurzivno na vseh datotekah hierarhije, vendar morate ime lastnosti vpisati sami." #. (para) #: ../source/TortoiseSVN_en.xml:7639 msgid "If you wish to edit an existing property, select that property from the list of existing properties, then click on Edit...." msgstr "Če želite urediti obstoječo lastnost, jo izberite iz seznama obstoječih lastnosti in kliknite na gumb Uredi...." #. (para) #: ../source/TortoiseSVN_en.xml:7643 msgid "If you wish to remove an existing property, select that property from the list of existing properties, then click on Remove." msgstr "Če želite odstraniti nastavljeno lastnost, jo izberite iz seznama obstoječih lastnosti in kliknite na gumb Odstrani." #. (para) #: ../source/TortoiseSVN_en.xml:7647 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 "Lastnost svn:externals se uporablja za vključitev zunanjih elementov iz istega ali drugega skladišča. Za več informacij preberite ." #. (title) #: ../source/TortoiseSVN_en.xml:7655 msgid "Exporting and Importing Properties" msgstr "Izvažanje in uvažanje lastnosti" #. (para) #: ../source/TortoiseSVN_en.xml:7656 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 "Pogosto isti nabor lastnosti nastavite na več datotekah/mapah, naprimer bugtraq:logregex. Za enostaven prenos lastnosti iz enega projekta na drugega lahko uporabite zmožnost Izvoz/Uvoz." #. (para) #: ../source/TortoiseSVN_en.xml:7662 msgid "From the file or folder where the properties are already set, use TortoiseSVNproperties, 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 "Na datoteki ali mapi, ki vsebuje nastavljene lastnosti, uporabite TortoiseSVNLastnosti, izberite lastnosti, ki jih želite izvoziti in kliknite na gumb Izvozi.... Vpisati boste morali ime datoteke, v katero naj se lastnosti shranijo." #. (para) #: ../source/TortoiseSVN_en.xml:7672 msgid "From the folder(s) where you wish to apply these properties, use TortoiseSVNproperties 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 "Na mapah, na katerih želite nastaviti lastnosti, uporabite TortoiseSVNLastnosti in kliknite na gumb Uvozi.... Izberite datoteko, iz katere želite uvoziti lastnosti, zato izberite datoteko, ki ste jo ustvarili pri izvažanju. Lastnosti bodo v mapo dodane nerekurzivno." #. (para) #: ../source/TortoiseSVN_en.xml:7683 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 "Če želite drevesu dodati lastnosti rekurzivno, naredite zgoraj opisane korake, potem pa v oknu lastnosti izberite vsako lastnost, kliknite na gumb Uredi..., potrdite polje Uporabi lastnost rekurzivno in kliknite na gumb V redu." #. (para) #: ../source/TortoiseSVN_en.xml:7690 msgid "The Import file format is binary and proprietary to TortoiseSVN. Its only purpose is to transfer properties using Import and Export, so there is no need to edit these files." msgstr "Izvozna datoteka je binarna in lastna sistemu TortoiseSVN. Njena edina uporaba je prenos lastnosti z uporabo ukazov Izvozi in Uvozi, tako da teh datotek ne urejamo." #. (title) #: ../source/TortoiseSVN_en.xml:7697 msgid "Binary Properties" msgstr "Binarne lastnosti" #. (para) #: ../source/TortoiseSVN_en.xml:7698 msgid "TortoiseSVN 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 "TortoiseSVN lahko z uporabo datotek dodaja lastnostim dvojiške vrednosti. Če želite dvojiško lastnost prebrati, jo shranite v datoteko z gumbom Shrani.... Če želite dvojiško lastnost nastaviti, uporabite urejevalnik datotek ali drugo primerno orodje, ki vam omogoča ustvariti datoteko z željeno vsebino, potem pa datoteko naložite s klikom na gumb Naloži...." #. (para) #: ../source/TortoiseSVN_en.xml:7705 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 "Čeprav se dvojiške lastnosti ne uporabljajo prav pogosto, pa so včasih precej uporabne. Primer: če shranjujete obsežne grafične datoteke ali če je aplikacija, ki slike nalaga, obsežna, lahko pomanjšane slike shranite kot lastnosti datotek in jih tako hitreje pregledujete." #. (title) #: ../source/TortoiseSVN_en.xml:7713 msgid "Automatic property setting" msgstr "Samodejna nastavitev lastnosti" #. (primary) #: ../source/TortoiseSVN_en.xml:7715 msgid "auto-props" msgstr "auto-props" #. (para) #: ../source/TortoiseSVN_en.xml:7717 msgid "You can configure Subversion and TortoiseSVN to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this." msgstr "Subversion in TortoiseSVN lahko prilagodite tako, da se lastnosti samodejno nastavijo datotekam in mapam, ko se te dodajo v skladišče. To lahko storite na dva načina." #. (para) #: ../source/TortoiseSVN_en.xml:7722 msgid "You can edit the subversion configuration file to enable this feature on your client. The General page of TortoiseSVN's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of subversion'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 subversion feature and works with any subversion client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository." msgstr "To zmožnost lahko vključite neposredno v konfiguracijski datoteki za Subversion. Na strani Splošno v nastavitvah se nahaja gumb, ki odpre konfiguracijsko datoteko v urejevalniku besedil. Konfiguracijska datoteka je besedilna datoteka, s katero nastavite določene zmožnosti programa Subversion. Spremeniti morate dve stvari: najprej v odseku miscellany izbrišite komentar pred vrstico enable-auto-props = yes. Nato v naslednjem odseku definirajte, katere lastnosti naj se pripnejo določenim vrstam datotek. S tem določite nastavitve, ki veljajo za vse odjemalce Subversion, vendar jih je potrebno nastaviti na vsakem odjemalcu posebej - možnost, da jih nastavite v skladišču, od koder jih odjemalci preberejo, ne obstaja." #. (para) #: ../source/TortoiseSVN_en.xml:7739 msgid "An alternative method is to set the tsvn:autoprops property on folders, as described in the next section. This method only works for TortoiseSVN clients, but it does get propagated to all working copies on update." msgstr "Druga možnost je nastavitev lastnosti tsvn:autoprops na mapah, kot je opisano v naslednjem odseku. Ta metoda deluje le pri odjemalcih TortoiseSVN, vendar se pri posodobitvi prenese na vse delovne kopije." #. (para) #: ../source/TortoiseSVN_en.xml:7745 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 "Ne glede na uporabljeno metodo upoštevajte, da se samodejne lastnosti upoštevajo le pri dodajanju datotek v skladišče. Te lastnosti nikoli ne spreminjajo lastnosti datotek, ki so že pod nadzorom različic." #. (para) #: ../source/TortoiseSVN_en.xml:7751 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 "Če želite stoodstotno zagotoviti, da imajo datoteke ob dodajanju v skladišče nastavljene ustrezne lastnosti, namestite v skladišče akcijske skripte, ki se izvedejo pred objavo (pre-hook script)." #. (title) #: ../source/TortoiseSVN_en.xml:7758 msgid "Commit properties" msgstr "Objavite lastnosti" #. (para) #: ../source/TortoiseSVN_en.xml:7759 msgid "Subversion properties are versioned. After you change or add a property you have to commit your changes." msgstr "Lastnosti v sistemu Subversion so pod nadzorom različic. Potem, ko spremenite ali dodate lastnosti, morate spremembe objaviti." #. (title) #: ../source/TortoiseSVN_en.xml:7765 msgid "Conflicts on properties" msgstr "Spori pri lastnostih" #. (para) #: ../source/TortoiseSVN_en.xml:7766 msgid "If there's a conflict on committing the changes, because another user has changed the same property, Subversion generates a .prej file. Delete this file after you have resolved the conflict." msgstr "Če pri objavi sprememb pride do spora, ker je nek drug uporabnik sprememnil isto lastnost, Subversion ustvari datoteko .prej. Ko rešite spor, to datoteko izbrišite." #. (title) #: ../source/TortoiseSVN_en.xml:7775 msgid "TortoiseSVN Project Properties" msgstr "Projektne lastnosti TortoiseSVN" #. (primary) #: ../source/TortoiseSVN_en.xml:7777 msgid "project properties" msgstr "lasnosti projekta" #. (primary) #: ../source/TortoiseSVN_en.xml:7780 msgid "TortoiseSVN properties" msgstr "lastnosti TortoiseSVN" #. (para) #: ../source/TortoiseSVN_en.xml:7787 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 nastavi najmanjšo dolžino sporočila dnevniškega zapisa za objavo. Če vnesete krajši zapis, objava ni mogoča. Ta lastnost je uporabna, ker vas opozori, da morate pri vsaki objavi podati primerno opisno sporočilo. Če ta lastnost ni nastavljena ali je nastavljena na vrednost nič, sistem omogoča objavo brez sporočila." #. (para) #: ../source/TortoiseSVN_en.xml:7796 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 nastavi najmanjšo dolžino sporočila pri zaklepu. Če vnesete krajši zapis, pridobitev zaklepa ni mogoča. Ta lastnost je uporabna, ker vas opozori, da morate pri pridobivanju zaklepa podati primerno opisno sporočilo. Če ta lastnost ni nastavljena ali je nastavljena na vrednost nič, sistem omogoča pridobivanje zaklepa brez vnosa sporočila." #. (para) #: ../source/TortoiseSVN_en.xml:7807 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 uporablja pri projektih, ki zahtevajo, da je sporočilo dnevniškega zapisa oblikovano tako, da imajo vrstice določeno največjo dolžino (tipično je ta dolžina 80 znakov) pred novo vrstico. Nastavitev vrednosti, različne od nič, ima dve posledici v oknu za vnos dnevniškega zapisa: nariše mejo največje dovoljene dolžine vrstice in onemogoči oblivanje besedila, tako da vidite, katere vrstice so predolge. Opomba: ta zmožnost pravilno deluje le, če je pisava, uporabljena za sporočila dnevniških zapisov, konstantne širine." #. (para) #: ../source/TortoiseSVN_en.xml:7820 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 uporablja pri projektih, kjer je oblika sporočil dnevniških zapisov predpisana. Ta lastnosti vsebuje besedilo v več vrsticah, ki se vstavi v okno za vnos sporočila dnevniškega zapisa ob pričetku objave. Zapis nato uredite in vnesete zahtevane informacije. Opomba: če hkrati s to lastnostjo uporabljate tudi lastnost tsvn:logminsize, nastavite najmanjšo dolžino dnevniškega zapisa na vrednost, ki je večja od dolžine predloge, sicer določanje najmanjše velikosti zapisa nima več zaščitne vloge." #. (para) #: ../source/TortoiseSVN_en.xml:7831 msgid "Subversion 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 subversion 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 subversion autoprops, e.g. *.sh = svn:eol-style=native;svn:executable sets two properties on files with the .sh extension." msgstr "Subversion omogoča nastavljanje samodejnih lastnosti (autoprops), ki se nastavijo vsem novim ali uvoženim datotekam, odvisno od končnice datoteke. Vsak uporabnik mora imeti v svoji konfiguracijski datoteki odjemalca nastavljene ustrezne samodejne lastnosti. Lastnost tsvn:autoprops lahko nastavite tudi neposredno na mapah. Pri dodajanju ali uvažanju datotek se te lastnosti spojijo z lastnostmi, ki so nastavljene v konfiguracijski datoteki. Oblika je enaka kot pri samodejnih lastnostih Subversion, n. pr: *.sh = svn:eol-style=native;svn:executable nastavi dve lastnosti na datotekah s končnico .sh." #. (para) #: ../source/TortoiseSVN_en.xml:7844 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 "Če pride do spora med krajevnimi samodejnimi lastnostmi in lastnostjo tsvn:autoprops, se upoštevajo nastavitve projekta, ker so sprecifične za ta projekt." #. (para) #: ../source/TortoiseSVN_en.xml:7851 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 "V oknu za objave lahko prilepite seznam spremenjenih datotek, vključno s stanjem vsake datoteke (dodano, spremenjeno...). Lastnost tsvn:logfilelistenglish določa, ali se stanje vstavlja v angleškem jeziku ali v jeziku, ki ga uporabljate v programu TortoiseSVN. Če te lastnosti ne nastavite, se upošteva privzeta vrednost true, kar pomeni, da so podatki o stanju prilepljeni v angleškem jeziku." #. (para) #: ../source/TortoiseSVN_en.xml:7862 msgid "TortoiseSVN 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 "V programu TortoiseSVN lahko uporabljate črkovalnike, ki jih uporabljata tudi programa OpenOffice in Mozilla. Če imate nameščeno katero izmed teh dveh aplikacij, ta lastnost definira, kateri črkovalnik naj se uporabi, torej v katerem jeziku se vpisujejo sporočila dnevniških zapisov. Lastnost tsvn:projectlanguage nastavi jezikovni modul, ki naj se uporabi za preverjanje sporočil dnevniških zapisov. Vrednosti za vaš jezik najdete na naslednji strani: MSDN: Language Identifiers." #. (para) #: ../source/TortoiseSVN_en.xml:7876 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 "Vrednost lahko vnesete v desetiški obliki ali v šestnajstiški obliki - v tem primeru ji dodajte predpono 0x. Primer: za uporabo ameriške angleščine vnesite 0x0409 ali 1033." #. (para) #: ../source/TortoiseSVN_en.xml:7884 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 "Lastnost tsvn:logsummary se uporablja za izluščenje dela sporočila dnevniškega zapisa, ki se izpiše v dnevniku kot povzetek sporočila." #. (para) #: ../source/TortoiseSVN_en.xml:7889 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 lastnosti tsvn:logsummary mora biti enovrstični regularni izraz, ki vsebuje eno skupino. Rezultat te skupine se uporabi za povzetek." #. (para) #: ../source/TortoiseSVN_en.xml:7895 msgid "An example: \\[SUMMARY\\]:\\s+(.*) Will catch everything after [SUMMARY] in the log message and use that as the summary." msgstr "Primer: \\[SUMMARY\\]:\\s+(.*) najde vso besedilo, ki se nahaja za nizom [SUMMARY] in ga uporabi kot povzetek." #. (para) #: ../source/TortoiseSVN_en.xml:7903 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 "Kadar želite dodati novo lastnost, jo lahko izberete iz seznama v spustnem polju ali pa vpišete poljubno ime lastnosti. Če na projektu uporabljate uporabniško določene lastnosti in želite, da se te lastnosti pojavijo v spustnem polju (v izogib tipkarskim napakam pri pisanju imena), lahko ustvarite seznam lastnih lastnosti z uporabo tsvn:userfileproperties in tsvn:userdirproperties. Te lastnosti nastavite mapi. Ko boste urejali lastnosti kateregakoli elementa v tej mapi, se bodo lastne lastnosti pojavile na seznamu preddefiniranih imen." #. (para) #: ../source/TortoiseSVN_en.xml:7782 msgid "TortoiseSVN has a few special properties of its own, and these begin with tsvn:. " msgstr "TortoiseSVN ima nekaj svojih posebnih lastnosti, ki se začnejo s tsvn:. " #. (para) #. (para) #: ../source/TortoiseSVN_en.xml:7919 #: ../source/TortoiseSVN_en.xml:10362 msgid "Some tsvn: properties require a true/false value. TortoiseSVN also understands yes as a synonym for true and no as a synonym for false." msgstr "Nekatere lastnosti tsvn: zahtevajo vrednost true/false. TortoiseSVN razume tudi besedo yes kot sinonim za true in besedo no kot sinonim za false." #. (para) #: ../source/TortoiseSVN_en.xml:7925 msgid "TortoiseSVN can integrate with some bug tracking tools. This uses project properties that start with bugtraq:. Read for further information." msgstr "TortoiseSVN zna vključiti nekatera orodja za sledenje zadev. Za to se uporabljajo lastnosti, ki se začnejo z bugtraq:. Za več informacij preberite ." #. (para) #: ../source/TortoiseSVN_en.xml:7930 msgid "It can also integrate with some web-based repository browsers, using project properties that start with webviewer:. Read for further information." msgstr "Vključi lahko tudi nekatera spletna orodja za brskanje po skladiščih. Za to uporablja lastnosti, ki se začnejo z webviewer:. Za več informacij preberite ." #. (title) #: ../source/TortoiseSVN_en.xml:7936 msgid "Set the project properties on folders" msgstr "Nastavite projektne lastnosti na mapah" #. (para) #: ../source/TortoiseSVN_en.xml:7937 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, TortoiseSVN 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 "Te posebne projektne lastnosti morate nastaviti na mapah, da bo sistem deloval. Ko objavite datoteko ali mapo, se lastnosti preberejo iz te mape. Če TortoiseSVN lastnosti ne najde tam, jih išče v nadrejenih mapah, dokler ne pride do mape brez različic ali do korenske mape pogona (n. pr. C:\\). Če ste prepričani, da bodo uporabniki prevzemali projekt zgolj iz poti n. pr. trunk/ in ne iz katere izmed podmap, potem je dovolj, da lastnosti nastavite na trunk/. Če niste prepričani, potem raje nastavite te lastnosti rekurzivno