merge original branch.

[tortoisegit/TortoiseGitJp.git] / doc / po / TortoiseSVN_sl.po

#
# Slovenian translation for TortoiseGit
# Copyright (C) 2004-2008 the TortoiseGit team
# This file is distributed under the same license as TortoiseGit
#
# Last commit by:
# $Author: luebbe $
# $Date: 2009-01-08 17:19:56 +0800 (Thu, 08 Jan 2009) $
# $Rev: 15043 $
#
# Authors:
# Matjaz Cepon <matjaz.cepon@gmail.com>, 2007
#
msgid ""
msgstr ""
"Project-Id-Version: TortoiseGit 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 <matjaz.cepon@gmail.com>\n"
"Language-Team: TortoiseGit translation team <tortoisegit-dev@googlegroups.com >\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Slovenian\n"
"X-Poedit-Country: SLOVENIA\n"

#. (title)
#. (secondary)
#: ../source/TortoiseGit_en.xml:4
#: ../source/TortoiseGit_en.xml:3023
msgid "TortoiseGit"
msgstr "TortoiseGit"

#. (subtitle)
#: ../source/TortoiseGit_en.xml:5
msgid "A Git client for Windows"
msgstr "Odjemalec za Git v operacijskem sistemu Windows"

#. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated
#. (subtitle)
#: ../source/TortoiseGit_en.xml:6
msgid "Version $MajorVersion$.$MinorVersion$.$MicroVersion$"
msgstr "Verzija $MajorVersion$.$MinorVersion$.$MicroVersion$"

#. (edition)
#: ../source/TortoiseGit_en.xml:8
msgid "First"
msgstr "Prva"

#. (firstname)
#: ../source/TortoiseGit_en.xml:11
msgid "Stefan"
msgstr "Stefan"

#. (surname)
#: ../source/TortoiseGit_en.xml:12
msgid "Küng"
msgstr "Küng"

#. (firstname)
#: ../source/TortoiseGit_en.xml:15
msgid "Lübbe"
msgstr "Lübbe"

#. (surname)
#: ../source/TortoiseGit_en.xml:16
msgid "Onken"
msgstr "Onken"

#. (firstname)
#: ../source/TortoiseGit_en.xml:19
msgid "Simon"
msgstr "Simon"

#. (surname)
#: ../source/TortoiseGit_en.xml:20
msgid "Large"
msgstr "Large"

#. (title)
#: ../source/TortoiseGit_en.xml:27
msgid "Preface"
msgstr "Predgovor"

#. (para)
#: ../source/TortoiseGit_en.xml:35
msgid "Do you work in a team?"
msgstr "Delate v teamu?"

#. (para)
#: ../source/TortoiseGit_en.xml:40
msgid "Has it ever happened that you were working on a file, and someone else was working on the same file at the same time? Did you lose your changes to that file because of that?"
msgstr "Se vam je že kdaj zgodilo, da ste popravljali datoteko istočasno kot nekdo drug? Ste zaradi tega izgubili narejene spremembe?"

#. (para)
#: ../source/TortoiseGit_en.xml:47
msgid "Have you ever saved a file, and then wanted to revert the changes you made? Have you ever wished you could see what a file looked like some time ago?"
msgstr "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/TortoiseGit_en.xml:54
msgid "Have you ever found a bug in your project and wanted to know when that bug got into your files?"
msgstr "Ste kdaj našli hrošča v svojem projektu in ste želeli izvedeti, kdaj se je prikradel tja?"

#. (para)
#: ../source/TortoiseGit_en.xml:61
msgid "If you answered <quote>yes</quote> to one of these questions, then TortoiseGit is for you! Just read on to find out how TortoiseGit can help you in your work. It's not that difficult."
msgstr "Če ste vsaj na eno vprašanje odgovorili z <quote>da</quote>, potem je TortoiseGit za vas! Preberite si, kako vam lahko TortoiseGit pomaga pri delu. Sploh ni težko."

#. (title)
#: ../source/TortoiseGit_en.xml:71
msgid "Audience"
msgstr "Komu je priročnik namenjen"

#. (para)
#: ../source/TortoiseGit_en.xml:72
msgid "This book is written for computer literate folk who want to use Git to manage their data, but are uncomfortable using the command line client to do so. Since TortoiseGit is a windows shell extension it's assumed that the user is familiar with the windows explorer and knows how to use it."
msgstr "Kniga je napisana za računalniško pismene uporabnike, ki želijo uporabljati Git, vendar niso vešči dela preko ukazne vrstice. Ker je TortoiseGit razširitev Windowsove lupine, predpostavljamo, da uporabnik pozna Raziskovalca in ga zna uporabljati."

#. (title)
#: ../source/TortoiseGit_en.xml:84
msgid "Reading Guide"
msgstr "Vodnik po knjigi"

#. (para)
#: ../source/TortoiseGit_en.xml:85
msgid "This <xref linkend=\"tsvn-preface\"/> explains a little about the TortoiseGit project, the community of people who work on it, and the licensing conditions for using it and distributing it."
msgstr "V poglavju <xref linkend=\"tsvn-preface\"/> podamo nekaj podatkov o projektu TortoiseGit, o skupnosti ljudi, ki dela na tem projektu ter o licenčnih pogojih uporabe in distribucije."

#. (para)
#: ../source/TortoiseGit_en.xml:90
msgid "The <xref linkend=\"tsvn-introduction\"/> explains what TortoiseGit is, what it does, where it comes from and the basics for installing it on your PC."
msgstr "V poglavju <xref linkend=\"tsvn-introduction\"/> si pogledamo, kaj TortoiseGit je, kaj lahko z njim naredimo, od kje prihaja in osnovna navodila za namestitev na vašem računalniku."

#. (para)
#: ../source/TortoiseGit_en.xml:95
msgid "In <xref linkend=\"tsvn-basics\"/> we give a short introduction to the <emphasis>Git</emphasis> revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Git project and explains the different approaches to version control, and how Git works."
msgstr "Poglavje <xref linkend=\"tsvn-basics\"/> poda nekaj osnov o sistemu za nadzor različic <emphasis>Git</emphasis>, ki je podlaga za TortoiseGit. Ta del je izposojen iz dokumentacije Git in ponazori različne pristope k vodenju različic datotek in delovanje sistema Git."

#. (para)
#: ../source/TortoiseGit_en.xml:102
msgid "Even most Git users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators."
msgstr "Čeprav večini uporabnikov sistema Git ne bo nikoli potrebno postavljati strežnika, naslednje poglavje opiše, kako se to naredi. Primerno je za skrbnike sistema."

#. (para)
#: ../source/TortoiseGit_en.xml:107
msgid "The chapter on <xref linkend=\"tsvn-repository\"/> explains how to set up a local repository, which is useful for testing Git and TortoiseGit using a single PC. It also explains a bit about repository administration which is also relevant to repositories located on a server."
msgstr "V poglavju <xref linkend=\"tsvn-repository\"/> razložimo, kako narediti krajevno skladišče, ki je uporabno za preizkušanje programov Git in TortoiseGit 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/TortoiseGit_en.xml:113
msgid "The <xref linkend=\"tsvn-dug\"/> is the most important section as it explains all the main features of TortoiseGit and how to use them. It takes the form of a tutorial, starting with checking out a working copy, modifying it, committing your changes, etc. It then progresses to more advanced topics."
msgstr "<xref linkend=\"tsvn-dug\"/> je najpomembnejše poglavje, saj so v njem razložene vse glavne zmožnosti programa TortoiseGit 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/TortoiseGit_en.xml:120
msgid "<xref linkend=\"tsvn-subwcrev\"/> is a separate program included with TortoiseGit which can extract the information from your working copy and write it into a file. This is useful for including build information in your projects."
msgstr "<xref linkend=\"tsvn-subwcrev\"/> je zunanji program, ki je vključen v paket TortoiseGit. 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/TortoiseGit_en.xml:125
msgid "The <xref linkend=\"tsvn-howto\"/> section answers some common questions about performing tasks which are not explicitly covered elsewhere."
msgstr "Poglavje <xref linkend=\"tsvn-howto\"/> poda odgovore na nekatera pogosta vprašanje o nalogah, ki niso opisana v ostalih poglavjih."

#. (para)
#: ../source/TortoiseGit_en.xml:129
msgid "The section on <xref linkend=\"tsvn-automation\"/> shows how the TortoiseGit GUI dialogs can be called from the command line. This is useful for scripting where you still need user interaction."
msgstr "Poglavje <xref linkend=\"tsvn-automation\"/> ponazori, kako lahko kličemo pogovorna okna TortoiseGit iz ukazne vrstice. To je primerno za pisanje ukaznih datotek, v katerih še vedno želimo uporabnikove odzive."

#. (para)
#: ../source/TortoiseGit_en.xml:134
msgid "The <xref linkend=\"tsvn-cli\"/> give a correlation between TortoiseGit commands and their equivalents in the Git command line client <literal>svn.exe</literal>."
msgstr "Poglavje <xref linkend=\"tsvn-cli\"/> poda seznam ukazov TortoiseGit in njihovih sorodnih ukazov v odjemalcu Git za ukazno vrstico (<literal>svn.exe</literal>)."

#. (title)
#: ../source/TortoiseGit_en.xml:144
msgid "TortoiseGit is free!"
msgstr "TortoiseGit je brezplačen!"

#. (para)
#: ../source/TortoiseGit_en.xml:145
msgid "TortoiseGit is free. You don't have to pay to use it, and you can use it any way you want. It is developed under the GNU General Public License (GPL)."
msgstr "Program TortoiseGit 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/TortoiseGit_en.xml:149
msgid "TortoiseGit is an Open Source project. That means you have full access to the source code of this program. You can browse it on this link <ulink url=\"http://TortoiseGit.tigris.org/svn/TortoiseGit/\"><citetitle>http://TortoiseGit.tigris.org/svn/TortoiseGit/</citetitle></ulink>. (Username:guest, for password hit enter) The most recent version (where we're currently working) is located under <filename>/trunk/</filename> the released versions are located under <filename>/tags/</filename>."
msgstr "TortoiseGit je odptrokodni projekt. To pomeni, da imate popolnoma prost dostop do izvorne kode programa. Po njej lahko brskate, če kliknete na povezavo <ulink url=\"http://TortoiseGit.tigris.org/svn/TortoiseGit/\"><citetitle>http://TortoiseGit.tigris.org/svn/TortoiseGit/</citetitle></ulink>. (Uporabniško ime: guest, geslo: &lt;pustite prazno&gt;). Najnovejša različica, na kateri trenutno delamo, se nahaja v mapi <filename>/trunk/</filename>, končne izdaje pa v mapi <filename>/tags/</filename>."

#. (title)
#: ../source/TortoiseGit_en.xml:168
msgid "Community"
msgstr "Skupnost"

#. (para)
#: ../source/TortoiseGit_en.xml:169
msgid "Both TortoiseGit and Git are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs."
msgstr "Projekta TortoiseGit in Git razvija skupnost ljudi, ki prihajajo iz vseh koncev sveta in ki so se združili, da bi ustvarjali čudovite programe."

#. (title)
#: ../source/TortoiseGit_en.xml:180
msgid "Acknowledgments"
msgstr "Zasluge"

#. (term)
#: ../source/TortoiseGit_en.xml:183
msgid "Tim Kemp"
msgstr "Tim Kemp"

#. (para)
#: ../source/TortoiseGit_en.xml:185
msgid "for founding the TortoiseGit project"
msgstr "za ustanovitev projekta TortoiseGit"

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

#. (para)
#: ../source/TortoiseGit_en.xml:193
msgid "for the hard work to get TortoiseGit to what it is now"
msgstr "za trdo delo, s katerim je pripomogel, da je TortoiseGit danes to, kar je"

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

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:208
msgid "Simon Large"
msgstr "Simon Large"

#. (para)
#: ../source/TortoiseGit_en.xml:210
msgid "for helping with the documentation and bug hunting"
msgstr "za pomoč pri dokumentaciji in iskanju napak"

#. (term)
#: ../source/TortoiseGit_en.xml:216
msgid "The Git Book"
msgstr "The Git Book"

#. (para)
#: ../source/TortoiseGit_en.xml:218
msgid "for the great introduction to Git and its chapter 2 which we copied here"
msgstr "za izvrsten uvod v sistem Git in poglavje številka dve, ki smo ga uporabili v tej knjigi"

#. (term)
#: ../source/TortoiseGit_en.xml:225
msgid "The Tigris Style project"
msgstr "The Tigris Style project"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:233
msgid "Our Contributors"
msgstr "Zunanji sodelavci"

#. (para)
#: ../source/TortoiseGit_en.xml:235
msgid "for the patches, bug reports and new ideas, and for helping others by answering questions on our mailing list."
msgstr "za popravke, poročila o napakah in nove ideje in za pomoč ostalim, podano preko naših dopisnih seznamov"

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

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:255
msgid "Terminology used in this document"
msgstr "Uporabljena terminologija"

#. (para)
#: ../source/TortoiseGit_en.xml:256
msgid "To make reading the docs easier, the names of all the screens and Menus from TortoiseGit are marked up in a different font. The <guilabel>Log Dialog</guilabel> for instance."
msgstr "Da bi olajšali branje knjige, so imena vseh oken in menijev TortoiseGit označena z drugo barvo, npr. <guilabel>Dnevnik</guilabel>."

#. (para)
#: ../source/TortoiseGit_en.xml:261
msgid "A menu choice is indicated with an arrow. <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Show Log</guimenuitem></menuchoice> means: select <emphasis>Show Log</emphasis> from the <emphasis>TortoiseGit</emphasis> context menu."
msgstr "Izbira v meniju je prikazana s puščico. <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Pokaži dnevnik</guimenuitem></menuchoice> pomeni: iz kontekstnega menija <emphasis>TortoiseGit</emphasis> izberite <emphasis>Pokaži dnevnik</emphasis>."

#. (para)
#: ../source/TortoiseGit_en.xml:270
msgid "Where a local context menu appears within one of the TortoiseGit dialogs, it is shown like this: <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Save As ...</guimenuitem></menuchoice>"
msgstr "V primeru, ko se kontekstni meni pojavi znotraj enega od pogovornih oken sistema TortoiseGit, je to prikazano takole: <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Shrani kot ...</guimenuitem></menuchoice>"

#. (para)
#: ../source/TortoiseGit_en.xml:278
msgid "User Interface Buttons are indicated like this: Press <guibutton>OK</guibutton> to continue."
msgstr "Gumbi uporabniškega vmesnika so prikazani takole: Za nadaljevanje pritisnite <guibutton>V redu</guibutton>."

#. (para)
#: ../source/TortoiseGit_en.xml:282
msgid "User Actions are indicated using a bold font. <keycap>Alt+A</keycap>: press the <keycap>Alt</keycap>-Key on your keyboard and while holding it down press the <keycap>A</keycap>-Key as well. <action>Right-drag</action>: press the right mouse button and while holding it down <emphasis>drag</emphasis> the items to the new location."
msgstr "Uporabnikove akcije so nakazane z uporabo polkrepke pisave. <keycap>ALT+A</keycap>: pritisnite in držite tipko <keycap>Alt</keycap> na tipkovnici, hkrati pa pritisnite še tipko <keycap>A</keycap>. <action>Desni poteg</action>: pritisnite desno tipko na miški, jo držite in <emphasis>povlecite</emphasis> elemente na novo lokacijo."

#. (para)
#: ../source/TortoiseGit_en.xml:290
msgid "System output and keyboard input is indicated with a <literal>different</literal> font as well."
msgstr "Odgovor sistema in vnos preko tipkovnice sta prav tako ponazorjena z <literal>drugačno</literal> pisavo."

#. (para)
#: ../source/TortoiseGit_en.xml:295
msgid "Important notes are marked with an icon."
msgstr "Pomembne opombe so označene z ikono."

#. (para)
#: ../source/TortoiseGit_en.xml:300
msgid "Tips that make your life easier."
msgstr "Namigi za lažje delo."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:310
msgid "Where extreme care has to be taken, data corruption or other nasty things may occur if these warnings are ignored."
msgstr "Kjer morate biti še posebej previdni, saj lahko ob neupoštevanju pride do okvare podatkov ali ostalih hudih zapletov."

#. (title)
#. (title)
#. (title)
#: ../source/TortoiseGit_en.xml:319
#: ../source/TortoiseGit_en.xml:1482
#: ../source/TortoiseGit_en.xml:2482
msgid "Introduction"
msgstr "Uvod"

#. (primary)
#: ../source/TortoiseGit_en.xml:322
msgid "version control"
msgstr "nadzor različic"

#. (para)
#: ../source/TortoiseGit_en.xml:325
msgid "Version control is the art of managing changes to information. It has long been a critical tool for programmers, who typically spend their time making small changes to software and then undoing or checking some of those changes the next day. Imagine a team of such developers working concurrently - and perhaps even simultaneously on the very same files! - and you can see why a good system is needed to <emphasis>manage the potential chaos</emphasis>."
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 <emphasis> vodenje potencialnega nereda</emphasis>."

#. (title)
#: ../source/TortoiseGit_en.xml:339
msgid "What is TortoiseGit?"
msgstr "Kaj je TortoiseGit?"

#. (para)
#: ../source/TortoiseGit_en.xml:340
msgid "TortoiseGit is a free open-source client for the <firstterm>Git</firstterm> version control system. That is, TortoiseGit manages files and directories over time. Files are stored in a central <firstterm>repository</firstterm>. The repository is much like an ordinary file server, except that it remembers every change ever made to your files and directories. This allows you to recover older versions of your files and examine the history of how and when your data changed, and who changed it. This is why many people think of Git and version control systems in general as a sort of <quote>time machine</quote>."
msgstr "TortoiseGit je brezplačen odprtokodni odjemalec za sistem nadzora različic <firstterm>Git</firstterm>. TortoiseGit upravlja datoteke in mape skozi čas. Datoteke so shranjene v centralnem <firstterm>skladišču</firstterm>. 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 Git in tudi ostale sisteme za nadzor različic kot neke vrste <quote>časovni stroj</quote>."

#. (para)
#: ../source/TortoiseGit_en.xml:352
msgid "Some version control systems are also software configuration management (SCM) systems. These systems are specifically tailored to manage trees of source code, and have many features that are specific to software development - such as natively understanding programming languages, or supplying tools for building software. Git, however, is not one of these systems; it is a general system that can be used to manage <emphasis>any</emphasis> 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). Git ni tak sistem; je splošen sistem, ki omogoča urejanje <emphasis>katerokoli</emphasis> zbirke datotek, vključno z datotekami izvorne kode."

#. (title)
#: ../source/TortoiseGit_en.xml:368
msgid "TortoiseGit's History"
msgstr "Zgodovina TortoiseGit"

#. (para)
#: ../source/TortoiseGit_en.xml:369
msgid "In 2002, Tim Kemp found that Git was a very good version control system, but it lacked a good GUI client. The idea for a Git client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS."
msgstr "Leta 2002 je Tim Kemp ugotovil, da je Git 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/TortoiseGit_en.xml:375
msgid "Tim studied the source code of TortoiseCVS and used it as a base for TortoiseGit. He then started the project, registered the domain <literal>TortoiseGit.org</literal> and put the source code online. During that time, Stefan Küng was looking for a good and free version control system and found Git and the source for TortoiseGit. Since TortoiseGit was still not ready for use then he joined the project and started programming. Soon he rewrote most of the existing code and started adding commands and features, up to a point where nothing of the original code remained."
msgstr "Tim je preučil izvorno kodo aplikacije TortoiseCVS in jo uporabil kot osnovo za TortoiseGit. Nato je začel s projektom, registriral domeno <literal>TortoiseGit.org</literal> in objavil izvorno kodo. Med tem časom je Stefan Küng iskal dober brezplačen sistem za nadzor različic in našel Git ter izvorno kodo za TortoiseGit. 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/TortoiseGit_en.xml:386
msgid "As Git became more stable it attracted more and more users who also started using TortoiseGit as their Git client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation."
msgstr "Sistem Git je postajal vse bolj stabilen in je pridobival vedno več uporabnikov, ki so uporabljali TortoiseGit kot odjemalca za Git. Š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 TortoiseGit. Ureja tudi spletno stran in prevode."

#. (title)
#: ../source/TortoiseGit_en.xml:399
msgid "TortoiseGit's Features"
msgstr "Značilnosti TortoiseGit"

#. (para)
#: ../source/TortoiseGit_en.xml:400
msgid "What makes TortoiseGit such a good Git client? Here's a short list of features."
msgstr "Zakaj je TortoiseGit tako dober odjemalec za Git? Tukaj je kratek seznam njegovih značilnosti."

#. (term)
#: ../source/TortoiseGit_en.xml:406
msgid "Shell integration"
msgstr "Integracija z lupino"

#. (primary)
#: ../source/TortoiseGit_en.xml:409
msgid "Windows shell"
msgstr "Lupina Windows"

#. (primary)
#: ../source/TortoiseGit_en.xml:412
msgid "explorer"
msgstr "raziskovalec"

#. (para)
#: ../source/TortoiseGit_en.xml:414
msgid "TortoiseGit integrates seamlessly into the Windows shell (i.e. the explorer). This means you can keep working with the tools you're already familiar with. And you do not have to change into a different application each time you need functions of the version control!"
msgstr "TortoiseGit se 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/TortoiseGit_en.xml:421
msgid "And you are not even forced to use the Windows Explorer. TortoiseGit's context menus work in many other file managers, and in the File/Open dialog which is common to most standard Windows applications. You should, however, bear in mind that TortoiseGit is intentionally developed as extension for the Windows Explorer. Thus it is possible that in other applications the integration is not as complete and e.g. the icon overlays may not be shown."
msgstr "Pri tem pa vam ni nujno uporabljati ravno Raziskovalca. Kontekstni meniji TortoiseGit 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 TortoiseGit 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/TortoiseGit_en.xml:435
msgid "Icon overlays"
msgstr "Prekrivne ikone"

#. (para)
#: ../source/TortoiseGit_en.xml:437
msgid "The status of every versioned file and folder is indicated by small overlay icons. That way you can see right away what the status of your working copy is."
msgstr "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/TortoiseGit_en.xml:445
msgid "Easy access to Git commands"
msgstr "Preprost dostop do ukazov sistema Git"

#. (para)
#: ../source/TortoiseGit_en.xml:447
msgid "All Git commands are available from the explorer context menu. TortoiseGit adds its own submenu there."
msgstr "Vsi ukazi sistema Git so na razpolago v kontekstnem meniju Raziskovalca. TortoiseGit doda tja svoj lasten pomeni."

#. (para)
#: ../source/TortoiseGit_en.xml:454
msgid "Since TortoiseGit is a Git client, we would also like to show you some of the features of Git itself:"
msgstr "Ker je TortoiseGit odjemalec za Git, vam bomo prikazali tudi nekaj značilnosti samega sistema Git:"

#. (term)
#: ../source/TortoiseGit_en.xml:460
msgid "Directory versioning"
msgstr "Vodenje različic map"

#. (para)
#: ../source/TortoiseGit_en.xml:462
msgid "CVS only tracks the history of individual files, but Git implements a <quote>virtual</quote> versioned filesystem that tracks changes to whole directory trees over time. Files <emphasis>and</emphasis> directories are versioned. As a result, there are real client-side <command>move</command> and <command>copy</command> commands that operate on files and directories."
msgstr "CVS upravlja le zgodovino posameznih datotek, Git pa ima <quote>virtualni</quote> datotečni sistem pod nadzorom različic, ki upravlja spremembe na celotnem drevesu map. Pod nadzorom so datoteke <emphasis>in</emphasis> mape. Posledica tega je, da imamo na strani odjemalca na razpolago ukaza <command>premakni</command> in <command>kopiraj</command>, ki delujeta na datotekah in mapah."

#. (term)
#: ../source/TortoiseGit_en.xml:475
msgid "Atomic commits"
msgstr "Atomične objave"

#. (para)
#: ../source/TortoiseGit_en.xml:477
msgid "A commit either goes into the repository completely, or not at all. This allows developers to construct and commit changes as logical chunks."
msgstr "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/TortoiseGit_en.xml:485
msgid "Versioned metadata"
msgstr "Metapodatki pod nadzorom različic"

#. (para)
#: ../source/TortoiseGit_en.xml:487
msgid "Each file and directory has an invisible set of <quote>properties</quote> 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 <quote>lastnosti</quote>. Lahko si izmislite kakršen koli par ključ/vrednost. Lastnosti so pod nadzorom različic, prav tako kot vsebina datoteke."

#. (term)
#: ../source/TortoiseGit_en.xml:497
msgid "Choice of network layers"
msgstr "Izbira plasti omrežja"

#. (para)
#: ../source/TortoiseGit_en.xml:499
msgid "Git has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Git's <quote>advanced</quote> network server is a module for the Apache web server, which speaks a variant of HTTP called WebDAV/DeltaV. This gives Git a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Git server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh."
msgstr "Git je vpeljal abstrakten koncept dostopa do skladišča, kar uporabnikom omogoča, da izdelajo nove omrežne mehanizme. Gitov <quote>napredni</quote> mrežni strežnik je modul za spletni strežnik Apache, ki govori narečje protokola HTTP, imenovano WebDAV/DeltaV. To daje sistemu Git veliko prednosti s stališča stabilnosti in povezovanja, prinaša pa še številne dodatne zmožnosti, n. pr.: avtentikacijo, avtorizacijo, <emphasis>wire compression</emphasis> in brskanje po skladišču. Na razpolago pa je tudi manjši, samostojen strežnik za Git. Strežnik se pogovarja po prilagojenem protokolu, ki se ga preprosto preusmeri preko ssh."

#. (term)
#: ../source/TortoiseGit_en.xml:516
msgid "Consistent data handling"
msgstr "Konsistentno upravljanje s podatki"

#. (para)
#: ../source/TortoiseGit_en.xml:518
msgid "Git expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network."
msgstr "Git 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/TortoiseGit_en.xml:529
msgid "Efficient branching and tagging"
msgstr "Učinkovita uporaba vej in oznak"

#. (para)
#: ../source/TortoiseGit_en.xml:531
msgid "The cost of branching and tagging need not be proportional to the project size. Git creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository."
msgstr "Cena vej in oznak ni nujno sorazmerna z velikostjo projekta. Git 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/TortoiseGit_en.xml:542
msgid "Hackability"
msgstr "Možnost vključevanja v druge aplikacije"

#. (para)
#: ../source/TortoiseGit_en.xml:544
msgid "Git has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Git extremely maintainable and usable by other applications and languages."
msgstr "Sistem Git nima zgodovine. Razvit je kot zbirka knjižnic v jeziku C z dobro definiranim programskim vmesnikom (API). Zato je Git zelo primeren za vzdrževanje in uporabo s strani ostalih aplikacij in jezikov."

#. (title)
#: ../source/TortoiseGit_en.xml:558
msgid "Installing TortoiseGit"
msgstr "Namestitev TortoiseGit"

#. (title)
#: ../source/TortoiseGit_en.xml:560
msgid "System requirements"
msgstr "Sistemske zahteve"

#. (para)
#: ../source/TortoiseGit_en.xml:561
msgid "TortoiseGit runs on Windows 2000 SP2, Windows XP or higher. Windows 98, Windows ME and Windows NT4 are no longer supported since TortoiseGit 1.2.0, but you can still download the older versions if you really need them."
msgstr "TortoiseGit deluje na sistemih Windows 2000 SP2, Windows XP ali novejšem. Od verzije TortoiseGit 1.2.0 ne podpiramo sistemov Windows 98, Windows ME in Windows NT4. Če želite uporabljati TortoiseGit na teh sistemih, lahko na naši domači strani najdete starejše različice."

#. (para)
#: ../source/TortoiseGit_en.xml:567
msgid "If you encounter any problems during or after installing TortoiseGit please refer to <xref linkend=\"tsvn-faq\"/> first."
msgstr "Če med namestitvijo TortoiseGit ali po njej naletite na težave, se najprej obrnite na <xref linkend=\"tsvn-faq\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:575
msgid "Installation"
msgstr "Namestitev"

#. (primary)
#: ../source/TortoiseGit_en.xml:577
msgid "install"
msgstr "namesti"

#. (para)
#: ../source/TortoiseGit_en.xml:579
msgid "TortoiseGit comes with an easy to use installer. Double click on the installer file and follow the instructions. The installer will take care of the rest."
msgstr "TortoiseGit ima enostaven namestitveni program. Dvokliknite na namestitveno datoteko in sledite navodilom. Namestitveni program bo poskrbel za vse potrebno."

#. (para)
#: ../source/TortoiseGit_en.xml:585
msgid "You need Administrator privileges to install TortoiseGit."
msgstr "Za namstitev TortoiseGit potrebujete skrbniške pravice."

#. (title)
#: ../source/TortoiseGit_en.xml:591
msgid "Language Packs"
msgstr "Jezikovni paketi"

#. (primary)
#: ../source/TortoiseGit_en.xml:593
msgid "language packs"
msgstr "jezikovni paketi"

#. (primary)
#: ../source/TortoiseGit_en.xml:596
msgid "translations"
msgstr "prevodi"

#. (para)
#: ../source/TortoiseGit_en.xml:598
msgid "The TortoiseGit user interface has been translated into many different languages, so you may be able to download a language pack to suit your needs. You can find the language packs on our <ulink url=\"http://TortoiseGit.net/translation_status\"><citetitle>translation status page</citetitle></ulink>. And if there is no language pack available yet, why not join the team and submit your own translation ;-)"
msgstr "Uporabniški vmesnik TortoiseGit je preveden v veliko jezikov, med drugim tudi v slovenščino. Jezikovne pakete najdete <ulink url=\"http://TortoiseGit.net/translation_status\"><citetitle> na tem naslovu</citetitle></ulink>. Če jezikovnega paketa za vaš jezik ni, se lahko pridružite naši ekipi in naredite lasten prevod ;-)"

#. (para)
#: ../source/TortoiseGit_en.xml:609
msgid "Each language pack is packaged as a <literal>.exe</literal> 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 <literal>.exe</literal>. Poženite ga in sledite navodilom. Ob naslednjem zagonu programa bo TortoiseGit uporabljal izbrani jezik."

#. (title)
#: ../source/TortoiseGit_en.xml:616
msgid "Spellchecker"
msgstr "Črkovalnik"

#. (primary)
#: ../source/TortoiseGit_en.xml:618
msgid "spellchecker"
msgstr "črkovalnik"

#. (primary)
#: ../source/TortoiseGit_en.xml:621
msgid "dictionary"
msgstr "slovar"

#. (para)
#: ../source/TortoiseGit_en.xml:623
msgid "TortoiseGit includes a spell checker which allows you to check your commit log messages. This is especially useful if the project language is not your native language. The spell checker uses the same dictionary files as <ulink url=\"http://openoffice.org\"><citetitle>OpenOffice</citetitle></ulink> and <ulink url=\"http://mozilla.org\"><citetitle>Mozilla</citetitle></ulink>."
msgstr "TortoiseGit 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 <ulink url=\"http://openoffice.org\"><citetitle>OpenOffice</citetitle></ulink> in <ulink url=\"http://mozilla.org\"><citetitle>Mozilla</citetitle></ulink>."

#. (para)
#: ../source/TortoiseGit_en.xml:636
msgid "The installer automatically adds the US and UK English dictionaries. If you want other languages, the easiest option is simply to install one of TortoiseGit's language packs. This will install the appropriate dictionary files as well as the TortoiseGit local user interface. Next time you restart, the dictionary will be available too."
msgstr "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 TortoiseGit 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/TortoiseGit_en.xml:644
msgid "Or you can install the dictionaries yourself. If you have OpenOffice or Mozilla installed, you can copy those dictionaries, which are located in the installation folders for those applications. Otherwise, you need to download the required dictionary files from <ulink url=\"http://wiki.services.openoffice.org/wiki/Dictionaries\"><citetitle>http://wiki.services.openoffice.org/wiki/Dictionaries</citetitle></ulink>"
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 <ulink url=\"http://wiki.services.openoffice.org/wiki/Dictionaries\"><citetitle>http://wiki.services.openoffice.org/wiki/Dictionaries</citetitle></ulink>"

#. (filename)
#: ../source/TortoiseGit_en.xml:661
msgid "en_US.aff"
msgstr "en_US.aff"

#. (filename)
#: ../source/TortoiseGit_en.xml:666
msgid "en_US.dic"
msgstr "en_US.dic"

#. (para)
#: ../source/TortoiseGit_en.xml:653
msgid "Once you have got the dictionary files, you probably need to rename them so that the filenames only have the locale chars in it. Example: <placeholder-1/> Then just copy them to the <filename>bin</filename> sub-folder of the TortoiseGit installation folder. Normally this will be <filename>C:\\Program Files\\TortoiseGit\\bin</filename>. If you don't want to litter the <filename>bin</filename> sub-folder, you can instead place your spell checker files in <filename>C:\\Program Files\\TortoiseGit\\Languages</filename>. If that folder isn't there, you have to create it first. The next time you start TortoiseGit, the spell checker will be available."
msgstr "Ko imate datoteke slovarjev, jih morate verjetno preimenovati, tako da vsebujejo le nize, ki označujejo jezik. Primer: <placeholder-1/> Potem jih prekopirajte v podmapo <filename>bin</filename> namestitvene mape TortoiseGit. Običajno je ta mapa <filename>C:\\Program Files\\TortoiseGit\\bin</filename>. Če ne želite smetiti po podmapi <filename>bin</filename>, lahko datoteke črkovalnika namesitve v mapo <filename>C:\\Program Files\\TortoiseGit\\Languages</filename>. Če ta mapa še ne obstaja, jo morate naprej ustvariti. Ko boste TortoiseGit naslednjič zagnali, bo črkovalnik na voljo."

#. (para)
#: ../source/TortoiseGit_en.xml:684
msgid "Check the <literal>tsvn:projectlanguage</literal> setting. Refer to <xref linkend=\"tsvn-dug-propertypage\"/> for information about setting project properties."
msgstr "Preveri nastavitev lastnosti <literal>tsvn:projectlanguage</literal>. Preberite <xref linkend=\"tsvn-dug-propertypage\"/> za več informacij o nastavitvi projektnih lastnosti."

#. (para)
#: ../source/TortoiseGit_en.xml:691
msgid "If no project language is set, or that language is not installed, try the language corresponding to the Windows locale."
msgstr "Če projektni jezik ni nastavljen ali nastavljeni jezik ni nameščen, poiskusi z jezikom sistema Windows."

#. (para)
#: ../source/TortoiseGit_en.xml:697
msgid "If the exact Windows locale doesn't work, try the <quote>Base</quote> language, eg. <literal>de_CH</literal> (Swiss-German) falls back to <literal>de_DE</literal> (German)."
msgstr "Če jezik sistema Windows ne deluje, poizkusi z <quote>osnovnim</quote> jezikok. Primer: <literal>de_CH</literal> (švicarska nemščina) ima za osnovo <literal>de_DE</literal> (nemščino)."

#. (para)
#: ../source/TortoiseGit_en.xml:705
msgid "If none of the above works, then the default language is English, which is included with the standard installation."
msgstr "Če po zgornjih pravilih ne uspe najti slovarja, potem je privzeti jezik angleščina, ki se nahaja v standarnem namestitvenem paketu."

#. (para)
#: ../source/TortoiseGit_en.xml:679
msgid "If you install multiple dictionaries, TortoiseGit uses these rules to select which one to use. <placeholder-1/>"
msgstr "Če namestite več slovarjev, TortoiseGit uporabi naslednja pravila, da ugotovi, katerega naj uporabi. <placeholder-1/>"

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

#. (primary)
#: ../source/TortoiseGit_en.xml:724
msgid "Git book"
msgstr "Git book"

#. (para)
#: ../source/TortoiseGit_en.xml:727
msgid "This chapter is a slightly modified version of the same chapter in the Git book. An online version of the Git book is available here: <ulink url=\"http://svnbook.red-bean.com/\"><citetitle>http://svnbook.red-bean.com/</citetitle></ulink>."
msgstr "To poglavje je rahlo spremenjena verzija istega poglavja v knjigi The Git book. Spletna različica knjige je na voljo na tem naslovu: <ulink url=\"http://svnbook.red-bean.com/\"><citetitle>http://svnbook.red-bean.com/</citetitle></ulink>."

#. (para)
#: ../source/TortoiseGit_en.xml:735
msgid "This chapter is a short, casual introduction to Git. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Git, and show some simple examples of Git in use."
msgstr "To poglavje je kratek uvod v Git. Č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 Git in na enostavnih primerih pogledamo, kako se Git uporablja."

#. (para)
#: ../source/TortoiseGit_en.xml:743
msgid "Even though the examples in this chapter show people sharing collections of program source code, keep in mind that Git can manage any sort of file collection - it's not limited to helping computer programmers."
msgstr "Čeprav primeri v tem poglavju prikazujejo, kako si uporabniki delijo programsko izvorno kodo, upoštevajte, da lahko Git upravlja katerekoli datoteke - ni omejen samo na pomoč računalniškim programerjem."

#. (title)
#. (title)
#. (title)
#: ../source/TortoiseGit_en.xml:751
#: ../source/TortoiseGit_en.xml:1256
#: ../source/TortoiseGit_en.xml:2945
msgid "The Repository"
msgstr "Skladišče"

#. (primary)
#. (primary)
#: ../source/TortoiseGit_en.xml:753
#: ../source/TortoiseGit_en.xml:3711
msgid "repository"
msgstr "skladišče"

#. (para)
#: ../source/TortoiseGit_en.xml:755
msgid "Git is a centralized system for sharing information. At its core is a <firstterm>repository</firstterm>, which is a central store of data. The repository stores information in the form of a <firstterm>filesystem tree</firstterm> - a typical hierarchy of files and directories. Any number of <firstterm>clients</firstterm> 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 "Git je centraliziran sistem za souporabo informacij. Njegovo bistvo je <firstterm>skladišče</firstterm>, centralno mesto za shranjevanje podatkov. Skladišče shranjuje informacije v obliki <firstterm>drevesne strukture datotečnega sistema</firstterm>, kar je tipična hierarhija datotek in map. S skladiščem se lahko poveže poljubno število <firstterm>odjemalcev</firstterm> 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/TortoiseGit_en.xml:767
msgid "A Typical Client/Server System"
msgstr "Tipičen sistem odjemalec/strežnik"

#. (para)
#: ../source/TortoiseGit_en.xml:770
msgid "So why is this interesting? So far, this sounds like the definition of a typical file server. And indeed, the repository <emphasis>is</emphasis> a kind of file server, but it's not your usual breed. What makes the Git repository special is that <emphasis>it remembers every change</emphasis> 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 <emphasis>je</emphasis> neke vrste datotečni strežnik. Git je poseben zaradi dejstva, da si <emphasis>zapomni vsako spremembo</emphasis>, 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/TortoiseGit_en.xml:780
msgid "When a client reads data from the repository, it normally sees only the latest version of the filesystem tree. But the client also has the ability to view <emphasis>previous</emphasis> states of the filesystem. For example, a client can ask historical questions like, <quote>what did this directory contain last Wednesday?</quote>, or <quote>who was the last person to change this file, and what changes did they make?</quote> These are the sorts of questions that are at the heart of any <firstterm>version control system</firstterm>: 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 <emphasis>predhodnja</emphasis> stanja datotečnega sistema. Odjemalec lahko postavi vprašanja o zgodovini, n. pr. <quote>kaj je ta mapa vsebovala prešnjo sredo?</quote> ali <quote>kdo je zadnji avtor sprememb na tej datoteki in kakšne so te spremembe?</quote> Takšna vprašanja so osrčje kateregakoli <firstterm>sistema za nadzor različic</firstterm>. Ti sistemi so nareni za hranjenje in spremljanje sprememb podatkov skozi čas."

#. (title)
#: ../source/TortoiseGit_en.xml:795
msgid "Versioning Models"
msgstr "Modeli nadzora različic"

#. (para)
#: ../source/TortoiseGit_en.xml:796
msgid "All version control systems have to solve the same fundamental problem: how will the system allow users to share information, but prevent them from accidentally stepping on each other's feet? It's all too easy for users to accidentally overwrite each other's changes in the repository."
msgstr "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/TortoiseGit_en.xml:805
msgid "The Problem of File-Sharing"
msgstr "Težave souporabe datotek"

#. (para)
#: ../source/TortoiseGit_en.xml:806
msgid "Consider this scenario: suppose we have two co-workers, Harry and Sally. They each decide to edit the same repository file at the same time. If Harry saves his changes to the repository first, then it's possible that (a few moments later) Sally could accidentally overwrite them with her own new version of the file. While Harry's version of the file won't be lost forever (because the system remembers every change), any changes Harry made <emphasis>won't</emphasis> 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, <emphasis>ne bodo</emphasis> 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/TortoiseGit_en.xml:822
msgid "The Problem to Avoid"
msgstr "Težava, ki se ji je potrebno izogniti"

#. (title)
#. (title)
#: ../source/TortoiseGit_en.xml:827
#: ../source/TortoiseGit_en.xml:843
msgid "The Lock-Modify-Unlock Solution"
msgstr "Rešitev zakleni-spremeni-odkleni"

#. (para)
#: ../source/TortoiseGit_en.xml:828
msgid "Many version control systems use a <firstterm>lock-modify-unlock</firstterm> 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 <emphasis>lock</emphasis> 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 <firstterm>zakleni-spremeni-odkleni</firstterm>, kar predstavlja zelo enostavno rešitev problema. V takšnem sistemu lahko datoteko spreminja samo en uporabnik naenkrat. Pred spreminjanjem datoteke jo mora Harry <emphasis>zakleniti</emphasis>. 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/TortoiseGit_en.xml:846
msgid "The problem with the lock-modify-unlock model is that it's a bit restrictive, and often becomes a roadblock for users:"
msgstr "Model zakleni-spremeni-odkleni uporabnike omejuje in jih ovira pri delu:"

#. (para)
#: ../source/TortoiseGit_en.xml:853
msgid "<emphasis>Locking may cause administrative problems.</emphasis> 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 "<emphasis>Zaklepanje lahko povzroča skrbniške težave.</emphasis>  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/TortoiseGit_en.xml:864
msgid "<emphasis>Locking may cause unnecessary serialization.</emphasis> 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 "<emphasis>Zaklepanje lahko povzroči nepotrebno delo eden za drugim.</emphasis> 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/TortoiseGit_en.xml:876
msgid "<emphasis>Locking may create a false sense of security.</emphasis> 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 "<emphasis>Zaklepanje ustvarja lažen občutek varnosti.</emphasis> 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/TortoiseGit_en.xml:894
#: ../source/TortoiseGit_en.xml:922
msgid "The Copy-Modify-Merge Solution"
msgstr "Rešitev kopiraj-spremeni-spoji"

#. (para)
#: ../source/TortoiseGit_en.xml:895
msgid "Git, CVS, and other version control systems use a <firstterm>copy-modify-merge</firstterm> model as an alternative to locking. In this model, each user's client reads the repository and creates a personal <firstterm>working copy</firstterm> 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 "Git, CVS in še nekateri drugi sistemi za nadzor različic uporabljajo model <firstterm>kopiraj-spremeni-spoji</firstterm> kot alternativo zaklepanju datotek. Pri tem modelu ustvari vsak odjemalec osebno <firstterm>delovno kopijo</firstterm> 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/TortoiseGit_en.xml:907
msgid "Here's an example. Say that Harry and Sally each create working copies of the same project, copied from the repository. They work concurrently, and make changes to the same file <filename>A</filename> 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 <firstterm>out-of-date</firstterm>. In other words, that file A in the repository has somehow changed since he last copied it. So Harry asks his client to <firstterm>merge</firstterm> 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 <filename>A</filename> 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 <firstterm>zastarela</firstterm>. 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 <firstterm>spoji</firstterm> 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/TortoiseGit_en.xml:926
msgid "...Copy-Modify-Merge Continued"
msgstr "...Kopiraj-spremeni-spoji (nadaljevanje)"

#. (primary)
#. (primary)
#: ../source/TortoiseGit_en.xml:930
#: ../source/TortoiseGit_en.xml:4891
msgid "conflict"
msgstr "spor"

#. (para)
#: ../source/TortoiseGit_en.xml:932
msgid "But what if Sally's changes <emphasis>do</emphasis> overlap with Harry's changes? What then? This situation is called a <firstterm>conflict</firstterm>, 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 <emphasis>vseeno</emphasis> prekrivajo s Harryjevimi? Nastane <firstterm>sporna</firstterm> 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/TortoiseGit_en.xml:947
msgid "The copy-modify-merge model may sound a bit chaotic, but in practice, it runs extremely smoothly. Users can work in parallel, never waiting for one another. When they work on the same files, it turns out that most of their concurrent changes don't overlap at all; conflicts are infrequent. And the amount of time it takes to resolve conflicts is far less than the time lost by a locking system."
msgstr "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/TortoiseGit_en.xml:956
msgid "In the end, it all comes down to one critical factor: user communication. When users communicate poorly, both syntactic and semantic conflicts increase. No system can force users to communicate perfectly, and no system can detect semantic conflicts. So there's no point in being lulled into a false promise that a locking system will somehow prevent conflicts; in practice, locking seems to inhibit productivity more than anything else."
msgstr "Na 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/TortoiseGit_en.xml:966
msgid "There is one common situation where the lock-modify-unlock model comes out better, and that is where you have unmergeable files. For example if your repository contains some graphic images, and two people change the image at the same time, there is no way for those changes to be merged together. Either Harry or Sally will lose their changes."
msgstr "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/TortoiseGit_en.xml:976
msgid "What does Git Do?"
msgstr "Kaj naredi Git?"

#. (para)
#: ../source/TortoiseGit_en.xml:977
msgid "Git uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Git also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Git will still provide the features you need."
msgstr "Git po privzetih nastavitvah uporablja model kopiraj-spremeni-spoji in v veliko primerih je to vse, kar potrebujete. Od različice 1.2 naprej pa Git 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 Git ponuja možnosti, ki jih potrebujete."

#. (title)
#: ../source/TortoiseGit_en.xml:989
msgid "Git in Action"
msgstr "Git v akciji"

#. (title)
#: ../source/TortoiseGit_en.xml:991
msgid "Working Copies"
msgstr "Delovne kopije"

#. (primary)
#: ../source/TortoiseGit_en.xml:993
msgid "working copy"
msgstr "delovna kopija"

#. (para)
#: ../source/TortoiseGit_en.xml:995
msgid "You've already read about working copies; now we'll demonstrate how the Git client creates and uses them."
msgstr "O delovnih kopijah ste že brali. Sedaj bomo prikazali, kako jih odjemalec Git ustvari in uporablja."

#. (para)
#: ../source/TortoiseGit_en.xml:1000
msgid "A Git working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Git will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so."
msgstr "Delovna kopija sistema Git 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: Git 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/TortoiseGit_en.xml:1010
msgid "After you've made some changes to the files in your working copy and verified that they work properly, Git provides you with commands to <emphasis>publish</emphasis> your changes to the other people working with you on your project (by writing to the repository). If other people publish their own changes, Git provides you with commands to merge those changes into your working directory (by reading from the repository)."
msgstr "Ko ste naredili določene spremembe v datotekah v delovni kopiji in jih preverili, uporabite ukaze sistema Git, da spremembe <emphasis>objavite</emphasis> (s pisanjem v skladišče), tako da so vidne ostalim sodelavcem, ki delajo na projektu. Če ostali sodelavci naredijo spremembe na datotekah, vam Git omogoča, da te spremembe spojite v delovno kopijo (z branjem iz skladišča)."

#. (para)
#: ../source/TortoiseGit_en.xml:1020
msgid "A working copy also contains some extra files, created and maintained by Git, to help it carry out these commands. In particular, each directory in your working copy contains a subdirectory named <filename>.svn</filename>, also known as the working copy <firstterm>administrative directory</firstterm>. The files in each administrative directory help Git recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work."
msgstr "Delovna kopija vsebuje tudi nekaj posebnih datotek, ki jih ustvari in vzdržuje Git za pomoč pri izvajanju ukazov. Vsak mapa znotraj delovne kopije vsebuje podmapo <filename>.svn</filename>, ki ji rečemu <firstterm>skrbniška mapa</firstterm>. Datoteke znotraj te mape pomagajo sistemu Git prepoznati datoteke, ki vsebujejo neobjavljene spremembe, in datoteke, ki so jih spreminjali drugi uporabniki in so tako zastarele."

#. (para)
#: ../source/TortoiseGit_en.xml:1031
msgid "A typical Git repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository."
msgstr "Tipično skladišče sistema Git 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/TortoiseGit_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/TortoiseGit_en.xml:1043
msgid "The Repository's Filesystem"
msgstr "Datotečni sistem skladišča"

#. (para)
#: ../source/TortoiseGit_en.xml:1046
msgid "In other words, the repository's root directory has two subdirectories: <filename>paint</filename> and <filename>calc</filename>."
msgstr "Z drugimi besedami, korenska mapa skladišča ima dve podmapi: <filename>paint</filename> in <filename>calc</filename>."

#. (para)
#: ../source/TortoiseGit_en.xml:1051
msgid "To get a working copy, you must <firstterm>check out</firstterm> some subtree of the repository. (The term <emphasis>check out</emphasis> 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 <firstterm>prevzeti</firstterm> neko poddrevo skladišča. (<emphasis>Prevzeti</emphasis> se morda sliši, kot da vir podatkov zaklenete ali rezervirate, v resnici pa si s tem izdelate zasebno kopijo projekta)."

#. (para)
#: ../source/TortoiseGit_en.xml:1058
msgid "Suppose you make changes to <filename>button.c</filename>. Since the <filename>.svn</filename> directory remembers the file's modification date and original contents, Git can tell that you've changed the file. However, Git does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as <firstterm>committing</firstterm> (or <firstterm>checking in</firstterm>) changes to the repository."
msgstr "Recimo, da naredite spremembo na datoteki  <filename>button.c</filename>. Ker si mapa <filename>.svn</filename> zapomni datum spremembe datoteke in izvirno vsebino, Git ve, da ste datoteko sprememenili. Vendar pa Git ne objavi sprememb, dokler mu tega ne ukažete. Temu rečemo <firstterm>objava</firstterm> (ali <firstterm>vrnitev</firstterm>) sprememb v skladišče."

#. (para)
#: ../source/TortoiseGit_en.xml:1068
msgid "To publish your changes to others, you can use Git's <command>commit</command> command."
msgstr "Da bi omogočili dostop do svojih sprememb ostalim, uporabite ukaz <command>objavi</command>."

#. (para)
#: ../source/TortoiseGit_en.xml:1072
msgid "Now your changes to <filename>button.c</filename> have been committed to the repository; if another user checks out a working copy of <filename>/calc</filename>, they will see your changes in the latest version of the file."
msgstr "Sedaj so spremembe v datoteki <filename>button.c</filename> objavljene v skladišču; če nek drug uporabnik prevzame delovno kopijo iz mape <filename>/calc</filename>, bo te spremembe videl v zadnji različici datoteke."

#. (para)
#: ../source/TortoiseGit_en.xml:1078
msgid "Suppose you have a collaborator, Sally, who checked out a working copy of <filename>/calc</filename> at the same time you did. When you commit your change to <filename>button.c</filename>, Sally's working copy is left unchanged; Git only modifies working copies at the user's request."
msgstr "Predpostavimo, da imate sodelavko Sally, ki je prevzela delovno kopijo <filename>/calc</filename> sočasno z vami. Ko objavite spremembe v datoteki <filename>button.c</filename>, se Sallyjina delovna kopija ne spremeni; Git spreminja delovne kopije le na zahtevo uporabnika."

#. (para)
#: ../source/TortoiseGit_en.xml:1086
msgid "To bring her project up to date, Sally can ask Git to <firstterm>update</firstterm> her working copy, by using the Git <command>update</command> 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 Git zahteva, da  <firstterm>posodobi</firstterm> njeno delovno kopijo z uporabo ukaza <command>update</command>. 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/TortoiseGit_en.xml:1094
msgid "Note that Sally didn't need to specify which files to update; Git uses the information in the <filename>.svn</filename> 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; Git uporabi informacije v mapi <filename>.svn</filename> in dodatne informacije iz skladišča, da se odloči, katere datoteke je potrebno posodobiti."

#. (title)
#: ../source/TortoiseGit_en.xml:1103
msgid "Repository URLs"
msgstr "Naslovi URL skladišča"

#. (para)
#: ../source/TortoiseGit_en.xml:1104
msgid "Git repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:"
msgstr "Do skladišč Git 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/TortoiseGit_en.xml:1112
msgid "Repository Access URLs"
msgstr "Naslovi URL za dostop do skladišča"

#. (entry)
#: ../source/TortoiseGit_en.xml:1118
msgid "Schema"
msgstr "Shema"

#. (entry)
#: ../source/TortoiseGit_en.xml:1119
msgid "Access Method"
msgstr "Način dostopa"

#. (literal)
#: ../source/TortoiseGit_en.xml:1125
msgid "file://"
msgstr "file://"

#. (entry)
#: ../source/TortoiseGit_en.xml:1127
msgid "Direct repository access on local or network drive."
msgstr "Neposreden dostop do skladišča na krajevnem ali omrežnem disku."

#. (literal)
#. (literal)
#: ../source/TortoiseGit_en.xml:1133
#: ../source/TortoiseGit_en.xml:1144
msgid "http://"
msgstr "http://"

#. (entry)
#: ../source/TortoiseGit_en.xml:1135
msgid "Access via WebDAV protocol to Git-aware Apache server."
msgstr "Dostop do strežnika Apache s sistemom Git preko protokola WebDAV."

#. (literal)
#: ../source/TortoiseGit_en.xml:1141
msgid "https://"
msgstr "https://"

#. (entry)
#: ../source/TortoiseGit_en.xml:1143
msgid "Same as <placeholder-1/>, but with SSL encryption."
msgstr "Enako kot <placeholder-1/>, vendar z enkripcijo SSL."

#. (literal)
#: ../source/TortoiseGit_en.xml:1149
msgid "svn://"
msgstr "svn://"

#. (literal)
#. (literal)
#. (primary)
#. (primary)
#: ../source/TortoiseGit_en.xml:1153
#: ../source/TortoiseGit_en.xml:1162
#: ../source/TortoiseGit_en.xml:2484
#: ../source/TortoiseGit_en.xml:2623
msgid "svnserve"
msgstr "svnserve"

#. (entry)
#: ../source/TortoiseGit_en.xml:1151
msgid "Unauthenticated TCP/IP access via custom protocol to a <placeholder-1/> server."
msgstr "Dostop TCP/IP brez avtentikacije preko protokola po meri do strežnika <placeholder-1/>"

#. (literal)
#: ../source/TortoiseGit_en.xml:1158
msgid "svn+ssh://"
msgstr "svn+ssh://"

#. (entry)
#: ../source/TortoiseGit_en.xml:1160
msgid "authenticated, encrypted TCP/IP access via custom protocol to a <placeholder-1/> server."
msgstr "avtenticiran, enkriptiran dostop TCP/IP preko protokola po meri do strežnika <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:1168
msgid "For the most part, Git's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The <literal>file://</literal> 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 <systemitem class=\"url\">file://hostname/path/to/repos</systemitem>. For the local machine, the <literal>hostname</literal> portion of the URL is required to be either absent or <literal>localhost</literal>. For this reason, local paths normally appear with three slashes, <systemitem class=\"url\">file:///path/to/repos</systemitem>."
msgstr "V večini primerov se v sistemu Git za naslove URL uporablja standardna sintaksa, kar omogoča, da se ime strežnika in številka vrat pojavljata kot del naslova URL. Metoda dostopa <literal>file://</literal> se običajno uporablja za lokalni dostop, možno pa jo je uporabljati tudi za poti UNC. URL je naslednje oblike: <systemitem class=\"url\">file://gostitelj/pat/do/skladišča</systemitem>. Za krajevne dostope dela <literal>gostitelj</literal> ne navedemo ali pa navedemo <literal>localhost</literal>. Iz tega razloga se krajevne poti običajno zapisujejo s tremi poševnicami: <systemitem class=\"url\">file:///pat/do/skladišča</systemitem>."

#. (para)
#: ../source/TortoiseGit_en.xml:1181
msgid "Also, users of the <literal>file://</literal> scheme on Windows platforms will need to use an unofficially <quote>standard</quote> 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 <literal>X</literal> is the drive on which the repository resides:"
msgstr "Poleg tega morajo uporabniki sheme <literal>file://</literal> na operacijskem sistemu Windows uporabljati neuradno <quote>standardno</quote> 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; <literal>X</literal> je pogon, na katerem se nahaja skladišče:"

#. (screen)
#: ../source/TortoiseGit_en.xml:1191
#, no-wrap
msgid ""
"\n"
"file:///X:/path/to/repos\n"
"...\n"
"file:///X|/path/to/repos\n"
"...\n"
msgstr ""
"\n"
"file:///X:/pot/do/skladišča\n"
"...\n"
"file:///X|/pot/do/skladišča\n"
"...\n"

#. (para)
#: ../source/TortoiseGit_en.xml:1197
msgid "Note that a URL uses ordinary slashes even though the native (non-URL) form of a path on Windows uses backslashes."
msgstr "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/TortoiseGit_en.xml:1201
msgid "You can safely access a FSFS repository via a network share, but you <emphasis>cannot</emphasis> 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 <emphasis>ne morete</emphasis> dostopati do skladišč tipa BDB."

#. (para)
#. (para)
#: ../source/TortoiseGit_en.xml:1207
#: ../source/TortoiseGit_en.xml:2610
msgid "Do not create or access a Berkeley DB repository on a network share. It <emphasis>cannot</emphasis> 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 <emphasis>ne more</emphasis> 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/TortoiseGit_en.xml:1219
msgid "Revisions"
msgstr "Revizije"

#. (primary)
#. (primary)
#: ../source/TortoiseGit_en.xml:1221
#: ../source/TortoiseGit_en.xml:9605
msgid "revision"
msgstr "revizija"

#. (para)
#: ../source/TortoiseGit_en.xml:1223
msgid "A <command>svn commit</command> 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 <command>svn commit</command> 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/TortoiseGit_en.xml:1231
msgid "In the repository, each commit is treated as an atomic transaction: either all the commits changes take place, or none of them take place. Git retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions."
msgstr "V skladišču se vsaka objava opravi kot atomična transakcija: upoštevane so vse spremembe v objavi ali pa nobena. Git poskuša ohraniti atomičnost zaradi sesutja aplikacij, sistema, težav z omrežjem in ostalih uporabnikov posredovanj."

#. (para)
#: ../source/TortoiseGit_en.xml:1238
msgid "Each time the repository accepts a commit, this creates a new state of the filesystem tree, called a <firstterm>revision</firstterm>. 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 <firstterm>revizija</firstterm>. 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/TortoiseGit_en.xml:1247
msgid "A nice way to visualize the repository is as a series of trees. Imagine an array of revision numbers, starting at 0, stretching from left to right. Each revision number has a filesystem tree hanging below it, and each tree is a <quote>snapshot</quote> 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 <quote>posnetek</quote> izgleda skladišča po vsaki objavi."

#. (title)
#: ../source/TortoiseGit_en.xml:1260
msgid "Global Revision Numbers"
msgstr "Globalne številke revizij"

#. (para)
#: ../source/TortoiseGit_en.xml:1261
msgid "Unlike those of many other version control systems, Git's revision numbers apply to <emphasis>entire trees</emphasis>, not individual files. Each revision number selects an entire tree, a particular state of the repository after some committed change. Another way to think about it is that revision N represents the state of the repository filesystem after the Nth commit. When a Git user talks about ``revision 5 of <filename>foo.c</filename>'', they really mean ``<filename>foo.c</filename> as it appears in revision 5.'' Notice that in general, revisions N and M of a file do <emphasis>not</emphasis> necessarily differ!"
msgstr "Za razliko od mnogih drugih sistemov za nadzor različic se revizije v sistemu Git nanašajo na <emphasis>celotno drevo</emphasis>, 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 Git govorimo o ``reviziji 5 datoteke <filename>foo.c</filename>'', v resnici mislimo ``Datoteka <filename>foo.c</filename>, kot se nahaja v reviziji 5''. Upoštevajte, da se v splošnem reviziji N in M neke datoteke <emphasis>ne</emphasis> razlikujeta."

#. (para)
#: ../source/TortoiseGit_en.xml:1276
msgid "It's important to note that working copies do not always correspond to any single revision in the repository; they may contain files from several different revisions. For example, suppose you check out a working copy from a repository whose most recent revision is 4:"
msgstr "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/TortoiseGit_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/TortoiseGit_en.xml:1288
msgid "At the moment, this working directory corresponds exactly to revision 4 in the repository. However, suppose you make a change to <filename>button.c</filename>, 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 <filename>button.c</filename> 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/TortoiseGit_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/TortoiseGit_en.xml:1301
msgid "Suppose that, at this point, Sally commits a change to <filename>integer.c</filename>, creating revision 6. If you use <command>svn update</command> to bring your working copy up to date, then it will look like this:"
msgstr "Denimo, da v tem trenutku Sally objavi spremembo datoteke <filename>integer.c</filename> in s tem ustvari revizijo 6. Če uporabite ukaz <command>svn update</command>, ki posodobi vašo delovno kopijo, bo le-ta izgledala takole:"

#. (screen)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:1312
msgid "Sally's changes to <filename>integer.c</filename> will appear in your working copy, and your change will still be present in <filename>button.c</filename>. In this example, the text of <filename>Makefile</filename> is identical in revisions 4, 5, and 6, but Git will mark your working copy of <filename>Makefile</filename> 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 <filename>integer.c</filename> se bodo pojavile v vaši delovni kopiji in v datoteki <filename>button.c</filename> bodo še vedno vaše spremembe. V tem primeru je besedilo datoteke <filename>Makefile</filename> identično v revizijah 4, 5 in 6, vendar bo Git označil vašo delovno kopijo datoteke <filename>Makefile</filename> 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/TortoiseGit_en.xml:1325
msgid "How Working Copies Track the Repository"
msgstr "Kako delovne kopije spremljajo skladišče"

#. (para)
#: ../source/TortoiseGit_en.xml:1326
msgid "For each file in a working directory, Git records two essential pieces of information in the <filename>.svn/</filename> administrative area:"
msgstr "Za vsako datoteko v delovni kopiji Git shrani dve pomembni informaciji v skrbniško področje <filename>.svn/</filename>:"

#. (para)
#: ../source/TortoiseGit_en.xml:1332
msgid "what revision your working file is based on (this is called the file's <firstterm>working revision</firstterm>), and"
msgstr "na kateri reviziji je osnovana vaša delovna datoteka (rečemo ji datotečna <firstterm>delovna revizija</firstterm>) in"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:1345
msgid "Given this information, by talking to the repository, Git can tell which of the following four states a working file is in:"
msgstr "S temi informacijami in komunikacijo s skladiščem lahko Git ugotovi, v katerem od štirih stanj se delovna datoteka nahaja:"

#. (term)
#: ../source/TortoiseGit_en.xml:1352
msgid "Unchanged, and current"
msgstr "Nespremenjeno in trenutno"

#. (para)
#: ../source/TortoiseGit_en.xml:1354
msgid "The file is unchanged in the working directory, and no changes to that file have been committed to the repository since its working revision. A <command>commit</command> of the file will do nothing, and an <command>update</command> 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 <command>objavi</command> ne bo storil ničesar, prav tako tudi ne ukaz <command>posodobi</command>."

#. (term)
#: ../source/TortoiseGit_en.xml:1365
msgid "Locally changed, and current"
msgstr "Krajevno spremenjeno in trenutno"

#. (para)
#: ../source/TortoiseGit_en.xml:1367
msgid "The file has been changed in the working directory, and no changes to that file have been committed to the repository since its base revision. There are local changes that have not been committed to the repository, thus a <command>commit</command> of the file will succeed in publishing your changes, and an <command>update</command> 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 <command>objavi</command> na datoteki objavil vaše spremembe, ukaz <command>posodobi</command> pa ne bo naredil ničesar."

#. (term)
#: ../source/TortoiseGit_en.xml:1379
msgid "Unchanged, and out-of-date"
msgstr "Nespremenjeno in zastarelo"

#. (para)
#: ../source/TortoiseGit_en.xml:1381
msgid "The file has not been changed in the working directory, but it has been changed in the repository. The file should eventually be updated, to make it current with the public revision. A <command>commit</command> of the file will do nothing, and an <command>update</command> 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 <command>objavi</command> ne bo naredil ničesar, ukaz <command>posodobi</command> pa bo prenesel najnovejše spremembe iz skladišča v delovno kopijo."

#. (term)
#: ../source/TortoiseGit_en.xml:1393
msgid "Locally changed, and out-of-date"
msgstr "Krajevno spremenjeno in zastarelo"

#. (para)
#: ../source/TortoiseGit_en.xml:1395
msgid "The file has been changed both in the working directory, and in the repository. A <command>commit</command> of the file will fail with an <emphasis>out-of-date</emphasis> error. The file should be updated first; an <command>update</command> command will attempt to merge the public changes with the local changes. If Git can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict."
msgstr "Datoteka je bila spremenjena v delovni kopiji in v skladišču. Ukaz <command>objavi</command> ne bo uspel; prikazalo se bo sporočilo, da je datoteka <emphasis>zastarela</emphasis>. Datoteko je potrebno najprej posodobiti; ukaz <command>posodobi</command> bo poskušal javne spremembe spojiti s krajevnimi. Če Git ne more spojiti različic samodejno, reševanje spora prepusti uporabniku."

#. (title)
#: ../source/TortoiseGit_en.xml:1412
msgid "Summary"
msgstr "Povzetek"

#. (para)
#: ../source/TortoiseGit_en.xml:1413
msgid "We've covered a number of fundamental Git concepts in this chapter:"
msgstr "V tem poglavju smo pregledali nekaj osnovnih principov sistema Git:"

#. (para)
#: ../source/TortoiseGit_en.xml:1419
msgid "We've introduced the notions of the central repository, the client working copy, and the array of repository revision trees."
msgstr "Predstavili smo koncept centralnega skladišča, delovne kopije na strani odjemalca in polja dreves revizij v skladišču."

#. (para)
#: ../source/TortoiseGit_en.xml:1425
msgid "We've seen some simple examples of how two collaborators can use Git to publish and receive changes from one another, using the 'copy-modify-merge' model."
msgstr "Videli smo nekaj primerov, kako lahko dva sodelavca uporabljata Git in model 'kopiraj-spremeni-spoji' za objavljanje sprememb in sprejemanje sprememb drug od drugega."

#. (para)
#: ../source/TortoiseGit_en.xml:1432
msgid "We've talked a bit about the way Git tracks and manages information in a working copy."
msgstr "Govorili smo o tem, kako Git sledi in upravlja informacije v delovni kopiji."

#. (title)
#: ../source/TortoiseGit_en.xml:1445
msgid "Setting Up A Server"
msgstr "Nameščanje strežnika"

#. (para)
#: ../source/TortoiseGit_en.xml:1447
msgid "To use TortoiseGit (or any other Git client), you need a place where your repositories are located. You can either store your repositories locally and access them using the <literal>file://</literal> protocol or you can place them on a server and access them with the <literal>http://</literal> or <literal>svn://</literal> protocols. The two server protocols can also be encrypted. You use <literal>https://</literal> or <literal>svn+ssh://</literal>. This chapter shows you step by step on how you can set up such a server on a Windows machine."
msgstr "Za uporabo programa TortoiseGit (ali kateregakoli drugega odjemalca za Git) potrebuteje prostor, kjer se bodo nahajala skladišča. Lahko jih namestite krajevno in dostopate do njih preko protokola <literal>file://</literal> ali pa jih postavite na strežnik in dostopate do njih preko protokolov <literal>http://</literal> ali <literal>svn://</literal>. Strežniška protokola sta lahko ekriptirana. Pri tem uporabite <literal>https://</literal> ali <literal>svn+ssh://</literal>. V tem poglavju so podani koraki nameščanja strežnika na operacijskem sistemu Windows."

#. (para)
#: ../source/TortoiseGit_en.xml:1458
msgid "More detailed information on the Git server options, and how to choose the best architecture for your situation, can be found in the Git book under <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.serverconfig.html\"><citetitle>Server Configuration</citetitle></ulink>."
msgstr "Podrobnejše informacije o možnostih strežnika Git in izbiri pravilne arhitekture za vaš primer najdete v knjigi The Git Book, poglavje <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.serverconfig.html\"><citetitle>Server Configuration</citetitle></ulink>."

#. (para)
#: ../source/TortoiseGit_en.xml:1466
msgid "If you don't have a server and you work alone then local repositories are probably your best choice. You can skip this chapter and go directly to <xref linkend=\"tsvn-repository\"/>."
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 <xref linkend=\"tsvn-repository\"/>."

#. (para)
#: ../source/TortoiseGit_en.xml:1471
msgid "If you were thinking about setting up a multi-user repository on a network share, think again. Read <xref linkend=\"tsvn-repository-local-share\"/> 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 <xref linkend=\"tsvn-repository-local-share\"/>, kjer boste izbedeli, zakaj to ni dobra odločitev."

#. (title)
#: ../source/TortoiseGit_en.xml:1480
msgid "Apache Based Server"
msgstr "Strežnik na osnovi strežnika Apache"

#. (primary)
#: ../source/TortoiseGit_en.xml:1484
msgid "Apache"
msgstr "Apache"

#. (para)
#: ../source/TortoiseGit_en.xml:1486
msgid "The most flexible of all possible server setups for Git is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:"
msgstr "Najbolj prilagodljiv sistem za Git 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/TortoiseGit_en.xml:1492
#: ../source/TortoiseGit_en.xml:1496
msgid "WebDAV"
msgstr "WebDAV"

#. (para)
#: ../source/TortoiseGit_en.xml:1498
msgid "The Apache based Git server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a <quote>Web folder</quote> in the Windows explorer and then access it like any other folder in the file system."
msgstr "Strežniki Git, postavljeni na strežniku Apache, uporabljajo protokol WebDAV, ki ga podpirajo številni ostali programi. Ta omogoča, da naprimer priklopite skladišče kot <quote>internetno mapo</quote> v Windowsovem Raziskovalcu in do nje dostopate kot do katerekoli druge mape v datotečnem sistemu"

#. (term)
#: ../source/TortoiseGit_en.xml:1509
msgid "Browsing The Repository"
msgstr "Brskanje po skladišču"

#. (para)
#: ../source/TortoiseGit_en.xml:1511
msgid "You can point your browser to the URL of your repository and browse the contents of it without having a Git client installed. This gives access to your data to a much wider circle of users."
msgstr "V spletni brskalnik lahko vpišete naslov URL skladišča in brskate po vsebini, ne da bi imeli nameščenega odjemalca za Git. To omogoča dostop do podatkov precej širšemu krogu uporabnikov."

#. (term)
#. (title)
#: ../source/TortoiseGit_en.xml:1521
#: ../source/TortoiseGit_en.xml:3640
msgid "Authentication"
msgstr "Avtentikacija"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:1530
msgid "Security"
msgstr "Varnost"

#. (para)
#: ../source/TortoiseGit_en.xml:1532
msgid "Since Apache is very stable and secure, you automatically get the same security for your repository. This includes SSL encryption."
msgstr "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/TortoiseGit_en.xml:1542
msgid "Installing Apache"
msgstr "Namestitev strežnika Apache"

#. (para)
#: ../source/TortoiseGit_en.xml:1547
msgid "Please note that Windows XP without the service pack 1 will lead to bogus network data and could therefore corrupt your repository!"
msgstr "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/TortoiseGit_en.xml:1555
msgid "Download the latest version of the Apache web server from <ulink url=\"http://httpd.apache.org/download.cgi\"><citetitle>http://httpd.apache.org/download.cgi</citetitle></ulink>. 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  <ulink url=\"http://httpd.apache.org/download.cgi\"><citetitle>http://httpd.apache.org/download.cgi</citetitle></ulink>. Poskrbite, da prenesete različico 2.2.x - različica 1.3.x.x ne bo delovala!"

#. (para)
#: ../source/TortoiseGit_en.xml:1564
msgid "The msi installer for Apache can be found by clicking on <literal>other files</literal>, then browse to <filename>binaries/win32</filename>. You may want to choose the msi file <filename>apache-2.2.x-win32-x86-openssl-0.9.x.msi</filename> (the one that includes OpenSSL)."
msgstr "Namestitveni program MSI za spletni strežnik Apache dobite, če kliknete na <literal>other files</literal> in greste na pot <filename>binaries/win32</filename>. Lahko izbere datoteko <filename>apache-2.2.x-win32-x86-openssl-0.9.x.msi</filename> (vključuje tudi OpenSSL)."

#. (para)
#: ../source/TortoiseGit_en.xml:1572
msgid "Once you have the Apache2 installer you can double click on it and it will guide you through the installation process. Make sure that you enter the server-URL correctly (if you don't have a DNS name for your server just enter the IP-address). I recommend to install Apache <emphasis>for All Users, on Port 80, as a Service</emphasis>. 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, <filename>\\Apache Group\\Apache2\\conf</filename> and locate the file <filename>httpd.conf</filename>. Edit that file so that <literal>Listen 80</literal> is changed to a free port, e.g. <literal>Listen 81</literal>. 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 <emphasis>za vse uporabnike, na vrata 80, kot storitev</emphasis> (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 <filename>c:\\Program Files\\Apache Group\\Apache2\\conf</filename> in poiščite datoteko <filename>httpd.conf</filename>. Spremenite jo tako, da vrednost vrat v izrazu <literal>Listen 80</literal> zamenjate z vrednostjo katerihkoli prostih vrat, na primer <literal>Listen 81</literal>. Potem namestitev ponovite - tokrat bi morala biti uspešna."

#. (para)
#: ../source/TortoiseGit_en.xml:1594
msgid "Now test if the Apache web server is running correctly by pointing your web browser to <systemitem class=\"url\">http://localhost/</systemitem> - a preconfigured Website should show up."
msgstr "Sedaj preverite, če spletni strežnik Apache deluje pravilno. Usmerite svoj spletni brskalnik na stran <systemitem class=\"url\">http://localhost/</systemitem> - pojaviti se mora prednastavljena spletna stran."

#. (para)
#: ../source/TortoiseGit_en.xml:1603
msgid "If you decide to install Apache as a service, be warned that by default it will run as the local system account. It would be a more secure practice for you to create a separate account for Apache to run as."
msgstr "Č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/TortoiseGit_en.xml:1609
msgid "Make sure that the account on the server that Apache is running as has an explicit entry in the repository directory's access control list (right-click directory | properties | security), with full control. Otherwise, users will not be able to commit their changes."
msgstr "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/TortoiseGit_en.xml:1615
msgid "Even if Apache runs as local system, you still need such an entry (which will be the SYSTEM account in this case)."
msgstr "Tudi če Apache teče pod sistemskim računom, morate pravico vseeno določiti (v tem primeru za račun SYSTEM)."

#. (para)
#: ../source/TortoiseGit_en.xml:1619
msgid "If Apache does not have this permission set up, your users will get <quote>Access denied</quote> error messages, which show up in the Apache error log as error 500."
msgstr "Če Apache tega dovoljenja nima, bodo uporabniki dobili opozorilo <quote>Dostop zavrnjen</quote>, ki je v dnevniku napak strežnika Apache predstavljen s številko 500."

#. (para)
#: ../source/TortoiseGit_en.xml:1543
msgid "The first thing you need before installing Apache is a computer with Windows 2000, Windows XP+SP1, Windows 2003, Vista or Server 2008. <warning><placeholder-1/></warning><placeholder-2/><caution><placeholder-3/><placeholder-4/><placeholder-5/><placeholder-6/></caution>"
msgstr "Za namestitev strežnika Apache potrebujete računalnik s sistemom Windows 2000, Windows XP+SP1, Windows 2003, Vista ali Server 2008. <warning><placeholder-1/></warning><placeholder-2/><caution><placeholder-3/><placeholder-4/><placeholder-5/><placeholder-6/></caution>"

#. (title)
#: ../source/TortoiseGit_en.xml:1628
msgid "Installing Git"
msgstr "Namestitev sistema Git"

#. (para)
#: ../source/TortoiseGit_en.xml:1632
msgid "Download the latest version of the Git Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to <ulink url=\"http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100\"><citetitle>http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100</citetitle></ulink>."
msgstr "Prenesite zadnjo različico Win32 dvojiških datotek Git 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 <ulink url=\"http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100\"><citetitle>http://Git.tigris.org/servlets/ProjectDocumentList?folderID=8100</citetitle></ulink>."

#. (para)
#: ../source/TortoiseGit_en.xml:1644
msgid "Run the Git installer and follow the instructions. If the Git installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps."
msgstr "Poženite namestitveni program za Git 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/TortoiseGit_en.xml:1654
#: ../source/TortoiseGit_en.xml:1983
msgid "mod_authz_svn"
msgstr "mod_authz_svn"

#. (para)
#: ../source/TortoiseGit_en.xml:1656
msgid "Using the windows explorer, go to the installation directory of Git (usually <filename>c:\\program files\\Git</filename>) and find the files <filename>/httpd/mod_dav_svn.so</filename> and <filename>mod_authz_svn.so</filename>. Copy these files to the Apache modules directory (usually <filename>c:\\program files\\apache group\\apache2\\modules </filename>)."
msgstr "Z Raziskovalcem pojdite v namestitveno mapo Git (običajno <filename>c:\\program files\\Git</filename>) in poiščite datoteki <filename>/httpd/mod_dav_svn.so</filename> in <filename>mod_authz_svn.so</filename>. Prekopirajte ti datoteki v podmapo modules namestitvene mape strežnika Apache (običajno <filename>c:\\program files\\apache group\\apache2\\modules </filename>)."

#. (para)
#: ../source/TortoiseGit_en.xml:1669
msgid "Copy the file <filename>/bin/libdb*.dll</filename> and <filename>/bin/intl3_svn.dll</filename> from the Git installation directory to the Apache bin directory."
msgstr "Prekopirajte datoteki <filename>/bin/libdb*.dll</filename> in <filename>/bin/intl3_svn.dll</filename> iz namestitvene mape Git v podmapo bin strežnika Apache."

#. (para)
#: ../source/TortoiseGit_en.xml:1677
msgid "Edit Apache's configuration file (usually <filename> C:\\Program Files\\Apache Group\\Apache2\\conf\\httpd.conf</filename>) with a text editor such as Notepad and make the following changes:"
msgstr "Popravite konfiguracijsko datoteko strežnika Apache (ponavadi <filename> C:\\Program Files\\Apache Group\\Apache2\\conf\\httpd.conf</filename>) z urejevalnikom besedil (n. pr. z Beležko) in naredite naslednje spremembe:"

#. (para)
#: ../source/TortoiseGit_en.xml:1683
msgid ""
"Uncomment (remove the '<literal>#</literal>' mark) the following lines: <screen>\n"
"#LoadModule dav_fs_module modules/mod_dav_fs.so\n"
"#LoadModule dav_module modules/mod_dav.so\n"
"</screen> Add the following two lines to the end of the <literal>LoadModule</literal> section. <screen>\n"
"LoadModule dav_svn_module modules/mod_dav_svn.so\n"
"LoadModule authz_svn_module modules/mod_authz_svn.so\n"
"</screen>"
msgstr ""
"Odstranite komentar (oznako '<literal>#</literal>') izpred naslednjih vrstic:<screen>\n"
"#LoadModule dav_fs_module modules/mod_dav_fs.so\n"
"#LoadModule dav_module modules/mod_dav.so\n"
"</screen> Dodajte naslednji vrstici na konec sekcije <literal>LoadModule</literal>. <screen>\n"
"LoadModule dav_svn_module modules/mod_dav_svn.so\n"
"LoadModule authz_svn_module modules/mod_authz_svn.so\n"
"</screen>"

#. (title)
#. (term)
#: ../source/TortoiseGit_en.xml:1702
#: ../source/TortoiseGit_en.xml:12335
msgid "Configuration"
msgstr "Konfiguracija"

#. (para)
#: ../source/TortoiseGit_en.xml:1713
msgid ""
"At the end of the config file add the following lines: <screen>\n"
"&lt;Location /svn&gt;\n"
"  DAV svn\n"
"  SVNListParentPath on\n"
"  SVNParentPath D:\\SVN\n"
"  #SVNIndexXSLT \"/svnindex.xsl\"\n"
"  AuthType Basic\n"
"  AuthName \"Git repositories\"\n"
"  AuthUserFile passwd\n"
"  #AuthzSVNAccessFile svnaccessfile\n"
"  Require valid-user\n"
"&lt;/Location&gt;\n"
"</screen> This configures Apache so that all your Git repositories are physically located below <filename>D:\\SVN</filename>. The repositories are served to the outside world from the URL: <systemitem class=\"url\"> http://MyServer/svn/ </systemitem>. Access is restricted to known users/passwords listed in the <filename>passwd</filename> file."
msgstr ""
"Na koncu datoteke Config dodajte naslednje vrstice:  <screen>\n"
"&lt;Location /svn&gt;\n"
"  DAV svn\n"
"  SVNListParentPath on\n"
"  SVNParentPath D:\\SVN\n"
"  #SVNIndexXSLT \"/svnindex.xsl\"\n"
"  AuthType Basic\n"
"  AuthName \"Skladišča Git\"\n"
"  AuthUserFile passwd\n"
"  #AuthzSVNAccessFile svnaccessfile\n"
"  Require valid-user\n"
"&lt;/Location&gt;\n"
"</screen> S tem nastavite strežnik Apache tako, da so vsa skladišča sistema Git znotraj mape <filename>D:\\SVN</filename>. Zunanjemu svetu so skladišča na voljo na naslovu <systemitem class=\"url\"> http://MojStrežnik/svn/ </systemitem>. Dostop je omejen na uporabniška imena/gesla, ki so navedena v datoteki <filename>passwd</filename>."

#. (para)
#: ../source/TortoiseGit_en.xml:1740
msgid ""
"To create the <filename>passwd</filename> file, open the command prompt (DOS-Box) again, change to the <filename>apache2</filename> folder (usually <filename>c:\\program files\\apache group\\apache2</filename>) and create the file by entering <screen>\n"
"bin\\htpasswd -c passwd &lt;username&gt;\n"
"</screen> This will create a file with the name <filename>passwd</filename> which is used for authentication. Additional users can be added with <screen>\n"
"bin\\htpasswd passwd &lt;username&gt;\n"
"</screen>"
msgstr ""
"Za ustvarjanje datoteke <filename>passwd</filename> ponovno odprite ukazno lupino (okno DOS), pojdite v mapo strežnika Apache2 (ponavadi <filename>c:\\program files\\apache group\\apache2</filename>) in z naslednjim ukazom ustvarite datoteko: <screen>\n"
"bin\\htpasswd -c passwd &lt;username&gt;\n"
"</screen> S tem ustvarite datoteko z imenom <filename>passwd</filename>, ki se uporablja za avtentikacijo. Dodatne uporabnike lahko vnesete z <screen>\n"
"bin\\htpasswd geslo &lt;uporabniško ime&gt;\n"
"</screen>"

#. (para)
#: ../source/TortoiseGit_en.xml:1759
msgid "Restart the Apache service again."
msgstr "Ponovno zaženite storitev (service) Apache."

#. (para)
#: ../source/TortoiseGit_en.xml:1764
msgid "Point your browser to <systemitem class=\"url\">http://MyServer/svn/MyNewRepository</systemitem> (where <filename>MyNewRepository</filename> is the name of the Git repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository."
msgstr "Usmerite spletni brskalnik na <systemitem class=\"url\">http://MojStrežnik/svn/MojeNovoSkladišče</systemitem> (kjer je  <filename>MojeNovoSkladišče</filename> ime skladišča Git, 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/TortoiseGit_en.xml:1703
msgid "Now you have set up Apache and Git, but Apache doesn't know how to handle Git clients like TortoiseGit yet. To get Apache to know which URL will be used for Git repositories you have to edit the Apache configuration file (usually located in <filename>c:\\program files\\apache group\\apache2\\conf\\httpd.conf</filename>) with any text editor you like (e.g. Notepad): <placeholder-1/>"
msgstr "Apache in  Git sta nameščena, vendar Apache še ne zna delati z odjemalci Git, kakršen je TortoiseGit. Da poveste strežniku Apache, kateri naslovi URL bodo uporabljeni kot skladišča Git, morate popraviti njegovo konfiguracijsko datoteko (običajno se nahaja na <filename>c:\\program files\\apache group\\apache2\\conf\\httpd.conf</filename>) z urejevalnikom besedila (n. pr. z Beležko): <placeholder-1/>"

#. (primary)
#: ../source/TortoiseGit_en.xml:1777
msgid "SVNPath"
msgstr "SVNPath"

#. (primary)
#. (literal)
#. (primary)
#: ../source/TortoiseGit_en.xml:1780
#: ../source/TortoiseGit_en.xml:1815
#: ../source/TortoiseGit_en.xml:1951
msgid "SVNParentPath"
msgstr "SVNParentPath"

#. (title)
#: ../source/TortoiseGit_en.xml:1785
msgid "Apache <filename>httpd.conf</filename> Settings"
msgstr "Nastavitve Apache <filename>httpd.conf</filename>"

#. (entry)
#: ../source/TortoiseGit_en.xml:1791
msgid "Setting"
msgstr "Nastavitev"

#. (entry)
#: ../source/TortoiseGit_en.xml:1792
msgid "Explanation"
msgstr "Razlaga"

#. (systemitem)
#: ../source/TortoiseGit_en.xml:1800
msgid "http://MyServer/svn/"
msgstr "http://MojStrežnik/svn/"

#. (entry)
#: ../source/TortoiseGit_en.xml:1798
msgid "means that the Git repositories are available from the URL <placeholder-1/>"
msgstr "pomeni, da so skladišča sistema Git na voljo na naslovu URL <placeholder-1/>"

#. (entry)
#: ../source/TortoiseGit_en.xml:1805
msgid "tells Apache which module will be responsible to serve that URL - in this case the Git module."
msgstr "pove strežniku Apache, kateri modul bo odgovoren za strežbo naslova URL - v tem primeru modul Git."

#. (entry)
#: ../source/TortoiseGit_en.xml:1812
msgid "For Git version 1.3 and higher, this directive enables listing all the available repositories under <placeholder-1/>."
msgstr "V različicah sistema Git 1.3 ali novejših ta ukaz omogoča izpis seznama vse razpoložljivih skladišč v mapi <placeholder-1/>."

#. (filename)
#: ../source/TortoiseGit_en.xml:1822
msgid "D:\\SVN"
msgstr "D:\\SVN"

#. (entry)
#: ../source/TortoiseGit_en.xml:1820
msgid "tells Git to look for repositories below <placeholder-1/>"
msgstr "pove sistemu Git, naj skladišča išče v mapi <placeholder-1/>"

#. (entry)
#: ../source/TortoiseGit_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/TortoiseGit_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/TortoiseGit_en.xml:1841
msgid "is used as an information whenever an authentication dialog pops up to tell the user what the authentication is for"
msgstr "se uporablja kot informacija ob prikazu pojavnega okna za avtentikacijo. Uporabniku pove, za kaj se avtentikacija uporablja."

#. (entry)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:1854
msgid "Location of the Access file for paths inside a Git repository"
msgstr "lokacija datoteke dostopov za poti v skladiščih Git"

#. (entry)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:1873
msgid ""
"If you want your repository to have read access for everyone but write access only for specific users you can change the line <screen>\n"
"Require valid-user\n"
"</screen> to <screen>\n"
"&lt;LimitExcept GET PROPFIND OPTIONS REPORT&gt;\n"
"Require valid-user\n"
"&lt;/LimitExcept&gt;\n"
"</screen>"
msgstr ""
"Če želite, da imajo pravico branja v vašem skladišču vsi uporabniki, pravico pisanja pa samo nekateri, spremenite vrstico  <screen>\n"
"Require valid-user\n"
"</screen> v <screen>\n"
"&lt;LimitExcept GET PROPFIND OPTIONS REPORT&gt;\n"
"Require valid-user\n"
"&lt;/LimitExcept&gt;\n"
"</screen>"

#. (para)
#: ../source/TortoiseGit_en.xml:1888
msgid ""
"Using a <filename>passwd</filename> 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 <screen>\n"
"#AuthzSVNAccessFile svnaccessfile\n"
"</screen> and create a Git access file. Apache will make sure that only valid users are able to access your <filename>/svn</filename> location, and will then pass the username to Git's <literal>AuthzSVNAccessFile</literal> module so that it can enforce more granular access based upon rules listed in the Git access file. Note that paths are specified either as <literal>repos:path</literal> or simply <literal>path</literal>. If you don't specify a particular repository, that access rule will apply to all repositories under <literal>SVNParentPath</literal>. The format of the authorization-policy file used by <literal>mod_authz_svn</literal> is described in <xref linkend=\"tsvn-serversetup-mod_authz_svn\"/>"
msgstr ""
"Z uporabno datoteke <filename>passwd</filename> 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 <screen>\n"
"#AuthzSVNAccessFile svnaccessfile\n"
"</screen> in ustvarite datoteko dostopa. Apache poskrbi, da lahko samo veljavni uporabniki dostopajo do lokacije <filename>/svn</filename>, in potem posreduje uporabniško ime  modulu <literal>AuthzSVNAccessFile</literal>, tako da lahko le-ta bolj podrobno ugotovi pravice glede na pravila, ki so zapisana v datoteki dostopa. Poti so zapisane v obliki <literal>skladišče:pot</literal> ali preprosto <literal>pot</literal>. Če ne določite skladišča, pravilo velja za vsa skladišča v mapi <literal>SVNParentPath</literal>. Oblika avtorizacijske datoteke, ki jo uporablja <literal>mod_authz_svn</literal>, je opisana v <xref linkend=\"tsvn-serversetup-mod_authz_svn\"/>"

#. (para)
#: ../source/TortoiseGit_en.xml:1915
msgid ""
"To make browsing the repository with a web browser 'prettier', uncomment the line <screen>\n"
"#SVNIndexXSLT \"/svnindex.xsl\"\n"
"</screen> and put the files <filename>svnindex.xsl</filename>, <filename>svnindex.css</filename> and <filename>menucheckout.ico</filename> in your document root directory (usually <filename>C:/Program Files/Apache Group/Apache2/htdocs</filename>). The directory is set with the <literal>DocumentRoot</literal> directive in your Apache config file."
msgstr ""
"Da bi polepšali izpis pri brskanju po skladišču, odkomentirajte naslednjo vrstico <screen>\n"
"#SVNIndexXSLT \"/svnindex.xsl\"\n"
"</screen> in dodajte datoteke <filename>svnindex.xsl</filename>, <filename>svnindex.css</filename> in <filename>menucheckout.ico</filename> v korensko mapo dokumentov na strežniku (ponavadi <filename>C:/Program Files/Apache Group/Apache2/htdocs</filename>). Mapa se nastavi z ukazom <literal>DocumentRoot</literal> v konfiguracijski datoteki strežnika Apache."

#. (para)
#: ../source/TortoiseGit_en.xml:1928
msgid "You can get those three files directly from our source repository at <ulink url=\"http://TortoiseGit.tigris.org/svn/TortoiseGit/trunk/contrib/other/svnindex\"><citetitle>http://TortoiseGit.tigris.org/svn/TortoiseGit/trunk/contrib/other/svnindex</citetitle></ulink>. If you're asked for authentication for this link, enter <literal>guest</literal> as username and leave the password empty."
msgstr "Te tri datoteke lahko prenesete neposredno iz našega skladišča na naslovu <ulink url=\"http://TortoiseGit.tigris.org/svn/TortoiseGit/trunk/contrib/other/svnindex\"><citetitle>http://TortoiseGit.tigris.org/svn/TortoiseGit/trunk/contrib/other/svnindex</citetitle></ulink>. Če se pojavi zahteva po avtentikaciji, vnesite <literal>guest</literal> za uporabniško ime in pustite polje za geslo prazno."

#. (para)
#: ../source/TortoiseGit_en.xml:1937
msgid "The XSL file from the TortoiseGit repository has a nice gimmick: if you browse the repository with your web browser, then every folder in your repository has an icon on the right shown. If you click on that icon, the TortoiseGit checkout dialog is started for this URL."
msgstr "Datoteka XSL skladišča TortoiseGit 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/TortoiseGit_en.xml:1782
msgid "A short explanation of what you just entered: <placeholder-1/> But that's just an example. There are many, many more possibilities of what you can do with the Apache web server. <placeholder-2/>"
msgstr "Kratka obrazložitev pravkar vnesenega: <placeholder-1/> Vendar je to le primer. Obstaja še zelo veliko stvari, ki jih lahko naredite s spletnim strežnikom Apache. <placeholder-2/>"

#. (title)
#: ../source/TortoiseGit_en.xml:1949
msgid "Multiple Repositories"
msgstr "Več skladišč"

#. (primary)
#: ../source/TortoiseGit_en.xml:1954
msgid "Index of projects"
msgstr "Indeks projektov"

#. (para)
#: ../source/TortoiseGit_en.xml:1956
msgid "If you used the <literal>SVNParentPath</literal> directive then you don't have to change the Apache config file every time you add a new Git repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Create repository here...</guimenuitem></menuchoice> and a new project has a home..."
msgstr "Če ste pri nameščanju nastavili ukaz <literal>SVNParentPath</literal>, 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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Tukaj ustvari skladišče...</guimenuitem></menuchoice> in nov projekt ima svoj dom..."

#. (para)
#: ../source/TortoiseGit_en.xml:1970
msgid "If you are using Git 1.3 or later, you can use the <literal>SVNListParentPath on</literal> 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 Git 1.3 ali novejšo različico, lahko uporabite ukaz <literal>SVNListParentPath on</literal>. 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/TortoiseGit_en.xml:1978
msgid "Path-Based Authorization"
msgstr "Avtorizacija na osnovi poti"

#. (primary)
#: ../source/TortoiseGit_en.xml:1980
msgid "Authorization"
msgstr "Avtorizacija"

#. (para)
#: ../source/TortoiseGit_en.xml:1985
msgid "The <literal>mod_authz_svn</literal> module permits fine-grained control of access permissions based on user names and repository paths. This is available with the Apache server, and as of Git 1.3 it is available with svnserve as well."
msgstr "Modul <literal>mod_authz_svn</literal> 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 Git 1.3 naprej pa tudi pri uporabi svnserve."

#. (para)
#: ../source/TortoiseGit_en.xml:1991
msgid ""
"An example file would look like this: <screen>\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"
"</screen>"
msgstr ""
"Primer datoteke izgleda takole: <screen>\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"
"</screen>"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_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 <emphasis>both</emphasis>, 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 <emphasis>obema</emphasis> pogojema: običajni zahtevi po avtentikaciji in avtorizacijski zahtevi za dostop do datoteke."

#. (title)
#: ../source/TortoiseGit_en.xml:2038
msgid "Authentication With a Windows Domain"
msgstr "Avtentikacija z domeno Windows"

#. (primary)
#: ../source/TortoiseGit_en.xml:2040
msgid "Windows domain"
msgstr "Domena Windows"

#. (primary)
#: ../source/TortoiseGit_en.xml:2043
msgid "domaincontroller"
msgstr "domenski kontroler"

#. (para)
#: ../source/TortoiseGit_en.xml:2045
msgid "As you might have noticed you need to make a username/password entry in the <filename>passwd</filename> 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 <filename>passwd</filename> 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/TortoiseGit_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: <literal>mod_auth_sspi</literal>!"
msgstr "Vendar obstaja rešitev problema - v primeru, če dostopate do skladišča iz krajevnega omrežja z domenskim kontrolerjem sistema Windows: <literal>mod_auth_sspi</literal>!"

#. (primary)
#: ../source/TortoiseGit_en.xml:2058
msgid "SSPI"
msgstr "SSPI"

#. (primary)
#: ../source/TortoiseGit_en.xml:2061
msgid "NTLM"
msgstr "NTLM"

#. (para)
#: ../source/TortoiseGit_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 <ulink url=\"http://sourceforge.net/projects/mod-auth-sspi/\"><citetitle>SourceForge</citetitle></ulink>."
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 <ulink url=\"http://sourceforge.net/projects/mod-auth-sspi/\"><citetitle>SourceForge</citetitle></ulink>."

#. (para)
#: ../source/TortoiseGit_en.xml:2074
msgid "Download the module which matches your apache version, then copy the file <filename>mod_auth_sspi.so</filename> into the Apache modules folder."
msgstr "Prenesite modul, ki ustreza različi vašega strežnika Apache, prekopirajte datoteko <filename>mod_auth_sspi.so</filename> v podmapo modules namestitvene mape strežnika Apache."

#. (para)
#: ../source/TortoiseGit_en.xml:2081
msgid ""
"Edit the Apache config file: add the line <screen>\n"
"LoadModule sspi_auth_module modules/mod_auth_sspi.so\n"
"</screen> to the <literal>LoadModule</literal> section. Make sure you insert this line <emphasis>before</emphasis> the line <screen>\n"
"LoadModule auth_module modules/mod_auth.so\n"
"</screen>"
msgstr ""
"Popravite konfiguracijsko datoteko strežnika Apache: dodajte vrstico <screen>\n"
"LoadModule sspi_auth_module modules/mod_auth_sspi.so\n"
"</screen> v sekcijo <literal>LoadModule</literal>. To vrstico morate vstaviti <emphasis>pred</emphasis> vrstico <screen>\n"
"LoadModule auth_module modules/mod_auth.so\n"
"</screen>"

#. (para)
#: ../source/TortoiseGit_en.xml:2094
msgid ""
"To make the Git location use this type of authentication you have to change the line <screen>\n"
"AuthType Basic\n"
"</screen> to <screen>\n"
"AuthType SSPI\n"
"</screen> also you need to add <screen>\n"
"SSPIAuth On\n"
"SSPIAuthoritative On\n"
"SSPIDomain &lt;domaincontroller&gt;\n"
"SSPIOmitDomain on\n"
"SSPIUsernameCase lower\n"
"SSPIPerRequestAuth on\n"
"SSPIOfferBasic On\n"
"</screen> within the <literal>&lt;Location /svn&gt;</literal> block. If you don't have a domain controller, leave the name of the domain control as <literal>&lt;domaincontroller&gt;</literal>."
msgstr ""
"Če želite, da Git uporablja ta tip avtentikacije, morate spremeniti vrstico <screen>\n"
"AuthType Basic\n"
"</screen> v <screen>\n"
"AuthType SSPI\n"
"</screen> in dodati <screen>\n"
"SSPIAuth On\n"
"SSPIAuthoritative On\n"
"SSPIDomain &lt;domaincontroller&gt;\n"
"SSPIOmitDomain on\n"
"SSPIUsernameCase lower\n"
"SSPIPerRequestAuth on\n"
"SSPIOfferBasic On\n"
"</screen> v blok <literal>&lt;Location /svn&gt;</literal>. Če nimate domenskega kontrolerja, pustite ime domenske kontrole na <literal>&lt;domaincontroller&gt;</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:2120
msgid "Note that if you are authenticating using SSPI, then you don't need the <literal>AuthUserFile</literal> 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 <filename>svnaccessfile</filename> to reference <literal>DOMAIN\\username</literal> as well."
msgstr "Če za avtentikacijo uporabljate SSPI, potem ne potrebujete več vrstice <literal>AuthUserFile</literal> za datoteko gesel. Apache avtenticira vaše uporabniško ime in geslo v domeni Windows. Morali pa boste posodobiti seznam uporabnikov v datoteki <filename>svnaccessfile</filename>, da bo le-ta vsebovala tudi uporabnike oblike <literal>DOMENA\\uporabniško ime</literal>."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:2135
msgid "To enable SSL on your server, see the chapter: <xref linkend=\"tsvn-serversetup-apache-7\"/>"
msgstr "Za vklop varne povezave (SSL) na strežniku preberite <xref linkend=\"tsvn-serversetup-apache-7\"/>"

#. (para)
#: ../source/TortoiseGit_en.xml:2141
msgid "Git <filename>AuthzSVNAccessFile</filename> files are case sensitive in regard to user names (<literal>JUser</literal> is different from <literal>juser</literal>)."
msgstr "Datoteke <filename>AuthzSVNAccessFile</filename> sistema Git so občutljive na velike in male črke pri navajanju uporabniških imen (beseda <literal>UPorabnik</literal> je torej drugačna kot <literal>uporabnik</literal>)."

#. (para)
#: ../source/TortoiseGit_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. <literal>JUser</literal>)."
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. <literal>JUporabnik</literal>)."

#. (para)
#: ../source/TortoiseGit_en.xml:2151
msgid "This difference can bite you when using SSPI authentication as the windows domain and user names are passed to Git in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with."
msgstr "Ta razlika pa vam lahko ponagaja pri uporabi avtentikacije SSPI. Sistem Git 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/TortoiseGit_en.xml:2159
msgid "The end result is that you may need at least two entries in your <literal>AuthzSVNAccessFile</literal> for each user -- a lowercase entry and an entry in the same case that Internet Explorer passes to Apache. You will also need to train your users to also type in their credentials using lower case when accessing repositories via TortoiseGit."
msgstr "Rezultat tega je, da boste mogoče potrebovali vsaj dva vnosa v <literal>AuthzSVNAccessFile</literal> 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 TortoiseGit."

#. (para)
#: ../source/TortoiseGit_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 Git's <literal>AuthzSVNAccessFile</literal> module. You may need to experiment with the exact format of the user string in the <literal>svnaccessfile</literal> (e.g. <literal>DOMAIN\\user</literal> vs. <literal>DOMAIN//user</literal>) 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 <literal>AuthzSVNAccessFile</literal>. Mogoče boste morali poskušati ugotoviti pravilno obliko niza v datoteki <literal>svnaccessfile</literal> (n. pr. <literal>DOMENA\\uporabnik</literal> oz. <literal>DOMEMA//uporabnik</literal>), preden bo sistem res deloval."

#. (title)
#: ../source/TortoiseGit_en.xml:2181
msgid "Multiple Authentication Sources"
msgstr "Avtentikacija iz več virov"

#. (primary)
#: ../source/TortoiseGit_en.xml:2183
msgid "Multiple authentication"
msgstr "Večkratna avtentikacija"

#. (para)
#: ../source/TortoiseGit_en.xml:2185
msgid "It is also possible to have more than one authentication source for your Git repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password."
msgstr "Določiti je mogoče več virov za avtentikacijo skladišč Git. 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/TortoiseGit_en.xml:2191
msgid "A common scenario is to use both Windows domain authentication and a <literal>passwd</literal> 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 <literal>passwd</literal>. Na ta način lahko omogočite dostop tudi uporabnikom, ki nimajo uporabniškega imena in gesla za domeno Windows."

#. (para)
#: ../source/TortoiseGit_en.xml:2198
msgid ""
"To enable both Windows domain and <filename>passwd</filename> file authentication, add the following entries within the <literal>&lt;Location&gt;</literal> block of your Apache config file: <screen>\n"
"AuthBasicAuthoritative Off\n"
"SSPIAuthoritative Off\n"
"</screen>"
msgstr ""
"Da bi omogočili avtentikacijo preko domene Windows in datoteke <filename>passwd</filename>, dodajte naslednji vrstici znotraj bloka <literal>&lt;Location&gt;</literal> v konfiguracijski datoteki strežnika Apache: <screen>\n"
"AuthBasicAuthoritative Off\n"
"SSPIAuthoritative Off\n"
"</screen>"

#. (para)
#: ../source/TortoiseGit_en.xml:2209
msgid ""
"Here is an example of the full Apache configuration for combined Windows domain and <literal>passwd</literal> file authentication: <screen>\n"
"&lt;Location /svn&gt;\n"
"  DAV svn\n"
"  SVNListParentPath on\n"
"  SVNParentPath D:\\SVN\n"
"\n"
"  AuthName \"Git repositories\"\n"
"  AuthzSVNAccessFile svnaccessfile.txt\n"
"\n"
"# NT Domain Logins.\n"
"  AuthType SSPI\n"
"  SSPIAuth On\n"
"  SSPIAuthoritative Off\n"
"  SSPIDomain &lt;domaincontroller&gt;\n"
"  SSPIOfferBasic On\n"
"\n"
"# Htpasswd Logins.\n"
"  AuthType Basic\n"
"  AuthBasicAuthoritative Off\n"
"  AuthUserFile passwd\n"
"\n"
"  Require valid-user\n"
"&lt;/Location&gt;\n"
"</screen>"
msgstr ""
"Sledi celoten primer konfiguracije strežnika Apache za kombinacijo avtentikacije preko domene Windows in dateteke <literal>passwd</literal>: <screen>\n"
"&lt;Location /svn&gt;\n"
"  DAV svn\n"
"  SVNListParentPath on\n"
"  SVNParentPath D:\\SVN\n"
"\n"
"  AuthName \"Skladišča Git\"\n"
"  AuthzSVNAccessFile svnaccessfile.txt\n"
"\n"
"# Logiranje preko domen NT.\n"
"  AuthType SSPI\n"
"  SSPIAuth On\n"
"  SSPIAuthoritative Off\n"
"  SSPIDomain &lt;domaincontroller&gt;\n"
"  SSPIOfferBasic On\n"
"\n"
"# Logiranje preko datoteke passwd.\n"
"  AuthType Basic\n"
"  AuthBasicAuthoritative Off\n"
"  AuthUserFile passwd\n"
"\n"
"  Require valid-user\n"
"&lt;/Location&gt;\n"
"</screen>"

#. (title)
#: ../source/TortoiseGit_en.xml:2239
msgid "Securing the server with SSL"
msgstr "Zavarovanje strežnika z SSL"

#. (primary)
#: ../source/TortoiseGit_en.xml:2241
msgid "SSL"
msgstr "SSL"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:2249
msgid ""
"In the apache config file, uncomment the lines: <screen>\n"
"#LoadModule ssl_module modules/mod_ssl.so\n"
"</screen> and at the bottom <screen>\n"
"#Include conf/extra/httpd-ssl.conf\n"
"</screen> then change the line (on one line) <screen>\n"
"SSLMutex \"file:C:/Program Files/Apache Software Foundation/\\\n"
"Apache2.2/logs/ssl_mutex\"\n"
"</screen> to <screen>\n"
"SSLMutex default\n"
"</screen>"
msgstr ""
"V konfiguracijski datoteki strežnika Apache odstranite komentar izpred naslednjih vrstic:<screen>\n"
"#LoadModule ssl_module modules/mod_ssl.so\n"
"</screen> in na koncu <screen>\n"
"#Include conf/extra/httpd-ssl.conf\n"
"</screen> nato spremenite vrstico (v eni vrstici) <screen>\n"
"SSLMutex \"file:C:/Program Files/Apache Software Foundation/\\\n"
"Apache2.2/logs/ssl_mutex\"\n"
"</screen> v <screen>\n"
"SSLMutex default\n"
"</screen>"

#. (para)
#: ../source/TortoiseGit_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. <filename>C:\\program files\\apache group\\apache2</filename>) and type the following command: <screen>\n"
"bin\\openssl req -config conf\\openssl.cnf -new -out my-server.csr\n"
"</screen> 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. <filename>C:\\program files\\apache group\\apache2</filename>) in vpišite naslednji ukaz: <screen>\n"
"bin\\openssl req -config conf\\openssl.cnf -new -out my-server.csr\n"
"</screen> 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/TortoiseGit_en.xml:2286
msgid ""
"Normally the <filename>privkey.pem</filename> file is created automatically, but if it isn't you need to type this command to generate it: <screen>\n"
"bin\\openssl genrsa -out conf\\privkey.pem 2048\n"
"</screen>"
msgstr ""
"Običajno se datoteka <filename>privkey.pem</filename> ustvari samodejno, če pa se ne, morate vtipkati naslednji ukaz, da jo ustvarite:<screen>\n"
"bin\\openssl genrsa -out conf\\privkey.pem 2048\n"
"</screen>"

#. (para)
#: ../source/TortoiseGit_en.xml:2294
msgid ""
"Next type the commands <screen>\n"
"bin\\openssl rsa -in conf\\privkey.pem -out conf\\server.key\n"
"</screen> and (on one line) <screen>\n"
"bin\\openssl req -new -key conf\\server.key -out conf\\server.csr \\\n"
"-config conf\\openssl.cnf\n"
"</screen> and then (on one line) <screen>\n"
"bin\\openssl x509 -in conf\\server.csr -out conf\\server.crt\n"
"                 -req -signkey conf\\server.key -days 4000\n"
"</screen> This will create a certificate which will expire in 4000 days. And finally enter (on one line): <screen>\n"
"bin\\openssl x509 -in conf\\server.cert -out conf\\server.der.crt\n"
"                 -outform DER\n"
"</screen> These commands created some files in the Apache <filename>conf</filename> folder (<filename>server.der.crt</filename>, <filename>server.csr</filename>, <filename>server.key</filename>, <filename>.rnd</filename>, <filename>privkey.pem</filename>, <filename>server.cert</filename>)."
msgstr ""
"Nato vpišite naslednje ukaze <screen>\n"
"bin\\openssl rsa -in conf\\privkey.pem -out conf\\server.key\n"
"</screen> in (v eni vrstici) <screen>\n"
"bin\\openssl req -new -key conf\\server.key -out conf\\server.csr \\\n"
"-config conf\\openssl.cnf\n"
"</screen> in nato (v eni vrstici) <screen>\n"
"bin\\openssl x509 -in conf\\server.csr -out conf\\server.crt\n"
"                 -req -signkey conf\\server.key -days 4000\n"
"</screen> S tem ustvarite certifikat, ki bo potekel čez 4000 dni. Nato vpišite (v eni vrstici) še:<screen>\n"
"bin\\openssl x509 -in conf\\server.cert -out conf\\server.der.crt\n"
"                 -outform DER\n"
"</screen> Ti ukazi ustvarijo nekaj datotek v konfiguracijski mapi (<filename>conf</filename>) strežnika Apache (<filename>server.der.crt</filename>, <filename>server.csr</filename>, <filename>server.key</filename>, <filename>.rnd</filename>, <filename>privkey.pem</filename>, <filename>server.cert</filename>)."

#. (para)
#: ../source/TortoiseGit_en.xml:2326
msgid "Restart the Apache service."
msgstr "Ponovno zaženite storitev Apache."

#. (para)
#: ../source/TortoiseGit_en.xml:2331
msgid "Point your browser to <systemitem class=\"url\">https://servername/svn/project</systemitem> ..."
msgstr "Usmerite vaš spletni brskalnik na <systemitem class=\"url\">https://servername/svn/project</systemitem> ..."

#. (title)
#: ../source/TortoiseGit_en.xml:2339
msgid "SSL and Internet Explorer"
msgstr "SSL in Internet Explorer"

#. (para)
#: ../source/TortoiseGit_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 TortoiseGit and any other Git 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, TortoiseGit in ostali odjemalci za Git še vedno lahko izvajajo avtentikacijo."

#. (para)
#: ../source/TortoiseGit_en.xml:2354
msgid "define a separate <literal>&lt;Location /path&gt;</literal> directive in the Apache config file, and add the <literal>SSPIBasicPreferred On</literal>. This will allow IE to authenticate again, but other browsers and Git won't be able to authenticate against that location."
msgstr "v konfiguracijski datoteki Apache definirate ločen ukaz <literal>&lt;Location /path&gt;</literal> in dodate vrstico <literal>SSPIBasicPreferred On</literal>. To omogoči avtentikacijo preko Internet Explorerja, vendar pa ostali brskalniki in odjemalci za Git ne bodo mogli izvajati avtentikacije na tej lokaciji."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:2372
msgid ""
"In the SSL \"standard\" setup there's often the following statement in Apache's virtual SSL host: <screen>\n"
"SetEnvIf User-Agent \".*MSIE.*\" \\\n"
"             nokeepalive ssl-unclean-shutdown \\\n"
"             downgrade-1.0 force-response-1.0\n"
"</screen> There are (were?) good reasons for this configuration, see <ulink url=\"http://www.modssl.org/docs/2.8/ssl_faq.html#ToC49\"><citetitle>http://www.modssl.org/docs/2.8/ssl_faq.html#ToC49</citetitle></ulink> But if you want NTLM authentication you have to use <literal>keepalive</literal>. If You uncomment the whole <literal>SetEnvIf</literal> you should be able to authenticate IE with windows authentication over SSL against the Apache on Win32 with included <literal>mod_auth_sspi</literal>."
msgstr ""
"Pri \"standardni\" namestitvi SSL se v Apachejevem virtualnem gostitelju pogosto nahaja naslednji stavek: <screen>\n"
"SetEnvIf User-Agent \".*MSIE.*\" \\\n"
"             nokeepalive ssl-unclean-shutdown \\\n"
"             downgrade-1.0 force-response-1.0\n"
"</screen> Obstajajo (so obstajali?) dobri razlogi za takšno konfiguracijo, poglejte na <ulink url=\"http://www.modssl.org/docs/2.8/ssl_faq.html#ToC49\"><citetitle>http://www.modssl.org/docs/2.8/ssl_faq.html#ToC49</citetitle></ulink> Toda če želite uporabiti avtentikacijo NTLM, morate uporabiti opcijo <literal>keepalive</literal>. Če odkomentirate celoten blok <literal>SetEnvIf</literal>, boste lahko uporabljali avtentikacijo IE z avtentikacijo sistema Windows preko protokola SSL in strežnika Apache na sistemu WIN32 z vključenim modulom  <literal>mod_auth_sspi</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:2349
msgid "If you still want to use IE to browse the repository you can either: <placeholder-1/>"
msgstr "Če še vedno želite uporabljati Internet Explorer za brskanje po skladišču, lahko: <placeholder-1/>"

#. (title)
#: ../source/TortoiseGit_en.xml:2395
msgid "Forcing SSL access"
msgstr "Vsiljevanje dostopa SSL"

#. (para)
#: ../source/TortoiseGit_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 Git <literal>&lt;Location&gt;</literal> block: <literal>SSLRequireSSL</literal>."
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 Git blok <literal>&lt;Location&gt;</literal>: <literal>SSLRequireSSL</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:2403
msgid ""
"An example <literal>&lt;Location&gt;</literal> block would look like this: <screen>\n"
"&lt;Location /svn&gt;\n"
"  DAV svn\n"
"  SVNParentPath D:\\SVN\n"
"  SSLRequireSSL\n"
"  AuthType Basic\n"
"  AuthName \"Git repositories\"\n"
"  AuthUserFile passwd\n"
"  #AuthzSVNAccessFile svnaccessfile\n"
"  Require valid-user\n"
"&lt;/Location&gt;\n"
"</screen>"
msgstr ""
"Primer bloka <literal>&lt;Location&gt;</literal> izgleda takole: <screen>\n"
"&lt;Location /svn&gt;\n"
"  DAV svn\n"
"  SVNParentPath D:\\SVN\n"
"  SSLRequireSSL\n"
"  AuthType Basic\n"
"  AuthName \"Skladišča Git\"\n"
"  AuthUserFile passwd\n"
"  #AuthzSVNAccessFile svnaccessfile\n"
"  Require valid-user\n"
"&lt;/Location&gt;\n"
"</screen>"

#. (title)
#: ../source/TortoiseGit_en.xml:2421
msgid "Using client certificates with virtual SSL hosts"
msgstr "Uporaba certifikatov odjemalca z navideznimi gostitelji SSL"

#. (para)
#: ../source/TortoiseGit_en.xml:2422
msgid "Sent to the TortoiseGit mailing list by Nigel Green. Thanks!"
msgstr "Prispevek je na dopisni seznam poslal Nigel Green. Hvala!"

#. (para)
#: ../source/TortoiseGit_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 Git 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 Git."

#. (para)
#: ../source/TortoiseGit_en.xml:2431
msgid "Adding an <literal>SSLVerifyClient Optional</literal> directive to the <emphasis>per-server</emphasis> section of the Apache configuration (i.e. outside of any <literal>VirtualHost</literal> and <literal>Directory</literal> blocks) forces Apache to request a client Certificate in the initial SSL handshake. Due to a bug in <literal>mod_ssl</literal> 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 <emphasis>per-server</emphasis> v konfiguraciji strežnika Apache (n. pr. izven blokov <literal>VirtualHost</literal> in <literal>Directory</literal>) dodate ukaz <literal>SSLVerifyClient Optional</literal>, strežnik prisilite, da ob prvem kontaktu v načinu SSL zahteva certifikat. Zaradi napake v modulu <literal>mod_ssl</literal> je pomembno certifikat zatevati na tem mestu, kajti stvar ob ponovnem vzpostavaljnju poveze SSL ne deluje."

#. (para)
#: ../source/TortoiseGit_en.xml:2441
msgid ""
"The solution is to add the following directive to the virtual host directory that you want to lock down for Git: <screen>\n"
"SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n"
"</screen> 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 Git: <screen>\n"
"SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n"
"</screen> S tem dostop do mape dovolimo le uporabnjikom, ki so uporabili veljaven certifikat."

#. (para)
#: ../source/TortoiseGit_en.xml:2450
msgid ""
"To summarise, the relevant lines of the Apache configuration are: <screen>\n"
"SSLVerifyClient Optional\n"
"\n"
"### Virtual host configuration for the PUBLIC host \n"
"### (not requiring a certificate)\n"
"\n"
"&lt;VirtualHost 127.0.0.1:443&gt;\n"
"  &lt;Directory \"pathtopublicfileroot\"&gt;\n"
"  &lt;/Directory&gt;\n"
"&lt;/VirtualHost&gt;\n"
"\n"
"### Virtual host configuration for Git \n"
"### (requiring a client certificate)\n"
"&lt;VirtualHost 127.0.0.1:443&gt;\n"
"  &lt;Directory \"Git host root path\"&gt;\n"
"    SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n"
"  &lt;/Directory&gt;\n"
"\n"
"  &lt;Location /svn&gt;\n"
"    DAV svn\n"
"    SVNParentPath /pathtorepository\n"
"  &lt;/Location&gt;\n"
"&lt;/VirtualHost&gt;\n"
"</screen>"
msgstr ""
"Za zakljkuček poglejmo pomembne dele konfiguracijske datoteke strežnika Apache: <screen>\n"
"SSLVerifyClient Optional\n"
"\n"
"### Navidezni gostitelj za JAVEN dostop\n"
"### (ne zahteva certifikata)\n"
"\n"
"&lt;VirtualHost 127.0.0.1:443&gt;\n"
"  &lt;Directory \"potdokorenskemapezajavnidstop\"&gt;\n"
"  &lt;/Directory&gt;\n"
"&lt;/VirtualHost&gt;\n"
"\n"
"### Navidezni gostitelj za Git\n"
"### (zahteva certifikat)\n"
"&lt;VirtualHost 127.0.0.1:443&gt;\n"
"  &lt;Directory \"korenska mapa za Git\"&gt;\n"
"    SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n"
"  &lt;/Directory&gt;\n"
"\n"
"  &lt;Location /svn&gt;\n"
"    DAV svn\n"
"    SVNParentPath /potdoskladišča\n"
"  &lt;/Location&gt;\n"
"&lt;/VirtualHost&gt;\n"
"</screen>"

#. (title)
#: ../source/TortoiseGit_en.xml:2480
msgid "Svnserve Based Server"
msgstr "Strežnik svnserve"

#. (para)
#: ../source/TortoiseGit_en.xml:2486
msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Git includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection."
msgstr "Včasih strežnika Apache ne morete uporabiti. Na srečo Git vsebuje Svnserve - samostojen mini strežnik, ki uporablja protokol po meri preko običajne povezave TCP/IP."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:2499
msgid "Installing svnserve"
msgstr "Nameščanje svnserve"

#. (para)
#: ../source/TortoiseGit_en.xml:2503
msgid "Get the latest version of Git from <ulink url=\"http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91\"><citetitle>http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91</citetitle></ulink>. Alternatively get a pre-packaged installer from CollabNet at <ulink url=\"http://www.collab.net/downloads/Git\"><citetitle>http://www.collab.net/downloads/Git</citetitle></ulink>. 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 Git prenesite z naslova <ulink url=\"http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91\"><citetitle>http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91</citetitle></ulink>. Prenesete pa lahko tudi namestitveni program iz strežnika CollabNet na naslovu <ulink url=\"http://www.collab.net/downloads/Git\"><citetitle>http://www.collab.net/downloads/Git</citetitle></ulink>. Namestitveni program namesti svnserve kot storitev Windows, vsebuje pa tudi nekaj orodij, ki jih potrebujete za varno delovanje preko SASL."

#. (para)
#: ../source/TortoiseGit_en.xml:2517
msgid "If you already have a version of Git installed, and svnserve is running, you will need to stop it before continuing."
msgstr "Če je Git že nameščen in svnserve trenutno teče, ga morate pred nadaljevanjem zaustaviti."

#. (para)
#: ../source/TortoiseGit_en.xml:2523
msgid "Run the Git installer. If you run the installer on your server (recommended) you can skip step 4."
msgstr "Zaženite namestitvni program Git. Če nameščate Git na strežniku (priporočamo), lahko korak 4 preskočite."

#. (para)
#: ../source/TortoiseGit_en.xml:2529
msgid "Open the windows-explorer, go to the installation directory of Git (usually <filename>C:\\Program Files\\Git</filename>) and in the <filename>bin</filename> directory, find the files <filename>svnserve.exe</filename>, <filename>intl3_svn.dll</filename>, <filename>libapr.dll</filename>, <filename>libapriconv.dll</filename>, <filename>libapriutil.dll</filename>, <filename>libdb*.dll</filename>, <filename>libeay32.dll</filename> and <filename>ssleay32.dll</filename> - copy these files, or just copy all of the <filename>bin</filename> directory, into a directory on your server e.g. <filename>c:\\svnserve</filename>"
msgstr "Odprite Raziskovalca, pojdite na namestitveno mapo Git (običajno <filename>C:\\Program Files\\Git</filename>) in v mapi  <filename>bin</filename> poiščite datoteke <filename>svnserve.exe</filename>, <filename>intl3_svn.dll</filename>, <filename>libapr.dll</filename>, <filename>libapriconv.dll</filename>, <filename>libapriutil.dll</filename>, <filename>libdb*.dll</filename>, <filename>libeay32.dll</filename> in <filename>ssleay32.dll</filename> - prekopirajte jih ali pa prekopirajte celopno mapo <filename>bin</filename> v mapo na vašem strežniku, n. pr. <filename>c:\\svnserve</filename>"

#. (title)
#: ../source/TortoiseGit_en.xml:2551
msgid "Running svnserve"
msgstr "Poganjanje svnserve"

#. (para)
#: ../source/TortoiseGit_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: <screen>\n"
"svnserve.exe --daemon\n"
"</screen> 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: <screen>\n"
"svnserve.exe --daemon\n"
"</screen> 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/TortoiseGit_en.xml:2563
msgid "If you have not yet created a repository, follow the instructions given with the Apache server setup <xref linkend=\"tsvn-serversetup-apache-4\"/>."
msgstr "Če še niste ustvarili skladišča, sledite navodilom, podanim pri namestitvi strežnika Apache: <xref linkend=\"tsvn-serversetup-apache-4\"/>."

#. (para)
#: ../source/TortoiseGit_en.xml:2568
msgid "To test that svnserve is working, use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Repo-Browser</guimenuitem></menuchoice> to view a repository."
msgstr "Če želite preveriti, ali svnserve teče, uporabite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Skladiščni brskalnik</guimenuitem></menuchoice> - videti morate skladišče."

#. (para)
#: ../source/TortoiseGit_en.xml:2576
msgid ""
"Assuming your repository is located in <filename>c:\\repos\\TestRepo</filename>, and your server is called <filename>localhost</filename>, enter: <screen>\n"
"svn://localhost/repos/TestRepo\n"
"</screen> when prompted by the repo browser."
msgstr ""
"Če predpostavimo, da se skladišče nahaja v mapi <filename>c:\\sklad\\TestnoSkladišče</filename>, in je vašemu strežniku ime <filename>localhost</filename>, vpišite: <screen>\n"
"svn://localhost/sklad/TestnoSkladišče\n"
"</screen>ko dobite poziv brskalnika po skladišču."

#. (para)
#: ../source/TortoiseGit_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: <screen>\n"
"svnserve.exe --daemon --root drive:\\path\\to\\repository\\root\n"
"</screen> Using the previous test as a guide, svnserve would now run as: <screen>\n"
"svnserve.exe --daemon --root c:\\repos\n"
"</screen> And in TortoiseGit our repo-browser URL is now shortened to: <screen>\n"
"svn://localhost/TestRepo\n"
"</screen> 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: <screen>\n"
"svnserve.exe --daemon --root pogon:\\pot\\do\\skladišča\\root\n"
"</screen> Če uporabimo prejšnji primer, se ukaz za zagon svnserve sedaj glasi: <screen>\n"
"svnserve.exe --daemon --root c:\\sklad\n"
"</screen> V skladiščnem brskalniku TortoiseGit pa se naslov URL skrajša na: <screen>\n"
"svn://localhost/TestnoSkladišče\n"
"</screen> Upoštevajte, da morate stikalo --root uporabiti tudi takrat, ko se skladišče nahaja na drugi particiji ali pogonu kot svnserve."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:2621
msgid "Run svnserve as a Service"
msgstr "Zaženite svnserve kot storitev"

#. (para)
#: ../source/TortoiseGit_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 Git 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 Git 1.4 se svnserve lahko namesti kot domorodna storitev (native windows service)."

#. (para)
#: ../source/TortoiseGit_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. <screen>\n"
"sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n"
"    --root c:\\repos\" displayname= \"Git\" depend= tcpip \n"
"    start= auto\n"
"</screen> If any of the paths include spaces, you have to use (escaped) quotes around the path, like this: <screen>\n"
"sc create svnserve binpath= \"\n"
"    \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n"
"    --service --root c:\\repos\" displayname= \"Git\" \n"
"    depend= tcpip start= auto\n"
"</screen> You can also add a description after creating the service. This will show up in the Windows Services Manager. <screen>\n"
"sc description svnserve \"Git server (svnserve)\"\n"
"</screen>"
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. <screen>\n"
"sc create svnserve binpath= \"c:\\svnserve\\svnserve.exe --service \n"
"    --root c:\\repos\" displayname= \"Git\" depend= tcpip \n"
"    start= auto\n"
"</screen> Če katera od poti vsebuje presledke, morate uporabiti poševnice in navednice. Primer: <screen>\n"
"sc create svnserve binpath= \"\n"
"    \\\"C:\\Program Files\\Git\\bin\\svnserve.exe\\\"\n"
"    --service --root c:\\repos\" displayname= \"Git\" \n"
"    depend= tcpip start= auto\n"
"</screen> Ko ste storitev ustvarili, jih lahko dodate tudi opis. Le ta se potem pojavi v upravljalcu storitev (Windows Service Manager). <screen>\n"
"sc description svnserve \"Strežnik Git (svnserve)\"\n"
"</screen>"

#. (para)
#: ../source/TortoiseGit_en.xml:2655
msgid "Note the rather unusual command line format used by <literal>sc</literal>. In the <literal>key= value</literal> pairs there must be no space between the key and the <literal>=</literal> but there must be a space before the value."
msgstr "Pazite na nekoliko nenavadno obliko ukaza <literal>sc</literal>. Pri podajanju parametrov <literal>ključ= vrednost</literal> ne sme biti med ključem in znakom <literal>=</literal> nobenega presledka, presledek pa se mora nahajati pred vrednostjo."

#. (para)
#: ../source/TortoiseGit_en.xml:2662
msgid ""
"Microsoft now recommend services to be run as under either the Local Service or Network Service account. Refer to <ulink url=\"http://www.microsoft.com/technet/security/topics/serversecurity/serviceaccount/default.mspx\"><citetitle>The Services and Service Accounts Security Planning Guide</citetitle></ulink>. To create the service under the Local Service account, append the following to the example above. <screen>\n"
"obj= \"NT AUTHORITY\\LocalService\"\n"
"</screen> Note that you would have to give the Local Service account appropriate rights to both Git and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"."
msgstr ""
"Microsoft po novem priporoča, da se storitve poganjajo pod računom Lokalna storitev (Local Service) ali Omrežna storitev (Network Service). Preverite <ulink url=\"http://www.microsoft.com/technet/security/topics/serversecurity/serviceaccount/default.mspx\"><citetitle>The Services and Service Accounts Security Planning Guide</citetitle></ulink>. Za ustvarjanje storitve pod računom Lokalna storitev dodajte zgornjemu primeru naslednjo vrstico. <screen>\n"
"obj= \"NT AUTHORITY\\LocalService\"\n"
"</screen> Upoštevajte, da morate dodati računu potrebne pravice za Git 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/TortoiseGit_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/TortoiseGit_en.xml:2684
msgid "For more detailed information, refer to <ulink url=\"http://svn.collab.net/repos/svn/trunk/notes/windows-service.txt\"><citetitle>Windows Service Support for Svnserve</citetitle></ulink>."
msgstr "Za ostale informacije kliknite na <ulink url=\"http://svn.collab.net/repos/svn/trunk/notes/windows-service.txt\"><citetitle>Windows Service Support for Svnserve</citetitle></ulink>."

#. (para)
#: ../source/TortoiseGit_en.xml:2690
msgid ""
"If you installed an earlier version of svnserve using the <literal>SVNService</literal> 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 <screen>\n"
"svnservice -remove\n"
"</screen> to remove the service registry entry."
msgstr ""
"Če ste predhodnjo različico svnserve namestili z uporabo ovoja <literal>SVNService</literal>, 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: <screen>\n"
"svnservice -remove\n"
"</screen>"

#. (title)
#: ../source/TortoiseGit_en.xml:2704
msgid "Basic Authentication with svnserve"
msgstr "Osnovna avtentikacija s svnserve"

#. (para)
#: ../source/TortoiseGit_en.xml:2705
msgid "The default svnserve setup provides anonymous read-only access. This means that you can use an <literal>svn://</literal> URL to checkout and update, or use the repo-browser in TortoiseGit to view the repository, but you won't be able to commit any changes."
msgstr "Po privzetih nastavitvah svnserve omogoča anonimen dostop samo za branje. To pomeni, da lahko uporabite naslov <literal>svn://</literal> za prevzem in posodobitev skladišča ali skladiščni brskalnik za pregledovanje skladišča, ne morete pa objavljati narejenih sprememb."

#. (para)
#: ../source/TortoiseGit_en.xml:2711
msgid "To enable write access to a repository, you need to edit the <filename>conf/svnserve.conf</filename> 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 <filename>conf/svnserve.conf</filename> v mapi skladišča. Ta datoteka vsebuje nastavitve svnserve, poleg tega pa tudi koristno dokumentacijo."

#. (para)
#: ../source/TortoiseGit_en.xml:2717
msgid ""
"You can enable anonymous write access by simply setting: <screen>\n"
"[general]\n"
"anon-access = write\n"
"</screen> However, you will not know who has made changes to a repository, as the <literal>svn:author</literal> 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:  <screen>\n"
"[general]\n"
"anon-access = write\n"
"</screen> Vendar pa v tem primeru ne veste, kdo je spremembe vpisal, saj bo lastnost <literal>svn:author</literal> prazna. Prav tako ne boste mogli določati, kdo lahko spremembe v skladišče zapisuje. To je nevarno!"

#. (para)
#: ../source/TortoiseGit_en.xml:2728
msgid ""
"One way to overcome this is to create a password database: <screen>\n"
"[general]\n"
"anon-access = none\n"
"auth-access = write\n"
"password-db = userfile\n"
"</screen> Where <filename>userfile</filename> is a file which exists in the same directory as <filename>svnserve.conf</filename>. 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 <filename>conf</filename> directory. If you include a path, it must be written <filename>/the/unix/way</filename>. Using \\ or drive letters will not work. The <filename>userfile</filename> should have a structure of: <screen>\n"
"[users]\n"
"username = password\n"
"...\n"
"</screen> This example would deny all access for unauthenticated (anonymous) users, and give read-write access to users listed in <filename>userfile</filename>."
msgstr ""
"Rešitev problema je ustvarjanje baze gesel: <screen>\n"
"[general]\n"
"anon-access = none\n"
"auth-access = write\n"
"password-db = datotekauporabnikov\n"
"</screen> <filename>datotekauporabnikov</filename> je datoteka, ki se nahaja v isti mapi kot datoteka <filename>svnserve.conf</filename>. 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 <filename>conf</filename>. Če vključite pot, mora biti navedena <filename>/po/pravilih/sistema/unix</filename>. Uporaba znaka \\ ali črk pogona ni dovoljena. Datoteka <filename>datotekauporabnikov</filename> mora imeti naslednjo strukturo: <screen>\n"
"[users]\n"
"uporabniško ime = geslo\n"
"...\n"
"</screen> Ta primer prepove dostop vsem anonimnim uporabnikom (takšnim, ki se niso avtenticirali), uporabnikom, ki so navedeni v datoteki <filename>datotekauporabnikov</filename>, pa dovoli branje in pisanje po skladišču."

#. (para)
#: ../source/TortoiseGit_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 TortoiseGit can cache your credentials so that you only have to enter them once. More information can be found in the Git book, specifically in the sections <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.serverconfig.svnserve.html#svn.serverconfig.svnserve.auth.users\"><citetitle>Create a 'users' file and realm</citetitle></ulink> and <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.serverconfig.netmodel.html#svn.serverconfig.netmodel.credcache\"><citetitle>Client Credentials Caching</citetitle></ulink>"
msgstr "Če vzdržujete več skladišč, bo uporaba iste baze gesel olajšala avtentikacijo uporabnikom, saj ima TortoiseGit 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 Git book v poglavjih <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.serverconfig.svnserve.html#svn.serverconfig.svnserve.auth.users\"><citetitle>Create a 'users' file and realm</citetitle></ulink> in <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.serverconfig.netmodel.html#svn.serverconfig.netmodel.credcache\"><citetitle>Client Credentials Caching</citetitle></ulink>"

#. (title)
#: ../source/TortoiseGit_en.xml:2774
msgid "Better Security with SASL"
msgstr "Boljša varnost s SASL"

#. (primary)
#: ../source/TortoiseGit_en.xml:2776
msgid "SASL"
msgstr "SASL"

#. (title)
#: ../source/TortoiseGit_en.xml:2779
msgid "What is SASL?"
msgstr "Kaj je SASL?"

#. (para)
#: ../source/TortoiseGit_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 Git 1.5 and later, both the svnserve server and TortoiseGit 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 TortoiseGit."

#. (para)
#: ../source/TortoiseGit_en.xml:2788
msgid "For a more complete discussion of the options available, you should look at the Git book in the section <ulink url=\"http://svnbook.red-bean.com/nightly/en/svn.serverconfig.svnserve.html#svn.serverconfig.svnserve.sasl\"><citetitle>Using svnserve with SASL</citetitle></ulink>. 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 Git Book, poglavje <ulink url=\"http://svnbook.red-bean.com/nightly/en/svn.serverconfig.svnserve.html#svn.serverconfig.svnserve.sasl\"><citetitle>Using svnserve with SASL</citetitle></ulink>. Č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/TortoiseGit_en.xml:2801
msgid "SASL Authentication"
msgstr "Avtentikacija SASL"

#. (para)
#: ../source/TortoiseGit_en.xml:2802
msgid ""
"To activate specific SASL mechanisms on the server, you'll need to do three things. First, create a <literal>[sasl]</literal> section in your repository's <filename>svnserve.conf</filename> file, with this key-value pair: <screen>\n"
"use-sasl = true\n"
"</screen>"
msgstr ""
"Za aktivacijo določenih mehanizmov SASL na strežniku morate narediti tri stvari. Najprej ustvarite sekcijo <literal>[sasl]</literal> v datoteki <filename>svnserve.conf</filename>, ki se nahaja znotraj skladišča, pri tem uporabite naslednjo vrednost: <screen>\n"
"use-sasl = true\n"
"</screen>"

#. (para)
#: ../source/TortoiseGit_en.xml:2811
msgid "Second, create a file called <filename>svn.conf</filename> in a convenient location - typically in the directory where Git is installed."
msgstr "Nato ustvarite datoteko <filename>svn.conf</filename> na primerni lokaciji - ponavadi je to v namestitveni mapi Git."

#. (para)
#: ../source/TortoiseGit_en.xml:2816
msgid "Thirdly, create two new registry entries to tell SASL where to find things. Create a registry key named <literal>[HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library]</literal> and place two new string values inside it: <literal>SearchPath</literal> set to the directory path containing the <filename>sasl*.dll</filename> plug-ins (normally in the Git install directory), and <literal>ConfFile</literal> set to the directory containing the <filename>svn.conf</filename> 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 <literal>[HKEY_LOCAL_MACHINE\\SOFTWARE\\Carnegie Mellon\\Project Cyrus\\SASL Library]</literal>, vanj pa dodajte dve novi vrednosti (niz/string): <literal>SearchPath</literal> nastavite na mapo, ki vsebuje vtičnike <filename>sasl*.dll</filename> (običajno je to namestitvena mapa Git), in <literal>ConfFile</literal> nastavite na mapo, ki vsebuje datoteko <filename>svn.conf</filename>. Če ste za namestitev uporabili namestitveni program s strežnika CollabNet, imate te vnose že v registru."

#. (para)
#: ../source/TortoiseGit_en.xml:2828
msgid ""
"Edit the <filename>svn.conf</filename> file to contain the following: <screen>\n"
"pwcheck_method: auxprop\n"
"auxprop_plugin: sasldb\n"
"mech_list: DIGEST-MD5\n"
"sasldb_path: C:\\TortoiseGit\\sasldb\n"
"</screen> The last line shows the location of the authentication database, which is a file called <filename>sasldb</filename>. 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 <filename>svn.conf</filename> dodajte naslednje besedilo: <screen>\n"
"pwcheck_method: auxprop\n"
"auxprop_plugin: sasldb\n"
"mech_list: DIGEST-MD5\n"
"sasldb_path: C:\\TortoiseGit\\sasldb\n"
"</screen> Zadnja vrstica prikazuje lokacijo avtentikacijske baze podatkov, ki se imenuje <filename>sasldb</filename>. 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/TortoiseGit_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/TortoiseGit_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 <literal>saslpasswd2</literal> program. If you used the CollabNet installer, that program will be in the install directory. Use a command something like this: <screen>\n"
"saslpasswd2 -c -f C:\\TortoiseGit\\sasldb -u realm username\n"
"</screen> The <literal>-f</literal> switch gives the database location, <literal>realm</literal> must be the same as the value you defined in your repository's <filename>svnserve.conf</filename> 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 <literal>saslpasswd2</literal>. Če ste uporabili namestitveni program CollabNet, se ta program nahaja v namestitveni mapi. Uporabite naslednjo ukazno vrstico: <screen>\n"
"saslpasswd2 -c -f C:\\TortoiseGit\\sasldb -u realm uporabniškoime\n"
"</screen> Stikalo <literal>-f</literal> pove, da podajate lokacijo baze podatkov, vrednost <literal>realm</literal> mora biti enaka vrednosti, ki ste jo navedli v datoteki <filename>svnserve.conf</filename> skladišča, uporabniškoime pa je željeno uporabniško ime uporabnika. Upoštevajte, da realm ne sme vsebovati presledkov."

#. (para)
#: ../source/TortoiseGit_en.xml:2862
msgid "You can list the usernames stored in the database using the <literal>sasldblistusers2</literal> program."
msgstr "Seznam uporabniških imen v bazi lahko izpišete s programom <literal>sasldblistusers2</literal>."

#. (title)
#: ../source/TortoiseGit_en.xml:2868
msgid "SASL Encryption"
msgstr "Enkripcija SASL"

#. (para)
#: ../source/TortoiseGit_en.xml:2869
msgid ""
"To enable or disable different levels of encryption, you can set two values in your repository's <filename>svnserve.conf</filename> file: <screen>\n"
"[sasl]\n"
"use-sasl = true\n"
"min-encryption = 128\n"
"max-encryption = 256\n"
"</screen>"
msgstr ""
"Za določanje različnih nivojev enkripcije lahko v datoteki <filename>svnserve.conf</filename> skladišča nastavite dve vrednosti: <screen>\n"
"[sasl]\n"
"use-sasl = true\n"
"min-encryption = 128\n"
"max-encryption = 256\n"
"</screen>"

#. (para)
#: ../source/TortoiseGit_en.xml:2880
msgid "The <literal>min-encryption</literal> and <literal>max-encryption</literal> 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 <literal>min-encryption</literal> in <literal>max-encryption</literal> 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/TortoiseGit_en.xml:2897
msgid "Authentication with svn+ssh"
msgstr "Avtentikacija s svn+ssh"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_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/TortoiseGit_en.xml:2910
msgid "A basic method for setting up your server is given in <xref linkend=\"tsvn-ssh-howto\"/>. You can find other SSH topics within the FAQ by searching for <quote>SSH</quote>."
msgstr "Osnovna navodila za postavitev strežnika so podana v poglavju <xref linkend=\"tsvn-ssh-howto\"/>. Podrobnosti o SSH najdete v pogosto zastavljenih vprašanjih. Iščite niz <quote>SSH</quote>."

#. (para)
#: ../source/TortoiseGit_en.xml:2916
msgid "Further information about svnserve can be found in the <ulink url=\"http://svnbook.red-bean.com\"><citetitle>Version Control with Git</citetitle></ulink>."
msgstr "Več informacij o svnserve lahko dobite na naslovu <ulink url=\"http://svnbook.red-bean.com\"><citetitle>Version Control with Git</citetitle></ulink>."

#. (title)
#: ../source/TortoiseGit_en.xml:2924
msgid "Path-based Authorization with svnserve"
msgstr "Avtorizacija svnserve na osnovi poti"

#. (para)
#: ../source/TortoiseGit_en.xml:2925
msgid ""
"Starting with Git 1.3, svnserve supports the same <literal>mod_authz_svn</literal> path-based authorization scheme that is available with the Apache server. You need to edit the <filename>conf/svnserve.conf</filename> file in your repository directory and add a line referring to your authorization file. <screen>\n"
"[general]\n"
"authz-db = authz\n"
"</screen> Here, <filename>authz</filename> 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 <xref linkend=\"tsvn-serversetup-mod_authz_svn\"/> for a description of the file format."
msgstr ""
"Od različice Git 1.3 najprej svnserve omogoča uporabo istega modula <literal>mod_authz_svn</literal> za avtorizacijo na osnovi poti, kot je na voljo v strežniku Apache. Spremeniti morate datoteko <filename>conf/svnserve.conf</filename> v mapi skladišča in dodati vrstico, ki pove, kje se nahaja avtorizacijska datoteka. <screen>\n"
"[general]\n"
"authz-db = authz\n"
"</screen> <filename>authz</filename> 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 <xref linkend=\"tsvn-serversetup-mod_authz_svn\"/>, kjer je opisana oblika datoteke."

#. (para)
#: ../source/TortoiseGit_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 Git command line client or with TortoiseGit."
msgstr "Ne glede na uporabljen protokol za dostop do skladišča morate vedno ustvariti vsaj eno skladišče. To lahko storite preko ukazne vrstice (Git) ali preko grafičnega vmesnika (TortoiseGit)."

#. (para)
#: ../source/TortoiseGit_en.xml:2952
msgid "If you haven't created a Git repository yet, it's time to do that now."
msgstr "Če še niste ustvarili skladišča Git, je sedaj čas, da to storite."

#. (title)
#: ../source/TortoiseGit_en.xml:2960
msgid "Repository Creation"
msgstr "Ustvarjanje skladišča"

#. (primary)
#: ../source/TortoiseGit_en.xml:2962
msgid "create repository"
msgstr "ustvari skladišče"

#. (para)
#: ../source/TortoiseGit_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 <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.reposadmin.planning.html#svn.reposadmin.basics.backends\"><citetitle>Choosing a Data Store</citetitle></ulink> in the Git 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 <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.reposadmin.planning.html#svn.reposadmin.basics.backends\"><citetitle>Choosing a Data Store</citetitle></ulink> v knjigi The Git Book."

#. (title)
#: ../source/TortoiseGit_en.xml:2979
msgid "Creating a Repository with the Command Line Client"
msgstr "Ustvarjanje skladišča z odjemalcem za ukazno vrstico"

#. (primary)
#. (primary)
#: ../source/TortoiseGit_en.xml:2981
#: ../source/TortoiseGit_en.xml:3022
msgid "Create"
msgstr "Ustvari"

#. (secondary)
#: ../source/TortoiseGit_en.xml:2982
msgid "Command Line Client"
msgstr "Odjemalec za ukazno vrstico"

#. (para)
#: ../source/TortoiseGit_en.xml:2986
msgid "Create an empty folder with the name SVN (e.g. <filename>D:\\SVN\\</filename>), which is used as root for all your repositories."
msgstr "Ustvarite prazno mapo z imenom SVN (n.pr. <filename>D:\\SVN\\</filename>), ki se uporablja kot korenska mapa za vsa vaša skladišča."

#. (para)
#: ../source/TortoiseGit_en.xml:2993
msgid "Create another folder <filename>MyNewRepository</filename> inside <filename>D:\\SVN\\</filename>."
msgstr "Ustvarite še eno mapo iz imenom <filename>MojeNovoSkladišče</filename> znotraj <filename>D:\\SVN\\</filename>."

#. (para)
#: ../source/TortoiseGit_en.xml:3000
msgid ""
"Open the command prompt (or DOS-Box), change into <filename>D:\\SVN\\</filename> and type <screen>\n"
"svnadmin create --fs-type bdb MyNewRepository\n"
"</screen> or <screen>\n"
"svnadmin create --fs-type fsfs MyNewRepository\n"
"</screen>"
msgstr ""
" Odprite ukazni poziv (ali okno DOS), spremenite trenutno mapo v <filename>D:\\SVN\\</filename> in vtipkajte <screen>\n"
"svnadmin create --fs-type bdb MojeNovoSkladišče\n"
"</screen> ali <screen>\n"
"svnadmin create --fs-type fsfs MojeNovoSkladišče\n"
"</screen>"

#. (para)
#: ../source/TortoiseGit_en.xml:3013
msgid "Now you've got a new repository located at <filename>D:\\SVN\\MyNewRepository</filename>."
msgstr "Sedaj imate novo skladišče na lokaciji <filename>D:\\SVN\\MojeNovoSkladišče</filename>."

#. (title)
#: ../source/TortoiseGit_en.xml:3020
msgid "Creating The Repository With TortoiseGit"
msgstr "Ustvarjanje skladišča s programom TortoiseGit"

#. (title)
#: ../source/TortoiseGit_en.xml:3027
msgid "The TortoiseGit menu for unversioned folders"
msgstr "Menu TortoiseGit za datoteke brez različic"

#. (para)
#: ../source/TortoiseGit_en.xml:3032
msgid "Open the windows explorer"
msgstr "Odprite Raziskovalca"

#. (para)
#: ../source/TortoiseGit_en.xml:3037
msgid "Create a new folder and name it e.g. <filename>SVNRepository</filename>"
msgstr "Ustvarite novo mapo in jo poimenujte npr. <filename>SkladiščeSVN</filename>"

#. (para)
#: ../source/TortoiseGit_en.xml:3043
msgid "<action>Right-click</action> on the newly created folder and select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Create Repository here...</guimenuitem></menuchoice>."
msgstr "Na novo ustvarjeno mapo <action>kliknite z desnim gumbom</action> in izberite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Ustvari skladišče tukaj...</guimenuitem></menuchoice>."

#. (para)
#: ../source/TortoiseGit_en.xml:3051
msgid "A repository is then created inside the new folder. <emphasis>Don't edit those files yourself!!!</emphasis>. If you get any errors make sure that the folder is empty and not write protected."
msgstr "Skladišče se ustvari znotraj nove mape. <emphasis>Datotek v v novi mapi ne urejajte sami!!!</emphasis>. Če se pojavijo kakšne napake, preverite, ali je mapa res prazna in da ni zaščitena proti pisanju."

#. (para)
#: ../source/TortoiseGit_en.xml:3060
msgid "TortoiseGit no longer offers the option to create BDB repositories, although you can still use the command line client to create them. FSFS repositories are generally easier for you to maintain, and also makes it easier for us to maintain TortoiseGit due to compatibility issues between the different BDB versions."
msgstr "TortoiseGit 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 TortoiseGit olajšajo vzrževanje programa (zaradi težav s kompatibilnostjo različnih revizij BDB)."

#. (para)
#: ../source/TortoiseGit_en.xml:3067
msgid "Future versions of TortoiseGit will not support <literal>file://</literal> 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 <literal>svn://</literal>, <literal>http://</literal> or <literal>https://</literal> protocols. For this reason, we strongly recommend that any new repository which must be accessed using <literal>file://</literal> protocol is created as FSFS."
msgstr "Prihodnje različice TortoiseGit ne bodo podpirale dostopa <literal>file:///</literal> do BDB skladišč zaradi težav s kompatibilnostjo, bodo pa vedno podpirale ta format skladišča za dostope do strežnika preko protokolov <literal>svn://</literal>, <literal>http://</literal> ali <literal>https://</literal>. Zato priporočamo, da za nova skladišča uporabite sistem FSFS, če želite do njih dostopati preko protokola <literal>file://</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:3079
msgid "Of course we also recommend that you don't use <literal>file://</literal> 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 <literal>file://</literal>, razen za preizkušanje. Uporaba strežnika je bolj varna in zanesljiva, razen če skladišče uporablja en sam razvijalec."

#. (title)
#: ../source/TortoiseGit_en.xml:3088
msgid "Local Access to the Repository"
msgstr "Krajevni dostop do skladišča"

#. (primary)
#: ../source/TortoiseGit_en.xml:3090
msgid "Access"
msgstr "Dostop"

#. (primary)
#: ../source/TortoiseGit_en.xml:3093
msgid "UNC paths"
msgstr "Poti UNC"

#. (para)
#: ../source/TortoiseGit_en.xml:3095
msgid "To access your local repository you need the path to that folder. Just remember that Git expects all repository paths in the form <systemitem class=\"url\">file:///C:/SVNRepository/</systemitem>. Note the use of forward slashes throughout."
msgstr "Za dostop do krajevnega skladišča potrebujete le pot do skladišča. Zapomnite si, da Git pričakuje pot do skladišč oblike <systemitem class=\"url\">file:///C:/SkladiščeSVN/</systemitem>. Upoštevajte, da morate uporabljati poševnico in ne obrnjeno poševnico."

#. (para)
#: ../source/TortoiseGit_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 <systemitem class=\"url\">file://ServerName/path/to/repos/</systemitem>. 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 <systemitem class=\"url\">file://ImeStrežnika/pot/do/skladišča/</systemitem>. Upoštevajte, da je potrebno na začetku uporabiti le dve poševnici."

#. (para)
#: ../source/TortoiseGit_en.xml:3108
msgid "Prior to SVN 1.2, UNC paths had to be given in the more obscure form <systemitem class=\"url\">file:///\\ServerName/path/to/repos</systemitem>. This form is still supported, but not recommended."
msgstr "Pred različico Git 1.2 so morale biti poti UNC podane v nekoliko bolj obskurni obliki <systemitem class=\"url\">file:///\\ImeStrežnika/pot/do/skladišča</systemitem>. Ta oblika je še vedno možna, vendar ni priporočljiva."

#. (para)
#: ../source/TortoiseGit_en.xml:3115
msgid "Do not create or access a Berkeley DB repository on a network share. It <emphasis>cannot</emphasis> 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 <emphasis>ne more</emphasis> 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/TortoiseGit_en.xml:3126
msgid "Accessing a Repository on a Network Share"
msgstr "Dostop do skladišča na deljenem omrežnem pogonu"

#. (primary)
#: ../source/TortoiseGit_en.xml:3128
msgid "Network share"
msgstr "Omrežni deljeni pogon"

#. (para)
#: ../source/TortoiseGit_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 <literal>file://</literal> protocol, this is most definitely <emphasis>not</emphasis> recommended. In fact we would <emphasis>strongly</emphasis> 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 <literal>file://</literal>, to <emphasis>ni</emphasis> priporočljivo. V bistvu ta način <emphasis>močno</emphasis> odsvetujemo in ga ne podpiramo."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:3142
msgid "Secondly not all network file sharing protocols support the locking that Git requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time."
msgstr "Druga težava je, da vsi omrežni protokoli ne omogočajo zaklepanja datotek, ki ga Git 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/TortoiseGit_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/TortoiseGit_en.xml:3153
msgid "<literal>file://</literal> access is intended for local, single-user access only, particularly testing and debugging. When you want to share the repository you <emphasis>really</emphasis> need to set up a proper server, and it is not nearly as difficult as you might think. Read <xref linkend=\"tsvn-serversetup\"/> for guidelines on choosing and setting up a server."
msgstr "Protokol <literal>file://</literal> je namenjen krajevnemu dostopu za enega uporabnika, predvsem za testiranje in razhroščevanje. Če želite deliti skladišče, morate <emphasis>zares</emphasis> 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 <xref linkend=\"tsvn-serversetup\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:3163
msgid "Repository Layout"
msgstr "Postavitev skladišča"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:3170
msgid "There are some standard, recommended ways to organize a repository. Most people create a <filename>trunk</filename> directory to hold the <quote>main line</quote> of development, a <filename>branches</filename> directory to contain branch copies, and a <filename>tags</filename> 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 Git. Večina ljudi naredi mapo <filename>trunk</filename> za <quote>glavno vejo</quote> razvoja, mapo <filename>branches</filename> za stranske veje in mapo <filename>tags</filename>, ki vsebuje oznake. Če se v skladišču nahaja samo en projekt, uporabniki pogosto ustvarijo naslednjo strukture vrhnjih map:"

#. (screen)
#: ../source/TortoiseGit_en.xml:3179
#, no-wrap
msgid ""
"\n"
"/trunk\n"
"/branches\n"
"/tags\n"
msgstr ""
"\n"
"/trunk\n"
"/branches\n"
"/tags\n"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_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/TortoiseGit_en.xml:3196
msgid "...or by project:"
msgstr "... ali po projektu:"

#. (screen)
#: ../source/TortoiseGit_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/TortoiseGit_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/TortoiseGit_en.xml:3215
msgid "If you adopt a top level <filename>/trunk /tags /branches</filename> 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 <filename>/trunk /tags /branches</filename>, to ne pomeni, da morate prekopirati celotno glavno vejo za vsako vejo ali oznako, tako da ta struktura prinaša več prilagodljivosti."

#. (para)
#: ../source/TortoiseGit_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 Git and TortoiseGit projects appear at the same host address, but are completely separate repositories allowing independent development, and no confusion over build numbers."
msgstr "Za 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 Git in TortoiseGit 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/TortoiseGit_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, TortoiseGit 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 TortoiseGit premakne ali preimenuje po vaših željah."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:3256
msgid "create a new empty folder on your hard drive"
msgstr "ustvarite novo prazno mapo na trdem disku"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:3267
msgid "import this structure into the repository via a <action>right click</action> on the folder and selecting <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Import...</guimenuitem></menuchoice> This will import your temp folder into the repository root to create the basic repository layout."
msgstr "uvozite to strukturo v skladišče - <action>desno kliknite</action> na mapo in izberite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Uvozi...</guimenuitem></menuchoice> S tem uvozite začasno mapo v korensko mapo skladišča in ustvarite osnovno postavitev."

#. (para)
#: ../source/TortoiseGit_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 <filename>/trunk /tags /branches</filename> 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: <placeholder-1/>"
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 <filename>/trunk /tags /branches</filename>, 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: <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_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: <screen>\n"
"C:\\Temp\\New\\trunk\n"
"C:\\Temp\\New\\branches\n"
"C:\\Temp\\New\\tags\n"
"</screen> Import <filename>C:\\Temp\\New</filename> into the repository root, which will then look like this: <screen>\n"
"/trunk\n"
"/branches\n"
"/tags\n"
"</screen>"
msgstr ""
"Upoštevajte, da se ime mape, ki jo uvažate, ne pojavi v skladišču, ampak le njena vsebina. Naprimer: ustvarite naslednjo strukturo:  <screen>\n"
"C:\\Temp\\New\\trunk\n"
"C:\\Temp\\New\\branches\n"
"C:\\Temp\\New\\tags\n"
"</screen> Uvozite <filename>C:\\Temp\\New</filename> v korensko mapo skladišča, ki potem izgleda takole: <screen>\n"
"/trunk\n"
"/branches\n"
"/tags\n"
"</screen>"

#. (title)
#: ../source/TortoiseGit_en.xml:3302
msgid "Repository Backup"
msgstr "Varnostna kopija skladišča"

#. (primary)
#: ../source/TortoiseGit_en.xml:3304
msgid "backup"
msgstr "varnostna kopija"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_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 <emphasis>any</emphasis> 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 <emphasis>kakršenkoli</emphasis> 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/TortoiseGit_en.xml:3323
msgid ""
"The recommended method is to run <screen>\n"
"svnadmin hotcopy path/to/repository path/to/backup --clean-logs\n"
"</screen> to create a copy of your repository in a safe manner. Then backup the copy. The <literal>--clean-logs</literal> 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 <screen>\n"
"svnadmin hotcopy pot/do/skladišča pot/do/varnostne/kopije --clean-logs\n"
"</screen>S tem naredite kopijo skladišča na varen način. Potem naredite varnostno kopije kopije. Stikalo <literal>--clean-logs</literal> 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/TortoiseGit_en.xml:3333
msgid "The <literal>svnadmin</literal> tool is installed automatically when you install the Git command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the <filename>.zip</filename> version, so the download is smaller, and it takes care of setting the paths for you. You can download the latest version of the Git command line client from <ulink url=\"http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91\"><citetitle>http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91</citetitle></ulink>."
msgstr "Orodje <literal>svnadmin</literal> se namesti samodejno ob namestitvi odjemalca Git 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 <filename>.zip</filename>, tako da je prenos hitrejši, poleg tega pa namesto vas opravi nastavitve. Najnovejša različica odjemalca Git za ukazno vrstico se nahaja na naslovu <ulink url=\"http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91\"><citetitle>http://Git.tigris.org/servlets/ProjectDocumentList?folderID=91</citetitle></ulink>."

#. (title)
#: ../source/TortoiseGit_en.xml:3348
msgid "Hook Scripts"
msgstr "Ukazne datoteke akcij"

#. (primary)
#: ../source/TortoiseGit_en.xml:3350
msgid "hooks"
msgstr "akcije"

#. (primary)
#. (primary)
#: ../source/TortoiseGit_en.xml:3353
#: ../source/TortoiseGit_en.xml:11999
msgid "hook scripts"
msgstr "ukazne datoteke akcij"

#. (primary)
#: ../source/TortoiseGit_en.xml:3356
msgid "server side hook scripts"
msgstr "ukazne datoteke akcij na strežniku"

#. (para)
#: ../source/TortoiseGit_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 <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.reposadmin.create.html#svn.reposadmin.create.hooks\"><citetitle>Hook Scripts</citetitle></ulink> in the Git 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 <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.reposadmin.create.html#svn.reposadmin.create.hooks\"><citetitle>Hook Scripts</citetitle></ulink> v knjigi The Git Book, če želite izvedeti kaj več o akcijah, ki so na voljo."

#. (para)
#: ../source/TortoiseGit_en.xml:3373
msgid "These hook scripts are executed by the server that hosts the repository. TortoiseGit also allows you to configure client side hook scripts that are executed locally upon certain events. See <xref linkend=\"tsvn-dug-settings-hooks\"/> for more information."
msgstr "Ukazne datoteke akcij izvede strežnik, ki gosti skladišče. TortoiseGit 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 <xref linkend=\"tsvn-dug-settings-hooks\"/>."

#. (para)
#: ../source/TortoiseGit_en.xml:3379
msgid ""
"Sample hook scripts can be found in the <filename>hooks</filename> 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. <screen>\n"
"rem Only allow log messages to be changed.\n"
"if \"%4\" == \"svn:log\" exit 0\n"
"echo Property '%4' cannot be changed &gt;&amp;2\n"
"exit 1\n"
"</screen> 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 <filename>&gt;&amp;2</filename>"
msgstr ""
"Primere ukaznih datotek akcij najdete v podmapi <filename>hooks</filename> 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. <screen>\n"
"rem Dovoli samo spremembe sporočil dnevniških zapisov.\n"
"if \"%4\" == \"svn:log\" exit 0\n"
"echo Lastnosti '%4' ne morete spremeniti &gt;&amp;2\n"
"exit 1\n"
"</screen> 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 <filename>&gt;&amp;2</filename> na koncu sporočila."

#. (title)
#: ../source/TortoiseGit_en.xml:3399
msgid "Checkout Links"
msgstr "Povezave za prevzem"

#. (primary)
#: ../source/TortoiseGit_en.xml:3401
msgid "checkout link"
msgstr "povezava za prevzem"

#. (primary)
#: ../source/TortoiseGit_en.xml:3404
msgid "TortoiseGit link"
msgstr "povezava TortoiseGit"

#. (primary)
#: ../source/TortoiseGit_en.xml:3407
msgid "link"
msgstr "povezava"

#. (primary)
#: ../source/TortoiseGit_en.xml:3410
msgid "website"
msgstr "spletna stran"

#. (para)
#: ../source/TortoiseGit_en.xml:3412
msgid "If you want to make your Git repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a <firstterm>checkout link</firstterm> for other TortoiseGit users."
msgstr "Če želite ponuditi skladišče Git tudi ostalim uporabnikom, lahko povezavo vključite v svojo spletno stran. Da jo naredite bolj dostopno, lahko dodate <firstterm>prevzemno povezavo</firstterm> za uporabnike TortoiseGit."

#. (para)
#: ../source/TortoiseGit_en.xml:3418
msgid "When you install TortoiseGit, it registers a new <literal>tsvn:</literal> protocol. When a TortoiseGit user clicks on such a link, the checkout dialog will open automatically with the repository URL already filled in."
msgstr "Ko namestite TortoiseGit, ta registrira nov protokol <literal>tsvn:</literal>. Ko uporabnik klikne na takšno povezavo, se samodejno odpre okno za prevzem z že izpolnjenim naslovom URL skladišča."

#. (programlisting)
#: ../source/TortoiseGit_en.xml:3427
#, no-wrap
msgid ""
"\n"
"&lt;a href=\"tsvn:https://TortoiseGit.tigris.org/svn/TortoiseGit/trunk\"&gt;\n"
"&lt;/a&gt;\n"
msgstr ""
"\n"
"&lt;a href=\"tsvn:https://TortoiseGit.tigris.org/svn/TortoiseGit/trunk\"&gt;\n"
"&lt;/a&gt;\n"

#. (para)
#: ../source/TortoiseGit_en.xml:3424
msgid "To include such a link in your own html page, you need to add code which looks something like this: <placeholder-1/>"
msgstr "Če želite dodati takšno povezavo na svojo HTML stran, ji dodajte naslednjo kodo: <placeholder-1/>"

#. (programlisting)
#: ../source/TortoiseGit_en.xml:3439
#, no-wrap
msgid ""
"\n"
"&lt;a href=\"tsvn:https://TortoiseGit.tigris.org/svn/TortoiseGit/trunk\"&gt;\n"
"&lt;img src=TortoiseCheckout.png&gt;&lt;/a&gt;\n"
msgstr ""
"\n"
"&lt;a href=\"tsvn:https://TortoiseGit.tigris.org/svn/TortoiseGit/trunk\"&gt;\n"
"&lt;img src=TortoiseCheckout.png&gt;&lt;/a&gt;\n"

#. (para)
#: ../source/TortoiseGit_en.xml:3432
msgid "Of course it would look even better if you included a suitable picture. You can use the <ulink url=\"http://TortoiseGit.tigris.org/images/TortoiseCheckout.png\"><citetitle>TortoiseGit logo</citetitle></ulink> or you can provide your own image. <placeholder-1/>"
msgstr "Seveda bo vse skupaj izgledalo še bolje, če dodate primerno sliko. Uporabite lahko <ulink url=\"http://TortoiseGit.tigris.org/images/TortoiseCheckout.png\"><citetitle>logotip programa TortoiseGit</citetitle></ulink> ali pa svojo sliko. <placeholder-1/>"

#. (title)
#: ../source/TortoiseGit_en.xml:3447
msgid "Daily Use Guide"
msgstr "Dnevna uporaba"

#. (para)
#: ../source/TortoiseGit_en.xml:3451
msgid "This document describes day to day usage of the TortoiseGit client. It is <emphasis>not</emphasis> an introduction to version control systems, and <emphasis>not</emphasis> an introduction to Git (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it."
msgstr "Ta dokument opisuje dnevno uporabo odjemalca TortoiseGit. To <emphasis>ni</emphasis> uvod v sisteme za nadzor različic, prav tako pa <emphasis>ni</emphasis> uvod v Git (SVN). To poglavje uporabite, ko veste, kaj želite narediti, vendar se ne spomnite natančno, kako se to naredi."

#. (para)
#: ../source/TortoiseGit_en.xml:3459
msgid "If you need an introduction to version control with Git, then we recommend you read the fantastic book: <ulink url=\"http://svnbook.red-bean.com/\"><citetitle>Version Control with Git</citetitle></ulink>."
msgstr "Če potrebujete uvod v nadzor različic s sistemom Git, vam priporočamo odlično knjigo: <ulink url=\"http://svnbook.red-bean.com/\"><citetitle>Version Control with Git</citetitle></ulink>."

#. (para)
#: ../source/TortoiseGit_en.xml:3466
msgid "This document is also a work in progress, just as TortoiseGit and Git are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time."
msgstr "Tako kot programa TortoiseGit in Git 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 TortoiseGit razvijamo v svojem prostem času."

#. (para)
#: ../source/TortoiseGit_en.xml:3478
msgid "You should have installed TortoiseGit already."
msgstr "morate imeti TortoiseGit že nameščen,"

#. (para)
#: ../source/TortoiseGit_en.xml:3483
msgid "You should be familiar with version control systems."
msgstr "morate poznati sisteme za nadzor različic,"

#. (para)
#: ../source/TortoiseGit_en.xml:3488
msgid "You should know the basics of Git."
msgstr "morate poznati osnove sistema Git,"

#. (para)
#: ../source/TortoiseGit_en.xml:3493
msgid "You should have set up a server and/or have access to a Git repository."
msgstr "imeti morate nameščen strežnik in/ali dostop do skladišča Git."

#. (para)
#: ../source/TortoiseGit_en.xml:3474
msgid "In order to get the most out of the Daily Use Guide: <placeholder-1/>"
msgstr "Da bi se čimveč naučili iz poglavja Dnevna uporaba: <placeholder-1/>"

#. (title)
#: ../source/TortoiseGit_en.xml:3504
msgid "Getting Started"
msgstr "Kako začeti"

#. (title)
#. (title)
#. (title)
#: ../source/TortoiseGit_en.xml:3506
#: ../source/TortoiseGit_en.xml:5014
#: ../source/TortoiseGit_en.xml:15002
msgid "Icon Overlays"
msgstr "Prekrivne ikone"

#. (title)
#. (title)
#: ../source/TortoiseGit_en.xml:3509
#: ../source/TortoiseGit_en.xml:5023
msgid "Explorer showing icon overlays"
msgstr "Raziskovalec prikaže prekrivne ikone"

#. (para)
#: ../source/TortoiseGit_en.xml:3507
msgid "<placeholder-1/> One of the most visible features of TortoiseGit is the icon overlays which appear on files in your working copy. These show you at a glance which of your files have been modified. Refer to <xref linkend=\"tsvn-dug-wcstatus-1\"/> to find out what the different overlays represent."
msgstr "<placeholder-1/> Ena izmed vizuelno najbolj opaznih zmožnosti TortoiseGit 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 <xref linkend=\"tsvn-dug-wcstatus-1\"/> za več informacij o tem, kaj različne ikone predstavljajo."

#. (title)
#: ../source/TortoiseGit_en.xml:3520
msgid "Context Menus"
msgstr "Kontekstni meni"

#. (primary)
#: ../source/TortoiseGit_en.xml:3522
msgid "context menu"
msgstr "kontekstni meni"

#. (primary)
#: ../source/TortoiseGit_en.xml:3525
msgid "right-click"
msgstr "desni klik"

#. (title)
#: ../source/TortoiseGit_en.xml:3529
msgid "Context menu for a directory under version control"
msgstr "Kontekstni meni za mapo pod nadzorom različic"

#. (para)
#: ../source/TortoiseGit_en.xml:3527
msgid "<placeholder-1/> All TortoiseGit commands are invoked from the context menu of the windows explorer. Most are directly visible, when you <action>right click</action> on a file or folder. The commands that are available depend on whether the file or folder or its parent folder is under version control or not. You can also see the TortoiseGit menu as part of the Explorer file menu."
msgstr "<placeholder-1/> Vsi ukazi TortoiseGit se kličejo iz kontekstnega menija Raziskovalca. Večina je vidna, ko <action>desno kliknete</action> 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 TortoiseGit lahko vidite tudi kot del glavnega menija Datoteka v Raziskovalcu."

#. (para)
#: ../source/TortoiseGit_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 <keycap>Shift</keycap> key when you <action>right-click</action>."
msgstr "Nekateri zelo redko uporabljeni ukazi so na voljo v razširjenem kontekstnem meniju, ki ga prikažete tako, da držite pritisnjeno tipko <keycap>Shift</keycap> in <action>desno kliknete</action>."

#. (title)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:3545
msgid "In some cases you may see several TortoiseGit entries. This is not a bug! <placeholder-1/> This example is for an unversioned shortcut within a versioned folder, and in the Explorer file menu there are <emphasis>three</emphasis> entries for TortoiseGit. One is for the folder, one for the shortcut itself, and the third for the object the shortcut is pointing to. To help you distinguish between them, the icons have an indicator in the lower right corner to show whether the menu entry is for a file, a folder, a shortcut or for multiple selected items."
msgstr "V nekaterih primerih lahko vidite več elementov TortoiseGit. To ni napaka! <placeholder-1/> Ta primer opisuje bližnjico za datoteke brez različic. Znotraj mape pod nadzorom in v meniju Raziskovalca so <emphasis>trije</emphasis> elementi sistema TortoiseGit. 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/TortoiseGit_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/TortoiseGit_en.xml:3568
#: ../source/TortoiseGit_en.xml:4499
msgid "Drag and Drop"
msgstr "Povleci in spusti"

#. (primary)
#: ../source/TortoiseGit_en.xml:3570
msgid "drag handler"
msgstr "držalo za poteg"

#. (primary)
#: ../source/TortoiseGit_en.xml:3573
msgid "drag-n-drop"
msgstr "povleci-in-spusti"

#. (primary)
#: ../source/TortoiseGit_en.xml:3576
msgid "right drag"
msgstr "poteg z desnim gumbom"

#. (title)
#. (title)
#: ../source/TortoiseGit_en.xml:3580
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:3578
msgid "<placeholder-1/> Other commands are available as drag handlers, when you <action>right drag</action> files or folders to a new location inside working copies or when you <action>right drag</action> a non-versioned file or folder into a directory which is under version control."
msgstr "<placeholder-1/> Drugi ukazi so na voljo kot meni, ko <action>z desnim gumbom</action> povlečete datoteke ali mape na novo lokacijo znotraj delovne kopije ali ko <action>z desnim gumbom</action> povlečete datoteko ali mapo brez različic v mapo, ki je pod nadzorom."

#. (title)
#: ../source/TortoiseGit_en.xml:3590
msgid "Common Shortcuts"
msgstr "Pogoste bližnjice"

#. (term)
#: ../source/TortoiseGit_en.xml:3597
msgid "F1"
msgstr "F1"

#. (para)
#: ../source/TortoiseGit_en.xml:3599
msgid "Help, of course."
msgstr "Pomoč, seveda."

#. (term)
#: ../source/TortoiseGit_en.xml:3605
msgid "F5"
msgstr "F5"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:3619
msgid "Ctrl-A"
msgstr "Ctrl-A"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:3629
msgid "Ctrl-C"
msgstr "Ctrl-C"

#. (para)
#: ../source/TortoiseGit_en.xml:3631
msgid "... Copy the selected text."
msgstr "... Kopirajte izbrano besedilo"

#. (para)
#: ../source/TortoiseGit_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. <placeholder-1/>"
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. <placeholder-1/>"

#. (primary)
#: ../source/TortoiseGit_en.xml:3642
msgid "authentication"
msgstr "avtentikacija"

#. (title)
#: ../source/TortoiseGit_en.xml:3648
msgid "Authentication Dialog"
msgstr "Okno za avtentikacijo"

#. (para)
#: ../source/TortoiseGit_en.xml:3656
msgid "<filename>svn.simple</filename> contains credentials for basic authentication (username/password)."
msgstr "<filename>svn.simple</filename> vsebuje podatke o osnovni avtentikaciji (uporabniško ime/geslo)."

#. (para)
#: ../source/TortoiseGit_en.xml:3662
msgid "<filename>svn.ssl.server</filename> contains SSL server certificates."
msgstr "<filename>svn.ssl.server</filename> vsebuje certificate strežnika SSL"

#. (para)
#: ../source/TortoiseGit_en.xml:3668
msgid "<filename>svn.username</filename> contains credentials for username-only authentication (no password needed)."
msgstr "<filename>svn.username</filename> vsebuje avtentikacijske podatke za avtentikacijo samo z uporabniškim imenom (brez gesla)."

#. (para)
#: ../source/TortoiseGit_en.xml:3644
msgid "If the repository that you are trying to access is password protected, an authentication Dialog will show up. <placeholder-1/> Enter your username and password. The checkbox will make TortoiseGit store the credentials in Git's default directory: <filename>%APPDATA%\\Git\\auth</filename> in three subdirectories: <placeholder-2/>"
msgstr "Če je skladišče, do katerega želite dostopati, zaščiteno z geslom, se prikaže avtentikacijsko pogovorno okno.  <placeholder-1/> Vpišite svoje uporabniško ime in geslo. Potrditveno polje pove programu TortoiseGit, naj avtentikacijske podatke shrani v privzeto mapo: <filename>%APPDATA%\\Git\\auth</filename> v tri podmape: <placeholder-2/>"

#. (para)
#: ../source/TortoiseGit_en.xml:3675
msgid "If you want to clear the authentication cache for all servers, you can do so from the <guilabel>Saved Data</guilabel> page of TortoiseGit's settings dialog. That button will clear all cached authentication data from the Git <filename>auth</filename> directories, as well as any authentication data stored in the registry by earlier versions of TortoiseGit. Refer to <xref linkend=\"tsvn-dug-settings-saved-data\"/>."
msgstr "Če želite izbrisati avtentikacijski predpomnilnik za vse strežnike, lahko to storite v nastavitvah TortoiseGit - stran <guilabel>Splošno</guilabel>. Ta gumb bo izbrisal vse avtentikacijske podatke iz map <filename>auth</filename>, prav tako pa tudi vse podatke iz registra (iz prejšnjih različic TortoiseGit). Preberite <xref linkend=\"tsvn-dug-settings-saved-data\"/>."

#. (para)
#: ../source/TortoiseGit_en.xml:3684
msgid "For more information on how to set up your server for authentication and access control, refer to <xref linkend=\"tsvn-serversetup\"/>"
msgstr "Za več informacij, kako namestiti strežnik za avtentikacijo in nadzor dostopov, si oglejte <xref linkend=\"tsvn-serversetup\"/>"

#. (title)
#: ../source/TortoiseGit_en.xml:3691
msgid "Maximizing Windows"
msgstr "Povečevanje oken"

#. (primary)
#: ../source/TortoiseGit_en.xml:3693
msgid "maximize"
msgstr "povečaj"

#. (para)
#: ../source/TortoiseGit_en.xml:3695
msgid "Many of TortoiseGit's dialogs have a lot of information to display, but it is often useful to maximize only the height, or only the width, rather than maximizing to fill the screen. As a convenience, there are shortcuts for this on the <guilabel>Maximize</guilabel> button. Use the <action>middle mouse</action> button to maximize vertically, and <action>right mouse</action> to maximize horizontally."
msgstr "Kar nekaj pogovornih oken TortoiseGit 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 <guilabel>Razpni</guilabel>. Uporabite <action>srednji miškin gumb</action> za podaljšanje navpične stranice na višino zaslona in <action>desni miških gumb</action> za podaljšanje vodoravne stranice na širino zaslona."

#. (title)
#: ../source/TortoiseGit_en.xml:3706
msgid "Importing Data Into A Repository"
msgstr "Uvažanje podatkov v skladišče"

#. (primary)
#: ../source/TortoiseGit_en.xml:3708
msgid "import"
msgstr "uvoz"

#. (primary)
#: ../source/TortoiseGit_en.xml:3714
msgid "add files to repository"
msgstr "dodaj datoteke v skladišče"

#. (title)
#. (entry)
#. (title)
#. (glossterm)
#: ../source/TortoiseGit_en.xml:3718
#: ../source/TortoiseGit_en.xml:13769
#: ../source/TortoiseGit_en.xml:14933
#: ../source/TortoiseGit_en.xml:15694
msgid "Import"
msgstr "Uvoz"

#. (primary)
#: ../source/TortoiseGit_en.xml:3720
msgid "temporary files"
msgstr "začasne datoteke"

#. (para)
#: ../source/TortoiseGit_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 <xref linkend=\"tsvn-repository-layout\"/> 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 <xref linkend=\"tsvn-repository-layout\"/> za dodatne napotke."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_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/TortoiseGit_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/TortoiseGit_en.xml:3730
msgid "This section describes the Git import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: <placeholder-1/> For these reasons we recommend that you do not use the import command at all but rather follow the two-step method described in <xref linkend=\"tsvn-dug-import-in-place\"/>. 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: <placeholder-1/> Zato priporočamo, da tega ukaza ne uporabljate, ampak uporabite postopek v dveh korakih, opisan v <xref linkend=\"tsvn-dug-import-in-place\"/>. Ker pa ste že ravno tukaj, si vseeno poglejmo, kako uvažanje deluje..."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_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/TortoiseGit_en.xml:3758
msgid "Before you import your project into a repository you should: <placeholder-1/>"
msgstr "Preden projekt uvozite v skladišče, morate: <placeholder-1/>"

#. (title)
#: ../source/TortoiseGit_en.xml:3790
msgid "The Import dialog"
msgstr "Okno za uvažanje"

#. (para)
#: ../source/TortoiseGit_en.xml:3779
msgid "Now select the top-level folder of your project directory structure in the windows explorer and <action>right click</action> to open the context menu. Select the command <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Import...</guimenuitem></menuchoice> which brings up a dialog box: <placeholder-1/>"
msgstr "Sedaj izberite vrhnjo datoteko vašega projekta v Raziskovalcu in <action>desno kliknite</action>. S tem odprete kontekstni meni. Izberite ukaz <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Uvozi...</guimenuitem></menuchoice>, ki prikaže naslednje okno: <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_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: <screen>\n"
"C:\\Projects\\Widget\\source\n"
"C:\\Projects\\Widget\\doc\n"
"C:\\Projects\\Widget\\images\n"
"</screen> and you import <filename>C:\\Projects\\Widget</filename> into <systemitem class=\"url\">http://mydomain.com/svn/trunk</systemitem> then you may be surprised to find that your subdirectories go straight into <literal>trunk</literal> rather than being in a <literal>Widget</literal> subdirectory. You need to specify the subdirectory as part of the URL, <systemitem class=\"url\">http://mydomain.com/svn/trunk/Widget-X</systemitem>. 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: <screen>\n"
"C:\\Projekti\\Widget\\source\n"
"C:\\Projekti\\Widget\\doc\n"
"C:\\Projekti\\Widget\\images\n"
"</screen> in uvozite <filename>C:\\Projekti\\Widget</filename> v <systemitem class=\"url\">http://mojadomena.com/svn/trunk</systemitem>, boste morda presenečeni ugotovili, da se vse vaše podmape nahajajo v podmapi <literal>trunk</literal> in ne v podmapi <literal>Widget</literal>. Podmapo morate navesti kot del naslova URL: <systemitem class=\"url\">http://mojadomena.com/svn/trunk/Widget-X</systemitem>. Uvažanje samodejno ustvari podmape znotraj skladišča, če le-te še ne obstajajo."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:3818
msgid "By default, files and folders which match the global-ignore patterns are <emphasis>not</emphasis> imported. To override this behaviour you can use the <guilabel>Include ignored files</guilabel> checkbox. Refer to <xref linkend=\"tsvn-dug-settings-main\"/> for more information on setting a global ignore pattern."
msgstr "Po privzetih nastavitvah se datoteke in mape, ki ustrezajo splošnemu vzorcu prezrtih elementov, <emphasis>ne</emphasis>  uvozijo. Če želite to pri posameznem uvozu spremeniti, potrdite potrditveno polje <guilabel>Vključi prezrte datoteke</guilabel>. Preberite <xref linkend=\"tsvn-dug-settings-main\"/> za več informacij o nastavljanju splošnih vzorcev prezrtih elementov."

#. (para)
#: ../source/TortoiseGit_en.xml:3825
msgid "As soon as you press <guibutton>OK</guibutton> TortoiseGit imports the complete directory tree including all files into the repository. The project is now stored in the repository under version control. Please note that the folder you imported is <emphasis>NOT</emphasis> under version control! To get a version-controlled <firstterm>working copy</firstterm> 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 <guibutton>V redu</guibutton>, TortoiseGit 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, <emphasis>NI</emphasis> pod nadzorom različic! Da bi dobili <firstterm>delovno kopijo</firstterm> 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/TortoiseGit_en.xml:3837
msgid "Import in Place"
msgstr "Uvažanje na mestu"

#. (primary)
#: ../source/TortoiseGit_en.xml:3839
msgid "import in place"
msgstr "uvažanje na mestu"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_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/TortoiseGit_en.xml:3859
msgid "Use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Add...</guimenuitem></menuchoice> on this versioned folder to add some or all of the content. You can add and remove files, set <literal>svn:ignore</literal> properties on folders and make any other changes you need to."
msgstr "Uporabite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Dodaj...</guimenuitem></menuchoice> na mapi pod nadzorom. S tem lahko dodate delno ali celotno vsebino, dodate ali odstranite datoteke, nastavite lastnosti <literal>svn:ignore</literal> na mapah in naredite vse ostale spremembe, ki so potrebne."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_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: <placeholder-1/>"
msgstr "Ob predpostavki, da skladišče že imate in želite dodati vanj novo drevesno strukturo, naredite naslednje: <placeholder-1/>"

#. (title)
#: ../source/TortoiseGit_en.xml:3880
msgid "Special Files"
msgstr "Posebne datoteke"

#. (primary)
#: ../source/TortoiseGit_en.xml:3882
msgid "special files"
msgstr "posebne datoteke"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:3891
msgid "In such cases we suggest to use <emphasis>template</emphasis> 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 <emphasis>make a copy</emphasis> 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 <emphasis>predlog</emphasis>. 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 <emphasis>naredi kopijo</emphasis> te datoteke in jo preimenuje. Po tem spreminjanje kopije ni več problematično."

#. (para)
#: ../source/TortoiseGit_en.xml:3899
msgid "As an example, you can have a look at TortoiseGit's build script. It calls a file named <filename>TortoiseVars.bat</filename> which doesn't exist in the repository. Only the file <filename>TortoiseVars.tmpl</filename>. <filename>TortoiseVars.tmpl</filename> is the template file which every developer has to create a copy from and rename that file to <filename>TortoiseVars.bat</filename>. 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 TortoiseGit. Ta kliče datoteko <filename>TortoiseVars.bat</filename>, ki ne obstaja v skladišču. Obstaja le datoteka <filename>TortoiseVars.tmpl</filename>. <filename>TortoiseVars.tmpl</filename> je predloga datoteke. Vsak uporabnik si izdela svojo kopijo in jo preimenuje v <filename>TortoiseVars.bat</filename>. V datoteko smo dodali komentarje, da uporabniki vidijo, katere vrstice morajo spremeniti v skladu s svojo namestitvijo, da bo stvar delovala."

#. (para)
#: ../source/TortoiseGit_en.xml:3910
msgid "So as not to disturb the users, we also added the file <filename>TortoiseVars.bat</filename> to the ignore list of its parent folder, i.e. we've set the Git property <literal>svn:ignore</literal> 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 <filename>TortoiseVars.bat</filename> na listo prezrtih elementov v nadrejeni mapi, to pomeni, da smo nastavili lastnost <literal>svn:ignore</literal>, ki vsebuje to datoteko. Tako se ta datoteka ne bo pojavila v oknu za objave kot datoteka brez različic."

#. (title)
#: ../source/TortoiseGit_en.xml:3919
msgid "Referenced Projects"
msgstr "Povezani projekti"

#. (primary)
#: ../source/TortoiseGit_en.xml:3921
msgid "external repositories"
msgstr "zunajnja skladišča"

#. (primary)
#. (primary)
#: ../source/TortoiseGit_en.xml:3924
#: ../source/TortoiseGit_en.xml:13351
msgid "externals"
msgstr "zunanji"

#. (para)
#: ../source/TortoiseGit_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 <literal>svn:externals</literal> 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 <literal>svn:externals</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:3934
msgid ""
"Let's say you check out a working copy of <filename>/project1</filename> to <filename>D:\\dev\\project1</filename>. Select the folder <filename>D:\\dev\\project1</filename>, <action>right click</action> and choose <menuchoice><guimenu>Windows Menu</guimenu><guimenuitem>Properties</guimenuitem></menuchoice> from the context menu. The Properties Dialog comes up. Then go to the Git tab. There, you can set properties. Click <guibutton>Add...</guibutton>. Select the <literal>svn:externals</literal> property from the combobox and write in the edit box the repository URL in the format <literal>name url</literal> or if you want to specify a particular revision, <literal>name -rREV url</literal> 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 <literal>%20</literal>. Note that it is not possible to use folder names with spaces in them. Suppose that you have set these properties on <filename>D:\\dev\\project1</filename>: <screen>\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"
"</screen> Now click <guibutton>Set</guibutton> and commit your changes. When you (or any other user) update your working copy, Git will create a sub-folder <filename>D:\\dev\\project1\\sounds</filename> and checkout the sounds project, another sub-folder <filename>D:\\dev\\project1\\quick graphs</filename> containing the graphics project, and finally a nested sub-folder <filename>D:\\dev\\project1\\skins\\toolkit</filename> containing revision 21 of the skin-maker project."
msgstr ""
"Denimo, da prevzamete delovno kopijo projekta <filename>/projekt1</filename> v <filename>D:\\dev\\projekt</filename>. Izberite mapo  <filename>D:\\dev\\projekt1</filename>, <action>desno kliknite</action> in iz kontekstnega menija izberite <menuchoice><guimenu>Windows Menu</guimenu><guimenuitem>Lastnosti</guimenuitem></menuchoice>. Pojavi se okno Lastnosti. Pojdite na zavihek Git. Tu lahko nastavite lastnosti. Kliknite <guibutton>Dodaj...</guibutton>. Iz spustnega seznama izberite lastnost <literal>svn:externals</literal> in vpišite v polje naslov URL skladišča v obliki <literal>ime url</literal> ali če želite nastaviti določeno revizijo: <literal>ime -rREV url</literal> 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 <literal>%20</literal>. Upoštevajte, da ne morete uporabljati map, ki vsebujejo presledke. Denimo, da ste nastavili na  <filename>D:\\dev\\projekt1</filename> naslednje lastnosti: <screen>\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"
"</screen> Sedaj kliknite <guibutton>Nastavi</guibutton> in objavite spremembe. Ko boste (ali pa kak drug uporabniki) posodobili delovno kopijo, bo Git ustvaril podmapo <filename>D:\\dev\\projekt1\\sounds</filename> in prevzel projekt Sounds, podmapo <filename>D:\\dev\\projekt1\\quick graphs</filename> s projektom Graphics in nazadnje še vgnezdeno podmapo <filename>D:\\dev\\projekt1\\skins\\toolkit</filename> z revizijo 21 projekta Skin-maker."

#. (para)
#: ../source/TortoiseGit_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 <emphasis>they</emphasis> 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/TortoiseGit_en.xml:3993
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:3998
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:4004
msgid "If you use absolute URLs in <literal>svn:externals</literal> 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 <literal>svn:externals</literal> 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/TortoiseGit_en.xml:4010
msgid "To avoid such problems, Git clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at <systemitem class=\"url\">http://example.com/svn/repos-1</systemitem> and another at <systemitem class=\"url\">http://example.com/svn/repos-2</systemitem>. We have a checkout of <systemitem class=\"url\">http://example.com/svn/repos-1/project/trunk</systemitem> into <filename>C:\\Working</filename> and the <literal>svn:externals</literal> property is set on trunk."
msgstr "V izogib tem težavam odjemalci Git 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 <systemitem class=\"url\">http://primer.com/svn/sklad-1</systemitem> in drugega na naslovu <systemitem class=\"url\">http://primer.com/svn/sklad-2</systemitem>. Prevzem naslova <systemitem class=\"url\">http://primer.com/svn/sklad-1/projekt/trunk</systemitem> naredimo v mapo <filename>C:\\Delo</filename>, lastnost <literal>svn:externals</literal> pa je nastavljena na glavno vejo (trunk)."

#. (term)
#: ../source/TortoiseGit_en.xml:4025
msgid "Relative to parent directory"
msgstr "Relativno na nadrejeno mapo"

#. (para)
#: ../source/TortoiseGit_en.xml:4027
msgid ""
"These URLs always begin with the string <literal>../</literal> for example: <screen>\n"
"../../widgets/foo  common/foo-widget\n"
"</screen> This will extract <systemitem class=\"url\">http://example.com/svn/repos-1/widgets/foo</systemitem> into <filename>C:\\Working\\common\\foo-widget</filename>."
msgstr ""
"Ti naslovi se vedno začnejo s predpono <literal>../</literal>. Primer: <screen>\n"
"../../widgets/foo  common/foo-widget\n"
"</screen> S tem se naslov <systemitem class=\"url\">http://primer.com/svn/sklad-1/widgets/foo</systemitem> razširi v <filename>C:\\Delo\\common\\foo-widget</filename>."

#. (para)
#: ../source/TortoiseGit_en.xml:4038
msgid "Note that the URL is relative to the URL of the directory with the <literal>svn:externals</literal> 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 <literal>svn:externals</literal> in ne na mapo, kjer se zunanji elementi nahajajo."

#. (term)
#: ../source/TortoiseGit_en.xml:4046
msgid "Relative to repository root"
msgstr "Relativno na korensko pot skladišča"

#. (para)
#: ../source/TortoiseGit_en.xml:4048
msgid ""
"These URLs always begin with the string <literal>^/</literal> for example: <screen>\n"
"^/widgets/foo  common/foo-widget\n"
"</screen> This will extract <systemitem class=\"url\">http://example.com/svn/repos-1/widgets/foo</systemitem> into <filename>C:\\Working\\common\\foo-widget</filename>."
msgstr ""
"Ti naslovi se vedno začnejo z <literal>^/</literal>. Primer: <screen>\n"
"^/widgets/foo  common/foo-widget\n"
"</screen> Naslov <systemitem class=\"url\">http://primer.com/svn/sklad-1/widgets/foo</systemitem> ustreza <filename>C:\\Delo\\common\\foo-widget</filename>."

#. (para)
#: ../source/TortoiseGit_en.xml:4059
msgid ""
"You can easily refer to other repositories with the same <literal>SVNParentPath</literal> (a common directory holding several repositories). For example: <screen>\n"
"^/../repos-2/hammers/claw  common/claw-hammer\n"
"</screen> This will extract <systemitem class=\"url\">http://example.com/svn/repos-2/hammers/claw</systemitem> into <filename>C:\\Working\\common\\claw-hammer</filename>."
msgstr ""
"S tem se enostavno sklicujete na skladišča, ki imajo enako lastnost <literal>SVNParentPath</literal> (skupna mapa, ki vsebuje več skladišč). Primer: <screen>\n"
"^/../sklad-2/hammers/claw  common/claw-hammer\n"
"</screen> Naslov <systemitem class=\"url\">http://primer.com/svn/sklad-2/hammers/claw</systemitem> ustreza <filename>C:\\Delo\\common\\claw-hammer</filename>."

#. (term)
#: ../source/TortoiseGit_en.xml:4074
msgid "Relative to scheme"
msgstr "Relativno na shemo"

#. (para)
#: ../source/TortoiseGit_en.xml:4076
msgid ""
"URLs beginning with the string <literal>//</literal> 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 <systemitem class=\"url\">http://</systemitem> while external clients use <systemitem class=\"url\">svn+ssh://</systemitem>. For example: <screen>\n"
"//example.com/svn/repos-1/widgets/foo  common/foo-widget\n"
"</screen> This will extract <systemitem class=\"url\">http://example.com/svn/repos-1/widgets/foo</systemitem> or <systemitem class=\"url\">svn+ssh://example.com/svn/repos-1/widgets/foo</systemitem> depending on which method was used to checkout <filename>C:\\Working</filename>."
msgstr ""
"Naslovi URL, ki se začnejo z nizom <literal>//</literal>, 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 <systemitem class=\"url\">http://</systemitem>, medtem kot zunanji odjemalci uporabijo <systemitem class=\"url\">svn+ssh://</systemitem>. Primer: <screen>\n"
"//primer.com/svn/sklad-1/widgets/foo  common/foo-widget\n"
"</screen> ustreza <systemitem class=\"url\">http://primer.com/svn/sklad-1/widgets/foo</systemitem> ali <systemitem class=\"url\">svn+ssh://primer.com/svn/sklad-1/widgets/foo</systemitem>, odvisno od metode, ki je bila uporabljena za prevzem mape <filename>C:\\Delo</filename>."

#. (term)
#: ../source/TortoiseGit_en.xml:4096
msgid "Relative to the server's hostname"
msgstr "Relativno na naslov strežnika"

#. (para)
#: ../source/TortoiseGit_en.xml:4098
msgid ""
"URLs beginning with the string <literal>/</literal> copy the scheme and the hostname part of the URL, for example: <screen>\n"
"/svn/repos-1/widgets/foo  common/foo-widget\n"
"</screen> This will extract <systemitem class=\"url\">http://example.com/svn/repos-1/widgets/foo</systemitem> into <filename>C:\\Working\\common\\foo-widget</filename>. But if you checkout your working copy from another server at <systemitem class=\"url\">svn+ssh://another.mirror.net/svn/repos-1/project1/trunk</systemitem> then the external reference will extract <systemitem class=\"url\">svn+ssh://another.mirror.net/svn/repos-1/widgets/foo</systemitem>."
msgstr ""
"Naslovi URL, ki se začnejo z nizom <literal>/</literal>, prekopirajo shemo in gostitelja naslova URL, n. pr. <screen>\n"
"/svn/sklad-1/widgets/foo  common/foo-widget\n"
"</screen> ustreza <systemitem class=\"url\">http://primer.com/svn/sklad-1/widgets/foo</systemitem> v <filename>C:\\Delo\\common\\foo-widget</filename>. Če ste delovno kopijo prevzeli iz drugega strežnika na naslovu <systemitem class=\"url\">svn+ssh://drug.strežnik.net/svn/sklad-1/projekt1/trunk</systemitem>, zunanje reference ustrezajo <systemitem class=\"url\">svn+ssh://drug.strežnik.net/svn/sklad-1/widgets/foo</systemitem>."

#. (para)
#: ../source/TortoiseGit_en.xml:4116
msgid "If you need more information how TortoiseGit handles Properties read <xref linkend=\"tsvn-dug-propertypage\"/>."
msgstr "Če želite izvedeti več o tem, kako Git obravnava lastnosti, preberite <xref linkend=\"tsvn-dug-propertypage\"/>."

#. (para)
#: ../source/TortoiseGit_en.xml:4120
msgid "To find out about different methods of accessing common sub-projects read <xref linkend=\"tsvn-howto-common-projects\"/>."
msgstr "Za pregled različnih načinov dostopa do skupnih projektov si preberite <xref linkend=\"tsvn-howto-common-projects\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:4127
msgid "Checking Out A Working Copy"
msgstr "Prevzemanje delovne kopije"

#. (primary)
#: ../source/TortoiseGit_en.xml:4129
msgid "checkout"
msgstr "prevzem"

#. (primary)
#: ../source/TortoiseGit_en.xml:4132
msgid "create working copy"
msgstr "ustvari delovno kopijo"

#. (para)
#: ../source/TortoiseGit_en.xml:4135
msgid "To obtain a working copy you need to do a <firstterm>checkout</firstterm> from a repository."
msgstr "Da bi ustvarili delovno kopijo, morate narediti <firstterm>prevzem</firstterm> iz skladišča."

#. (title)
#: ../source/TortoiseGit_en.xml:4149
msgid "The Checkout dialog"
msgstr "Okno za prevzem"

#. (para)
#: ../source/TortoiseGit_en.xml:4139
msgid "Select a directory in windows explorer where you want to place your working copy. <action>Right click</action> to pop up the context menu and select the command <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Checkout...</guimenuitem></menuchoice>, which brings up the following dialog box: <placeholder-1/> 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 <action>desnim klikom</action> prikličite kontekstni meni in izberite ukaz <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Prevzemi...</guimenuitem></menuchoice>, ki ponudi naslednje pogovorno okno: <placeholder-1/> Če vnesete ime mape, ki še ne obstaja, se le-ta pred prevzemom samodejno ustvari."

#. (title)
#: ../source/TortoiseGit_en.xml:4156
msgid "Checkout Depth"
msgstr "Globina prevzema"

#. (term)
#: ../source/TortoiseGit_en.xml:4164
msgid "Fully recursive"
msgstr "Popolnoma rekurzivno"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:4173
msgid "Immediate children, including folders"
msgstr "Takojšnji nasledniki, vključno z mapami"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:4182
msgid "Only file children"
msgstr "Samo podrejene datoteke"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:4191
msgid "Only this item"
msgstr "Samo ta element"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:4200
#: ../source/TortoiseGit_en.xml:8079
#: ../source/TortoiseGit_en.xml:14850
msgid "Working copy"
msgstr "Delovna kopija"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:4157
msgid "You can choose the <firstterm>depth</firstterm> 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. <placeholder-1/>"
msgstr "Lahko določite tudi <firstterm>globino</firstterm> 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. <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:4212
msgid "If you check out a sparse working copy (i.e., by choosing something other than <literal>fully recursive</literal> for the checkout depth), you can fetch additional sub-folders by using the repository browser (<xref linkend=\"tsvn-dug-repobrowser\"/>) or the check for modifications dialog (<xref linkend=\"tsvn-dug-wcstatus-2\"/>)."
msgstr "Če prevzamete delno delovno kopijo (za globino prevzema izberete karkoli razen <literal>popolnoma rekurzivno</literal>), lahko dodatne podmape prevzamete z uporabno brskalnika po skladišču (<xref linkend=\"tsvn-dug-repobrowser\"/>) ali pogovornega okna \"preveri spremembe\" (<xref linkend=\"tsvn-dug-wcstatus-2\"/>)."

#. (para)
#: ../source/TortoiseGit_en.xml:4219
msgid "In the repository browser, <action>Right click</action> on the checked out folder, then use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Repo-Browser</guimenuitem></menuchoice> to bring up the repository browser. Find the sub-folder you would like to add to your working copy, then use <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Update item to revision...</guimenuitem></menuchoice> 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 <action>desno kliknite</action> na prevzeto mapo in izberite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Brskalnik po skladišču</guimenuitem></menuchoice>. Poiščite podmapo, ki jo želite dodati v delovno kopijo, nato pa uporabite <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Posodobi element na revizijo</guimenuitem></menuchoice> 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/TortoiseGit_en.xml:4235
msgid "In the check for modifications dialog, first click on the button <guibutton>Check repository</guibutton>. The dialog will show all the files and folders which are in the repository but which you have not checked out as <literal>remotely added</literal>. <action>Right click</action> on the folder(s) you would like to add to your working copy, then use <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Update</guimenuitem></menuchoice>."
msgstr "V pogovornem oknu za preverjanje sprememb najprej kliknite gumb <guibutton>Preveri skladišče</guibutton>. Pogovorno okno prikaže vse datoteke in mape, ki se nahajajo v skladišču, pa niso prevezete, kot <literal>dodane oddaljeno</literal>. <action>Desno kliknite</action> na mape, ki jih želite dodati v delovno kopijo, nato uporabite <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Posodobi</guimenuitem></menuchoice>."

#. (para)
#: ../source/TortoiseGit_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 <literal>Project01</literal> to <literal>Project99</literal>, and you only want to checkout <literal>Project03</literal>, <literal>Project25</literal> and <literal>Project76/SubProj</literal>. 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 <literal>Projekt01</literal> do <literal>Projekt99</literal>, prevzeti pa želite le mape <literal>Projekt03</literal>, <literal>Projekt25</literal> and <literal>Projekt76/Podprojekt</literal>. Naredite naslednje korake:"

#. (para)
#: ../source/TortoiseGit_en.xml:4260
msgid "Checkout the parent folder with depth <quote>Only this item</quote> You now have an empty top level folder."
msgstr "Prevzemite nadrejeno mapo z globino <quote>Samo ta element</quote>. S tem ste ustvarili prazno vrhnjo mapo."

#. (para)
#: ../source/TortoiseGit_en.xml:4267
msgid "Select the new folder and use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Repo browser</guimenuitem></menuchoice> to display the repository content."
msgstr "Za prikaz vsebine skladišča izberite novo mapo in uporabite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Brskalnik po skladišču</guimenuitem></menuchoice>."

#. (para)
#: ../source/TortoiseGit_en.xml:4277
msgid "Right click on <literal>Project03</literal> and <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Update item to revision...</guimenuitem></menuchoice>. Keep the default settings and click on <guibutton>OK</guibutton>. You now have that folder fully populated."
msgstr "Desno kliknite na mapo <literal>Projekt03</literal> in izberite <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Posodobi element na revizijo...</guimenuitem></menuchoice>. Uporabite prevzete nastavitve in kliknite na gumb <guibutton>V redu</guibutton>. S tem ste prevzeli vsebino mape."

#. (para)
#: ../source/TortoiseGit_en.xml:4287
msgid "Repeat the same process for <literal>Project25</literal>."
msgstr "Isti postopek ponovite za mapo <literal>Projekt25</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:4292
msgid "Navigate to <literal>Project76/SubProj</literal> and do the same. This time note that the <literal>Project76</literal> folder has no content except for <literal>SubProj</literal>, which itself is fully populated. Git has created the intermediate folders for you without populating them."
msgstr "Pojdite na <literal>Projekt76/Podprojekt</literal> in ponovite postopek. Mapa <literal>Projekt76</literal> nima vsebine - izjema je le mapa <literal>Podprojekt</literal>, katere vsebina je prenešena. Git je ustvaril vmesne mapi brez prenašanja vsebine."

#. (title)
#: ../source/TortoiseGit_en.xml:4302
msgid "Working copy depth cannot be reduced"
msgstr "Globine delovne kopije ni mogoče zmanjšati"

#. (para)
#: ../source/TortoiseGit_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 Git."
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 Git."

#. (title)
#: ../source/TortoiseGit_en.xml:4311
msgid "Using an older server"
msgstr "Uporaba starejšega strežnika"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:4322
msgid "If the project contains references to external projects which you do <emphasis>not</emphasis> want checked out at the same time, use the <guilabel>Omit externals</guilabel> checkbox."
msgstr "Če projekt vsebuje reference na zunanje projekte, ki jih <emphasis>ne</emphasis> želite prevzeti istočasno, uporabite potrditveno polje <guilabel>Izpusti zunanje</guilabel>."

#. (para)
#: ../source/TortoiseGit_en.xml:4328
msgid "If <guilabel>Omit externals</guilabel> is checked, or if you wish to increase the depth value, you will have to perform updates to your working copy using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Update to Revision...</guimenuitem></menuchoice> instead of <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Update</guimenuitem></menuchoice>. The standard update will include all externals and keep the existing depth."
msgstr "Če je možnost <guilabel>Izpusti zunanje</guilabel> potrjena ali če želite povečati globino, morate narediti posodobitev delovne kopije z uporabo ukaza <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Posodobi na revizijo...</guimenuitem></menuchoice> namesto ukaza <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Posodobi</guimenuitem></menuchoice>. Standardna posodobitev vključuje vse zunanje projekte in obdrži obstoječo globino."

#. (para)
#: ../source/TortoiseGit_en.xml:4344
msgid "It is recommended that you check out only the <literal>trunk</literal> 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 <literal>trunk</literal> 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/TortoiseGit_en.xml:4352
msgid "Exporting"
msgstr "Izvažanje"

#. (para)
#: ../source/TortoiseGit_en.xml:4353
msgid "Sometimes you may want to create a local copy without any of those <filename>.svn</filename> directories, e.g. to create a zipped tarball of your source. Read <xref linkend=\"tsvn-dug-export\"/> to find out how to do that."
msgstr "Včasih potrebujete krajevno kopijo brez map <filename>.svn</filename>, n. pr. če želite zapakirati svojo izvorno kodo. Več o tem si preberite v <xref linkend=\"tsvn-dug-export\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:4362
msgid "Committing Your Changes To The Repository"
msgstr "Objavljanje sprememb v skladišču"

#. (primary)
#: ../source/TortoiseGit_en.xml:4364
msgid "commit"
msgstr "objava"

#. (primary)
#: ../source/TortoiseGit_en.xml:4367
msgid "send changes"
msgstr "pošlji spremembe"

#. (primary)
#: ../source/TortoiseGit_en.xml:4370
msgid "check in"
msgstr "objavi"

#. (para)
#: ../source/TortoiseGit_en.xml:4373
msgid "Sending the changes you made to your working copy is known as <firstterm>committing</firstterm> the changes. But before you commit you have to make sure that your working copy is up to date. You can either use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Update</guimenuitem></menuchoice> directly. Or you can use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Check for Modifications</guimenuitem></menuchoice> 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 <firstterm>objava</firstterm> sprememb. Preden pa spremembe objavite, se morate prepričati, da je vaša delovna kopija posodobljena. Uporabite lahko ukaz <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Posodobi</guimenuitem></menuchoice>. Lahko pa uporabite ukaz <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Preveri spremembe</guimenuitem></menuchoice>, da vidite, katere datoteke so bile spremenjene v delovni kopiji ali v skladišču."

#. (title)
#: ../source/TortoiseGit_en.xml:4390
msgid "The Commit Dialog"
msgstr "Okno objave"

#. (title)
#: ../source/TortoiseGit_en.xml:4400
msgid "The Commit dialog"
msgstr "Okno objave"

#. (para)
#: ../source/TortoiseGit_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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Commit...</guimenuitem></menuchoice>. <placeholder-1/>"
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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Objavi...</guimenuitem></menuchoice>. <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:4411
#: ../source/TortoiseGit_en.xml:5245
msgid "Items which have been switched to a different repository path are also indicated using an <literal>(s)</literal> 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 <literal>(s)</literal>. Lahko da ste kakšen element preklopili, ko ste delali na neki veji in ga pozabili preklopiti nazaj. To je opozorilo!"

#. (title)
#: ../source/TortoiseGit_en.xml:4418
msgid "Commit files or folders?"
msgstr "Naj objavim datoteke ali mape?"

#. (para)
#: ../source/TortoiseGit_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 <emphasis>not</emphasis> 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 <emphasis>ne</emphasis> pomeni, da se vse datoteke označijo kot spremenjene, ampak vam le olajša delo, saj ga opravi namesto vas."

#. (para)
#: ../source/TortoiseGit_en.xml:4429
msgid "If you have modified files which have been included from a different repository using <literal>svn:externals</literal>, 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 <literal>svn:externals</literal>, 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/TortoiseGit_en.xml:4437
msgid "Many unversioned files in the commit dialog"
msgstr "Veliko datotek brez različic v oknu objave"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:4451
msgid "add the file to the <literal>svn:ignore</literal> list using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Add to ignore list</guimenuitem></menuchoice> This will only affect the directory on which you set the <literal>svn:ignore</literal> property. Using the SVN Property Dialog, you can alter the <literal>svn:ignore</literal> property for a directory."
msgstr "dodate datoteko na seznam prezrtih (<literal>svn:ignore</literal>) z uporabo ukaza <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Dodaj na seznam prezrtih</guimenuitem></menuchoice> Ta nastavitev vpliva le na mapo, v kateri ste nastavili lastnost <literal>svn:ignore</literal>. Z uporabo okna Lastnosti lahko lastnost mape spremenite."

#. (para)
#: ../source/TortoiseGit_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: <placeholder-1/> Read <xref linkend=\"tsvn-dug-ignore\"/> 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: <placeholder-1/> Za več informacij preberite <xref linkend=\"tsvn-dug-ignore\"/>."

#. (para)
#: ../source/TortoiseGit_en.xml:4468
msgid "<action>Double clicking</action> 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 "<action>Dvoklik</action> 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/TortoiseGit_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 <keycap>Shift</keycap>-<action>select</action> to make the action recursive."
msgstr "Izbiro elementov naredite s potrditvijo polja pred posameznim elementom. Za mape lahko uporabite označevanje s tipko <keycap>Shift</keycap>-<action>izbira</action>, s čemer naredite akcijo rekurzivno."

#. (para)
#: ../source/TortoiseGit_en.xml:4480
msgid "The columns displayed in the bottom pane are customizable. If you <action>right click</action> 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 <action>desnim klikom</action> 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/TortoiseGit_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 <guilabel>Keep locks</guilabel> checkbox is checked. The default state of this checkbox is taken from the <literal>no_unlock</literal> option in the Git configuration file. Read <xref linkend=\"tsvn-dug-settings-main\"/> for information on how to edit the Git 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 <guilabel>Ohrani zaklepe</guilabel>. Privzeto stanje tega polja je definirano v konfiguracijski datoteki sistema Git z možnostjo <literal>no_unlock</literal>. Za več informacij o urejanju konfiguracijske datoteke Git si preberite <xref linkend=\"tsvn-dug-settings-main\"/>."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_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 Git."

#. (title)
#. (title)
#: ../source/TortoiseGit_en.xml:4516
#: ../source/TortoiseGit_en.xml:5317
msgid "Repairing External Renames"
msgstr "Popravljanje zunanjih preimenovanj"

#. (para)
#. (para)
#: ../source/TortoiseGit_en.xml:4517
#: ../source/TortoiseGit_en.xml:5318
msgid "Sometimes files get renamed outside of Git, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Git about the connection. Simply select both the old name (missing) and the new name (unversioned) and use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Repair Move</guimenuitem></menuchoice> to pair the two files as a rename."
msgstr "Včasih datoteke preimenujete zunaj sistema Git, zato se v seznamu sprememb pojavita manjkajoča datoteka in datoteka brez različic. Da bi preprečili izgubo zgodovine, morate sistemu Git povedati, da med datotekama obstaja povezava. Enostavno izberite tako staro ime (manjkajoče) kot novo ime (brez različic) in uporabite <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Popravi premik</guimenuitem></menuchoice> in s tem povežete datoteki v preimenovanje."

#. (title)
#. (title)
#: ../source/TortoiseGit_en.xml:4532
#: ../source/TortoiseGit_en.xml:5363
msgid "Change Lists"
msgstr "Seznami sprememb"

#. (para)
#: ../source/TortoiseGit_en.xml:4533
msgid "The commit dialog supports Git's changelist feature to help with grouping related files together. Find out about this feature in <xref linkend=\"tsvn-dug-changelists\"/>."
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 <xref linkend=\"tsvn-dug-changelists\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:4540
msgid "Excluding Items from the Commit List"
msgstr "Izključevanje elementov iz okna objav"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:4551
msgid "To help out in awkward cases like this, we have reserved a changelist called <literal>ignore-on-commit</literal>. 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 <literal>ignore-on-commit</literal>. 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/TortoiseGit_en.xml:4560
msgid "Commit Log Messages"
msgstr "Sporočila dnevniških zapisov objav"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_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 <literal>text</literal>, use <literal>*text*</literal> for bold, <literal>_text_</literal> for underlining, and <literal>^text^</literal> for italics."
msgstr "Sporočilom dnevniških zapisov lahko dodate enostavno oblikovanje, podobno tistemu, ki ga uporabljate pri elektronski pošti. Če želite <literal>besedilu</literal> dodati oblikovanje, uporabite <literal>*besedilo*</literal> za polkrepko pisavo, <literal>_besedilo_</literal> za podčrtano pisavo in <literal>^besedilo^</literal> za poševno pisavo."

#. (title)
#: ../source/TortoiseGit_en.xml:4579
msgid "The Commit Dialog Spellchecker"
msgstr "Črkovalnik v oknu objave"

#. (para)
#: ../source/TortoiseGit_en.xml:4577
msgid "<placeholder-1/> TortoiseGit includes a spellchecker to help you get your log messages right. This will highlight any mis-spelled words. Use the context menu to access the suggested corrections. Of course, it doesn't know <emphasis>every</emphasis> 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 "<placeholder-1/> TortoiseGit 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 <emphasis>vseh</emphasis> 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/TortoiseGit_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 <keycap>Ctrl+Space</keycap>), a drop-down appears allowing you to select the full name. The regular expressions supplied with TortoiseGit are held in the TortoiseGit installation <filename>bin</filename> folder. You can also define your own regexes and store them in <filename>%APPDATA%\\TortoiseGit\\autolist.txt</filename>. Of course your private autolist will not be overwritten when you update your installation of TortoiseGit. If you are unfamiliar with regular expressions, take a look at the introduction at <ulink url=\"http://en.wikipedia.org/wiki/Regular_expression\"><citetitle>http://en.wikipedia.org/wiki/Regular_expression</citetitle></ulink>, and the online documentation and tutorial at <ulink url=\"http://www.regular-expressions.info/\"><citetitle>http://www.regular-expressions.info/</citetitle></ulink>."
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 <keycap>Ctrl+Space</keycap>), se pojavi spustni meni, ki vam omogoča, da izberete cel izraz. Regularni izrazi, ki so na voljo, se nahajajo v podmapi <filename>bin</filename> namestitvene mape sistema TortoiseGit. Definirate pa lahko tudi svoje regularne izraze in jih shranite v datoteko <filename>%APPDATA%\\TortoiseGit\\autolist.txt</filename>. Seveda se pri nadgranji sistema TortoiseGit ta zasebni seznam ohrani. Če regularnih izrazov ne poznate, si lahko ogledate dokumentacijo na spletu na naslovih <ulink url=\"http://en.wikipedia.org/wiki/Regular_expression\"><citetitle>http://en.wikipedia.org/wiki/Regular_expression</citetitle></ulink> in <ulink url=\"http://www.regular-expressions.info/\"><citetitle>http://www.regular-expressions.info/</citetitle></ulink>."

#. (para)
#: ../source/TortoiseGit_en.xml:4610
msgid "You can re-use previously entered log messages. Just click on <guibutton>Recent messages</guibutton> to view a list of the last few messages you entered for this working copy. The number of stored messages can be customized in the TortoiseGit settings dialog."
msgstr "Predhodno vnesena sporočila dnevniških zapisov lahko ponovno uporabite. Enostavno kliknite na <guibutton>Zadnja sporočila</guibutton> 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 TortoiseGit."

#. (para)
#: ../source/TortoiseGit_en.xml:4616
msgid "You can clear all stored commit messages from the <guilabel>Saved data</guilabel> page of TortoiseGit's settings, or you can clear individual messages from within the <guilabel>Recent messages</guilabel> dialog using the <keycap>Delete</keycap> key."
msgstr "Shranjena sporočila lahko izbrišete na strani <guilabel>Shranjeni podatki</guilabel> v oknu za nastavitve TortoiseGit, posamezna sporočila pa lahko izbrišete iz okna <guilabel>Zadnja sporočila</guilabel>, če držite pritisnjeno tipko <keycap>Delete</keycap>."

#. (title)
#: ../source/TortoiseGit_en.xml:4623
msgid "Special Folder Properties"
msgstr "Posebne lastnosti map"

#. (para)
#: ../source/TortoiseGit_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 <xref linkend=\"tsvn-dug-propertypage\"/> 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 <xref linkend=\"tsvn-dug-propertypage\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:4632
msgid "Integration with Bug Tracking Tools"
msgstr "Integracija s sistemi za sledenje hroščev"

#. (para)
#: ../source/TortoiseGit_en.xml:4633
msgid "If you have activated the bug tracking system, you can set one or more Issues in the <guilabel>Bug-ID / Issue-Nr:</guilabel> 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 <xref linkend=\"tsvn-dug-bugtracker\"/>."
msgstr "Če uporabljate sistem za sledenje zadev, lahko v vnosno polje <guilabel>ID hrošča / št. zadeve:</guilabel> 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 <xref linkend=\"tsvn-dug-bugtracker\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:4644
msgid "Commit Progress"
msgstr "Napredek objave"

#. (title)
#: ../source/TortoiseGit_en.xml:4649
msgid "The Progress dialog showing a commit in progress"
msgstr "Okno napredka prikazuje napredovanje objave"

#. (para)
#: ../source/TortoiseGit_en.xml:4645
msgid "After pressing <guibutton>OK</guibutton>, a dialog appears displaying the progress of the commit. <placeholder-1/>"
msgstr "Po pritisku na gumb <guibutton>V redu</guibutton> se pojavi okno napredka objave.  <placeholder-1/>"

#. (term)
#. (term)
#: ../source/TortoiseGit_en.xml:4658
#: ../source/TortoiseGit_en.xml:5183
msgid "Blue"
msgstr "Modra"

#. (para)
#: ../source/TortoiseGit_en.xml:4660
msgid "Committing a modification."
msgstr "Objavljanje spremembe."

#. (term)
#. (term)
#. (term)
#: ../source/TortoiseGit_en.xml:4666
#: ../source/TortoiseGit_en.xml:4733
#: ../source/TortoiseGit_en.xml:5191
msgid "Purple"
msgstr "Škrlatna"

#. (para)
#: ../source/TortoiseGit_en.xml:4668
msgid "Committing a new addition."
msgstr "Objavljanje novega elementa."

#. (term)
#. (term)
#. (term)
#: ../source/TortoiseGit_en.xml:4674
#: ../source/TortoiseGit_en.xml:4741
#: ../source/TortoiseGit_en.xml:5203
msgid "Dark red"
msgstr "Temno rdeča"

#. (para)
#: ../source/TortoiseGit_en.xml:4676
msgid "Committing a deletion or a replacement."
msgstr "Objavljanje brisanja ali zamenjave."

#. (term)
#. (term)
#. (term)
#: ../source/TortoiseGit_en.xml:4682
#: ../source/TortoiseGit_en.xml:4768
#: ../source/TortoiseGit_en.xml:5231
msgid "Black"
msgstr "Črna"

#. (para)
#: ../source/TortoiseGit_en.xml:4684
msgid "All other items."
msgstr "Ostali elementi."

#. (para)
#: ../source/TortoiseGit_en.xml:4653
msgid "The progress dialog uses colour coding to highlight different commit actions <placeholder-1/>"
msgstr "Okno napredka uporablja barvno kodiranje za označevanje različnih operacij objave. <placeholder-1/>"

#. (para)
#. (para)
#. (para)
#: ../source/TortoiseGit_en.xml:4691
#: ../source/TortoiseGit_en.xml:4778
#: ../source/TortoiseGit_en.xml:5240
msgid "This is the default colour scheme, but you can customise those colours using the settings dialog. Read <xref linkend=\"tsvn-dug-settings-colours\"/> for more information."
msgstr "To je privzeta barvna shema, vendar lahko barve poljubno nastavite v oknu za nastavitve. Za več informacij preberite <xref linkend=\"tsvn-dug-settings-colours\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:4699
msgid "Update Your Working Copy With Changes From Others"
msgstr "Posodobite delovno kopijo s spremembami ostalih uporabnikov"

#. (primary)
#. (primary)
#: ../source/TortoiseGit_en.xml:4701
#: ../source/TortoiseGit_en.xml:13110
msgid "update"
msgstr "posodobitev"

#. (primary)
#: ../source/TortoiseGit_en.xml:4704
msgid "fetch changes"
msgstr "dobi spremembe"

#. (title)
#: ../source/TortoiseGit_en.xml:4708
msgid "Progress dialog showing finished update"
msgstr "Okno napredka prikazuje končano posodobitev"

#. (para)
#: ../source/TortoiseGit_en.xml:4706
msgid "<placeholder-1/> 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 <emphasis>updating</emphasis>. 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, <action>right click</action> and select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Update</guimenuitem></menuchoice> 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 <emphasis>not</emphasis> affected by an update."
msgstr "<placeholder-1/> 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 <emphasis>posodabljanje</emphasis>. 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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Posodobi</guimenuitem></menuchoice>. 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 <emphasis>ne</emphasis> zgodi nobena sprememba."

#. (para)
#: ../source/TortoiseGit_en.xml:4735
msgid "New item added to your WC."
msgstr "Nov element dodan v delovno kopijo."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:4750
#: ../source/TortoiseGit_en.xml:5211
msgid "Green"
msgstr "Zelena"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:4759
#: ../source/TortoiseGit_en.xml:5221
msgid "Bright red"
msgstr "Svetlo rdeča"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_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/TortoiseGit_en.xml:4728
msgid "The progress dialog uses colour coding to highlight different update actions <placeholder-1/>"
msgstr "Okno napredka uporablja barvno označevanje različnih akcij posodobitev <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:4783
msgid "If you get any <emphasis>conflicts</emphasis> 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 <action>double click</action> on these lines to start the external merge tool to resolve the conflicts."
msgstr "Če med posodabljanjem nastanejo <emphasis>spori</emphasis> (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 <action>dvoklikom</action> na te vrtsice zaženete zunanje orodje za spajanje, s katerim lahko spore rešite."

#. (para)
#: ../source/TortoiseGit_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 <keycap>Ctrl+C</keycap>."
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 <keycap>Ctrl+C</keycap>."

#. (para)
#: ../source/TortoiseGit_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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Update to Revision...</guimenuitem></menuchoice> 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 <firstterm>depth</firstterm> at which to update the current folder. The terms used are described in <xref linkend=\"tsvn-dug-checkout-depth\"/>. The default depth is <guilabel>Working copy</guilabel>, which preserves the existing depth setting. You can also choose whether to ignore any external projects in the update (i.e. projects referenced using <literal>svn:externals</literal>)."
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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Posodobi na revizijo...</guimenuitem></menuchoice>. 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 <firstterm>globino</firstterm>, do katere se izvede posodobitev na trenutni mapi. Za definicijo uporabljenih izrazov poglejte v <xref linkend=\"tsvn-dug-checkout-depth\"/>. Privzeta globina je <guilabel>delovna kopija</guilabel>, ki ohrani obstoječo nastavitev globine. Izberete lahko tudi, ali želite pri posodabljanju prezreti zunanje projekte (projekte, ki imajo nastavljeno lastnost <literal>svn:externals</literal>)."

#. (para)
#: ../source/TortoiseGit_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 <quote>out of date</quote> 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 <xref linkend=\"tsvn-howto-rollback\"/> 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 <quote>zastarele</quote>! Č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 <xref linkend=\"tsvn-howto-rollback\"/> za nadaljnje informacije in druge metode."

#. (para)
#: ../source/TortoiseGit_en.xml:4829
msgid "<menuchoice><guimenuitem>Update to Revision</guimenuitem></menuchoice> 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 <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Save revision to...</guimenuitem></menuchoice> command from the log dialog for that file."
msgstr "Ukaz <menuchoice><guimenuitem>Posodobi na revizijo</guimenuitem></menuchoice> 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 <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Shrani revizijo v...</guimenuitem></menuchoice>."

#. (title)
#: ../source/TortoiseGit_en.xml:4848
msgid "Multiple Files/Folders"
msgstr "Več datotek/map"

#. (para)
#: ../source/TortoiseGit_en.xml:4849
msgid "If you select multiple files and folders in the explorer and then select <menuchoice><guimenuitem>Update</guimenuitem></menuchoice>, all of those files/folders are updated one by one. TortoiseGit makes sure that all files/folders which are from the same repository are updated to the exact same revision! Even if between those updates another commit occurred."
msgstr "Če v Raziskovalcu izberete več datotek in map in potem uporabite ukaz <menuchoice><guimenuitem>Posodobi</guimenuitem></menuchoice>, bodo vse datoteke/mape posodobljene ena za drugo. TortoiseGit 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/TortoiseGit_en.xml:4861
msgid "Local File Already Exists"
msgstr "Krajevna datoteka že obstaja"

#. (para)
#: ../source/TortoiseGit_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 Git tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Git will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file."
msgstr "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 Git prevzeti iz skladišča novo dodano datoteko in ugotovi, da v delovni kopiji že obstaja datoteka z enakim imenom. Git 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/TortoiseGit_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/TortoiseGit_en.xml:4876
msgid "If you keep getting error messages, use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Check for Modifications</guimenuitem></menuchoice> 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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Preveri spremembe</guimenuitem></menuchoice>, da dobite seznam težavnih datotek. Na ta način se lotite reševanja vseh naenkrat."

#. (title)
#: ../source/TortoiseGit_en.xml:4889
msgid "Resolving Conflicts"
msgstr "Reševanje sporov"

#. (primary)
#: ../source/TortoiseGit_en.xml:4894
msgid "resolve"
msgstr "reši"

#. (term)
#: ../source/TortoiseGit_en.xml:4917
msgid "filename.ext.mine"
msgstr "imedatoteke.kon.mine"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:4928
msgid "filename.ext.rOLDREV"
msgstr "imedatoteke.kon.rSTARAREVIZIJA"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:4939
msgid "filename.ext.rNEWREV"
msgstr "imedatoteke.kon.rNOVAREVIZIJA"

#. (para)
#: ../source/TortoiseGit_en.xml:4941
msgid "This is the file that your Git client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository."
msgstr "To je datoteka, ki jo je odjemalec Git pri posodabljanju delovne kopije prejel od strežnika. Ta datoteka ustreza reviziji HEAD v skladišču."

#. (para)
#: ../source/TortoiseGit_en.xml:4896
msgid ""
"Once in a while, you will get a <emphasis>conflict</emphasis> when you update your files from the repository. A conflict occurs when two or more developers have changed the same few lines of a file. As Git knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <literal>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</literal>. The conflicting area is marked like this: <screen>\n"
"&lt;&lt;&lt;&lt;&lt;&lt;&lt; filename\n"
"    your changes\n"
"=======\n"
"    code merged from repository\n"
"&gt;&gt;&gt;&gt;&gt;&gt;&gt; revision\n"
"</screen> Also, for every conflicted file Git places three additional files in your directory: <placeholder-1/>"
msgstr ""
"Občasno se pri posodabljanju delovne kopije iz skladišča pojavijo <emphasis>spori</emphasis>. Spor se pojavi, ko več uporabnikov spremeni iste vrstice v datoteki. Ker Git 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 <literal>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</literal>. Sporno območje je označeno takole: <screen>\n"
"&lt;&lt;&lt;&lt;&lt;&lt;&lt; ime datoteke\n"
"    vaše spremembe\n"
"=======\n"
"    koda, spojena iz skladišča\n"
"&gt;&gt;&gt;&gt;&gt;&gt;&gt; revizija\n"
"</screen> Poleg tega Git za vsako sporno datoteko doda v mapo tri dodatne datoteke: <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:4951
msgid "You can either launch an external merge tool / conflict editor with <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Edit Conflicts</guimenuitem></menuchoice> 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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Uredi spore</guimenuitem></menuchoice> 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/TortoiseGit_en.xml:4962
msgid "Afterwards execute the command <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Resolved</guimenuitem></menuchoice> and commit your modifications to the repository. Please note that the Resolve command does not really resolve the conflict. It just removes the <filename>filename.ext.mine</filename> and <filename>filename.ext.r*</filename> files, to allow you to commit your changes."
msgstr "Nato uporabite ukaz <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Rešen</guimenuitem></menuchoice> in objavite svoje spremembe v skladišču. Upoštevajte, da ukaz Reši ne reši sporov, ampak le odstrani datoteki <filename>imedatoteke.kon.mine</filename> in <filename>imedatoteke.kon.r*</filename>, da lahko spremembe objavite."

#. (para)
#: ../source/TortoiseGit_en.xml:4975
msgid "If you have conflicts with binary files, Git does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have <filename>filename.ext.r*</filename> 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, Git ne poskuša sam spajati datotek. Krajevna datoteka ostane nespremenjena (natančno takšna kot ob vaši zadnji spremembi), pojavijo pa se datoteke <filename>imedatoteke.kon.r*</filename>. Č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/TortoiseGit_en.xml:4985
msgid "You can use the Resolved command for multiple files if you right click on the parent folder and select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Resolved...</guimenuitem></menuchoice> 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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Rešen...</guimenuitem></menuchoice> Pokaže se okno s seznamom spornih datotek v mapi, v katerem izberete datoteke, ki jih želite označiti kot rešene."

#. (title)
#: ../source/TortoiseGit_en.xml:4998
msgid "Getting Status Information"
msgstr "Pridobivanje informacije o stanju"

#. (primary)
#. (primary)
#: ../source/TortoiseGit_en.xml:5000
#: ../source/TortoiseGit_en.xml:5149
msgid "status"
msgstr "stanje"

#. (primary)
#: ../source/TortoiseGit_en.xml:5003
msgid "view changes"
msgstr "poglej spremembe"

#. (primary)
#: ../source/TortoiseGit_en.xml:5006
msgid "working copy status"
msgstr "stanje delovna kopija"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:5016
#: ../source/TortoiseGit_en.xml:15007
msgid "overlays"
msgstr "prekrivki"

#. (primary)
#: ../source/TortoiseGit_en.xml:5019
msgid "icons"
msgstr "ikone"

#. (para)
#: ../source/TortoiseGit_en.xml:5027
msgid "Now that you have checked out a working copy from a Git repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Git status of the file the overlay icon is different."
msgstr "Ko prevzamete delovno kopijo iz skladišča Git, imajo datoteke v Raziskovalcu spremenjene ikone. To je razlog za veliko popularnost programa TortoiseGit. TortoiseGit doda datotekam prekrivno ikono, ki se prekriva z originalno ikono. Prekrivna ikona je odvisna od statusa datoteke."

#. (para)
#: ../source/TortoiseGit_en.xml:5035
msgid "<graphic fileref=\"../images/InGitIcon.png\"/> A fresh checked out working copy has a green checkmark as overlay. That means the Git status is <emphasis>normal</emphasis>."
msgstr "<graphic fileref=\"../images/InGitIcon.png\"/> Sveže prevzeta delovna kopija ima zeleno prekrivno ikono. To pomeni, da je status datoteke/mape <emphasis>običajno</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:5040
msgid "<graphic fileref=\"../images/ModifiedIcon.png\"/> As soon as you start editing a file, the status changes to <emphasis>modified</emphasis> 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 "<graphic fileref=\"../images/ModifiedIcon.png\"/> Ko začnete datoteko urejati, se njen status spremeni v <emphasis>spremenjeno</emphasis>, 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/TortoiseGit_en.xml:5048
msgid "<graphic fileref=\"../images/ConflictIcon.png\"/> If during an update a <emphasis>conflict</emphasis> occurs then the icon changes to a yellow exclamation mark."
msgstr "<graphic fileref=\"../images/ConflictIcon.png\"/> Če se pri posodabljanju pojavi <emphasis>spor</emphasis>, se ikona spremeni v rumen klicaj."

#. (para)
#: ../source/TortoiseGit_en.xml:5053
msgid "<graphic fileref=\"../images/ReadOnlyIcon.png\"/> If you have set the <literal>svn:needs-lock</literal> property on a file, Git makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file."
msgstr "<graphic fileref=\"../images/ReadOnlyIcon.png\"/> Če ste datoteki nastavili lastnost <literal>svn:needs-lock</literal>, Git 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/TortoiseGit_en.xml:5060
msgid "<graphic fileref=\"../images/LockedIcon.png\"/> If you hold a lock on a file, and the Git status is <emphasis>normal</emphasis>, 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 "<graphic fileref=\"../images/LockedIcon.png\"/> Če ste lastnik zaklepa datoteke, ki ima stanje <emphasis>običajno</emphasis>, vas ta ikona opominja, da morate zaklep sprostiti, če ga ne uporabljate, da lahko tudi drugi uporabniki objavijo spremembe na tej datoteki."

#. (para)
#: ../source/TortoiseGit_en.xml:5067
msgid "<graphic fileref=\"../images/DeletedIcon.png\"/> This icon shows you that some files or folders inside the current folder have been scheduled to be <emphasis>deleted</emphasis> from version control or a file under version control is missing in a folder."
msgstr "<graphic fileref=\"../images/DeletedIcon.png\"/> Ta ikona pove, da so nekatere datoteke ali mape znotraj trenutne mape označene <emphasis>za brisanje</emphasis> iz nadzora različic ali pa da se datoteka, ki je pod nadzorom, ne nahaja v mapi."

#. (para)
#: ../source/TortoiseGit_en.xml:5073
msgid "<graphic fileref=\"../images/AddedIcon.png\"/> The plus sign tells you that a file or folder has been scheduled to be <emphasis>added</emphasis> to version control."
msgstr "<graphic fileref=\"../images/AddedIcon.png\"/> Znak plus pomeni, da je datoteka ali mapa označena <emphasis>za dodajanje</emphasis> v nadzor različic."

#. (para)
#: ../source/TortoiseGit_en.xml:5078
msgid "<graphic fileref=\"../images/IgnoredIcon.png\"/> The bar sign tells you that a file or folder is <emphasis>ignored</emphasis> for version control purposes. This overlay is optional."
msgstr "<graphic fileref=\"../images/IgnoredIcon.png\"/> Znak pomeni, da je datoteka ali mapa v nadzoru različic <emphasis>prezrta</emphasis>. Prikaz te prekrivne ikone je možno vključiti ali izključiti."

#. (para)
#: ../source/TortoiseGit_en.xml:5084
msgid "<graphic fileref=\"../images/UnversionedIcon.png\"/> This icon shows files and folders which are not under version control, but have not been ignored. This overlay is optional."
msgstr "<graphic fileref=\"../images/UnversionedIcon.png\"/> Ta ikona označuje datoteke in mape, ki niso pod nadzorom, prav tako pa niso prezrte. Uporabo te ikone lahko izključite."

#. (para)
#: ../source/TortoiseGit_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. TortoiseGit tries to be a <quote>Good Citizen (TM)</quote> 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. TortoiseGit poskuša biti <quote>pošten državljan (TM)</quote> in ne uporablja veliko prekrivnih ikon, da ostane prostor tudi za ostale aplikacije."

#. (para)
#: ../source/TortoiseGit_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 TortoiseGit project introduced a common shared icon set, loaded as a DLL, which can be used by all Tortoise clients. Check with your client provider to see if this has been integrated yet :-)"
msgstr "Na trgu je več odjemalcev tipa Tortoise (TortoiseCVS, TortoiseHG, ...), tako da je omejitev števila prekrivnih resna težava. Zato je projekt TortoiseGit 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/TortoiseGit_en.xml:5105
msgid "For a description of how icon overlays correspond to Git status and other technical details, read <xref linkend=\"tsvn-app-internals-overlays\"/>."
msgstr "Za opis, kakšnemu statusu v sistemu Git ustrezajo prekrivne ikone in ostale tehnične podrobnosti preberite <xref linkend=\"tsvn-app-internals-overlays\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:5112
msgid "TortoiseGit Columns In Windows Explorer"
msgstr "Stolpci TortoiseGit v Raziskovalcu"

#. (primary)
#: ../source/TortoiseGit_en.xml:5114
msgid "Explorer Columns"
msgstr "Stolpci v Raziskovalcu"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:5121
msgid "Simply right click on one of the headings of a column, choose <guimenuitem>More...</guimenuitem> from the context menu displayed. A dialog will appear where you can specify the columns and their order, which is displayed in the <quote>Detailed View</quote>. 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 <guibutton>OK</guibutton>. 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 <guimenuitem>Več...</guimenuitem>. Pojavi se pogovorno okno, kjer lahko določite stolpce in njihov vrstni red, ki se prikaže v pogledu <quote>Detajli</quote>. Poiščite stolce, katerih imena se začnejo s SVN. Označite tiste, ki jih želite prikazati in zaprite okno s klikom na gumb <guibutton>V redu</guibutton>. 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/TortoiseGit_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 <emphasis>all</emphasis> 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 <emphasis>vse</emphasis> datoteke, ampak le za določene vrste datotek."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:5147
msgid "Local and Remote Status"
msgstr "Krajevno in oddaljeno stanje"

#. (primary)
#: ../source/TortoiseGit_en.xml:5152
msgid "modifications"
msgstr "spremembe"

#. (title)
#. (title)
#: ../source/TortoiseGit_en.xml:5156
#: ../source/TortoiseGit_en.xml:14697
msgid "Check for Modifications"
msgstr "Preveri posodobitve"

#. (para)
#: ../source/TortoiseGit_en.xml:5154
msgid "<placeholder-1/> 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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Check For Modifications...</guimenuitem></menuchoice> 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 "<placeholder-1/> Pogosto je zelo koristno, če veste, katere datoteke ste spremenili in katere datoteke so spremenili vaši sodelavci. Takrat pride prav ukaz <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Preveri posodobitve...</guimenuitem></menuchoice>. To pogovorno okno prikaže vse datoteke, ki so se kakorkoli spremenile, prav tako pa tudi vse datoteke brez različic."

#. (para)
#: ../source/TortoiseGit_en.xml:5171
msgid "If you click on the <guibutton>Check Repository</guibutton> 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 <guibutton>Preveri skladišče</guibutton>, 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/TortoiseGit_en.xml:5185
msgid "Locally modified items."
msgstr "Krajevno spremenjeni elementi."

#. (para)
#: ../source/TortoiseGit_en.xml:5193
msgid "Added items. Items which have been added with history have a <literal>+</literal> sign in the <guilabel>Text status</guilabel> 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 <guilabel>Stanje besedila</guilabel> znak <literal>+</literal>, namig pa pokaže, od kje je bil element skopiran."

#. (para)
#: ../source/TortoiseGit_en.xml:5205
msgid "Deleted or missing items."
msgstr "Izbrisani ali manjkajoči elementi."

#. (para)
#: ../source/TortoiseGit_en.xml:5213
msgid "Items modified locally and in the repository. The changes will be merged on update. These <emphasis>may</emphasis> produce conflicts on update."
msgstr "Elementi so spremenjeni krajevno in v skladišču. Ob posodobitvi bodo spremembe spojene. Situacija <emphasis>lahko</emphasis> povzroči spore pri posodobitvi."

#. (para)
#: ../source/TortoiseGit_en.xml:5223
msgid "Items modified locally and deleted in repository, or modified in repository and deleted locally. These <emphasis>will</emphasis> 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 <emphasis>bodo</emphasis> pojavili."

#. (para)
#: ../source/TortoiseGit_en.xml:5233
msgid "Unchanged and unversioned items."
msgstr "Nespremenjeni elementi in elementi brez različic."

#. (para)
#: ../source/TortoiseGit_en.xml:5179
msgid "The dialog uses colour coding to highlight the status. <placeholder-1/>"
msgstr "Pogovorno okno uporablja barvno kodiranje, da poudari stanje. <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:5251
msgid "From the context menu of the dialog you can show a diff of the changes. Check the local changes <emphasis>you</emphasis> made using <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Compare with Base</guimenuitem></menuchoice>. Check the changes in the repository made by others using <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Show Differences as Unified Diff</guimenuitem></menuchoice>."
msgstr "Iz kontekstnega menija lahko prikažete spremembe. Z uporabo <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Primerjaj z osnovo</guimenuitem></menuchoice> preverite spremembe, ki ste jih naredili <emphasis>vi</emphasis>. Z ukazom <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Pokaži razlike kot poenotene razlike</guimenuitem></menuchoice> preverite spremembe, ki so jih v skladišču naredili drugi uporabniki ."

#. (para)
#: ../source/TortoiseGit_en.xml:5264
msgid "You can also revert changes in individual files. If you have deleted a file accidentally, it will show up as <emphasis>Missing</emphasis> and you can use <emphasis>Revert</emphasis> to recover it."
msgstr "Posameznim datotekam lahko povrnete spremembe. Če ste pomotoma izbrisali datoteko, bo le-ta označena kot <emphasis>manjkajoča</emphasis>, zato lahko uporabite ukaz <emphasis>Povrni</emphasis>, da jo pridobite nazaj."

#. (para)
#: ../source/TortoiseGit_en.xml:5269
msgid "Unversioned and ignored files can be sent to the recycle bin from here using <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Delete</guimenuitem></menuchoice>. If you want to delete files permanently (bypassing the recycle bin) hold the <keycap>Shift</keycap> key while clicking on <guilabel>Delete</guilabel>."
msgstr "Datoteke brez različic in prezrte datoteke lahko pošljete v Koš z ukazom <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Zbriši</guimenuitem></menuchoice>. Če želite datoteke zbrisati trajno (brez pošiljanja v Koš),  ob kliku na <guilabel>Zbriši</guilabel> držite pritisnjeno tipko <keycap>Shift</keycap>."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:5282
msgid "The columns are customizable. If you <action>right click</action> 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 <action>desno kliknete</action> 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/TortoiseGit_en.xml:5291
msgid "If you are working on several unrelated tasks at once, you can also group files together into changelists. Read <xref linkend=\"tsvn-dug-commit-changelists\"/> for more information."
msgstr "Če delate na več nepovezanih nalogah hkrati, lahko sestavljate datoteke skupaj v sezname sprememb. Za več informacij preberite <xref linkend=\"tsvn-dug-commit-changelists\"/>."

#. (para)
#: ../source/TortoiseGit_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 <emphasis>commit</emphasis> revisions, not the <emphasis>update</emphasis> 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 <guilabel>Show unmodified files</guilabel> checkbox."
msgstr "Na dnu okna vidite povzetek območja revizij, ki jih uporabljate v delovni kopiji. To so <emphasis>objavljene</emphasis> revizije, ne <emphasis>posodobljene</emphasis> 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 <guilabel>Prikaži nespremenjene datoteke</guilabel>."

#. (para)
#: ../source/TortoiseGit_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 <guilabel>Check for Modifications</guilabel> dialog is the easiest way to achieve that. Just check the <guilabel>Show unmodified files</guilabel> 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 <guilabel>Preveri spremembe</guilabel>. Edino, kar morate storiti, je, da potrdite polje <guilabel>Prikaži nespremenjene datoteke</guilabel>."

#. (title)
#: ../source/TortoiseGit_en.xml:5333
msgid "Viewing Diffs"
msgstr "Pregledovanje razlik"

#. (primary)
#: ../source/TortoiseGit_en.xml:5335
msgid "diffing"
msgstr "razlikovanje"

#. (para)
#: ../source/TortoiseGit_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 <guimenuitem>Diff</guimenuitem> from TortoiseGit's context menu. This starts the external diff-viewer, which will then compare the current file with the pristine copy (<literal>BASE</literal> 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 <guimenuitem>Razlikuj</guimenuitem> iz kontekstnega menija. S tem poženete zunanji pregledovalnik razlik, ki bo primerjal trenutno datoteko z osnovno datoteko  (revizija <literal>BASE</literal>), ki se je shranila, ko ste naredili zadnji prevzem ali posodobitev."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:5351
msgid "Select the two files you want to compare in explorer (e.g. using <keycap>Ctrl</keycap> and the mouse) and choose <guimenuitem>Diff</guimenuitem> from TortoiseGit's context menu. The file clicked last (the one with the focus, i.e. the dotted rectangle) will be regarded as the later one."
msgstr "V Raziskovalcu izberite datoteki, ki ju želite primerjati (n. pr. z uporabo tipke <keycap>Ctrl</keycap> in miške) in iz kontekstnega menija TortoiseGit izberite <guimenuitem>Razlikuj</guimenuitem>. Datoteka, na katero ste kliknili nazadnje (datoteka, ki ima fokus oziroma datoteka s pikčasto obrobo) se bo obravnavala kot novejša."

#. (primary)
#: ../source/TortoiseGit_en.xml:5365
msgid "changelist"
msgstr "seznam sprememb"

#. (para)
#: ../source/TortoiseGit_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 <firstterm>changelist</firstterm> 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 <firstterm>seznam sprememb</firstterm> 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/TortoiseGit_en.xml:5378
msgid "The changelist feature in TortoiseGit is only available in Windows XP and later, as it depends on a shell capability which is not present in Windows 2000. Sorry, but Win2K is really quite old now, so please don't complain."
msgstr "Možnost uporabe seznamov sprememb v programu TortoiseGit 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/TortoiseGit_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/TortoiseGit_en.xml:5393
msgid "Select one or more files and use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Move to changelist</guimenuitem></menuchoice> 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 <guibutton>OK</guibutton>. 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 <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Premakni v seznam sprememb</guimenuitem></menuchoice>. 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 <guibutton>V redu</guibutton>. Okno za objave se spremeni in prikazuje skupine elementov."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:5414
msgid "Commit dialog with Changelists"
msgstr "Okno za objave s seznami sprememb"

#. (para)
#: ../source/TortoiseGit_en.xml:5412
msgid "<placeholder-1/> 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 "<placeholder-1/> 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/TortoiseGit_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/TortoiseGit_en.xml:5427
msgid "TortoiseGit reserves one changelist name for its own use, namely <literal>ignore-on-commit</literal>. 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 <xref linkend=\"tsvn-dug-commit-ignore\"/>."
msgstr "TortoiseGit si rezervira en seznam sprememb za lastno uporabo in sicer <literal>ignore-on-commit</literal>. Seznam se uporablja za datoteke, ki jih skoraj nikoli ne objavljate, čeprav imajo krajevne spremembe. Ta zmožnost je opisana v poglavju <xref linkend=\"tsvn-dug-commit-ignore\"/>."

#. (para)
#: ../source/TortoiseGit_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 <guilabel>Keep changelists</guilabel> 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 <guilabel>Ohrani sezname sprememb</guilabel> na dnu pogovornega okna."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:5449
msgid "Revision Log Dialog"
msgstr "Pogovorno okno Dnevnik"

#. (primary)
#: ../source/TortoiseGit_en.xml:5451
msgid "log"
msgstr "dnevnik"

#. (primary)
#: ../source/TortoiseGit_en.xml:5454
msgid "history"
msgstr "zgodovina"

#. (primary)
#: ../source/TortoiseGit_en.xml:5457
msgid "commit messages"
msgstr "sporočila objav"

#. (primary)
#: ../source/TortoiseGit_en.xml:5460
msgid "log messages"
msgstr "sporočilo objave"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_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/TortoiseGit_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/TortoiseGit_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/TortoiseGit_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/TortoiseGit_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. <placeholder-1/> 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. <placeholder-1/> Pogovorno okno pa naredi še veliko več - ponudi vam kontekstni meni, ki prinaša še več informacij o zgodovini projekta."

#. (title)
#: ../source/TortoiseGit_en.xml:5504
msgid "Invoking the Revision Log Dialog"
msgstr "Klicanje pogovornega okna dnevniških zapisov"

#. (title)
#: ../source/TortoiseGit_en.xml:5507
msgid "The Revision Log Dialog"
msgstr "Okno dnevnika"

#. (para)
#: ../source/TortoiseGit_en.xml:5513
msgid "From the TortoiseGit context submenu"
msgstr "Iz kontekstnega podmenija TortoiseGit"

#. (para)
#: ../source/TortoiseGit_en.xml:5518
msgid "From the property page"
msgstr "Iz strani lastnosti"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:5505
msgid "<placeholder-1/> There are several places from where you can show the Log dialog: <placeholder-2/>"
msgstr "<placeholder-1/> Obstaja veliko mest, od koder lahko lahko pokličete okno dnevnika: <placeholder-2/>"

#. (title)
#: ../source/TortoiseGit_en.xml:5533
msgid "Revision Log Actions"
msgstr "Akcije dnevnika"

#. (para)
#: ../source/TortoiseGit_en.xml:5534
msgid "The top pane has an <guilabel>Actions</guilabel> 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 <guilabel>Dejanja</guilabel> 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/TortoiseGit_en.xml:5539
msgid "<graphic fileref=\"../images/ActionModifiedIcon.png\"/> If a revision modified a file or directory, the <emphasis>modified</emphasis> icon is shown in the first column."
msgstr "<graphic fileref=\"../images/ActionModifiedIcon.png\"/> Če je v reviziji prišlo do spremembe datoteke ali mape, se v prvem stolpcu prikaže ikona <emphasis>spremenjeno</emphasis>."

#. (para)
#: ../source/TortoiseGit_en.xml:5544
msgid "<graphic fileref=\"../images/ActionAddedIcon.png\"/> If a revision added a file or directory, the <emphasis>added</emphasis> icon is shown in the second column."
msgstr "<graphic fileref=\"../images/ActionAddedIcon.png\"/> Če je bila v reviziji dodana datoteka ali mapa, se v drugem stolpcu prikaže ikona <literal>dodano</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:5549
msgid "<graphic fileref=\"../images/ActionDeletedIcon.png\"/> If a revision deleted a file or directory, the <emphasis>deleted</emphasis> icon is shown in the third column."
msgstr "<graphic fileref=\"../images/ActionDeletedIcon.png\"/> Če je bila v reviziji izbrisana datoteka ali mapa, se v tretjem stolpcu prikaže ikona <literal>zbrisano</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:5554
msgid "<graphic fileref=\"../images/ActionReplacedIcon.png\"/> If a revision replaced a file or directory, the <emphasis>replaced</emphasis> icon is shown in the fourth column."
msgstr "<graphic fileref=\"../images/ActionReplacedIcon.png\"/> Če je revizija zamenjala datoteko ali mapo, se v četrtem stolcu prikaže ikona <literal>zamenjano</literal>."

#. (title)
#: ../source/TortoiseGit_en.xml:5561
msgid "Getting Additional Information"
msgstr "Pridobivanje dodatnih informacij"

#. (title)
#: ../source/TortoiseGit_en.xml:5564
msgid "The Revision Log Dialog Top Pane with Context Menu"
msgstr "Zgornji del Dnevnika s kontekstnim menijem"

#. (para)
#: ../source/TortoiseGit_en.xml:5573
msgid "Compare the selected revision with your working copy. The default Diff-Tool is TortoiseMerge which is supplied with TortoiseGit. If the log dialog is for a folder, this will show you a list of changed files, and allow you to review the changes made to each file individually."
msgstr "Primerjate izbrane revizije z delovno kopijo. Privzeto orodje za razlikovanje je TortoiseMerge, ki je del paketa TortoiseGit. Č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/TortoiseGit_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/TortoiseGit_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/TortoiseGit_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 <xref linkend=\"tsvn-dug-blame-diffs\"/> for more detail. (files only)."
msgstr "Okrivite izbrano revizijo in datoteko v delovni osnovi z vizualno primerjavo razlik. Za podrobnejše informacije preberite <xref linkend=\"tsvn-dug-blame-diffs\"/>. (velja le za datoteke)."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_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/TortoiseGit_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/TortoiseGit_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/TortoiseGit_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/TortoiseGit_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/TortoiseGit_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/TortoiseGit_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 <emphasis>not</emphasis> 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 <emphasis>ne</emphasis> 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/TortoiseGit_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 <emphasis>not</emphasis> affect the repository until you commit the changes. Note that this will undo <emphasis>all</emphasis> 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 <emphasis>ne</emphasis> vpliva na skladišče, dokler sprememb ne objavite. Upoštevajte, da bo operacija razveljavila <emphasis>vse</emphasis> 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/TortoiseGit_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/TortoiseGit_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/TortoiseGit_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/TortoiseGit_en.xml:5709
msgid "Edit the log message or author attached to a previous commit. Read <xref linkend=\"tsvn-dug-showlog-4\"/> to find out how this works."
msgstr "Uredite sporočilo dnevniškega zapisa in avtoja v predhodni objavi. Za dodatne informacije preberite <xref linkend=\"tsvn-dug-showlog-4\"/>."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_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 Git (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 Git in so prikazani v spodnjem delu okna. Iskanje ni občutljivo na velike in male črke."

#. (para)
#: ../source/TortoiseGit_en.xml:5562
msgid "<placeholder-1/> 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. <placeholder-2/>"
msgstr "<placeholder-1/> 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. <placeholder-2/>"

#. (title)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:5742
msgid "Compare the two selected revisions using a visual difference tool. The default Diff-Tool is TortoiseMerge which is supplied with TortoiseGit."
msgstr "Primerjate izbrani reviziji z grafičnim orodjem za razlikovanje. Privzeto orodje je TortoiseMerge, ki se namesti hkrati z orodjem TortoiseGit."

#. (para)
#: ../source/TortoiseGit_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 <xref linkend=\"tsvn-dug-compare-revs\"/>."
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 <xref linkend=\"tsvn-dug-compare-revs\"/>."

#. (para)
#: ../source/TortoiseGit_en.xml:5755
msgid "Blame the two revisions and compare the blame reports using a visual difference tool. Read <xref linkend=\"tsvn-dug-blame-diffs\"/> for more detail."
msgstr "Okrivite dve reviziji in primerjate rezultate z grafičnim orodjem za razlikovanje. Za več informacij preberite <xref linkend=\"tsvn-dug-blame-diffs\"/>."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_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/TortoiseGit_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/TortoiseGit_en.xml:5732
msgid "<placeholder-1/> If you select two revisions at once (using the usual <keycap>Ctrl</keycap>-modifier), the context menu changes and gives you fewer options: <placeholder-2/>"
msgstr "<placeholder-1/>Če izberete dve reviziji naenkrat (z uporabo tipke <keycap>Ctrl</keycap>), se kontekstni meni spremeni in ponudi manj možnosti. Lahko: <placeholder-2/>"

#. (para)
#: ../source/TortoiseGit_en.xml:5779
msgid "If you select two or more revisions (using the usual <keycap>Ctrl</keycap> or <keycap>Shift</keycap> 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 <keycap>Ctrl</keycap> ali <keycap>Shift</keycap>), 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/TortoiseGit_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/TortoiseGit_en.xml:5792
msgid "The Log Dialog Bottom Pane with Context Menu"
msgstr "Kontekstni meni spodnjega dela Dnevnika"

#. (para)
#: ../source/TortoiseGit_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 <emphasis>modified</emphasis>."
msgstr "Prikažete spremembe, ki so bile narejene v izbrani reviziji izbrane datoteke. Ta možnost je na razpolago le za <emphasis>spremenjene</emphasis> datoteke."

#. (para)
#: ../source/TortoiseGit_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 <xref linkend=\"tsvn-dug-blame-diffs\"/> 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 <xref linkend=\"tsvn-dug-blame-diffs\"/>."

#. (para)
#. (para)
#: ../source/TortoiseGit_en.xml:5813
#: ../source/TortoiseGit_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/TortoiseGit_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/TortoiseGit_en.xml:5824
msgid "View the Git properties for the selected item."
msgstr "Pogledate lastnosti Git za izbran element."

#. (para)
#: ../source/TortoiseGit_en.xml:5829
msgid "Show the revision log for the selected single file."
msgstr "Prikažete dnevnik za izbrano datoteko."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:5790
msgid "<placeholder-1/> The bottom pane of the Log dialog also has a context menu that allows you to <placeholder-2/>"
msgstr "<placeholder-1/> Spodnji del dnevnika prav tako vsebuje kontekstni meni, s katerim lahko <placeholder-2/>"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:5846
msgid "Git uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. <quote>Done in r1234</quote> 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 Git pomenijo dve stvari. Revizija predstavlja stanje skladišča v nekem trenutku, predstavlja pa tudi seznam sprememb, ki so ustvarile to revizijo. N. pr. <quote>Narejeno v r1234</quote> pomeni, da spremembe, narejene v reviziji 1234, ustvarijo funkcionalnost X. Da ponazorimo, kateri pomen imamo v mislih, uporabljamo dva izraza."

#. (para)
#: ../source/TortoiseGit_en.xml:5855
msgid "If you select two revisions N and M, the context menu will offer to show the <emphasis>difference</emphasis> between those two revisions. In Git terms this is <literal>diff -r M:N</literal>."
msgstr "Če izberete revizijo N in M, vam kontekstni meni ponuja možnost prikaza <emphasis>razlik</emphasis> med tema dvema revizijama. Ekvivalenten ukaz pri delu z odjemalcem za ukazno vrstivo je <literal>diff -r M:N</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:5861
msgid "If you select a single revision N, the context menu will offer to show the <emphasis>changes</emphasis> made in that revision. In Git terms this is <literal>diff -r N-1:N</literal> or <literal>diff -c N</literal>."
msgstr "Če izberete samo revizijo N, vam kontekstni meni ponuja prikaz <emphasis>sprememb</emphasis>, opravljenih v tej reviziji. Ekvivalentna ukaza pri uporabi odjemalca za ukazno vrstico sta <literal>diff -r N-1:N</literal> in <literal>diff -c N</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:5867
msgid "The bottom pane shows the files changed in all selected revisions, so the context menu always offers to show <emphasis>changes</emphasis>."
msgstr "Spodnja polovica prikazuje vse spremenjene datoteke v vseh izbranih revizijah. Kontekstni meni ponuja prikaz <emphasis>sprememb</emphasis>."

#. (title)
#: ../source/TortoiseGit_en.xml:5874
msgid "Getting more log messages"
msgstr "Pridobivanje dodatnih dnevniških zapisov"

#. (para)
#: ../source/TortoiseGit_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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Settings</guimenuitem></menuchoice> (<xref linkend=\"tsvn-dug-settings-dialogs\"/>),"
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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Nastavitve</guimenuitem></menuchoice> (<xref linkend=\"tsvn-dug-settings-dialogs\"/>),"

#. (para)
#: ../source/TortoiseGit_en.xml:5895
msgid "When the <guilabel>Stop on copy/rename</guilabel> 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 <guilabel>Ustavi ob kopiranju/preimenovanju</guilabel>, 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/TortoiseGit_en.xml:5904
msgid "Normally you will want to leave this option unchecked. TortoiseGit remembers the state of the checkbox, so it will respect your preference."
msgstr "Običajno boste to možnost pustili izklopljeno. TortoiseGit si zapomni stanje potrditvenih polj, tako da bo upošteval vaše nastavitve."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:5916
msgid "Note that Git currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked."
msgstr "Upoštevajte, da Git 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/TortoiseGit_en.xml:5875
msgid "The Log dialog does not always show all changes ever made for a number of reasons: <placeholder-1/>"
msgstr "Okno Dnevnik ne pokaže vedno vseh sprememb. Razlogi so naslednji: <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:5925
msgid "If you want to see more log messages, click the <guibutton>Next 100</guibutton> 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 <guibutton>Naslednjih 100</guibutton> in prikazalo se bo naslednjih 100 zapisov. Postopek lahko ponovite poljubno mnogokrat."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:5935
msgid "Use <guibutton>Show Range ...</guibutton> 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 <guibutton>Pokaži obseg...</guibutton>, če želite videti le določen obseg revizij. V okno boste vnesli začetno in končno revizijo."

#. (para)
#: ../source/TortoiseGit_en.xml:5940
msgid "Use <guibutton>Show All</guibutton> if you want to see <emphasis>all</emphasis> log messages from HEAD right back to revision 1."
msgstr "Uporabite gumb <guibutton>Prikaži vse</guibutton>, če želite videti <emphasis>vse</emphasis> dnevniške zapise od končne revizije HEAD do revizije 1."

#. (title)
#: ../source/TortoiseGit_en.xml:5946
msgid "Merge Tracking Features"
msgstr "Zmožnosti sledenja spajanja"

#. (primary)
#: ../source/TortoiseGit_en.xml:5948
msgid "merge tracking log"
msgstr "zapis sledenja spajanja"

#. (para)
#: ../source/TortoiseGit_en.xml:5950
msgid "Git 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development."
msgstr "Git 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/TortoiseGit_en.xml:5959
msgid "The Log Dialog Showing Merge Tracking Revisions"
msgstr "Dnevnik prikazuje sledenje spajanja revizij"

#. (para)
#: ../source/TortoiseGit_en.xml:5962
msgid "If you want to see the detail of which revisions were merged as part of that commit, use the <guilabel>Include merged revisions</guilabel> 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 <guilabel>Vključi spojene revizije</guilabel>. 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/TortoiseGit_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/TortoiseGit_en.xml:5980
msgid "Changing the Log Message and Author"
msgstr "Spreminjanje sporočila dnevniškega zapisa in avtorja"

#. (primary)
#: ../source/TortoiseGit_en.xml:5982
msgid "edit log/author"
msgstr "popravljanje zapisa/avtorja"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:5991
msgid "Git lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.reposadmin.create.html#svn.reposadmin.create.hooks\"><citetitle>Hook Scripts</citetitle></ulink> in the Git Book for details about how to do that. Read <xref linkend=\"tsvn-repository-hooks\"/> to find some further notes on implementing hooks on a Windows machine."
msgstr "Git 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 <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.reposadmin.create.html#svn.reposadmin.create.hooks\"><citetitle>Hook Scripts</citetitle></ulink> v knjiigi The Git Book, če želite izvedeti več o tem. Preberite <xref linkend=\"tsvn-repository-hooks\"/>, če želite informacije o nastavljanju ukaznih datotek akcij v operacijskem sistemu Windows."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:6010
msgid "Because Git's revision properties are not versioned, making modifications to such a property (for example, the <literal>svn:log</literal> commit message property) will overwrite the previous value of that property <emphasis>forever</emphasis>."
msgstr "Lastnosti revizij v sistemu Git so brez različic, zato bo sprememba lastnosti (n. pr. lastnost <literal>svn:log</literal> za sporočilo objave) <emphasis>za vedno</emphasis> prepisala predhodno vrednosti te lastnosti."

#. (title)
#: ../source/TortoiseGit_en.xml:6020
msgid "Filtering Log Messages"
msgstr "Filtriranje dnevniških zapisov"

#. (primary)
#: ../source/TortoiseGit_en.xml:6022
msgid "filter"
msgstr "filter"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:6033
msgid "Click on the search icon to select which information you want to search in, and to choose <emphasis>regex</emphasis> 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 <ulink url=\"http://www.regular-expressions.info/\"><citetitle>http://www.regular-expressions.info/</citetitle></ulink>."
msgstr "Kliknite na ikono za iskanje ter izberite, po kateri informaciji želite iskati, ter način iskanja <emphasis>regex</emphasis>. 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 <ulink url=\"http://www.regular-expressions.info/\"><citetitle>http://www.regular-expressions.info/</citetitle></ulink> pa sta na voljo dokumentacija in učbenik o regularnih izrazih."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:6049
msgid "You can also filter the path names in the bottom pane using the <guilabel>Hide unrelated changed paths</guilabel> 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 <guilabel>Skrij nepovezane spremenjene poti</guilabel>. 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/TortoiseGit_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 <literal>tsvn:logsummary</literal> can be used to extract a portion of the log message to be shown in the top pane. Read <xref linkend=\"tsvn-dug-propertypage-tsvn-props\"/> 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 <literal>tsvn:logsummary</literal> lahko uporabite, da izvlečete del besedila, ki se prikaže kot povzetek. Za več informacij o tej lastnosti reberite <xref linkend=\"tsvn-dug-propertypage-tsvn-props\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:6070
msgid "Statistical Information"
msgstr "Statistične informacije"

#. (primary)
#: ../source/TortoiseGit_en.xml:6072
msgid "statistics"
msgstr "statistika"

#. (para)
#: ../source/TortoiseGit_en.xml:6074
msgid "The <guibutton>Statistics</guibutton> 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 <guibutton>Statistika</guibutton> 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/TortoiseGit_en.xml:6083
msgid "Statistics Page"
msgstr "Statistika"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:6091
msgid "Commits by Author Page"
msgstr "Stran objav glede na avtorja"

#. (title)
#: ../source/TortoiseGit_en.xml:6094
msgid "Commits-by-Author Histogram"
msgstr "Histogram objav glede na avtorja"

#. (title)
#: ../source/TortoiseGit_en.xml:6101
msgid "Commits-by-Author Pie Chart"
msgstr "Potični graf objav glede na avtoja"

#. (para)
#: ../source/TortoiseGit_en.xml:6092
msgid "<placeholder-1/> This graph shows you which authors have been active on the project as a simple histogram, stacked histogram or pie chart. <placeholder-2/>"
msgstr "<placeholder-1/>  Ta graf prikazuje, kateri avtorji so bili aktivni na projektu v obliki preprostega histograma, zloženega stolpičnega diagrama ali potičnega diagrama. <placeholder-2/> "

#. (para)
#: ../source/TortoiseGit_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 <emphasis>Others</emphasis> 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 <emphasis>Ostali</emphasis>."

#. (title)
#: ../source/TortoiseGit_en.xml:6114
msgid "Commits by date Page"
msgstr "Objave po datumu"

#. (title)
#: ../source/TortoiseGit_en.xml:6117
msgid "Commits-by-date Graph"
msgstr "Objave po datumu"

#. (para)
#: ../source/TortoiseGit_en.xml:6115
msgid "<placeholder-1/> This page gives you a graphical representation of project activity in terms of number of commits <emphasis>and</emphasis> author. This gives some idea of when a project is being worked on, and who was working at which time."
msgstr "<placeholder-1/> Na tej strani je grafično prikazana projektna aktivnost: število objav <emphasis>in</emphasis> avtor. To vam pove, kdaj se na projektu dela in kdo je kdaj delal."

#. (para)
#: ../source/TortoiseGit_en.xml:6125
msgid "When there are several authors, you will get many lines on the graph. There are two views available here: <emphasis>normal</emphasis>, where each author's activity is relative to the base line, and <emphasis>stacked</emphasis>, 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: <emphasis>normalen</emphasis>, kjer je avtorjeva aktivnost relativna na osnovno linijo, in <emphasis>zložen</emphasis>, 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/TortoiseGit_en.xml:6135
msgid "By default the analysis is case-sensitive, so users <literal>PeterEgan</literal> and <literal>PeteRegan</literal> are treated as different authors. However, in many cases user names are not case-sensitive, and are sometimes entered inconsistently, so you may want <literal>DavidMorgan</literal> and <literal>davidmorgan</literal> to be treated as the same person. Use the <guilabel>Authors case insensitive</guilabel> checkbox to control how this is handled."
msgstr "Po privzetih nastavitvah je analiza občutljiva na male in velike črke, torej se uporabnika <literal>PeterEgan</literal> in <literal>PeteRegan</literal> 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 <literal>DavidMorgan</literal> in <literal>davidmorgan</literal> obravnavati kot isto osebo. Za nastavitev tega obnašanja uporabite potrditveno polje <guilabel>Za avtorje ni razlikovanja velikih/malih črk</guilabel>."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:6153
msgid "Offline Mode"
msgstr "Nepovezan način"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:6162
#: ../source/TortoiseGit_en.xml:9857
msgid "Refreshing the View"
msgstr "Osveževanje pogleda"

#. (para)
#: ../source/TortoiseGit_en.xml:6163
msgid "If you want to check the server again for newer log messages, you can simply refresh the view using <keycap>F5</keycap>. 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 <keycap>F5</keycap>. Č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 TortoiseGit poskušal vzpostaviti povezavo."

#. (para)
#: ../source/TortoiseGit_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 <keycap>Shift-F5</keycap> or <keycap>Ctrl-F5</keycap> 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  <keycap>Shift-F5</keycap> ali <keycap>Ctrl-F5</keycap>. Upoštevajte, da s tem osvežite le trenutno prikazana sporočila in ne celotnega predpomnilnika za trenutno skladišče."

#. (title)
#: ../source/TortoiseGit_en.xml:6182
msgid "Viewing Differences"
msgstr "Pregledovanje razlik"

#. (primary)
#. (primary)
#: ../source/TortoiseGit_en.xml:6184
#: ../source/TortoiseGit_en.xml:9033
msgid "diff"
msgstr "razlika"

#. (primary)
#: ../source/TortoiseGit_en.xml:6187
msgid "compare"
msgstr "primerjaj"

#. (para)
#: ../source/TortoiseGit_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. TortoiseGit provides a built-in tool named <application>TortoiseMerge</application> for viewing differences of text files. For viewing differences of image files, TortoiseGit also has a tool named <application>TortoiseIDiff</application>. 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. TortoiseGit vsebuje orodje <application>TortoiseMerge</application> za pregledovanje razlik besedilnih datotek. Za pregledovanje razlik grafičnih datotek TortoiseGit ponuja <application>TortoiseIDiff</application>. Seveda pa lahko uporabite tudi programe po lastni izbiri."

#. (title)
#: ../source/TortoiseGit_en.xml:6203
msgid "File Differences"
msgstr "Spremembe v datoteki"

#. (term)
#: ../source/TortoiseGit_en.xml:6206
msgid "Local changes"
msgstr "Krajevne spremembe"

#. (para)
#: ../source/TortoiseGit_en.xml:6208
msgid "If you want to see what changes <emphasis>you</emphasis> have made in your working copy, just use the explorer context menu and select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Diff</guimenuitem></menuchoice>."
msgstr "Če želite videti spremembe, ki ste jih naredili <emphasis>vi</emphasis>, uporabite kontekstni meni v Raziskovalcu in izberite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Razlikuj</guimenuitem></menuchoice>."

#. (term)
#: ../source/TortoiseGit_en.xml:6220
msgid "Difference to another branch/tag"
msgstr "Razlike v primerjavi z drugo vejo/oznako"

#. (para)
#: ../source/TortoiseGit_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 <keycap>Shift</keycap> key while you right click on the file. Then select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Diff with URL</guimenuitem></menuchoice>. 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 <keycap>Shift</keycap>. Potem izberite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Razlikuj z URL</guimenuitem></menuchoice>. V okno vnesite naslov URL skladišča, s katerim želite primerjati krajevno datoteko. "

#. (para)
#: ../source/TortoiseGit_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 <guimenuitem>Compare revisions</guimenuitem>. Read more in <xref linkend=\"tsvn-dug-compare-revs\"/>."
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 <guimenuitem>Primerjaj reviziji</guimenuitem>. Več o tem razloži <xref linkend=\"tsvn-dug-compare-revs\"/>."

#. (term)
#: ../source/TortoiseGit_en.xml:6245
msgid "Difference from a previous revision"
msgstr "Razlike v primerjavi s prejšnjo revizijo"

#. (para)
#: ../source/TortoiseGit_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 <guimenuitem>Compare with working copy</guimenuitem> 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 <guimenuitem>Primerjaj z delovno kopijo</guimenuitem>."

#. (para)
#: ../source/TortoiseGit_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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Diff with previous version</guimenuitem></menuchoice>. 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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Razlikuj s prejšno verzijo</guimenuitem></menuchoice>. 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/TortoiseGit_en.xml:6271
msgid "Difference between two previous revisions"
msgstr "Razlike med dvema prejšnjima razlikama"

#. (para)
#: ../source/TortoiseGit_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 <keycap>Ctrl</keycap>-modifier). Then select <guimenuitem>Compare revisions</guimenuitem> 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 <keycap>Ctrl</keycap>). Potem iz kontekstnega menija izberite <guimenuitem>Primerjaj reviziji</guimenuitem>."

#. (para)
#: ../source/TortoiseGit_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 <xref linkend=\"tsvn-dug-compare-revs\"/>."
msgstr "Če to storite v Dnevniku za mapo, potem pogovorno okno Primerjaj reviziji prikaže seznam spremenjenih datotek v mapi. Več o tem pove <xref linkend=\"tsvn-dug-compare-revs\"/>."

#. (term)
#: ../source/TortoiseGit_en.xml:6290
msgid "All changes made in a commit"
msgstr "Vse spremembe, narejeni pri objavi"

#. (para)
#: ../source/TortoiseGit_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 <guimenuitem>Show Differences as Unified-Diff</guimenuitem> 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 <guimenuitem>Prikaži razlike kot poenotene razlike</guimenuitem>."

#. (term)
#: ../source/TortoiseGit_en.xml:6306
msgid "Difference between files"
msgstr "Razlika med datotekami"

#. (para)
#: ../source/TortoiseGit_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 <keycap>Ctrl</keycap>-modifier). Then from the explorer context menu select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Diff</guimenuitem></menuchoice>."
msgstr "Če želite videti razlike med dvema različnima datotekama, lahko to storite neposredno iz Razskovalca, tako da izberete obe datoteki (z uporabo gumba  <keycap>Ctrl</keycap>). Potem iz kontekstnega menija Raziskovalca izberite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Razlikuj</guimenuitem></menuchoice>."

#. (term)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:6323
msgid "If you want to see the differences between a file in your working copy, and a file in any Git repository, you can do that directly in explorer by selecting the file then holding down the <keycap>Shift</keycap> key whilst right clicking to obtain the context menu. Select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Diff with URL</guimenuitem></menuchoice>. 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 Git, lahko to storite neposredno iz Raziskovalca. Izberite datoteko, pritisnite tipko <keycap>Shift</keycap> in desno kliknite, da se pojavi kontekstni meni. Izberite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Razlikuj z URL</guimenuitem></menuchoice>. 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/TortoiseGit_en.xml:6341
msgid "Difference with blame information"
msgstr "Razlike z informacijami o krivdi"

#. (para)
#: ../source/TortoiseGit_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 <xref linkend=\"tsvn-dug-blame-diffs\"/> 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 <xref linkend=\"tsvn-dug-blame-diffs\"/>."

#. (term)
#: ../source/TortoiseGit_en.xml:6352
msgid "Difference between folders"
msgstr "Razlika med mapama"

#. (para)
#: ../source/TortoiseGit_en.xml:6354
msgid "The built-in tools supplied with TortoiseGit do not support viewing differences between directory hierarchies. But if you have an external tool which does support that feature, you can use that instead. In <xref linkend=\"tsvn-dug-diff-tools\"/> we tell you about some tools which we have used."
msgstr "Orodja, ki jih dobite zraven programa TortoiseGit, ne omogočajo pregledovanja razlik med strukturami map. Če imate zunanje orodje, ki to omogoča, ga lahko uporabite. <xref linkend=\"tsvn-dug-diff-tools\"/> pove nekaj o orodjih, ki jih uporabljamo."

#. (para)
#: ../source/TortoiseGit_en.xml:6364
msgid "If you have configured a third party diff tool, you can use <keycap>Shift</keycap> when selecting the Diff command to use the alternate tool. Read <xref linkend=\"tsvn-dug-settings-progs\"/> to find out about configuring other diff tools."
msgstr "Če ste nastavili zunanje orodje za razlikovanje, lahko uporabite <keycap>Shift</keycap> ob izbiri ukaza Razlikuj in tako poženete zunanje orodje. O nastavljanju zunanjih orodij lahko več preberete v <xref linkend=\"tsvn-dug-settings-progs\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:6373
msgid "Line-end and Whitespace Options"
msgstr "Nastavitev zaključkov vrstic in presledkov"

#. (para)
#: ../source/TortoiseGit_en.xml:6374
msgid "Sometimes in the life of a project you might change the line endings from <literal>CRLF</literal> to <literal>LF</literal>, 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 <guilabel>Merge</guilabel> and <guilabel>Blame</guilabel> dialogs, as well as in the settings for TortoiseMerge."
msgstr "Med delom na projektu včasih zamenjate zaključke vrstic - namesto <literal>CRLF</literal> uporabite <literal>LF</literal>. 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 <guilabel>Spoji</guilabel> in <guilabel>Okrivi</guilabel>, prav tako pa tudi v nastavitvah programa TortoiseMerge."

#. (para)
#: ../source/TortoiseGit_en.xml:6385
msgid "<guilabel>Ignore line endings</guilabel> excludes changes which are due solely to difference in line-end style."
msgstr "Možnost <guilabel>Prezri zaključke vrstic</guilabel> izloči vse spremembe, ki so posledica sprememb zgolj zaradi različnih zaključkov vrstic."

#. (para)
#: ../source/TortoiseGit_en.xml:6389
msgid "<guilabel>Compare whitespaces</guilabel> includes all changes in indentation and inline whitespace as added/removed lines."
msgstr "Z možnostjo <guilabel>Primerjaj presledke</guilabel> povzročite, da so vse vrstice, ki vsebuje spremembe presledkov, prikazane kot dodane/odstranjene."

#. (para)
#: ../source/TortoiseGit_en.xml:6394
msgid "<guilabel>Ignore whitespace changes</guilabel> 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 <guilabel>Prezri razlike presledkov</guilabel> 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/TortoiseGit_en.xml:6402
msgid "<guilabel>Ignore all whitespaces</guilabel> excludes all whitespace-only changes."
msgstr "Možnost <guilabel>Prezri vse presledke</guilabel> izloči vse spremembe, ki so posledica spremembe presledkov."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:6412
msgid "Comparing Folders"
msgstr "Primerjanje map"

#. (primary)
#: ../source/TortoiseGit_en.xml:6414
msgid "compare revisions"
msgstr "primerjaj revizije"

#. (primary)
#: ../source/TortoiseGit_en.xml:6417
msgid "export changes"
msgstr "izvozi spremembe"

#. (title)
#: ../source/TortoiseGit_en.xml:6421
msgid "The Compare Revisions Dialog"
msgstr "Okno za primerjanje revizij"

#. (para)
#: ../source/TortoiseGit_en.xml:6419
msgid "<placeholder-1/> When you select two trees within the repository browser, or when you select two revisions of a folder in the log dialog, you can <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Compare revisions</guimenuitem></menuchoice>."
msgstr "<placeholder-1/> Ko v brskalniku po skladišču izberete dve drevesi ali ko izberete dve reviziji mape v dnevniku, lahko uporabite <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Primerjaj reviziji</guimenuitem></menuchoice>."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_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/TortoiseGit_en.xml:6441
msgid "If you want to export the list of files <emphasis>and</emphasis> the actions (modified, added, deleted) as well, you can do that using the keyboard shortcuts <keycap>Ctrl-A</keycap> to select all entries and <keycap>Ctrl-C</keycap> to copy the detailed list to the clipboard."
msgstr "Če želite izvoziti seznam datotek <emphasis>in</emphasis> dejanj (spremenjeno, dodano, zbrisano), lahko to storite z uporabo kombinacije <keycap>Ctrl-A</keycap> za izbiro vseh vnosov in <keycap>Ctrl-C</keycap> za kopiranje podrobnega seznama na odložišče."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_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/TortoiseGit_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 <filename>.c</filename> rather than <filename>*.c</filename>."
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 <filename>.c</filename> in ne <filename>*.c</filename>."

#. (title)
#: ../source/TortoiseGit_en.xml:6466
msgid "Diffing Images Using TortoiseIDiff"
msgstr "Razlikovanje slik z uporabo programa TortoiseIDiff"

#. (primary)
#: ../source/TortoiseGit_en.xml:6468
msgid "image diff"
msgstr "razlike slike"

#. (primary)
#: ../source/TortoiseGit_en.xml:6471
msgid "TortoiseIDiff"
msgstr "TortoiseIDiff"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:6480
msgid "The image difference viewer"
msgstr "Pregledovalnik razlik med slikami"

#. (para)
#: ../source/TortoiseGit_en.xml:6478
msgid "<placeholder-1/><menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Diff</guimenuitem></menuchoice> 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 "<placeholder-1/>Uporaba ukaza <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Razlikuj</guimenuitem></menuchoice> 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/TortoiseGit_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 <guilabel>Link images together</guilabel> 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 <guilabel>Poveži slike</guilabel>, so kontrole za premikanje (drsni trak, kolešček na miški) povezane."

#. (para)
#: ../source/TortoiseGit_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 <menuchoice><guimenu>View</guimenu><guimenuitem>Image Info</guimenuitem></menuchoice> 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 <menuchoice><guimenu>Pogled</guimenu><guimenuitem>Informacije o sliki</guimenuitem></menuchoice>. S tem okno skrijete. Iste informacije se prikažejo v namigu, če z miško mirujete v naslovni vrstici."

#. (para)
#: ../source/TortoiseGit_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. <keycap>Ctrl+Shift</keycap>-<action>Wheel</action> 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 <keycap>Ctrl-Shift</keycap>-<action>Zasuk miškinega koleščka</action>."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_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 <emphasis>XOR</emphasis> 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 <emphasis>ekskluzivni ALI</emphasis> barvnih vrednosti točk. Nespremenjena območja bodo bela, spremembe pa bodo obarvane."

#. (title)
#: ../source/TortoiseGit_en.xml:6535
msgid "External Diff/Merge Tools"
msgstr "Zunanja orodja za razlikovanje/spajanje"

#. (primary)
#: ../source/TortoiseGit_en.xml:6537
msgid "diff tools"
msgstr "orodja za razlikovanje"

#. (primary)
#: ../source/TortoiseGit_en.xml:6540
msgid "merge tools"
msgstr "orodja za spajanje"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:6550
msgid "WinMerge"
msgstr "WinMerge"

#. (para)
#: ../source/TortoiseGit_en.xml:6552
msgid "<ulink url=\"http://winmerge.sourceforge.net/\"><citetitle>WinMerge</citetitle></ulink> is a great open-source diff tool which can also handle directories."
msgstr "<ulink url=\"http://winmerge.sourceforge.net/\"><citetitle>WinMerge</citetitle></ulink> je odlično odprtokodno orodje za razlikovanje, ki zna delati tudi z mapami."

#. (term)
#: ../source/TortoiseGit_en.xml:6562
msgid "Perforce Merge"
msgstr "Perforce Merge"

#. (para)
#: ../source/TortoiseGit_en.xml:6564
msgid "Perforce is a commercial RCS, but you can download the diff/merge tool for free. Get more information from <ulink url=\"http://www.perforce.com/perforce/products/merge.html\"><citetitle>Perforce</citetitle></ulink>."
msgstr "Perforce je komercialna različica sistema RCS, vendar lahko njihovo orodje za razlikovanje uporabljate brezplačno. Za več informacij uporabite tole <ulink url=\"http://www.perforce.com/perforce/products/merge.html\"><citetitle>povezavo</citetitle></ulink>."

#. (term)
#: ../source/TortoiseGit_en.xml:6574
msgid "KDiff3"
msgstr "KDiff3"

#. (para)
#: ../source/TortoiseGit_en.xml:6576
msgid "KDiff3 is a free diff tool which can also handle directories. You can download it from <ulink url=\"http://kdiff3.sf.net/\"><citetitle>here</citetitle></ulink>."
msgstr "KDiff3 je brezplačno orodje za razlikovanje, ki zna delati z mapami. Dobite ga  <ulink url=\"http://kdiff3.sf.net/\"><citetitle>tukaj</citetitle></ulink>."

#. (term)
#: ../source/TortoiseGit_en.xml:6586
msgid "ExamDiff"
msgstr "ExamDiff"

#. (para)
#: ../source/TortoiseGit_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 <ulink url=\"http://www.prestosoft.com/\"><citetitle>PrestoSoft</citetitle></ulink>."
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 <ulink url=\"http://www.prestosoft.com/\"><citetitle>PrestoSoft</citetitle></ulink>."

#. (term)
#: ../source/TortoiseGit_en.xml:6603
msgid "Beyond Compare"
msgstr "Beyond Compare"

#. (para)
#: ../source/TortoiseGit_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 <ulink url=\"http://www.scootersoftware.com/\"><citetitle>Scooter Software</citetitle></ulink>."
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 <ulink url=\"http://www.scootersoftware.com/\"><citetitle>Scooter Software</citetitle></ulink>."

#. (term)
#: ../source/TortoiseGit_en.xml:6616
msgid "Araxis Merge"
msgstr "Araxis Merge"

#. (para)
#: ../source/TortoiseGit_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 <ulink url=\"http://www.araxis.com/merge/index.html\"><citetitle>Araxis</citetitle></ulink>."
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 <ulink url=\"http://www.araxis.com/merge/index.html\"><citetitle>Araxis</citetitle></ulink>."

#. (term)
#: ../source/TortoiseGit_en.xml:6630
msgid "SciTE"
msgstr "SciTE"

#. (para)
#: ../source/TortoiseGit_en.xml:6632
msgid "This text editor includes syntax colouring for unified diffs, making them much easier to read. Download it from <ulink url=\"http://www.scintilla.org/SciTEDownload.html\"><citetitle>Scintilla</citetitle></ulink>."
msgstr "Ta urejevalnik besedil uporablja barvno kodiranje za poenotene različice, kar precej olajša branje. Prevzamete ga lahko iz naslova <ulink url=\"http://www.scintilla.org/SciTEDownload.html\"><citetitle>Scintilla</citetitle></ulink>."

#. (term)
#: ../source/TortoiseGit_en.xml:6642
msgid "Notepad2"
msgstr "Notepad2"

#. (para)
#: ../source/TortoiseGit_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 <ulink url=\"http://www.flos-freeware.ch/notepad2.html\"><citetitle>here</citetitle></ulink>."
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 <ulink url=\"http://www.flos-freeware.ch/notepad2.html\"><citetitle>avtorjeve strani</citetitle></ulink>."

#. (para)
#: ../source/TortoiseGit_en.xml:6657
msgid "Read <xref linkend=\"tsvn-dug-settings-progs\"/> for information on how to set up TortoiseGit to use these tools."
msgstr "Preberite <xref linkend=\"tsvn-dug-settings-progs\"/>, če želite izvedeti več o uporabi teh orodij."

#. (title)
#: ../source/TortoiseGit_en.xml:6664
msgid "Adding New Files And Directories"
msgstr "Dodajanje novih datotek in map"

#. (primary)
#: ../source/TortoiseGit_en.xml:6666
msgid "add"
msgstr "dodaj"

#. (primary)
#: ../source/TortoiseGit_en.xml:6669
msgid "version new files"
msgstr "poglej nove datoteke"

#. (title)
#. (title)
#: ../source/TortoiseGit_en.xml:6674
#: ../source/TortoiseGit_en.xml:6842
msgid "Explorer context menu for unversioned files"
msgstr "Kontekstni menu v Raziskovalcu za datoteke brez različic"

#. (para)
#: ../source/TortoiseGit_en.xml:6672
msgid "<placeholder-1/> 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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Add</guimenuitem></menuchoice>."
msgstr "<placeholder-1/> Če ste med razvojem ustvarili nove datoteke in/ali mape, jih morate dodati v nadzor različic. Izberite datoteke in map in uporabite ukaz <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Dodaj</guimenuitem></menuchoice>."

#. (para)
#: ../source/TortoiseGit_en.xml:6686
msgid "After you added the files/directories to source control the file appears with a <literal>added</literal> 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 <emphasis>not</emphasis> affect the repository!"
msgstr "Potem ko ste datoteke/mape dodali v nadzor različic, so označene z ikono <literal>dodano</literal>, kar pomeni, da morate delovno kopijo objaviti, preden so dodane datoteke/mape na razplago ostalim uporabnikom. Zgolj dodajanje datoteke/mape <emphasis>ne</emphasis> vpliva na skladišče!"

#. (title)
#: ../source/TortoiseGit_en.xml:6695
msgid "Many Adds"
msgstr "Veliko dodanih elementov"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:6709
msgid "select the files you want to add"
msgstr "izberite datoteke, ki jih želite dodati"

#. (para)
#. (para)
#: ../source/TortoiseGit_en.xml:6714
#: ../source/TortoiseGit_en.xml:7158
msgid "<action>right-drag</action> them to the new location inside the working copy"
msgstr "povlecite jih <action>z desnim miškinim gumbom</action> na novo mesto znotraj delovne kopije"

#. (para)
#. (para)
#: ../source/TortoiseGit_en.xml:6720
#: ../source/TortoiseGit_en.xml:7164
msgid "release the right mouse button"
msgstr "sprostite gumb miške"

#. (para)
#: ../source/TortoiseGit_en.xml:6725
msgid "select <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>SVN Add files to this WC</guimenuitem></menuchoice>. The files will then be copied to the working copy and added to version control."
msgstr "izberite <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>SVN - Dodaj datoteke v to delovno kopijo</guimenuitem></menuchoice>. S tem datoteke prekopirate v delovno kopijo in jih dodate v nadzor različic."

#. (para)
#: ../source/TortoiseGit_en.xml:6704
msgid "To add files from outside your working copy you can use the drag-and-drop handler: <placeholder-1/>"
msgstr "Če želite dodati datoteke, ki se ne nahajajo v delovni kopiji, uporabite metodo povleci in spusti: <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:6741
msgid "If you add a file or folder by mistake, you can undo the addition before you commit using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Undo add...</guimenuitem></menuchoice>."
msgstr "Če datoteko ali mapo dodate po pomoti, lahko dodajanje pred objavo prekličete z ukazom <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Prekliči dodajanje...</guimenuitem></menuchoice>."

#. (title)
#: ../source/TortoiseGit_en.xml:6751
msgid "Copying/Moving/Renaming Files and Folders"
msgstr "Kopiranje/premikanje/preimenovanje obstoječih datotek in map"

#. (primary)
#: ../source/TortoiseGit_en.xml:6753
msgid "copy files"
msgstr "kopiraj datoteke"

#. (primary)
#: ../source/TortoiseGit_en.xml:6756
msgid "rename files"
msgstr "preimenuj datoteke"

#. (primary)
#: ../source/TortoiseGit_en.xml:6759
msgid "move files"
msgstr "premakni datoteke"

#. (primary)
#. (primary)
#: ../source/TortoiseGit_en.xml:6762
#: ../source/TortoiseGit_en.xml:7979
msgid "branch"
msgstr "veja"

#. (primary)
#. (primary)
#: ../source/TortoiseGit_en.xml:6765
#: ../source/TortoiseGit_en.xml:7982
msgid "tag"
msgstr "oznaka"

#. (para)
#: ../source/TortoiseGit_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 Git."
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 Git."

#. (para)
#: ../source/TortoiseGit_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 <action>right-drag</action> 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. <placeholder-1/> 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 <action>povlečete z desnim miškinim gumbom</action> iz ene delovne kopije v drugo, ali pa celo znotraj iste mape, se ob sprostitvi miškinega gumba prikaže kontekstni meni. <placeholder-1/> Sedaj lahko obstoječe elemente pod nadzorom prekopirate na drugo lokacijo in jih po potrebi istočasno preimenujete."

#. (para)
#: ../source/TortoiseGit_en.xml:6787
msgid "You can copy files and folders from your working copy to another location in the repository using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Branch/Tag</guimenuitem></menuchoice>. Refer to <xref linkend=\"tsvn-dug-branch-1\"/> to find out more."
msgstr "Datoteke in mape lahko prekopirate na drugo lokacijo v skladišču z uporabo ukaza <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Veja/oznaka</guimenuitem></menuchoice>. Preberite <xref linkend=\"tsvn-dug-branch-1\"/>."

#. (para)
#: ../source/TortoiseGit_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 <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Create branch/tag from revision</guimenuitem></menuchoice>. Refer to <xref linkend=\"tsvn-dug-showlog-2\"/> 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 <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Ustvari vejo/oznako iz revizije</guimenuitem></menuchoice>. Za več informacij preberite <xref linkend=\"tsvn-dug-showlog-2\"/>."

#. (para)
#: ../source/TortoiseGit_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 <xref linkend=\"tsvn-dug-repobrowser\"/> 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 <xref linkend=\"tsvn-dug-repobrowser\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:6813
msgid "Cannot copy between repositories"
msgstr "Kopiranje med skladišči ni mogoče"

#. (para)
#: ../source/TortoiseGit_en.xml:6814
msgid "Whilst you can copy and files and folders <emphasis>within</emphasis> a repository, you <emphasis>cannot</emphasis> copy or move from one repository to another while preserving history using TortoiseGit. Not even if the repositories live on the same server. All you can do is copy the content in its current state and add it as new content to the second repository."
msgstr "Kopiranje datotek in map <emphasis>znotraj</emphasis> skladišča je mogoče, kopiranje ali premikanje elementov med različnimi skladišči pa <emphasis>ne</emphasis>. 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/TortoiseGit_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/TortoiseGit_en.xml:6832
msgid "Ignoring Files And Directories"
msgstr "Dodajanje datotek in map na seznam prezrtih elementov"

#. (primary)
#: ../source/TortoiseGit_en.xml:6834
msgid "ignore"
msgstr "prezri"

#. (primary)
#: ../source/TortoiseGit_en.xml:6837
msgid "unversioned files/folders"
msgstr "datoteke/mape brez različic"

#. (para)
#: ../source/TortoiseGit_en.xml:6840
msgid "<placeholder-1/> 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, <filename>*.obj, *.lst</filename>, maybe an output folder used to store the executable. Whenever you commit changes, TortoiseGit shows your unversioned files, which fills up the file list in the commit dialog. Of course you can turn off this display, but then you might forget to add a new source file."
msgstr "<placeholder-1/> V večini projektov obstajajo datoteke in mape, ki jih ne dajemo pod nadzor različic. To so datoteke, ki jih naredi prevajalnik (<filename>*.obj, *.lst</filename>), mape, kamor se shranjujejo izvršne datoteke. Ko objavljate spremembe, TortoiseGit 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/TortoiseGit_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/TortoiseGit_en.xml:6859
msgid "If you <action>right click</action> on a single unversioned file, and select the command <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Add to Ignore List</guimenuitem></menuchoice> 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 <action>desno kliknete</action> na posamezno datoteko brez različic in iz kontekstnega menija izberete ukaz <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Dodaj na seznam prezrtih</guimenuitem></menuchoice>, 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/TortoiseGit_en.xml:6871
msgid "If you want to remove one or more items from the ignore list, <action>right click</action> on those items and select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Remove from Ignore List</guimenuitem></menuchoice> You can also access a folder's <literal>svn:ignore</literal> property directly. That allows you to specify more general patterns using filename globbing, described in the section below. Read <xref linkend=\"tsvn-dug-propertypage\"/> 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, <action>desno kliknite</action> na elemente in izberite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Odstrani s seznama prezrtih</guimenuitem></menuchoice> Dostopate pa lahko tudi neposredno do lastnosti <literal>svn:ignore</literal> 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 <xref linkend=\"tsvn-dug-propertypage\"/>. Upoštevajte, da je vsak vzorec za prezrte datoteke potrebno vpisati v svojo vrstico. Ločevanje s presledki ne deluje."

#. (title)
#: ../source/TortoiseGit_en.xml:6886
msgid "The Global Ignore List"
msgstr "Splošni seznam prezrtih elementov"

#. (para)
#: ../source/TortoiseGit_en.xml:6887
msgid "Another way to ignore files is to add them to the <firstterm>global ignore list</firstterm>. The big difference here is that the global ignore list is a client property. It applies to <emphasis>all</emphasis> Git projects, but on the client PC only. In general it is better to use the <filename>svn:ignore</filename> property where possible, because it can be applied to specific project areas, and it works for everyone who checks out the project. Read <xref linkend=\"tsvn-dug-settings-main\"/> for more information."
msgstr "Drug način, kako prezreti datoteke, je dodajanje na <firstterm>splošni seznam prezrtih elementov</firstterm>. Razlika je v tem, da je splošen seznam lastnost odjemalca. Velja za <emphasis>vse</emphasis> projekte v sistemu Git, vendar le na računalniku, kjer je nameščen odjemalec. Kjer je to le mogoče, je v splošnem bolje uporabiti lastnost <filename>svn:ignore</filename>, ker jo lahko nastavimo na določene dele projekta, poleg tega pa velja za vse uporabnike, ki prevzamejo projekt. Za več informacij preberite <xref linkend=\"tsvn-dug-settings-main\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:6900
msgid "Ignoring Versioned Items"
msgstr "Dodajanje elementov pod nadzorom različic na seznam prezrtih"

#. (para)
#: ../source/TortoiseGit_en.xml:6901
msgid "Versioned files and folders can never be ignored - that's a feature of Git. If you versioned a file by mistake, read <xref linkend=\"tsvn-howto-unversion\"/> for instructions on how to <quote>unversion</quote> it."
msgstr "Datotek in map pod nadzorom različic ni mogoče prezreti. Če ste dali datoteko pod nadzor različic po pomoti, preberite <xref linkend=\"tsvn-howto-unversion\"/>, kjer je opisano, kako jo iz sistema nadzora <quote>odstranite</quote>."

#. (title)
#: ../source/TortoiseGit_en.xml:6909
msgid "Pattern Matching in Ignore Lists"
msgstr "Iskanje vzorcev v seznamu prezrtih elementov"

#. (primary)
#: ../source/TortoiseGit_en.xml:6911
msgid "globbing"
msgstr "vzorci"

#. (primary)
#: ../source/TortoiseGit_en.xml:6914
msgid "pattern matching"
msgstr "iskanje vzorcev"

#. (term)
#: ../source/TortoiseGit_en.xml:6923
msgid "*"
msgstr "*"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:6932
msgid "?"
msgstr "?"

#. (para)
#: ../source/TortoiseGit_en.xml:6934
msgid "Matches any single character."
msgstr "Poišče katerikoli znak."

#. (term)
#: ../source/TortoiseGit_en.xml:6940
msgid "[...]"
msgstr "[...]"

#. (para)
#: ../source/TortoiseGit_en.xml:6942
msgid "Matches any one of the characters enclosed in the square brackets. Within the brackets, a pair of characters separated by <quote>-</quote> matches any character lexically between the two. For example <literal>[AGm-p]</literal> matches any one of <literal>A</literal>, <literal>G</literal>, <literal>m</literal>, <literal>n</literal>, <literal>o</literal> or <literal>p</literal>."
msgstr "Poišče katerikoli znak, ki je podan v oglatem oklepaju. Par znakov znotraj oklepajev, ločen z <quote>-</quote>, pomeni katerikoli znak med tema dvema znakoma. Primer: <literal>[AGm-p]</literal> išče kateregakoli izmed naslednjih znakov:  <literal>A</literal>, <literal>G</literal>, <literal>m</literal>, <literal>n</literal>, <literal>o</literal> ali <literal>p</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:6916
msgid "Git's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: <placeholder-1/>"
msgstr "Iskanje vzorcev v sistemu Git uporablja tehniko, ki izvira iz sistema Unix in se uporablja za določanje datotek z uporabo meta-znakov. Naslednji znaki imajo poseben pomen: <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:6956
msgid "Git uses the <literal>/</literal> 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 <literal>/</literal>, and not the Windows backslash."
msgstr "Git v vseh notranjih imenih poti uporablja znak <literal>/</literal> 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 <literal>/</literal> in ne <literal>\\</literal>, ki se uporablja v sistemu Windows."

#. (para)
#: ../source/TortoiseGit_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 <literal>*.tmp</literal> regardless of case, you could use a pattern like <literal>*.[Tt][Mm][Pp]</literal>."
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 <literal>*.tmp</literal> ne glede na uporabo velikih in malih črk uporabite vzorec <literal>*.[Tt][Mm][Pp]</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:6969
msgid "Git uses this pattern matching against every path presented to it for action. These paths are generally relative to the directory being acted upon for import, add, commit, etc. The matching pattern therefore has to take account of the fact that there may or may not be path components before the filename."
msgstr "Git 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/TortoiseGit_en.xml:6976
msgid "If directory names are present in a path, the matching algorithm will not trim them off, so pattern <literal>Fred.*</literal> will match <literal>Fred.c</literal> but not <literal>subdir/Fred.c</literal>. This is significant if you add a folder which contains some files that you want to be ignored, because those filenames will be preceded with the folder name when Git compares them with the ignore pattern."
msgstr "Če je v imenu datoteke navedena tudi pot, je algoritem za iskanje vzorcev ne bo odrezal. Vzorec <literal>Fred.*</literal> bo našel niz <literal>Fred.c</literal>, ne pa tudi niza <literal>subdir/Fred.c</literal>. 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/TortoiseGit_en.xml:6985
msgid "The <literal>/</literal> character is not treated in any special way for pattern matching purposes, so the pattern <literal>abc*xyz</literal> would match <literal>abcdxyz</literal> but also <literal>abcdir/subdir/anything/morexyz</literal>."
msgstr "Znak <literal>/</literal> pri iskanju vzorcev nima posebnega pomena, tako da vzorec <literal>abc*xyz</literal> najde tako <literal>abcdxyz</literal> kot tudi <literal>abcmapa/podmapa/nekaj/šenekajxyz</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:6991
msgid "To ignore all <literal>CVS</literal> folders you should either specify a pattern of <literal>*CVS</literal> or better, the pair <literal>CVS */CVS</literal>. The first option works, but would also exclude something called <literal>ThisIsNotCVS</literal>. Using <literal>*/CVS</literal> alone will not work on an immediate child <literal>CVS</literal> folder, and <literal>CVS</literal> alone will not work on sub-folders."
msgstr "Za dodajanje vseh map <literal>CVS</literal> na seznam uporabite vzorec <literal>*CVS</literal> ali še bolje: par <literal>CVS */CVS</literal>. Prva možnost sicer deluje, vendar preskoči naprimer element <literal>ToNiCVS</literal>. Samo uporaba vzorca <literal>*/CVS</literal> ne deluje na neposrednih podmapah, samo uporaba vzorca <literal>CVS</literal> pa ne deluje na podmapah."

#. (para)
#: ../source/TortoiseGit_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 <ulink url=\"http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_13\"><citetitle>Pattern Matching Notation</citetitle></ulink>."
msgstr "Če vas zanima uradna definicija iskanja vzorcev v datotekah, jo najdete v Specifikaciji IEEE za ukaze lupine <ulink url=\"http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_13\"><citetitle>Pattern Matching Notation</citetitle></ulink>."

#. (title)
#: ../source/TortoiseGit_en.xml:7010
msgid "Deleting, Moving and Renaming"
msgstr "Brisanje, preimenovanje in premikanje"

#. (title)
#: ../source/TortoiseGit_en.xml:7016
msgid "Explorer context menu for versioned files"
msgstr "Konteksni meni v Raziskovalcu za datotek pod nadzorom različic"

#. (para)
#: ../source/TortoiseGit_en.xml:7011
msgid "Unlike CVS, Git allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. <placeholder-1/>"
msgstr "V nasprotju s sistemom CVS Git dovoljuje preimenovanje in premikanje datotek in map. Zato se v podmeniju TortoiseGit nahajajo ukazi za brisanje in preimenovanje. <placeholder-1/>"

#. (title)
#: ../source/TortoiseGit_en.xml:7021
msgid "Deleting files and folders"
msgstr "Brisanje datotek in map"

#. (primary)
#: ../source/TortoiseGit_en.xml:7023
msgid "delete"
msgstr "izbriši"

#. (primary)
#: ../source/TortoiseGit_en.xml:7026
msgid "remove"
msgstr "odstrani"

#. (para)
#: ../source/TortoiseGit_en.xml:7028
msgid "Use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Delete</guimenuitem></menuchoice> to remove files or folders from Git."
msgstr "Za brisanje datotek ali map iz sistema Git uporabite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Izbriši</guimenuitem></menuchoice>."

#. (para)
#: ../source/TortoiseGit_en.xml:7036
msgid "When you <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Delete</guimenuitem></menuchoice> 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 <quote>deleted</quote> icon overlay. Up until you commit the change, you can get the file back using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Revert</guimenuitem></menuchoice> on the parent folder."
msgstr "Ko uporabite ukaz <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Izbriši</guimenuitem></menuchoice> 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 <quote>izbrisano</quote>. Dokler sprememb ne objavite, lahko izbrisano datoteko pridobite nazaj z uporabo ukaza <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Povrni</guimenuitem></menuchoice>, ki ga izvedete na nadrejeni mapi."

#. (para)
#: ../source/TortoiseGit_en.xml:7052
msgid "When you <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Delete</guimenuitem></menuchoice> 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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Revert</guimenuitem></menuchoice> on the folder itself. This difference in behaviour between files and folders is a part of Git, not TortoiseGit."
msgstr "Ko uporabite ukaz <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Izbriši</guimenuitem></menuchoice> 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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Povrni</guimenuitem></menuchoice> na mapi sami. Vzrok za razliko pri obnašanju je v delovnaju sistema Git, ne sistema TortoiseGit."

#. (para)
#: ../source/TortoiseGit_en.xml:7069
msgid "If you want to delete an item from the repository, but keep it locally as an unversioned file/folder, use <menuchoice><guimenu>Extended Context Menu</guimenu><guimenuitem>Delete (keep local)</guimenuitem></menuchoice>. You have to hold the <keycap>Shift</keycap> 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 <menuchoice><guimenu>Razširjeni kontekstni meni</guimenu><guimenuitem>Izbriši (ohrani krajevno)</guimenuitem></menuchoice>. Za prikaz razširjenega kontekstnega menija morate držati tipko <keycap>Shift</keycap> ob desnem kliku na element v Raziskovalcu."

#. (para)
#: ../source/TortoiseGit_en.xml:7080
msgid "If a <emphasis>file</emphasis> is deleted via the explorer instead of using the TortoiseGit context menu, the commit dialog shows those files and lets you remove them from version control too before the commit. However, if you update your working copy, Git will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Delete</guimenuitem></menuchoice> so that Git doesn't have to guess what you really want to do."
msgstr "Če <emphasis>datoteko</emphasis> izbrišete iz Raziskovalca, namesto da bi uporabili ukaz iz kontekstnega menija TortoiseGit, 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 Git 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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Izbriši</guimenuitem></menuchoice>, da sistemu Git ne bo potrebno ugibati, kaj pravzaprav želite."

#. (para)
#: ../source/TortoiseGit_en.xml:7094
msgid "If a <emphasis>folder</emphasis> is deleted via the explorer instead of using the TortoiseGit context menu, your working copy will be broken and you will be unable to commit. If you update your working copy, Git will replace the missing folder with the latest version from the repository and you can then delete it the correct way using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Delete</guimenuitem></menuchoice>."
msgstr "Če <emphasis>mapo</emphasis> izbrišete iz Raziskovalca, namesto da bi uporabili ukaz iz kontekstnega menija TortoiseGit, bo vaša delovna kopija pokvarjena in sprememb ne boste mogli objavljati. Če delovno kopijo posodobite, bo Git manjkajočo mapo nadomestil z najnovejšo različico mape iz skladišča. Potem jo lahko izbrišete na pravilen način z ukazom <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Izbriši</guimenuitem></menuchoice>."

#. (title)
#: ../source/TortoiseGit_en.xml:7107
msgid "Getting a deleted file or folder back"
msgstr "Kako dobiti nazaj izbrisane datoteke ali mape"

#. (para)
#: ../source/TortoiseGit_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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Revert</guimenuitem></menuchoice> 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 <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Copy to...</guimenuitem></menuchoice> 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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Povrni</guimenuitem></menuchoice>, 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 <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Kopiraj v...</guimenuitem></menuchoice>, kot cilj kopiranja pa izberite pot v delovni kopiji."

#. (title)
#: ../source/TortoiseGit_en.xml:7130
msgid "Moving files and folders"
msgstr "Premikanje datotek in map"

#. (primary)
#. (primary)
#. (primary)
#: ../source/TortoiseGit_en.xml:7132
#: ../source/TortoiseGit_en.xml:9403
#: ../source/TortoiseGit_en.xml:13011
msgid "rename"
msgstr "preimenuj"

#. (primary)
#: ../source/TortoiseGit_en.xml:7135
msgid "move"
msgstr "premakni"

#. (para)
#: ../source/TortoiseGit_en.xml:7138
msgid "If you want to do a simple in-place rename of a file or folder, use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Rename...</guimenuitem></menuchoice> Enter the new name for the item and you're done."
msgstr "Če želite datoteko preimenovati, uporabite <menuchoice><guimenu>Kontekstni meni </guimenu><guimenuitem>Preimenuj...</guimenuitem></menuchoice> Vpišite novo ime za element in preimenovanje je opravljeno."

#. (para)
#: ../source/TortoiseGit_en.xml:7153
msgid "select the files or directories you want to move"
msgstr "izberite datoteke ali mape, ki jih želite premakniti"

#. (para)
#: ../source/TortoiseGit_en.xml:7169
msgid "in the popup menu select <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>SVN Move versioned files here</guimenuitem></menuchoice>"
msgstr "v meniju izberite <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>SVN - Premakni datoteke pod nadzorom sem</guimenuitem></menuchoice>"

#. (para)
#: ../source/TortoiseGit_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: <placeholder-1/>"
msgstr "Če želite datoteke premakniti znotraj delovne kopije, naprimer v drugo podmapo, uporabite poteg z desnim miškinim gumbom: <placeholder-1/>"

#. (title)
#: ../source/TortoiseGit_en.xml:7180
msgid "Commit the parent folder"
msgstr "Objavi nadrejeno mapo"

#. (para)
#: ../source/TortoiseGit_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 <emphasis>both</emphasis> 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 <emphasis>obe</emphasis> datoteki - tako novo kot staro."

#. (para)
#: ../source/TortoiseGit_en.xml:7191
msgid "You <emphasis>must</emphasis> 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 <emphasis>morate</emphasis> objaviti preden začnete spreminjati njeno vsebino, v nasprotnem primeru lahko lahko pride do okvare delovne kopije."

#. (para)
#: ../source/TortoiseGit_en.xml:7197
msgid "You can also use the repository browser to move items around. Read <xref linkend=\"tsvn-dug-repobrowser\"/> to find out more."
msgstr "Za premikanje elementov lahko uporabite tudi brskalnik po skladišču.  Za več informacij preberite <xref linkend=\"tsvn-dug-repobrowser\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:7202
msgid "Do Not SVN Move Externals"
msgstr "Zunanjih elementov ne premikajte z ukazi Git"

#. (para)
#: ../source/TortoiseGit_en.xml:7203
msgid "You should <emphasis>not</emphasis> use the TortoiseGit <guilabel>Move</guilabel> or <guilabel>Rename</guilabel> commands on a folder which has been created using <literal>svn:externals</literal>. 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 <literal>svn:externals</literal> properties of the source and destination parent folders."
msgstr "Ukazov <guilabel>Premakni</guilabel> in <guilabel>Preimenuj</guilabel> <emphasis>ne</emphasis> uporabljajte na mapah, ki imajo nastavljeno lastnost <literal>svn:externals</literal>. 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 <literal>svn:externals</literal> nadrejenih map vira in cilja."

#. (title)
#: ../source/TortoiseGit_en.xml:7218
msgid "Changing case in a filename"
msgstr "Spreminjanje velikih in malih črk v imenih datotek"

#. (primary)
#: ../source/TortoiseGit_en.xml:7220
msgid "case change"
msgstr "spremembe velikih in malih črk"

#. (para)
#: ../source/TortoiseGit_en.xml:7223
msgid "Making case-only changes to a filename is tricky with Git on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command."
msgstr "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/TortoiseGit_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 Git. 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 Git. Preimenovanje v Raziskovalcu pokvari delovno kopijo!"

#. (para)
#: ../source/TortoiseGit_en.xml:7239
msgid "Commit the changes in your working copy."
msgstr "Objavite spremembe v delovni kopiji."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:7250
msgid "Update your working copy."
msgstr "Posodobite delovno kopijo"

#. (para)
#: ../source/TortoiseGit_en.xml:7235
msgid "Solution A) (recommended) <placeholder-1/>"
msgstr "Rešitev A) (priporočena) <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:7260
msgid "Rename from UPPERcase to UPPERcase_ with the rename command in the TortoiseGit submenu."
msgstr "Preimenujte datoteko, tako da uporabite ukaz Preimenuj iz kontekstnega menija TortoiseGit. Novo ime naj bo enako staremu, dodajte mu le znak _ na koncu."

#. (para)
#. (para)
#: ../source/TortoiseGit_en.xml:7266
#: ../source/TortoiseGit_en.xml:7276
msgid "Commit the changes."
msgstr "Objavite spremembe"

#. (para)
#: ../source/TortoiseGit_en.xml:7271
msgid "Rename from UPPERcase_ to upperCASE."
msgstr "Preimenujte datoteko (zamenjajte ustrezne velike in male črke)."

#. (para)
#: ../source/TortoiseGit_en.xml:7256
msgid "Solution B) <placeholder-1/>"
msgstr "Rešitev B) <placeholder-1/>"

#. (title)
#: ../source/TortoiseGit_en.xml:7284
msgid "Dealing with filename case conflicts"
msgstr "Obravnava težav pri imenih datotek zaradi velikih in malih črk"

#. (para)
#: ../source/TortoiseGit_en.xml:7285
msgid "If the repository already contains two files with the same name but differing only in case (e.g. <filename>TEST.TXT</filename> and <filename>test.txt</filename>), you will not be able to update or checkout the parent directory on a Windows client. Whilst Git supports case-sensitive filenames, Windows does not."
msgstr "Če se v skladišču že nahajata dve datoteki, ki se razlikujeta samo v velikih in malih črkah (n. pr. <filename>TEST.TXT</filename> in <filename>test.txt</filename>), mape, kjer se ti dve datoteki nahajata, na sistemu Windows ne morete posodobiti ali prevzeti. Git namreč omogoča ločevanje imen, ki se razlikujejo samo v velikih in malih črkah, sistem Windows pa ne."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_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/TortoiseGit_en.xml:7305
msgid "Preventing two files with the same name"
msgstr "Kako preprečiti dve datoteki z enakima imenoma"

#. (para)
#: ../source/TortoiseGit_en.xml:7306
msgid "There is a server hook script available at: <ulink url=\"http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/\"><citetitle>http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/</citetitle></ulink> that will prevent checkins which result in case conflicts."
msgstr "Na naslovu <ulink url=\"http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/\"><citetitle>http://svn.collab.net/repos/svn/trunk/contrib/hook-scripts/</citetitle></ulink> je na razpolago ukazna datoteka akcije, ki prepreči objave, ki vodijo do spora zaradi velikih in malih črk."

#. (title)
#: ../source/TortoiseGit_en.xml:7316
msgid "Repairing File Renames"
msgstr "Popravljanje preimenovanj datotek"

#. (para)
#: ../source/TortoiseGit_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 Git. If you try to commit your changes, Git will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Git does not know the files are related."
msgstr "Včasih vaše prijazno razvojno orodje preimenuje datoteke kot del refaktoriranja in seveda tega ne pove sistemu Git. Č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 Git ne ve, da sta datoteki povezani."

#. (para)
#: ../source/TortoiseGit_en.xml:7325
msgid "A better way is to notify Git that this change is actually a rename, and you can do this within the <guilabel>Commit</guilabel> and <guilabel>Check for Modifications</guilabel> dialogs. Simply select both the old name (missing) and the new name (unversioned) and use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Repair Move</guimenuitem></menuchoice> to pair the two files as a rename."
msgstr "Boljši način je, da sistemu Git poveste, da gre v tem primeru dejansko za preimenovanje datoteke in sicer lahko to storite v oknih <guilabel>Objavi</guilabel> in <guilabel>Preveri posodobitve</guilabel>. Enostavno izberite tako staro datoteko (manjkajočo) kot novo (brez različic) in uporabite <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Popravi premik</guimenuitem></menuchoice>. S tem datoteki povežete v preimenovanje."

#. (title)
#: ../source/TortoiseGit_en.xml:7339
msgid "Deleting Unversioned Files"
msgstr "Brisanje datotek brez različic"

#. (para)
#: ../source/TortoiseGit_en.xml:7340
msgid "Usually you set your ignore list such that all generated files are ignored in Git. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks."
msgstr "Običajno nastavite sezname prezrtih elementov v sistemu v Git 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/TortoiseGit_en.xml:7347
msgid "TortoiseGit provides just such an option using <menuchoice><guimenu>Extended Context Menu</guimenu><guimenuitem>Delete unversioned items...</guimenuitem></menuchoice>. You have to hold the <keycap>Shift</keycap> while right clicking on a folder in the explorer list pane (right pane) in order to see this in the extended context menu. This will produce a dialog which lists all unversioned files anywhere in your working copy. You can then select or deselect items to be removed."
msgstr "TortoiseGit vam ponuja to možnost z uporabo ukaza <menuchoice><guimenu>Razširjeni kontekstni meni</guimenu><guimenuitem>Izbriši datoteke brez različic...</guimenuitem></menuchoice>. Da vidite razširjeni kontekstni meni, med desnim klikom na mapo v Raziskovalcu držite pritisnjeno tipko <keycap>Shift</keycap>. Prikazalo se bo pogovorno okno s seznamom vseh datotek brez različic v delovni kopiji. Izberete lahko tiste, ki jih želite izbrisati."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:7367
msgid "Undo Changes"
msgstr "Razveljavljanje sprememb"

#. (primary)
#. (primary)
#: ../source/TortoiseGit_en.xml:7369
#: ../source/TortoiseGit_en.xml:13139
msgid "revert"
msgstr "povrni"

#. (primary)
#: ../source/TortoiseGit_en.xml:7372
msgid "undo"
msgstr "razveljavi"

#. (title)
#: ../source/TortoiseGit_en.xml:7387
msgid "Revert dialog"
msgstr "Okno za povrnitev"

#. (para)
#: ../source/TortoiseGit_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, <action>right click</action> to pop up the context menu and then select the command <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Revert</guimenuitem></menuchoice> 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 <guibutton>OK</guibutton>. <placeholder-1/>"
msgstr "Če želite v datoteki povrniti vse spremembe, ki ste jih naredili od zadnje posodobitve, <action>desno kliknite</action>, da se pojavi kontekstni meni in izberite ukaz <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Povrni</guimenuitem></menuchoice> Pojavi se pogovorno okno s seznamom vseh spremenjenih datotek, ki jih lahko povrnete. Izberite tiste, ki jih želite povrniti in kliknite na gumb <guibutton>V redu</guibutton>. <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:7396
msgid "If you want to undo the addition of an item, this appears in the context menu as <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Undo add...</guimenuitem></menuchoice>. 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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Prekliči dodajanje...</guimenuitem></menuchoice>. Dejansko se izvede ukaz Povrni, ki pa smo ga preimenovali, da je njegovo dejanje bolj očitno."

#. (para)
#. (para)
#: ../source/TortoiseGit_en.xml:7406
#: ../source/TortoiseGit_en.xml:9080
msgid "The columns in this dialog can be customized in the same way as the columns in the <guilabel>Check for modifications</guilabel> dialog. Read <xref linkend=\"tsvn-dug-wcstatus-2\"/> for further details."
msgstr "Stolpce v tem oknu lahko prilagodite enako kot stolpce v oknu <guilabel>Preveri spremembe</guilabel>. Za več informacij preberite <xref linkend=\"tsvn-dug-wcstatus-2\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:7412
msgid "Undoing Changes which have been Committed"
msgstr "Povrnitev sprememb, ki so že bile objavljene"

#. (para)
#: ../source/TortoiseGit_en.xml:7413
msgid "<menuchoice><guimenuitem>Revert</guimenuitem></menuchoice> will only undo your local changes. It does <emphasis>not</emphasis> undo any changes which have already been committed. If you want to undo all the changes which were committed in a particular revision, read <xref linkend=\"tsvn-dug-showlog\"/> for further information."
msgstr "Z ukazom <menuchoice><guimenuitem>Povrni</guimenuitem></menuchoice> lahko povrnete le spremembe, ki jih še niste objavili, <emphasis>ne</emphasis> pa tudi sprememb, ki ste jih že objavili. Če želite povrniti vse spremembe, ki ste jih objavili v določeni reviziji, preberite <xref linkend=\"tsvn-dug-showlog\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:7424
msgid "Revert is Slow"
msgstr "Povrnitev je počasna"

#. (para)
#: ../source/TortoiseGit_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 <guilabel>Use recycle bin when reverting</guilabel> box in TortoiseGit's settings."
msgstr "Povrnitev krajevnih sprememb lahko traja dalj časa, kot mogoče pričakujete. To se zgodi, ker TortoiseGit 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 <guilabel>Pri uporabi ukaza Povrni uporabi koš</guilabel>."

#. (title)
#. (entry)
#. (title)
#. (glossterm)
#: ../source/TortoiseGit_en.xml:7438
#: ../source/TortoiseGit_en.xml:13757
#: ../source/TortoiseGit_en.xml:14802
#: ../source/TortoiseGit_en.xml:15587
msgid "Cleanup"
msgstr "Čiščenje"

#. (primary)
#: ../source/TortoiseGit_en.xml:7440
msgid "cleanup"
msgstr "počisti"

#. (para)
#: ../source/TortoiseGit_en.xml:7442
msgid "If a Git command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Cleanup</guimenuitem></menuchoice> 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 Git 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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Počisti</guimenuitem></menuchoice>. Najbolje, da to storite na vrhnji mapi delovne kopije."

#. (para)
#: ../source/TortoiseGit_en.xml:7453
msgid "Cleanup has another useful side effect. If a file date changes but its content doesn't, Git cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these <quote>broken</quote> 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 Git 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/TortoiseGit_en.xml:7464
msgid "Use Commit Timestamps"
msgstr "Uporabi časovni žig objave"

#. (para)
#: ../source/TortoiseGit_en.xml:7465
msgid "Some earlier releases of Git were affected by a bug which caused timestamp mismatch when you check out with the <guilabel>Use commit timestamps</guilabel> option checked. Use the Cleanup command to speed up these working copies."
msgstr "Nekatere starejše različice sistema Git so vsebovale napako, ki je povzročila nepravilne časovne žige datotek v primeru uporabe možnosti <guilabel>Uporabi časovni žig objave</guilabel>. Uporabite ukaz Počisti, da pohitrite odzivnost takšne delovne kopije."

#. (title)
#: ../source/TortoiseGit_en.xml:7475
msgid "Project Settings"
msgstr "Nastavitve projekta"

#. (primary)
#: ../source/TortoiseGit_en.xml:7477
msgid "properties"
msgstr "lastnosti"

#. (title)
#: ../source/TortoiseGit_en.xml:7481
msgid "Explorer property page, Git tab"
msgstr "Stran Lastnosti v Raziskovalcu, zavihek Git"

#. (para)
#: ../source/TortoiseGit_en.xml:7479
msgid "<placeholder-1/> Sometimes you want to have more detailed information about a file/directory than just the icon overlay. You can get all the information Git provides in the explorer properties dialog. Just select the file or directory and select <menuchoice><guimenu>Windows Menu</guimenu><guimenuitem>properties</guimenuitem></menuchoice> in the context menu (note: this is the normal properties menu entry the explorer provides, not the one in the TortoiseGit submenu!). In the properties dialog box TortoiseGit has added a new property page for files/folders under Git control, where you can see all relevant information about the selected file/directory."
msgstr "<placeholder-1/> Včasih hočete o datoteki/mapi izvedeti več, kot pove prekrivna ikona. Vse informacije, ki jih Git poda, lahko najdete v oknu Lastnosti. V Raziskovalcu izberite datoteko in v kontekstnem meniju izberite <menuchoice><guimenu>Meni Windows</guimenu><guimenuitem>Lastnosti</guimenuitem></menuchoice> (pazite: to je običajno okno Lastnosti, ki ga prikaže Raziskovalec, ne tisti v podmeniju TortoiseGit!). V to okno za datoteke/mape pod nadzorom različic TortoiseGit doda zavihek Git, kjer dobite vse potrebne informacije o izbrani datoteki/mapi."

#. (title)
#: ../source/TortoiseGit_en.xml:7501
msgid "Git Properties"
msgstr "Lastnosti Git"

#. (primary)
#: ../source/TortoiseGit_en.xml:7503
msgid "Git properties"
msgstr "lastnosti Git"

#. (title)
#: ../source/TortoiseGit_en.xml:7509
msgid "Git property page"
msgstr "Lastnosti v sistemu Git"

#. (para)
#: ../source/TortoiseGit_en.xml:7507
msgid "<placeholder-1/> You can read and set the Git properties from the Windows properties dialog, but also from <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>properties</guimenuitem></menuchoice> and within TortoiseGit's status lists, from <menuchoice><guimenu>Context menu</guimenu><guimenuitem>properties</guimenuitem></menuchoice>."
msgstr "<placeholder-1/> Lastnosti Git lahko preberete in nastavite v oknu Lastnosti, ki ga prikaže sistem Windows. Poleg tega vidite te lastnosti tudi, če uporabite ukaz <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Lastnosti</guimenuitem></menuchoice>. V pogovornih oknih TortoiseGit, kjer se izpišejo seznami datotek, lahko lastnosti prikažete z ukazom <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Lastnosti</guimenuitem></menuchoice>."

#. (para)
#: ../source/TortoiseGit_en.xml:7524
msgid "You can add your own properties, or some properties with a special meaning in Git. These begin with <literal>svn:</literal>. <literal>svn:externals</literal> is such a property; see how to handle externals in <xref linkend=\"tsvn-dug-import-4\"/>."
msgstr "Dodate lahko svoje lastne lastnosti ali nekatere lastnosti, ki imajo v sistemu Git poseben pomen. Te se začnejo s <literal>svn:</literal>. Takšna lastnost je <literal>svn:externals</literal>; kako se uporablja zunanje elemente, si poglejte v  <xref linkend=\"tsvn-dug-import-4\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:7531
msgid "svn:keywords"
msgstr "svn:keywords"

#. (primary)
#: ../source/TortoiseGit_en.xml:7533
msgid "keywords"
msgstr "ključne besede"

#. (primary)
#: ../source/TortoiseGit_en.xml:7536
msgid "expand keywords"
msgstr "razširi ključne besede"

#. (para)
#: ../source/TortoiseGit_en.xml:7546
msgid "Date of last known commit. This is based on information obtained when you update your working copy. It does <emphasis>not</emphasis> check the repository to find more recent changes."
msgstr "Datum zadnje znane objave glede na informacije iz zadnje posodobitve delovne kopije. <emphasis>Ne</emphasis> preverja, če so v skladišču novejše spremembe."

#. (para)
#: ../source/TortoiseGit_en.xml:7557
msgid "Revision of last known commit."
msgstr "Revizija zadnje znane objave."

#. (para)
#: ../source/TortoiseGit_en.xml:7565
msgid "Author who made the last known commit."
msgstr "Avtor zadnje znane objave."

#. (para)
#: ../source/TortoiseGit_en.xml:7573
msgid "The full URL of this file in the repository."
msgstr "Celoten naslov URL te datoteke v skladišču."

#. (para)
#: ../source/TortoiseGit_en.xml:7581
msgid "A compressed combination of the previous four keywords."
msgstr "Stisnjena kombinacija prejšnjih štirih ključnih besed."

#. (para)
#: ../source/TortoiseGit_en.xml:7538
msgid "Git supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: <placeholder-1/>"
msgstr "Git 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: <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:7589
msgid "To find out how to use these keywords, look at the <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.advanced.props.special.keywords.html\"><citetitle>svn:keywords section</citetitle></ulink> in the Git 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 <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.advanced.props.special.keywords.html\"><citetitle>svn:keywords section</citetitle></ulink> knjige The Git Book. Tam dobite popoln opis ključnih besed in njihove uporabe."

#. (para)
#: ../source/TortoiseGit_en.xml:7599
msgid "For more information about properties in Git see the <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.advanced.props.html\"><citetitle>Special Properties</citetitle></ulink>."
msgstr "Več informacij o lastnostih v sistemu Git dobite na naslovu <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.advanced.props.html\"><citetitle>Special Properties</citetitle></ulink>."

#. (title)
#: ../source/TortoiseGit_en.xml:7606
msgid "Adding and Editing Properties"
msgstr "Dodajanje in urejanje lastnosti"

#. (title)
#: ../source/TortoiseGit_en.xml:7609
msgid "Adding properties"
msgstr "Dodajanje lastnosti"

#. (para)
#: ../source/TortoiseGit_en.xml:7607
msgid "<placeholder-1/> To add a new property, first click on <guilabel>Add...</guilabel>. 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 <guibutton>OK</guibutton> to add that property to the list."
msgstr "<placeholder-1/> Če želite dodati novo lastnost, najprej kliknite na gumb <guilabel>Dodaj...</guilabel>. 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 <guibutton>V redu</guibutton> dodate lastnost na seznam."

#. (para)
#: ../source/TortoiseGit_en.xml:7619
msgid "If you want to apply a property to many items at once, select the files/folders in explorer, then select <menuchoice><guimenu>Context menu</guimenu><guimenuitem>properties</guimenuitem></menuchoice>"
msgstr "Če želite lastnost nastaviti več elementom naenkrat, v Raziskovalcu izberite datoteke/mape, nato pa pokličite ukaz <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Lastnosti</guimenuitem></menuchoice>"

#. (para)
#: ../source/TortoiseGit_en.xml:7627
msgid "If you want to apply the property to <emphasis>every</emphasis> file and folder in the hierarchy below the current folder, check the <guilabel>Recursive</guilabel> checkbox."
msgstr "Če želite nastaviti lastnost <emphasis>vsaki</emphasis> datoteki in mapi v hierarhiji pod trenutno mapo, uporabite potrditveno polje <guilabel>Rekurzivno</guilabel>."

#. (para)
#: ../source/TortoiseGit_en.xml:7632
msgid "Some properties, for example <literal>svn:needs-lock</literal>, 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. <literal>svn:needs-lock</literal>, 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/TortoiseGit_en.xml:7639
msgid "If you wish to edit an existing property, select that property from the list of existing properties, then click on <guibutton>Edit...</guibutton>."
msgstr "Če želite urediti obstoječo lastnost, jo izberite iz seznama obstoječih lastnosti in kliknite na gumb <guibutton>Uredi...</guibutton>."

#. (para)
#: ../source/TortoiseGit_en.xml:7643
msgid "If you wish to remove an existing property, select that property from the list of existing properties, then click on <guibutton>Remove</guibutton>."
msgstr "Če želite odstraniti nastavljeno lastnost, jo izberite iz seznama obstoječih lastnosti in kliknite na gumb <guibutton>Odstrani</guibutton>."

#. (para)
#: ../source/TortoiseGit_en.xml:7647
msgid "The <literal>svn:externals</literal> property can be used to pull in other projects from the same repository or a completely different repository. For more information, read <xref linkend=\"tsvn-dug-import-4\"/>."
msgstr "Lastnost <literal>svn:externals</literal> se uporablja za vključitev zunanjih elementov iz istega ali drugega skladišča. Za več informacij preberite <xref linkend=\"tsvn-dug-import-4\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:7655
msgid "Exporting and Importing Properties"
msgstr "Izvažanje in uvažanje lastnosti"

#. (para)
#: ../source/TortoiseGit_en.xml:7656
msgid "Often you will find yourself applying the same set of properties many times, for example <literal>bugtraq:logregex</literal>. 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 <literal>bugtraq:logregex</literal>. Za enostaven prenos lastnosti iz enega projekta na drugega lahko uporabite zmožnost Izvoz/Uvoz."

#. (para)
#: ../source/TortoiseGit_en.xml:7662
msgid "From the file or folder where the properties are already set, use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>properties</guimenuitem></menuchoice>, select the properties you wish to export and click on <guibutton>Export...</guibutton>. 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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Lastnosti</guimenuitem></menuchoice>, izberite lastnosti, ki jih želite izvoziti in kliknite na gumb <guibutton>Izvozi...</guibutton>. Vpisati boste morali ime datoteke, v katero naj se lastnosti shranijo."

#. (para)
#: ../source/TortoiseGit_en.xml:7672
msgid "From the folder(s) where you wish to apply these properties, use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>properties</guimenuitem></menuchoice> and click on <guibutton>Import...</guibutton>. 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 <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Lastnosti</guimenuitem></menuchoice> in kliknite na gumb <guibutton>Uvozi...</guibutton>. 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/TortoiseGit_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 <guibutton>Edit...</guibutton>, check the <guilabel>Apply property recursively</guilabel> box and click on <guibutton>OK</guibutton>."
msgstr "Če želite drevesu dodati lastnosti rekurzivno, naredite zgoraj opisane korake, potem pa v oknu lastnosti izberite vsako lastnost, kliknite na gumb <guibutton>Uredi...</guibutton>, potrdite polje <guilabel>Uporabi lastnost rekurzivno</guilabel> in kliknite na gumb <guibutton>V redu</guibutton>."

#. (para)
#: ../source/TortoiseGit_en.xml:7690
msgid "The Import file format is binary and proprietary to TortoiseGit. Its only purpose is to transfer properties using Import and Export, so there is no need to edit these files."
msgstr "Izvozna datoteka je binarna in lastna sistemu TortoiseGit. Njena edina uporaba je prenos lastnosti z uporabo ukazov Izvozi in Uvozi, tako da teh datotek ne urejamo."

#. (title)
#: ../source/TortoiseGit_en.xml:7697
msgid "Binary Properties"
msgstr "Binarne lastnosti"

#. (para)
#: ../source/TortoiseGit_en.xml:7698
msgid "TortoiseGit can handle binary property values using files. To read a binary property value, <guibutton>Save...</guibutton> 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 <guibutton>Load...</guibutton> from that file."
msgstr "TortoiseGit lahko z uporabo datotek dodaja lastnostim dvojiške vrednosti. Če želite dvojiško lastnost prebrati, jo shranite v datoteko z gumbom <guibutton>Shrani...</guibutton>. Č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 <guibutton>Naloži...</guibutton>."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_en.xml:7713
msgid "Automatic property setting"
msgstr "Samodejna nastavitev lastnosti"

#. (primary)
#: ../source/TortoiseGit_en.xml:7715
msgid "auto-props"
msgstr "auto-props"

#. (para)
#: ../source/TortoiseGit_en.xml:7717
msgid "You can configure Git and TortoiseGit to set properties automatically on files and folders when they are added to the repository. There are two ways of doing this."
msgstr "Git in TortoiseGit 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/TortoiseGit_en.xml:7722
msgid "You can edit the Git configuration file to enable this feature on your client. The <guilabel>General</guilabel> page of TortoiseGit's settings dialog has an edit button to take you there directly. The config file is a simple text file which controls some of Git's workings. You need to change two things: firstly in the section headed <literal>miscellany</literal> uncomment the line <literal>enable-auto-props = yes</literal>. Secondly you need to edit the section below to define which properties you want added to which file types. This method is a standard Git feature and works with any Git client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository."
msgstr "To zmožnost lahko vključite neposredno v konfiguracijski datoteki za Git. Na strani <guilabel>Splošno</guilabel> 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 Git. Spremeniti morate dve stvari: najprej v odseku <literal>miscellany</literal> izbrišite komentar pred vrstico <literal>enable-auto-props = yes</literal>. Nato v naslednjem odseku definirajte, katere lastnosti naj se pripnejo določenim vrstam datotek. S tem določite nastavitve, ki veljajo za vse odjemalce Git, 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/TortoiseGit_en.xml:7739
msgid "An alternative method is to set the <literal>tsvn:autoprops</literal> property on folders, as described in the next section. This method only works for TortoiseGit clients, but it does get propagated to all working copies on update."
msgstr "Druga možnost je nastavitev lastnosti <literal>tsvn:autoprops</literal> na mapah, kot je opisano v naslednjem odseku. Ta metoda deluje le pri odjemalcih TortoiseGit, vendar se pri posodobitvi prenese na vse delovne kopije."

#. (para)
#: ../source/TortoiseGit_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/TortoiseGit_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/TortoiseGit_en.xml:7758
msgid "Commit properties"
msgstr "Objavite lastnosti"

#. (para)
#: ../source/TortoiseGit_en.xml:7759
msgid "Git properties are versioned. After you change or add a property you have to commit your changes."
msgstr "Lastnosti v sistemu Git so pod nadzorom različic. Potem, ko spremenite ali dodate lastnosti, morate spremembe objaviti."

#. (title)
#: ../source/TortoiseGit_en.xml:7765
msgid "Conflicts on properties"
msgstr "Spori pri lastnostih"

#. (para)
#: ../source/TortoiseGit_en.xml:7766
msgid "If there's a conflict on committing the changes, because another user has changed the same property, Git generates a <filename>.prej</filename> 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, Git ustvari datoteko <filename>.prej</filename>. Ko rešite spor, to datoteko izbrišite."

#. (title)
#: ../source/TortoiseGit_en.xml:7775
msgid "TortoiseGit Project Properties"
msgstr "Projektne lastnosti TortoiseGit"

#. (primary)
#: ../source/TortoiseGit_en.xml:7777
msgid "project properties"
msgstr "lasnosti projekta"

#. (primary)
#: ../source/TortoiseGit_en.xml:7780
msgid "TortoiseGit properties"
msgstr "lastnosti TortoiseGit"

#. (para)
#: ../source/TortoiseGit_en.xml:7787
msgid "<literal>tsvn:logminsize</literal> 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 "<literal>tsvn:logminsize</literal> 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/TortoiseGit_en.xml:7796
msgid "<literal>tsvn:lockmsgminsize</literal> 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 "<literal>tsvn:lockmsgminsize</literal> 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/TortoiseGit_en.xml:7807
msgid "<literal>tsvn:logwidthmarker</literal> 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 "<literal>tsvn:logwidthmarker</literal> 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/TortoiseGit_en.xml:7820
msgid "<literal>tsvn:logtemplate</literal> 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 <literal>tsvn:logminsize</literal>, be sure to set the length longer than the template or you will lose the protection mechanism."
msgstr "<literal>tsvn:logtemplate</literal> 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 <literal>tsvn:logminsize</literal>, 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/TortoiseGit_en.xml:7831
msgid "Git allows you to set <quote>autoprops</quote> which will be applied to newly added or imported files, based on the file extension. This depends on every client having set appropriate autoprops in their Git configuration file. <literal>tsvn:autoprops</literal> can be set on folders and these will be merged with the user's local autoprops when importing or adding files. The format is the same as for Git autoprops, e.g. <literal>*.sh = svn:eol-style=native;svn:executable</literal> sets two properties on files with the <literal>.sh</literal> extension."
msgstr "Git omogoča nastavljanje samodejnih lastnosti (<quote>autoprops</quote>), 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 <literal>tsvn:autoprops</literal> 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 Git, n. pr: <literal>*.sh = svn:eol-style=native;svn:executable</literal> nastavi dve lastnosti na datotekah s končnico <literal>.sh</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:7844
msgid "If there is a conflict between the local autoprops and <literal>tsvn:autoprops</literal>, the project settings take precedence because they are specific to that project."
msgstr "Če pride do spora med krajevnimi samodejnimi lastnostmi in lastnostjo <literal>tsvn:autoprops</literal>, se upoštevajo nastavitve projekta, ker so sprecifične za ta projekt."

#. (para)
#: ../source/TortoiseGit_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). <literal>tsvn:logfilelistenglish</literal> defines whether the file status is inserted in English or in the localized language. If the property is not set, the default is <literal>true</literal>."
msgstr "V oknu za objave lahko prilepite seznam spremenjenih datotek, vključno s stanjem vsake datoteke (dodano, spremenjeno...). Lastnost <literal>tsvn:logfilelistenglish</literal> določa, ali se stanje vstavlja v angleškem jeziku ali v jeziku, ki ga uporabljate v programu TortoiseGit. Če te lastnosti ne nastavite, se upošteva privzeta vrednost <literal>true</literal>, kar pomeni, da so podatki o stanju prilepljeni v angleškem jeziku."

#. (para)
#: ../source/TortoiseGit_en.xml:7862
msgid "TortoiseGit can use spell checker modules which are also used by OpenOffice and Mozilla. If you have those installed this property will determine which spell checker to use, i.e. in which language the log messages for your project should be written. <literal>tsvn:projectlanguage</literal> 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: <ulink url=\"http://msdn2.microsoft.com/en-us/library/ms776260.aspx\"><citetitle>MSDN: Language Identifiers</citetitle></ulink>."
msgstr "V programu TortoiseGit 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 <literal>tsvn:projectlanguage</literal> nastavi jezikovni modul, ki naj se uporabi za preverjanje sporočil dnevniških zapisov. Vrednosti za vaš jezik najdete na naslednji strani: <ulink url=\"http://msdn2.microsoft.com/en-us/library/ms776260.aspx\"><citetitle>MSDN: Language Identifiers</citetitle></ulink>."

#. (para)
#: ../source/TortoiseGit_en.xml:7876
msgid "You can enter this value in decimal, or in hexadecimal if prefixed with <literal>0x</literal>. For example English (US) can be entered as <literal>0x0409</literal> or <literal>1033</literal>."
msgstr "Vrednost lahko vnesete v desetiški obliki ali v šestnajstiški obliki - v tem primeru ji dodajte predpono <literal>0x</literal>. Primer: za uporabo ameriške angleščine vnesite <literal>0x0409</literal> ali <literal>1033</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:7884
msgid "The property <literal>tsvn:logsummary</literal> 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 <literal>tsvn:logsummary</literal> se uporablja za izluščenje dela sporočila dnevniškega zapisa, ki se izpiše v dnevniku kot povzetek sporočila."

#. (para)
#: ../source/TortoiseGit_en.xml:7889
msgid "The value of the <literal>tsvn:logsummary</literal> 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 <literal>tsvn:logsummary</literal> mora biti enovrstični regularni izraz, ki vsebuje eno skupino. Rezultat te skupine se uporabi za povzetek."

#. (para)
#: ../source/TortoiseGit_en.xml:7895
msgid "An example: <literal>\\[SUMMARY\\]:\\s+(.*)</literal> Will catch everything after <quote>[SUMMARY]</quote> in the log message and use that as the summary."
msgstr "Primer: <literal>\\[SUMMARY\\]:\\s+(.*)</literal> najde vso besedilo, ki se nahaja za nizom <quote>[SUMMARY]</quote> in ga uporabi kot povzetek."

#. (para)
#: ../source/TortoiseGit_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 <literal>tsvn:userfileproperties</literal> and <literal>tsvn:userdirproperties</literal>. 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 <literal>tsvn:userfileproperties</literal> in <literal>tsvn:userdirproperties</literal>. Te lastnosti nastavite mapi. Ko boste urejali lastnosti kateregakoli elementa v tej mapi, se bodo lastne lastnosti pojavile na seznamu preddefiniranih imen."

#. (para)
#: ../source/TortoiseGit_en.xml:7782
msgid "TortoiseGit has a few special properties of its own, and these begin with <literal>tsvn:</literal>. <placeholder-1/>"
msgstr "TortoiseGit ima nekaj svojih posebnih lastnosti, ki se začnejo s <literal>tsvn:</literal>. <placeholder-1/>"

#. (para)
#. (para)
#: ../source/TortoiseGit_en.xml:7919
#: ../source/TortoiseGit_en.xml:10362
msgid "Some <literal>tsvn:</literal> properties require a <literal>true/false</literal> value. TortoiseGit also understands <literal>yes</literal> as a synonym for <literal>true</literal> and <literal>no</literal> as a synonym for <literal>false</literal>."
msgstr "Nekatere lastnosti <literal>tsvn:</literal> zahtevajo vrednost <literal>true/false</literal>. TortoiseGit razume tudi besedo <literal>yes</literal> kot sinonim za <literal>true</literal> in besedo <literal>no</literal> kot sinonim za <literal>false</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:7925
msgid "TortoiseGit can integrate with some bug tracking tools. This uses project properties that start with <literal>bugtraq:</literal>. Read <xref linkend=\"tsvn-dug-bugtracker\"/> for further information."
msgstr "TortoiseGit zna vključiti nekatera orodja za sledenje zadev. Za to se uporabljajo lastnosti, ki se začnejo z <literal>bugtraq:</literal>. Za več informacij preberite <xref linkend=\"tsvn-dug-bugtracker\"/>."

#. (para)
#: ../source/TortoiseGit_en.xml:7930
msgid "It can also integrate with some web-based repository browsers, using project properties that start with <literal>webviewer:</literal>. Read <xref linkend=\"tsvn-dug-repoviewer\"/> 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 <literal>webviewer:</literal>. Za več informacij preberite <xref linkend=\"tsvn-dug-repoviewer\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:7936
msgid "Set the project properties on folders"
msgstr "Nastavite projektne lastnosti na mapah"

#. (para)
#: ../source/TortoiseGit_en.xml:7937
msgid "These special project properties must be set on <emphasis>folders</emphasis> for the system to work. When you commit a file or folder the properties are read from that folder. If the properties are not found there, TortoiseGit will search upwards through the folder tree to find them until it comes to an unversioned folder, or the tree root (eg. <literal>C:\\</literal>) is found. If you can be sure that each user checks out only from e.g <filename>trunk/</filename> and not some sub-folder, then it is sufficient to set the properties on <filename>trunk/</filename>. 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 <filename>trunk/</filename>)."
msgstr "Te posebne projektne lastnosti morate nastaviti na <emphasis>mapah</emphasis>, da bo sistem deloval. Ko objavite datoteko ali mapo, se lastnosti preberejo iz te mape. Če TortoiseGit 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. <literal>C:\\</literal>). Če ste prepričani, da bodo uporabniki prevzemali projekt zgolj iz poti n. pr. <filename>trunk/</filename> in ne iz katere izmed podmap, potem je dovolj, da lastnosti nastavite na <filename>trunk/</filename>. Če niste prepričani, potem raje nastavite te lastnosti rekurzivno na vseh podmapah. Lastnosti, ki so globlje v projektni hierarhiji, povozijo lastnosti, ki so višje (bližje poti <filename>trunk/</filename>)."

#. (para)
#: ../source/TortoiseGit_en.xml:7951
msgid "For project properties <emphasis>only</emphasis> you can use the <guilabel>Recursive</guilabel> checkbox to set the property to all sub-folders in the hierarchy, without also setting it on all files."
msgstr "<emphasis>Zgolj</emphasis> za projektne lastnosti lahko uporabite potrditveno polje <guilabel>Rekurzivno</guilabel>. S tem nastavite lastnost na vse podmape v hierarhiji, na datoteke pa ne."

#. (para)
#: ../source/TortoiseGit_en.xml:7958
msgid "When you add new sub-folders using TortoiseGit, any project properties present in the parent folder will automatically be added to the new child folder too."
msgstr "Ko s pomočjo programa TortoiseGit dodate nove podmape, se tja samodejno prenesejo projektne lastnosti nadrejene mape."

#. (para)
#: ../source/TortoiseGit_en.xml:7964
msgid "Although TortoiseGit's project properties are extremely useful, they only work with TortoiseGit, and some will only work in newer versions of TortoiseGit. If people working on your project use a variety of Git clients, or possibly have old versions of TortoiseGit, you may want to use repository hooks to enforce project policies. project properties can only help to implement a policy, they cannot enforce it."
msgstr "Čeprav so projektne lastnosti TortoiseGit zelo uporabne, delujejo le z odjemalcem TortoiseGit, nekatere celo samo z novejšimi različicami TortoiseGit. Če uporabniki na vašem projektu uporabljajo različne odjemalce za Git ali pa starejše različice TortoiseGit, raje uporabite skripte akcij v skladišču za zagotavljanje spoštovanja pravil. Lastnosti <literal>tsvn:</literal> vam le pomagajo nastaviti pravila, ne morejo pa jih zagotavljati."

#. (title)
#: ../source/TortoiseGit_en.xml:7977
msgid "Branching / Tagging"
msgstr "Ustvarjanje vej/oznak"

#. (primary)
#. (primary)
#: ../source/TortoiseGit_en.xml:7985
#: ../source/TortoiseGit_en.xml:9400
msgid "copy"
msgstr "kopija"

#. (primary)
#: ../source/TortoiseGit_en.xml:7988
msgid "mark release"
msgstr "usvari izdajo"

#. (para)
#: ../source/TortoiseGit_en.xml:7991
msgid "One of the features of version control systems is the ability to isolate changes onto a separate line of development. This line is known as a <firstterm>branch</firstterm>. Branches are often used to try out new features without disturbing the main line of development with compiler errors and bugs. As soon as the new feature is stable enough then the development branch is <firstterm>merged</firstterm> back into the main branch (trunk)."
msgstr "Ena od zmožnosti sistemov za nadzor različic je tudi možnost izoliranja sprememb v svojo razvojno linijo. Linija se prikaže kot <firstterm>veja</firstterm>. Veje se pogosto uporabljajo za preizkušanje novih stvari, da ne bi obremenjevali glavne razvojne linije z napakami prevajalnika in hrošči. Ko je nova zmožnost dovolj stabilna, se razvojna veja <firstterm>spoji</firstterm> nazaj v glavno vejo."

#. (para)
#: ../source/TortoiseGit_en.xml:8001
msgid "Another feature of version control systems is the ability to mark particular revisions (e.g. a release version), so you can at any time recreate a certain build or environment. This process is known as <firstterm>tagging</firstterm>."
msgstr "Še ena lastnost sistemov za nadzor različic je možnost označevanja določenih revizij (n. pr. verzije izdaje), tako da lahko kasneje ponovno zgradite izdajo ali nastavite razvojno okolje. Ta proces se imenuje <firstterm>označevanje</firstterm>."

#. (para)
#: ../source/TortoiseGit_en.xml:8007
msgid "Git does not have special commands for branching or tagging, but uses so-called <quote>cheap copies</quote> instead. Cheap copies are similar to hard links in Unix, which means that instead of making a complete copy in the repository, an internal link is created, pointing to a specific tree/revision. As a result branches and tags are very quick to create, and take up almost no extra space in the repository."
msgstr "Git nima posebnih ukazov za ustvarjanje vej ali oznak, ampak uporablja takoimenovane <quote>poceni kopije</quote>. Poceni kopije so podobne povezavam (hard links) v sistemu Unix, kar pomeni, da se namesto ustvarjanja kopije skladišča naredi notranja povezava, ki kaže na določeno drevo/revizijo. Zato je ustvarjanje vej in oznak zelo hitro, hkrati pa ne zavzema skoraj nobenega dodatnega prostora v skladišču."

#. (title)
#: ../source/TortoiseGit_en.xml:8017
msgid "Creating a Branch or Tag"
msgstr "Ustvarjanje veje ali oznake"

#. (title)
#: ../source/TortoiseGit_en.xml:8022
msgid "The Branch/Tag Dialog"
msgstr "Okno za za ustvarjanje veje/oznake"

#. (para)
#: ../source/TortoiseGit_en.xml:8018
msgid "If you have imported your project with the recommended directory structure, creating a branch or tag version is very simple: <placeholder-1/> Select the folder in your working copy which you want to copy to a branch or tag, then select the command <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Branch/Tag...</guimenuitem></menuchoice>."
msgstr "Če ste projekt uvozili v priporočeno sturkturo map, je ustvarjanje vej ali oznak zelo preprosto:  <placeholder-1/> Izberite mapo v delovni kopiji, ki jo želite prekopirati v vejo ali oznako, nato pa izberite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Veja/oznaka...</guimenuitem></menuchoice>."

#. (para)
#: ../source/TortoiseGit_en.xml:8032
msgid ""
"The default destination URL for the new branch will be the source URL on which your working copy is based. You will need to edit that URL to the new path for your branch/tag. So instead of <screen>\n"
"    http://svn.collab.net/repos/ProjectName/trunk\n"
"</screen> you might now use something like <screen>\n"
"    http://svn.collab.net/repos/ProjectName/tags/Release_1.10\n"
"</screen> If you can't remember the naming convention you used last time, click the button on the right to open the repository browser so you can view the existing repository structure."
msgstr ""
"Privzeti ciljni naslov URL za novo vejo bo naslov URL, na katerem je osnovana vaša delovna kopija.  Naslov URL boste morali urediti, tako da bo kazal na novo vejo/oznako. Namesto <screen>\n"
"    http://svn.collab.net/repos/ProjectName/trunk\n"
"</screen> sedaj uporabite naprimer <screen>\n"
"    http://svn.collab.net/repos/ProjectName/tags/Release_1.10\n"
"</screen> Če se ne spomnite, kakšen sistem označevanja ste uporabili pri prejšnjih uporabah ukaza, kliknite na gumb na desni in odpre se vam brskalnik po skladišču. Tako lahko vidite obstoječo strukturo map skladišča."

#. (term)
#. (listitem)
#: ../source/TortoiseGit_en.xml:8053
#: ../source/TortoiseGit_en.xml:14848
msgid "HEAD revision in the repository"
msgstr "Revizija HEAD v skladišču"

#. (para)
#: ../source/TortoiseGit_en.xml:8055
msgid "The new branch is copied directly in the repository from the HEAD revision. No data needs to be transferred from your working copy, and the branch is created very quickly."
msgstr "Nova veja se skopira neposredno v skladišču iz revizije HEAD. Prenos podatkov iz delovne kopije ni potreben, zato je ustvarjanje veje zelo hitro."

#. (term)
#: ../source/TortoiseGit_en.xml:8064
msgid "Specific revision in the repository"
msgstr "Določena revizija v skladišču"

#. (para)
#: ../source/TortoiseGit_en.xml:8066
msgid "The new branch is copied directly in the repository but you can choose an older revision. This is useful if you forgot to make a tag when you released your project last week. If you can't remember the revision number, click the button on the right to show the revision log, and select the revision number from there. Again no data is transferred from your working copy, and the branch is created very quickly."
msgstr "Nove veja se skopira neposredno v skladišču, vendar se lahko odločite za starejšo revizijo. To je uporabno, če ste prejšnji teden, ko ste naredili novo izdajo, pozabili kreirati oznako. Če se ne spomnite številke revizije, kliknite na gumb na desni in prikazalo se bo okno z dnevnikom revizij, od koder lahko izberete številko revizije. Iz delovne kopije se v skladišče ne prenašajo podatki, tako da je veja ustvarjena zelo hitro."

#. (para)
#: ../source/TortoiseGit_en.xml:8081
msgid "The new branch is an identical copy of your local working copy. If you have updated some files to an older revision in your WC, or if you have made local changes, that is exactly what goes into the copy. Naturally this sort of complex tag may involve transferring data from your WC back to the repository if it does not exist there already."
msgstr "Nova veja je identična kopija krajevne delovne kopije. Če ste nekatere datoteke posodobili na starejšo revizijo, bodo te starejše revizije datotek prav tako skopirane na vejo. Seveda se lahko pri takšnem zahtevnem tipu oznake zgodi, da se podatki prenašajo iz delovne kopije v skladišče, če tam še ne obstajajo."

#. (para)
#: ../source/TortoiseGit_en.xml:8048
msgid "Now you have to select the source of the copy. Here you have three options: <placeholder-1/>"
msgstr "Sedaj morate izbrati vir kopiranja. Imate tri možnosti:  <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:8094
msgid "If you want your working copy to be switched to the newly created branch automatically, use the <guilabel>Switch working copy to new branch/tag</guilabel> checkbox. But if you do that, first make sure that your working copy does not contain modifications. If it does, those changes will be merged into the branch WC when you switch."
msgstr "Če želite, da se vaša delovna kopija samodejno preklopi na novo ustvarjeno vejo, vklopite potrditveno polje <guilabel>Preklopi delovno kopijo na drugo vejo / oznako</guilabel>. Če želite to narediti, se najprej prepričajte, da vaša delovna kopija nima krajevnih sprememb. Če jih ima, potem bodo le-te spojene v delovno kopijo veje, ko naredite preklop."

#. (para)
#: ../source/TortoiseGit_en.xml:8102
msgid "Press <guibutton>OK</guibutton> to commit the new copy to the repository. Don't forget to supply a log message. Note that the copy is created <emphasis>inside the repository</emphasis>."
msgstr "Če želite objaviti novo kopijo v skladišču, pritisnite gumb <guibutton>V redu</guibutton>. Ne pozabiti na dnevniški zapis. Ne pozabite, da se kopija ustvari <emphasis>znotraj skladišča</emphasis>."

#. (para)
#: ../source/TortoiseGit_en.xml:8107
msgid "Note that unless you opted to switch your working copy to the newly created branch, creating a Branch or Tag does <emphasis>not</emphasis> affect your working copy. Even if you create the branch from your WC, those changes are committed to the new branch, not to the trunk, so your WC may still be marked as modified with respect to the trunk."
msgstr "Upoštevajte: če ne potrdite izbire za preklop nove veje na delovno kopijo, ustvarjanje vej in oznak <emphasis>nima</emphasis> vpliva na delovno kopijo. Tudi če vejo ustvarite iz delovne kopije, se spremembe objavijo na novi veji in ne na glavni veji, tako da je vaša delovna kopija še vedno lahko označena kot spremenjena (glede na glavno vejo)."

#. (title)
#: ../source/TortoiseGit_en.xml:8116
msgid "To Checkout or to Switch..."
msgstr "Prevzeti ali preklopiti..."

#. (primary)
#: ../source/TortoiseGit_en.xml:8119
msgid "switch"
msgstr "preklop"

#. (para)
#: ../source/TortoiseGit_en.xml:8121
msgid "...that is (not really) the question. While a checkout downloads everything from the desired branch in the repository to your working directory, <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Switch...</guimenuitem></menuchoice> only transfers the changed data to your working copy. Good for the network load, good for your patience. :-)"
msgstr "... to (zares) ni vprašanje. Medtem ko prevzem prevzame vse datoteke iz izbrane veje v delovno kopijo, <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Preklopi...</guimenuitem></menuchoice> prenese le spremenjene podatke v delovno kopijo. Dobro za obremenitev omrežja in vaše potrpljenje :-)"

#. (para)
#: ../source/TortoiseGit_en.xml:8137
msgid "<menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Checkout</guimenuitem></menuchoice> to make a fresh checkout in an empty folder. You can check out to any location on your local disk and you can create as many working copies from your repository as you like."
msgstr "Uporabite ukaz <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Prevzem</guimenuitem></menuchoice> in ustvarite svež prevzem v prazno mapo. Prevzem lahko naredite na katerokoli lokacijo na svojem disku. Naredite lahko poljubno število prevzemov iz skladišča."

#. (para)
#: ../source/TortoiseGit_en.xml:8149
msgid "Switch your current working copy to the newly created copy in the repository. Again select the top level folder of your project and use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Switch...</guimenuitem></menuchoice> from the context menu."
msgstr "Preklopite delovno kopijo na novo ustvarjeno kopijo v skladišču. Izberite vrhnjo  mapo projekta in iz kontekstnega menija uporabite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Preklopi...</guimenuitem></menuchoice>"

#. (para)
#: ../source/TortoiseGit_en.xml:8159
msgid "In the next dialog enter the URL of the branch you just created. Select the <guilabel>Head Revision</guilabel> radio button and click on <guibutton>OK</guibutton>. Your working copy is switched to the new branch/tag."
msgstr "V naslednjem pogovornem oknu vnesite naslov URL veje, ki ste jo ustvarili. Izberite radijski gumb <guilabel>Revizija HEAD</guilabel> in kliknite na gumb <guibutton>V redu</guibutton>. S tem ste delovno kopijo preklopili na novo vejo/oznako."

#. (para)
#: ../source/TortoiseGit_en.xml:8167
msgid "Switch works just like Update in that it never discards your local changes. Any changes you have made to your working copy which have not yet been committed will be merged when you do the Switch. If you do not want this to happen then you must either commit the changes before switching, or revert your working copy to an already-committed revision (typically HEAD)."
msgstr "Preklop, enako kot posodobitev, nikoli ne povozi krajevnih sprememb. Vse spremembe, ki ste jih naredili v delovni kopiji in še niso bile objavljene, bodo spojene, ko naredite preklop. Če tega ne želite, potem morate spremembe objaviti ali pa delovno kopijio povrniti na objavljeno revizijo (tipično HEAD)."

#. (para)
#: ../source/TortoiseGit_en.xml:8177
msgid "If you want to work on trunk and branch, but don't want the expense of a fresh checkout, you can use Windows Explorer to make a copy of your trunk checkout in another folder, then <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Switch...</guimenuitem></menuchoice> that copy to your new branch."
msgstr "Če želite delati na glavni in stranski veji, vendar ne želite delati svežih prevzemov, ki so časovno potratni, lahko naredite prevzem glavne veje, potem pa uporabite ukaz  <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Preklopi...</guimenuitem></menuchoice>, s katerim delovno kopijo posodobite na izbrano vejo."

#. (title)
#: ../source/TortoiseGit_en.xml:8190
msgid "The Switch Dialog"
msgstr "Okno za preklop"

#. (para)
#: ../source/TortoiseGit_en.xml:8132
msgid "To be able to work with your freshly generated branch or tag you have several ways to handle it. You can: <placeholder-1/><placeholder-2/>"
msgstr "Na voljo je več načinov, kako začnete delati z novo ustvarjeno vejo ali oznako. Lahko: <placeholder-1/><placeholder-2/>"

#. (para)
#: ../source/TortoiseGit_en.xml:8199
msgid "Tags are typically used to create a static snapshot of the project at a particular stage. As such they not normally used for development - that's what branches are for, which is the reason we recommended the <filename>/trunk /branches /tags</filename> repository structure in the first place. Working on a tag revision is <emphasis>not a good idea</emphasis>, but because your local files are not write protected there is nothing to stop you doing this by mistake. However, if you try to commit to a path in the repository which contains <filename>/tags/</filename>, TortoiseGit will warn you."
msgstr "Oznake se ponavadi uporabljajo za ustvarjanje statičnega posnetka projekta v določenem trenutku. Kot take se ponavadi ne uporabljajo za razvijanje - za to se uporabljajo veje, zato priporočamo strukturo skladišča <filename>/trunk /branches /tags</filename>. Delo na reviziji oznake <emphasis>ni dobra ideja</emphasis>, ker pa datoteke v vaši delovni kopiji niso zaščitene pred pisanjem, se vam napaka hitro zgodi. Če pa boste poskušali narediti objavo v skladišču, ki vsebuje mapo <filename>/tags/</filename>, vas bo TortoiseGit opozoril."

#. (para)
#: ../source/TortoiseGit_en.xml:8215
msgid "It may be that you need to make further changes to a release which you have already tagged. The correct way to handle this is to create a new branch from the tag first and commit the branch. Do your Changes on this branch and then create a new tag from this new branch, e.g. <filename>Version_1.0.1</filename>."
msgstr "Včasih morate narediti dodatne spremembe na izdaji, ki ste jo že označili. Pravilen postopek je, da ustvarite novo vejo iz oznake in vejo objavite. Nato na novi veji naredite potrebne spremembe in ustvarite novo oznako iz veje, n. pr. <filename>Verzija_1.0.1</filename>."

#. (para)
#: ../source/TortoiseGit_en.xml:8225
msgid "If you modify a working copy created from a branch and commit, then all changes go to the new branch and <emphasis>not</emphasis> the trunk. Only the modifications are stored. The rest remains a cheap copy."
msgstr "Če spremenite delovno kopijo, ustvarjeno iz veje, in jo objavite, gredo vse spremembe na novo vejo in <emphasis>ne</emphasis> na glavno vejo. Shranijo se le spremembe, nespremenjeni del pa ostane poceni kopija."

#. (para)
#: ../source/TortoiseGit_en.xml:8194
msgid "Although Git itself makes no distinction between tags and branches, the way they are typically used differs a bit. <placeholder-1/>"
msgstr "Čeprav Git ne razlikuje med oznakami in vejami, se pri pri tipični uporabi ta dva ukaza nekoliko razlikujeta. <placeholder-1/>"

#. (title)
#: ../source/TortoiseGit_en.xml:8238
msgid "Merging"
msgstr "Spajanje"

#. (primary)
#. (primary)
#. (primary)
#. (primary)
#: ../source/TortoiseGit_en.xml:8241
#: ../source/TortoiseGit_en.xml:8366
#: ../source/TortoiseGit_en.xml:8442
#: ../source/TortoiseGit_en.xml:8475
msgid "merge"
msgstr "spoji"

#. (para)
#: ../source/TortoiseGit_en.xml:8243
msgid "Where branches are used to maintain separate lines of development, at some stage you will want to merge the changes made on one branch back into the trunk, or vice versa."
msgstr "Kadar se veje uporabljajo za ločeno razvijanje, kasneje želite spremembe na eni veji spojiti nazaj v glavno vejo oz. obratno."

#. (para)
#: ../source/TortoiseGit_en.xml:8248
msgid "It is important to understand how branching and merging works in Git before you start using it, as it can become quite complex. It is highly recommended that you read the chapter <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.branchmerge.html\"><citetitle>Branching and Merging</citetitle></ulink> in the Git book, which gives a full description and many examples of how it is used."
msgstr "Pomembno je, da pred uporabo razumete, kako ustvarjanje vej in oznak v sistemu Git poteka. Vse skupaj lahko postane precej zapleteno. Toplo priporočamo, da preberete poglavje <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.branchmerge.html\"><citetitle>Branching and Merging</citetitle></ulink> v knjigi The Git Book, ki poda popoln opis in veliko primerov, kako ukaza uporabljati. "

#. (para)
#: ../source/TortoiseGit_en.xml:8258
msgid "The next point to note is that merging <emphasis>always</emphasis> takes place within a working copy. If you want to merge changes <emphasis>into</emphasis> a branch, you have to have a working copy for that branch checked out, and invoke the merge wizard from that working copy using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Merge...</guimenuitem></menuchoice>."
msgstr "Naslednja stvar, ki jo je treba poudariti, je, da se spajanje <emphasis>vedno</emphasis> izvaja v delovni kopiji. Če želite spremembe spojiti <emphasis>v</emphasis> vejo, morate imeti delovno kopijo, prevzeto iz te veje, in na njej izvesti ukaz  <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Spoji...</guimenuitem></menuchoice>."

#. (para)
#: ../source/TortoiseGit_en.xml:8269
msgid "In general it is a good idea to perform a merge into an unmodified working copy. If you have made other changes in your WC, commit those first. If the merge does not go as you expect, you may want to revert the changes, and the <guilabel>Revert</guilabel> command will discard <emphasis>all</emphasis> changes including any you made before the merge."
msgstr "V splošnem je priporočljivo, da spajanje izvajate ob nespremenjeni delovni kopiji. Če ste naredili kakšne spremembe v delovni kopiji, jih najprej objavite. Če operacija spajanja ne bo uspela, boste verjetno želeli povrniti spremembe. Ukaz <guilabel>Povrni</guilabel> bo izbrisal <emphasis>vse</emphasis> spremembe na delovni kopiji, vključno s tistimi, ki ste jih naredili pred poskusom spajanja."

#. (para)
#: ../source/TortoiseGit_en.xml:8276
msgid "There are three common use cases for merging which are handled in slightly different ways, as described below. The first page of the merge wizard asks you to select the method you need."
msgstr "Poznamo tri načine spajanja, ki se med seboj nekoliko razlikujejo. Izbiro načina vam omogoča prva stran čarovnika za spajanje."

#. (para)
#: ../source/TortoiseGit_en.xml:8283
msgid "Unlike the command line client, the merge dialog merges all revisions of a range. For example, if you want to merge revisions 5-7, you have to specify \"5-7\" or \"5,6,7\". With the command line client, you would have to specify \"4-7\" to include revision 5 in the merge."
msgstr "V nasprotju z odjemalcem za ukazno vrstico okno za spajanje spoji vse revizije obsega. Primer: če želite spojiti revizije 5-7, morate navesti \"5-7\" ali \"5,6,7\". Pri uporabi odjemalca za ukazno vrstico morate navesti \"4-7\", da vključite tudi revizijo 5."

#. (term)
#: ../source/TortoiseGit_en.xml:8293
msgid "Merge a range of revisions"
msgstr "Spoji območje revizij"

#. (para)
#: ../source/TortoiseGit_en.xml:8295
msgid "This method covers the case when you have made one or more revisions to a branch (or to the trunk) and you want to port those changes across to a different branch."
msgstr "Ta metoda pokriva primer, ko ste na veji (ali na glavni veji) naredili spremembe, ki jih sedaj želite prenesti na drugo vejo."

#. (para)
#: ../source/TortoiseGit_en.xml:8300
msgid "What you are asking Git to do is this: <quote>Calculate the changes necessary to get [FROM] revision 1 of branch A [TO] revision 7 of branch A, and apply those changes to my working copy (of trunk or branch B).</quote>"
msgstr "Od Gita zahtevate naslednje: <quote>Izračunaj spremembe, ki so potrebne, da iz revizije 1 ([OD]) veje A dobimo revizijo 7 ([DO]) veje A, in spremembe namesti na delovno kopijo (glavne ali stranske veje B).</quote>"

#. (term)
#. (title)
#: ../source/TortoiseGit_en.xml:8309
#: ../source/TortoiseGit_en.xml:8439
msgid "Reintegrate a branch"
msgstr "Vključitev veje"

#. (para)
#: ../source/TortoiseGit_en.xml:8311
msgid "This method covers the case when you have made a feature branch as discussed in the Git book. All trunk changes have been ported to the feature branch, week by week, and now the feature is complete you want to merge it back into the trunk. Because you have kept the feature branch synchronized with the trunk, the latest versions of branch and trunk will be absolutely identical except for your branch changes."
msgstr "Ta način se uporablja v primeru, ko ustvarite vejo za razvoj neke zmožnosti programa, kot je to opisano v knjigi The Git Book. Vse spremembe, ki so se dogajale na glavni veji, ste vsak teden spajali na vejo. Sedaj je razvoj nove zmožnosti končan, zato želite to kodo spojiti na glavno vejo. Ker ste vejo ves čas sihnronizirali z glavno vejo, sta stranska in glavna veja identični, le da stranska veja vsebuje kodo za novo zmožnost."

#. (para)
#: ../source/TortoiseGit_en.xml:8320
msgid "This is a special case of the tree merge described below, and it requires only the URL to merge from (normally) your development branch. It uses the merge-tracking features of Git to calculate the correct revision ranges to use, and perform additional checks which ensure that the branch has been fully updated with trunk changes. This ensures that you don't accidentally undo work that others have committed to trunk since you last synchronized changes."
msgstr "To je poseben primer spajanja dreves (opisano spodaj) in zahteva zgolj naslov URL, iz katerega spajate (običajno stranska veja, na kateri ste razvijali novo zmožnost). S sledenjem spajanja se izračuna pravilno območje spajanja in preveri, ali je stranska veja sinhronizirana z glavno. Na ta način preprečimo izgubo objavljenih sprememb na glavni veji od zadnje sinhronizacije."

#. (para)
#: ../source/TortoiseGit_en.xml:8330
msgid "After the merge, all branch development has been completely merged back into the main development line. The branch is now redundant and can be deleted."
msgstr "Po spojitvi je celoten razvoj na stranski veji spojen na glavno razvojno vejo. Stranska veja postane odvečna in jo lahko izbrišemo."

#. (term)
#: ../source/TortoiseGit_en.xml:8338
msgid "Merge two different trees"
msgstr "Spoji dveh različni drevesi"

#. (para)
#: ../source/TortoiseGit_en.xml:8340
msgid "This is a more general case of the reintegrate method. What you are asking Git to do is: <quote>Calculate the changes necessary to get [FROM] the head revision of the trunk [TO] the head revision of the branch, and apply those changes to my working copy (of the trunk).</quote> The net result is that trunk now looks exactly like the branch."
msgstr "To je bolj splošen primer vključitve veje. V tem primeru od Gita zahtevate naslednje:<quote>Izračunaj spremembe, ki so potrebne, da iz revizije HEAD ([OD]) na glavni veji dobimo revizijo HEAD ([DO]) na stranski veji, in spremembe namesti na delovno kopijo (glavne veje).</quote> Rezultat postopka sta identični glavna in stranska veja."

#. (para)
#: ../source/TortoiseGit_en.xml:8348
msgid "If your server/repository does not support merge-tracking then this is the only way to merge a branch back to trunk. Another use case occurs when you are using vendor branches and you need to merge the changes following a new vendor drop into your trunk code. For more information read the chapter on <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.advanced.vendorbr.html\"><citetitle>vendor branches</citetitle></ulink> in the Git Book."
msgstr "Če vaš strežnik ne podpira sledenja spajanja, lahko spremembe na stranski veji spojite na glavno le s tem načinom. Drug primer je uporaba vej zunanje kode (vendor branches), kjer morate spremembe, ki jih je naredil zunanji izvajalec, spojiti v svojo glavno vejo. Za več informacij preberite <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.advanced.vendorbr.html\"><citetitle>vendor branches</citetitle></ulink> v knjigi The Git Book."

#. (title)
#: ../source/TortoiseGit_en.xml:8363
msgid "Merging a Range of Revisions"
msgstr "Spajanje območja revizij"

#. (secondary)
#: ../source/TortoiseGit_en.xml:8367
msgid "revision range"
msgstr "območje revizij"

#. (title)
#: ../source/TortoiseGit_en.xml:8371
msgid "The Merge Wizard - Select Revision Range"
msgstr "Čarovnik za spajanje - Izberite obseg revizije"

#. (para)
#: ../source/TortoiseGit_en.xml:8369
msgid "<placeholder-1/> In the <guilabel>From:</guilabel> field enter the full folder URL of the branch or tag containing the changes you want to port into your working copy. You may also click <guibutton>...</guibutton> to browse the repository and find the desired branch. If you have merged from this branch before, then just use the drop down list which shows a history of previously used URLs."
msgstr "<placeholder-1/>V polje <guilabel>Izvorni naslov URL za spajanje:</guilabel> vnesite poln naslov URL veje ali oznake s spremembami, ki jih želite spojiti v delovno kopijo. Lahko pa kliknete na gumb <guibutton>...</guibutton>. S tem pobrskate po skladišču in najdete željeno vejo. Če ste s te veje že spajali, lahko uporabite spustni seznam, ki prikazuje zgodovino že vnešenih naslovov URL."

#. (para)
#: ../source/TortoiseGit_en.xml:8384
msgid "In the <guilabel>Revision range to merge</guilabel> field enter the list of revisions you want to merge. This can be a single revision, a list of specific revisions separated by commas, or a range of revisions separated by a dash, or any combination of these."
msgstr "V polje <guilabel>Območje revizij za spajanje</guilabel> vnesite seznam revizij, ki jih želite spojiti. Lahko vpišete eno revizijo, seznam določenih revizij, ločenih z vejicami, območje revizij, ločenih z vezajem ali kombinacijo vsega naštetega."

#. (para)
#: ../source/TortoiseGit_en.xml:8391
msgid "The easiest way to select the range of revisions you need is to click on <guibutton>Show Log</guibutton>, as this will list recent changes with their log comments. If you want to merge the changes from a single revision, just select that revision. If you want to merge changes from several revisions, then select that range (using the usual <keycap>Shift</keycap>-modifier). Click on <guibutton>OK</guibutton> and the list of revision numbers to merge will be filled in for you."
msgstr "Najlažji način, kako izberete večje število revizij, je s klikom na gumb <guibutton>Pokaži dnevnik</guibutton>; prikazalo se bo okno s seznamom zadnjih sprememb in pripadajočimi komentarji. Če želite spojiti spremembe iz ene revizije, izberite to revizijo. Če želite spojiti spremembe iz več revizij, izberite območje (z uporabo modifikatorja <keycap>Shift</keycap>). Kliknite na gumb <guibutton>V redu</guibutton> in seznam številk revizij se bo samodejno izpolnil."

#. (para)
#: ../source/TortoiseGit_en.xml:8402
msgid "If you want to merge changes back <emphasis>out</emphasis> of your working copy, to revert a change which has already been committed, select the revisions to revert and make sure the <guilabel>Reverse merge</guilabel> box is checked."
msgstr "Če želite spremembe spojiti nazaj <emphasis>ven</emphasis> iz delovne kopije (da prekličete že objavljeno spremembo), izberite revizije, ki jih želite povrniti in potrdite polje <guilabel>Obratno spajanje</guilabel>."

#. (para)
#: ../source/TortoiseGit_en.xml:8408
msgid "If you have already merged some changes from this branch, hopefully you will have made a note of the last revision merged in the log message when you committed the change. In that case, you can use <guibutton>Show Log</guibutton> for the Working Copy to trace that log message. Use the end point of the last merge as the start point for this merge. For example, if you have merged revisions 37 to 39 last time, then the start point for this merge should be revision 39."
msgstr "Če ste že spajali s te veje, ste verjetno v sporočilo objave vpisali komentar s številko zadnje spojene revizije. Če je temu tako, lahko uporabite gumb <guibutton>Pokaži dnevnik</guibutton>, da poiščete ustrezen dnevniški zapis za delovno kopijo. Končno revizijo prejšnjega spajanja uporabite kot začetno revizijo za tokratno spajanje. Primer: če ste pri zadnjem spajanju spojili spremembe med revizijama 37 in 39, potem mora biti začetna točka za to spajanje revizija 39."

#. (para)
#: ../source/TortoiseGit_en.xml:8419
msgid "If you are using the merge tracking features of Git, you do not need to remember which revisions have already been merged - Git will record that for you. If you leave the revision range blank, all revisions which have not yet been merged will be included. Read <xref linkend=\"tsvn-dug-merge-tracking\"/> to find out more."
msgstr "Če uporabljete sledenje spajanja, vam ni potrebno vedeti, katere revizije ste že spojili - Git si jih zapomni. Če pustite polje za vnos območja revizij prazno, bodo samodejno vključene vse revizije, ki še niso bile spojene. Za več informacij preberite <xref linkend=\"tsvn-dug-merge-tracking\"/>."

#. (para)
#: ../source/TortoiseGit_en.xml:8427
msgid "If other people may be committing changes then be careful about using the HEAD revision. It may not refer to the revision you think it does if someone else made a commit after your last update."
msgstr "Če v skladišču objavljajo tudi drugi uporabniki, potem bodite pri uporabi spajanja do revizije HEAD previdni. Revizija HEAD mogoče ni tista, kot mislite, saj je od vaše zadnje posodobitve delovne kopije lahko kak drug uporabnik naredil objavo."

#. (para)
#: ../source/TortoiseGit_en.xml:8433
msgid "Click <guibutton>Next</guibutton> and go to <xref linkend=\"tsvn-dug-merge-options\"/>"
msgstr "Kliknite gumb <guibutton>Naprej</guibutton> in pojdite na <xref linkend=\"tsvn-dug-merge-options\"/>"

#. (secondary)
#: ../source/TortoiseGit_en.xml:8443
msgid "reintegrate"
msgstr "vključitev"

#. (title)
#: ../source/TortoiseGit_en.xml:8447
msgid "The Merge Wizard - Reintegrate Merge"
msgstr "Čarovnik za spajanje - Vključitev veje"

#. (para)
#: ../source/TortoiseGit_en.xml:8445
msgid "<placeholder-1/> To merge a feature branch back into the trunk you must start the merge wizard from within a working copy of the trunk."
msgstr "<placeholder-1/> Za spajanje stranske veje na glavno vejo morate čarovnika za spajanje zagnati iz delovne kopije glavne veje."

#. (para)
#: ../source/TortoiseGit_en.xml:8453
msgid "In the <guilabel>From URL:</guilabel> field enter the full folder URL of the branch that you want to merge back. You may also click <guibutton>...</guibutton> to browse the repository."
msgstr "V polje <guilabel>Iz URL:</guilabel> vpišite poln naslov URL mape stranske veje, ki jo želite spojiti na glavno vejo. Uporabite lahko tudi gumb <guibutton>...</guibutton> in pobrskate po skladišču."

#. (para)
#: ../source/TortoiseGit_en.xml:8460
msgid "There are some conditions which apply to a reintegrate merge. Firstly, the server must support merge tracking. The working copy must be of depth infinite (no sparse checkouts), and it must not have any local modifications, switched items or items that have been updated to revisions other than HEAD. All changes to trunk made during branch development must have been merged across to the branch (or marked as having been merged). The range of revisions to merge will be calculated automatically."
msgstr "Za izvajanje vključevanja veje morajo biti izpolnjeni določeni pogoji. Strežnik mora podpirati sledenje spajanja. Delovna kopija mora biti prevzeta v celoti (delni prevzemi niso dovoljeni) in biti brez krajevnih sprememb, preklopov ali elementov, posodobljenih na starejše revizije. Vse spremembe, narejene na glavni veji, morajo biti že spojene na stransko vejo (oziroma morajo biti označene kot spojene). Območje revizij za spajanje se določi samodejno."

#. (title)
#: ../source/TortoiseGit_en.xml:8472
msgid "Merging Two Different Trees"
msgstr "Spajanje dveh različnih dreves"

#. (secondary)
#: ../source/TortoiseGit_en.xml:8476
msgid "two trees"
msgstr "dve drevesi"

#. (title)
#: ../source/TortoiseGit_en.xml:8480
msgid "The Merge Wizard - Tree Merge"
msgstr "Čarovnik za spajanje - Spajanje dreves"

#. (para)
#: ../source/TortoiseGit_en.xml:8478
msgid "<placeholder-1/> If you are using this method to merge a feature branch back to trunk, you need to start the merge wizard from within a working copy of trunk."
msgstr "<placeholder-1/> Če ta način uporabljate za spajanje stranske veje na glavno vejo, morate čarovnika za spajanje zagnati iz delovnke kopije glavne veje."

#. (para)
#: ../source/TortoiseGit_en.xml:8486
msgid "In the <guilabel>From:</guilabel> field enter the full folder URL of the <emphasis>trunk</emphasis>. This may sound wrong, but remember that the trunk is the start point to which you want to add the branch changes. You may also click <guibutton>...</guibutton> to browse the repository."
msgstr "V polje <guilabel>Od:</guilabel> vpišite poln naslov URL mape <emphasis>glavne veje</emphasis>. To se morda zdi napačno, a ne pozabite, da je glavna veja začetna točka spajanja, na katero želite dodati spremembe iz veje, kjer ste razvijali novo zmožnost. Uporabite lahko tudi gumb <guibutton>...</guibutton> in pobrskate po skladišču."

#. (para)
#: ../source/TortoiseGit_en.xml:8495
msgid "In the <guilabel>To:</guilabel> field enter the full folder URL of the feature branch."
msgstr "V polje <guilabel>Do:</guilabel> vpišite poln naslov URL mape veje, kjer ste razvijali novo zmožnost."

#. (para)
#: ../source/TortoiseGit_en.xml:8499
msgid "In both the <guilabel>From Revision</guilabel> field and the <guilabel>To Revision</guilabel> field, enter the last revision number at which the two trees were synchronized. If you are sure no-one else is making commits you can use the HEAD revision in both cases. If there is a chance that someone else may have made a commit since that synchronization, use the specific revision number to avoid losing more recent commits."
msgstr "V polji <guilabel>Revizija</guilabel> vpišite zadnji reviziji, pri kateri sta bili drevesi sihnronizirani. Če ste prepričani, da sprememb ne objavlja nihče drug, lahko v obeh primerih uporabite revizijo HEAD. Če obstaja možnost, da je po sinhronizaciji še kdo drug objavljal spremembe, potem raje uporabite točno določeno številko revizije, da se izognete izgubi sprememb iz novejših objav."

#. (para)
#: ../source/TortoiseGit_en.xml:8509
msgid "You can also use <guibutton>Show Log</guibutton> to select the revision."
msgstr "Za izbiro revizije lahko uporabite tudi gumb <guibutton>Pokaži dnevnik</guibutton>."

#. (title)
#: ../source/TortoiseGit_en.xml:8515
msgid "Merge Options"
msgstr "Možnosti spajanja"

#. (para)
#: ../source/TortoiseGit_en.xml:8517
msgid "This page of the wizard lets you specify advanced options, before starting the merge process. Most of the time you can just use the default settings."
msgstr "Ta stran čarovnika vam pred začetkom spajanja omogoča nastavitev naprednih možnosti. V večini primerov lahko uporabite kar privzete nastavitve."

#. (para)
#: ../source/TortoiseGit_en.xml:8522
msgid "You can specify the depth to use for the merge, i.e. how far down into your working copy the merge should go. The depth terms used are described in <xref linkend=\"tsvn-dug-checkout-depth\"/>. The default depth is <guilabel>Working copy</guilabel>, which uses the existing depth setting, and is almost always what you want."
msgstr "Določite lahko globino spajanja, ki pove, kako globoko v delovno kopijo spajanje deluje. Za definicijo globine poglejte <xref linkend=\"tsvn-dug-checkout-depth\"/>. Privzeta globina je <guilabel>delovna kopija</guilabel>, ki uporablja obstoječo nastavitev globine, kar največkrat tudi potrebujete."

#. (para)
#: ../source/TortoiseGit_en.xml:8529
msgid "Most of the time you want merge to take account of the file's history, so that changes relative to a common ancestor are merged. Sometimes you may need to merge files which are perhaps related, but not in your repository. For example you may have imported versions 1 and 2 of a third party library into two separate directories. Although they are logically related, Git has no knowledge of this because it only sees the tarballs you imported. If you attempt to merge the difference between these two trees you would see a complete removal followed by a complete add. To make Git use only path-based differences rather than history-based differences, check the <guilabel>Ignore ancestry</guilabel> box. Read more about this topic in the Git book, <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.branchmerge.copychanges.html#svn.branchmerge.copychanges.bestprac.ancestry\"><citetitle>Noticing or Ignoring Ancestry</citetitle></ulink>"
msgstr "V večini primerov želite pri spajanju upoštevati zgodovino datoteke, tako da se spojijo spremembe, ki so relativne na skupnega prednika. Včasih morate spojiti datoteke, ki so morda povezane, vendar ne v vašem skladišču. Primer: uvozili ste verziji 1 in 2 knjižnice, ki jo je izdelalo neko drugo podjetje. Čeprav sta verziji logično povezani, Git o tem ne ve nič, saj vidi le uvožena paketa. Če poskusite spojiti spremembe med tema dvema drevesoma, boste videli, da bo prva verzija odstranjena, druga pa dodana. Da bi Git upošteval razlike na osnovi poti in ne na osnovi zgodovine, potrdite polje <guilabel>Prezri dedovanje</guilabel>. Več o tem preberite v knjigi The Git book, <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.branchmerge.copychanges.html#svn.branchmerge.copychanges.bestprac.ancestry\"><citetitle>Noticing or Ignoring Ancestry</citetitle></ulink>"

#. (para)
#: ../source/TortoiseGit_en.xml:8546
msgid "You can specify the way that line ending and whitespace changes are handled. These options are described in <xref linkend=\"tsvn-dug-diff-eol-whitespace\"/>. The default behaviour is to treat all whitespace and line-end differences as real changes to be merged."
msgstr "Določite lahko, kako se upoštevajo zaključki vrstic in presledki. Možnosti so opisane v <xref linkend=\"tsvn-dug-diff-eol-whitespace\"/>. Privzeto obnašanje je, da se zaključki vrstic in presledki obravnavajo enako kot vse druge spremembe."

#. (para)
#: ../source/TortoiseGit_en.xml:8552
msgid "If you are using merge tracking and you want to mark a revision as having been merged, without actually doing the merge here, check the <guilabel>Only record the merge</guilabel> checkbox. There are two possible reasons you might want to do this. It may be that the merge is too complicated for the merge algorithms, so you code the changes by hand, then mark the change as merged so that the merge tracking algorithm is aware of it. Or you might want to prevent a particular revision from being merged. Marking it as already merged will prevent the merge occurring with merge-tracking-aware clients."
msgstr "Če uporabljate sledenje spajanja in želite revizijo označiti kot spojeno brez dejanskega spajanja, potrdite polje <guilabel>Zgolj zabeleži spajanje</guilabel>. To lahko naredite iz dveh razlogov. Lahko se zgodi, da je spajanje prezahtevno, da bi ga prepustili programu in naredite spremembe ročno, nato pa revizijo označite kot spojeno, da sistem sledenja spajanja ve za to. Drug razlog pa je, da želite preprečiti spajanje določene revizije. Če takšno revizijo označite kot spojeno, s tem preprečite ponovno spajanje (velja le za odjemalce, ki poznajo možnost sledenja spajanja)."

#. (para)
#: ../source/TortoiseGit_en.xml:8563
msgid "Now everything is set up, all you have to do is click on the <guibutton>Merge</guibutton> button. If you want to preview the results <guibutton>Test Merge</guibutton> performs the merge operation, but does <emphasis>not</emphasis> modify the working copy at all. It shows you a list of the files that will be changed by a real merge, and notes those areas where conflicts will occur."
msgstr "Sedaj so vse nastavitve narejene, zato morate le še klikniti na gumb <guibutton>Spoji</guibutton>. Če želite prehodno pogledati rezultat spajanja, lahko uporabite gumb <guibutton>Poizkusno spajanje</guibutton>, ki izvede spajanje, vendar <emphasis>ne</emphasis> spremeni delovne kopije. Pokaže vam seznam datotek, ki bodo spremenjene v primeru dejanskega spajanja in označi območja, kjer se bodo pojavili spori."

#. (para)
#: ../source/TortoiseGit_en.xml:8571
msgid "The merge progress dialog shows each stage of the merge, with the revision ranges involved. This may indicate one more revision than you were expecting. For example if you asked to merge revision 123 the progress dialog will report <quote>Merging revisions 122 through 123</quote>. To understand this you need to remember that Merge is closely related to Diff. The merge process works by generating a list of differences between two points in the repository, and applying those differences to your working copy. The progress dialog is simply showing the start and end points for the diff."
msgstr "Okno spajanja pokaže vsak korak procesa z območjem revizij, ki se uporablja. To obsega eno revizijo več, kot najbrž pričakujete. Če zahtevate spajanje revizije 123, okno prikaže besedilo <quote>Spajanje revizij 122 do 123</quote>. Da bi to razumeli, se morate zavedati, da je spajanje tesno povezano z razlikovanjem. Proces spajanja poteka tako, da se ustvari seznam sprememb med dvema točkama v skladišču in namesti te spremembe v delovno kopijo. Okno spajanja tako kaže začetno in končno točko razlike."

#. (title)
#: ../source/TortoiseGit_en.xml:8584
msgid "Reviewing the Merge Results"
msgstr "Preverjanje rezultatov spajanja"

#. (para)
#: ../source/TortoiseGit_en.xml:8585
msgid "The merge is now complete. It's a good idea to have a look at the merge and see if it's as expected. Merging is usually quite complicated. Conflicts often arise if the branch has drifted far from the trunk."
msgstr "Spajanje je sedaj zaključeno. Dobra praksa je, da rezultat spajanja preverimo. Spajanje je ponavadi kar komplicirano. Če je neka veja precej različna od glavne veje, se pri spajanju pogosto pojavijo spori."

#. (para)
#: ../source/TortoiseGit_en.xml:8590
msgid "For Git clients and servers prior to 1.5, no merge information is stored and merged revisions have to be tracked manually. When you have tested the changes and come to commit this revision, your commit log message should <emphasis>always</emphasis> include the revision numbers which have been ported in the merge. If you want to apply another merge at a later time you will need to know what you have already merged, as you do not want to port a change more than once. For more information about this, refer to <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.branchmerge.copychanges.html#svn.branchmerge.copychanges.bestprac\"><citetitle>Best Practices for Merging</citetitle></ulink> in the Git book."
msgstr "Pri uporabi odjemalcev in strežnika Suversion pred različico 1.5 se informacije o spajanju ne shranjujejo in jih je zato treba voditi ločeno. Ko ste spajanje preverili in ste pripravljeni na objavo spojene revizije, v sporočilo dnevniškega zapisa <emphasis>vedno</emphasis> vpišite številke revizij, ki ste jih prenesli. Če boste kasneje spet spajali s te veje, boste morali vedeti, katere revizije ste že spojili. Sprememb ne smete spajati dvakrat. Za več informacij preberite <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.branchmerge.copychanges.html#svn.branchmerge.copychanges.bestprac\"><citetitle>Best Practices for Merging</citetitle></ulink> v knjigi The Git book."

#. (para)
#: ../source/TortoiseGit_en.xml:8604
msgid "If your server and all clients are running Git 1.5 or higher, the merge tracking facility will record the revisions merged and avoid a revision being merged more than once. This makes your life much simpler as you can simply merge the entire revision range each time and know that only new revisions will actually be merged."
msgstr "Če strežnik in vsi odjemalci uporabljajo Git 1.5 ali novejši, zmožnost sledenje spajanja shrani spojene revizije in prepreči večkratno spajanje iste revizije. S tem si precej olajšate delo, saj lahko vedno izberete celotno območje revizij, spojene pa bodo le nove revizije."

#. (para)
#: ../source/TortoiseGit_en.xml:8611
msgid "Branch management is important. If you want to keep this branch up to date with the trunk, you should be sure to merge often so that the branch and trunk do not drift too far apart. Of course, you should still avoid repeated merging of changes, as explained above."
msgstr "Upravljanje vej je pomembno. Če želite biti na veji v koraku z glavno vejo, morate dovolj pogosto opravljati spajanje, da se veja in glavna veja ne oddaljita preveč ena od druge. Seveda se morate še vedno izogibati ponavljajočemu se spajanju sprememb, kot je opisano zgoraj."

#. (para)
#: ../source/TortoiseGit_en.xml:8618
msgid "If you have just merged a feature branch back into the trunk, the trunk now contains all the new feature code, and the branch is obsolete. You can now delete it from the repository if required."
msgstr "V tem primeru veje za razvoj nove zmožnosti ne potrebujete več, ker ste novo kodo že integrirali na glavno vejo. Veja je sedaj odvečna in jo lahko izbrišete iz skladišča, če želite."

#. (para)
#: ../source/TortoiseGit_en.xml:8626
msgid "Git can't merge a file with a folder and vice versa - only folders to folders and files to files. If you click on a file and open up the merge dialog, then you have to give a path to a file in that dialog. If you select a folder and bring up the dialog, then you must specify a folder URL for the merge."
msgstr "Git ne more spojiti datoteke z mapo in obratno - spaja lahko mape v mape in datoteke v datoteke. Če izberete datoteko in odprete okno za spajanje, potem morate v oknu navesti pot do datoteke. Če izberete mapo in odprete okno, potem morate vnesti naslov URL mape za spajanje."

#. (title)
#: ../source/TortoiseGit_en.xml:8636
msgid "Merge Tracking"
msgstr "Sledenje spajanja"

#. (primary)
#: ../source/TortoiseGit_en.xml:8638
msgid "merge tracking"
msgstr "sledenje spajanja"

#. (para)
#: ../source/TortoiseGit_en.xml:8646
msgid "You can avoid the danger of merging the same revision twice (repeated merge problem). Once a revision is marked as having been merged, future merges which include that revision in the range will skip over it."
msgstr "Večkratnemu spajanju iste revizije se lahko izognete. Ko je revizija označena kot spojena, jo bo Git pri naslednjih poskusil enostavno preskočil."

#. (para)
#: ../source/TortoiseGit_en.xml:8652
msgid "When you merge a branch back into trunk, the log dialog can show you the branch commits as part of the trunk log, giving better traceability of changes."
msgstr "Ko spremembe na veji spojite nazaj na glavno vejo, vam lahko dnevnik za glavno vejo prikaže tudi objave na posebni veji. S tem lažje sledite spremembam."

#. (para)
#: ../source/TortoiseGit_en.xml:8657
msgid "When showing blame information for a file, you can choose to show the original author of merged revisions, rather than the person who did the merge."
msgstr "Pri prikazu krivdnih informacij datoteke lahko prikažete avtorje spojenih revizij namesto avtorja, ki je opravil spajanje."

#. (para)
#: ../source/TortoiseGit_en.xml:8662
msgid "You can mark revisions as <emphasis>do not merge</emphasis> by including them in the list of merged revisions without actually doing the merge."
msgstr "Revizije lahko označite kot <emphasis>ne spajaj</emphasis>. To storite tako, da jih dodate na seznam spojenih revizij, čeprav se spajanje dejansko nikoli ni zgodilo."

#. (para)
#: ../source/TortoiseGit_en.xml:8640
msgid "Git 1.5 introduced facilities for merge tracking. When you merge changes from one tree into another, the revision numbers merged are stored and this information can be used for several different purposes. <placeholder-1/>"
msgstr "Git 1.5 prinaša zmožnost sledenja spajanja. Ko spajate spremembe iz enega drevesa v drugega, se številke spojenih revizij shranijo. Te informacije se lahko nato uporabijo za različne namene. <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:8670
msgid "Merge tracking information is stored in the <literal>svn:mergeinfo</literal> property by the client when it performs a merge. When the merge is committed the server stores that information in a database, and when you request merge, log or blame information, the server can respond appropriately. For the system to work properly you must ensure that the server, the repository and all clients are upgraded. Earlier clients will not store the <literal>svn:mergeinfo</literal> property and earlier servers will not provide the information requested by new clients."
msgstr "Informacije o sledenju spajanja odjemalec ob spajanju shrani v lastnost <literal>svn:mergeinfo</literal>. Ko je spajanje objavljeno, strežnik te informacije shrani v bazo podatkov, zato se ob zahtevi po spajanju, prikazu dnevnika ali krivde lahko ustrezno odzove. Da bi sistem deloval, morate nadgraditi tako strežnik kot tudi vse odjemalce. Starejši odjemalci namreč ne shranjujejo lastnosti <literal>svn:mergeinfo</literal>, starejši strežniki pa ne pošiljajo zahtevanih informacij novim odjemalcem."

#. (para)
#: ../source/TortoiseGit_en.xml:8680
msgid "Find out more about merge tracking from Git's <ulink url=\"http://Git.tigris.org/merge-tracking/index.html\"><citetitle>Merge tracking documentation</citetitle></ulink>."
msgstr "Več o sledenju spajanja preberite na strani <ulink url=\"http://Git.tigris.org/merge-tracking/index.html\"><citetitle>Merge tracking documentation</citetitle></ulink>."

#. (title)
#: ../source/TortoiseGit_en.xml:8688
msgid "Handling Conflicts during Merge"
msgstr "Reševanje sporom med spajanjem"

#. (primary)
#: ../source/TortoiseGit_en.xml:8691
msgid "merge conflicts"
msgstr "spori spajanja"

#. (title)
#: ../source/TortoiseGit_en.xml:8700
msgid "The Merge Conflict Callback Dialog"
msgstr "Povratne informacije o sporih spajanja"

#. (para)
#: ../source/TortoiseGit_en.xml:8693
msgid "Merging does not always go smoothly. Sometimes there is a conflict, and if you are merging multiple ranges, you generally want to resolve the conflict before merging of the next range starts. TortoiseGit helps you through this process by showing the <emphasis>merge conflict callback</emphasis> dialog. <placeholder-1/>"
msgstr "Spajanje ne poteka vedno gladko. Včasih se pojavi spor in če spajate območje revizij, je najbolje spor rešiti pred nadaljnjim spajanjem. TortoiseGit vam pri tem pomaga tako, da vam pokaže pogovorno okno <emphasis>povratne informacije o sporih spajanja</emphasis>. <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:8709
msgid "You may decide that your local changes are much more important, so you want to discard the version from the repository and keep your local version. Or you might discard your local changes in favour of the repository version. Either way, no attempt is made to merge the changes - you choose one or the other."
msgstr "Včasih se odločite, da so krajevne spremembe bolj pomembne, zato želite pozabiti na spremembe iz skladišča in obdržati krajevno verzijo. Ali pa naredite obratno. V nobenemem primeru se spajanje ne izvede - uporabi se ena ali druga verzija."

#. (para)
#: ../source/TortoiseGit_en.xml:8719
msgid "Normally you will want to look at the conflicts and resolve them. In that case, choose the <guibutton>Edit Conflict</guibutton> which will start up your merge tool. When you are satisfied with the result, click <guibutton>Resolved</guibutton>."
msgstr "Običajno boste spore pregledali in jih rešili. Za to uporabite gumb <guibutton>Uredi spor</guibutton>, ki zažene orodje za spajanje. Ko ste z rezultatom zadovoljni, kliknite na gumb <guibutton>Rešen</guibutton>."

#. (para)
#: ../source/TortoiseGit_en.xml:8727
msgid "The last option is to postpone resolution and continue with merging. You can choose to do that for the current conflicted file, or for all files in the rest of the merge. However, if there are further changes in that file, it will not be possible to complete the merge."
msgstr "Zadnja možnost je, da reševanje spora odložite na kasnejši čas in nadaljujete s spajanjem. Lahko se odločite, da to storite le za trenutno datoteko ali pa za celotno spajanje. Upoštevajte, da v primeru nadaljnjih sprememb iste datoteke spajanja ne bo moč zaključiti."

#. (para)
#: ../source/TortoiseGit_en.xml:8704
msgid "When a conflict occurs during the merge, you have three ways to handle it. <placeholder-1/>"
msgstr "V primeru spora imate tri možnosti reševanja: <placeholder-1/>"

#. (title)
#: ../source/TortoiseGit_en.xml:8739
msgid "Merge a Completed Branch"
msgstr "Spajanje zaključene veje"

#. (primary)
#: ../source/TortoiseGit_en.xml:8742
msgid "merge reintegrate"
msgstr "vključitev veje"

#. (title)
#: ../source/TortoiseGit_en.xml:8754
msgid "The Merge reintegrate Dialog"
msgstr "Okno Vključitev veje"

#. (para)
#: ../source/TortoiseGit_en.xml:8744
msgid "If you want to merge all changes from a feature branch back to trunk, then you can use the <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Merge reintegrate...</guimenuitem></menuchoice> from the extended context menu (hold down the <keycap>Shift</keycap> key while you right click on the file). <placeholder-1/> This dialog is very easy. All you have to do is set the options for the merge, as described in <xref linkend=\"tsvn-dug-merge-options\"/>. The rest is done by TortoiseGit automatically using merge tracking."
msgstr "Če želite spojiti vse spremembe iz glavne veje na stransko vejo, na kateri trenutno delate, lahko uporabite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Vključitev veje...</guimenuitem></menuchoice> iz razširjenega kontekstnega menija (ob desnem kliku držite pritisnjeno tipko<keycap>Shift</keycap>). <placeholder-1/> Pogovorno okno je enostavno. Vse, kar morate storiti, je nastaviti možnosti za spajanje, kot je to opisano v <xref linkend=\"tsvn-dug-merge-options\"/>. Vse ostalo naredi TortoiseGit sam s pomočjo sledenja spajanja."

#. (title)
#: ../source/TortoiseGit_en.xml:8763
msgid "Feature Branch Maintenance"
msgstr "Vzdrževanje stranskih vej"

#. (para)
#: ../source/TortoiseGit_en.xml:8764
msgid "When you develop a new feature on a separate branch it is a good idea to work out a policy for re-integration when the feature is complete. If other work is going on in <literal>trunk</literal> at the same time you may find that the differences become significant over time, and merging back becomes a nightmare."
msgstr "Pri razvijanju nove zmožnosti na stranski veji se je koristno odločiti, kako se razvoj na stranski veji vključi v glavno vejo razvoja. Če se na glavni veji (<literal>trunk</literal>) dogajajo spremembe, se lahko zgodi, da se po določenem času veji zelo razlikujeta, tako da združevanje postane prava nočna mora."

#. (para)
#: ../source/TortoiseGit_en.xml:8771
msgid "If the feature is relatively simple and development will not take long then you can adopt a simple approach, which is to keep the branch entirely separate until the feature is complete, then merge the branch changes back into trunk. In the merge wizard this would be a simple <guilabel>Merge a range of revisions</guilabel>, with the revision range being the revision span of the branch."
msgstr "Če je zmožnost enostavna, njen razvoj pa ne bo dolgotrajen, se lahko določite, da stransko vejo povsem ločite od glavne. Ko je razvoj na stranski veji končan, spremembe spojite nazaj na glavno vejo. V čarovniku za spajanje uporabite opcijo <guilabel>poji območje revizij</guilabel>, pri čemer za območje spajanja uporabite območje revizij stranske veje."

#. (para)
#: ../source/TortoiseGit_en.xml:8779
msgid "If the feature is going to take longer and you need to account for changes in <literal>trunk</literal>, then you need to keep the branch synchronised. This simply means that periodically you merge trunk changes into the branch, so that the branch contains all the trunk changes <emphasis>plus</emphasis> the new feature. The synchronisation process uses <guilabel>Merge a range of revisions</guilabel>. When the feature is complete then you can merge it back to <literal>trunk</literal> using either <guilabel>Reintegrate a branch</guilabel> or <guilabel>Merge two different trees</guilabel>."
msgstr "Če bo razvoj na stranski veji potekal dalj časa, pri tem pa morate upoštevati tudi spremembe na <literal>glavni veji</literal>, morate poskrbeti, da sta vejo sinhronizirani. To preprosto pomeni, da morate v določenih časovnih razmakih spajati spremembe iz glavne veje na stransko. Tako stranska veja vsebuje vse spremembe iz glavne veje, <emphasis>poleg tega pa</emphasis> tudi spremembe zaradi razvoja nove zmožnosti. Za sinhronizacij uporabljate možnost <guilabel>Spoji območje revizij</guilabel>. Ko je razvoj na stranski veji končan, lahko spojite spremembe nazaj na <literal>glavno vejo</literal> z uporabo možnosti <guilabel>Vključitev veje</guilabel> ali <guilabel>Spoji dve različni drevesi</guilabel>."

#. (title)
#: ../source/TortoiseGit_en.xml:8794
msgid "Locking"
msgstr "Zaklepanje"

#. (primary)
#: ../source/TortoiseGit_en.xml:8796
msgid "locking"
msgstr "zaklepanje"

#. (primary)
#: ../source/TortoiseGit_en.xml:8799
msgid "readonly"
msgstr "samo za branje"

#. (para)
#: ../source/TortoiseGit_en.xml:8809
msgid "You are using <quote>unmergeable</quote> files, for example, graphics files. If two people change the same file, merging is not possible, so one of you will lose their changes."
msgstr "Za delo uporabljate datoteke, ki jih ni mogoče spajati, naprimer grafične datoteke. Če dva uporabnika spremenita isto datoteko, spajanje ni mogoče, zato bo eden izmed njih svoje spremembe izgubil."

#. (para)
#: ../source/TortoiseGit_en.xml:8817
msgid "Your company has always used a locking revision control system in the past and there has been a management decision that <quote>locking is best</quote>."
msgstr "Vaše podjetje je v preteklosti vedno uporabljalo nadzor različic z zaklepanjem, zato se je vodstvo odločilo, da je <quote>zaklepanje najboljša rešitev</quote>."

#. (para)
#: ../source/TortoiseGit_en.xml:8801
msgid "Git generally works best without locking, using the <quote>Copy-Modify-Merge</quote> methods described earlier in <xref linkend=\"tsvn-basics-versioning-copymodifymerge\"/>. However there are a few instances when you may need to implement some form of locking policy. <placeholder-1/>"
msgstr "Git v splošnem najbolje deluje brez zaklepanja, z uporabo modela <quote>kopiraj-spremeni-spoji</quote>, kot je to opisano v <xref linkend=\"tsvn-basics-versioning-copymodifymerge\"/>. Se pa vseeno pojavijo situacije, kjer je potrebno uveljaviti določeno obliko zaklepanja. <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:8825
msgid "Firstly you need to ensure that your Git server is upgraded to at least version 1.2. Earlier versions do not support locking at all. If you are using <literal>file://</literal> access, then of course only your client needs to be updated."
msgstr "Najprej morate strežnik nadgraditi na različico Git 1.2 ali novejšo. Starejše različice namreč ne podpirajo zaklepanja. Če za dostop uporabljate protokol <literal>file://</literal>, potem morate seveda nadgraditi samo odjemalca."

#. (title)
#: ../source/TortoiseGit_en.xml:8832
msgid "How Locking Works in Git"
msgstr "Zaklepanje v sistemu Git"

#. (para)
#: ../source/TortoiseGit_en.xml:8833
msgid "By default, nothing is locked and anyone who has commit access can commit changes to any file at any time. Others will update their working copies periodically and changes in the repository will be merged with local changes."
msgstr "Po privzetih nastavitvah elementi niso zaklenjeni in vsakdo, ki ima pravice za pisanje v skladišču, lahko kadarkoli objavi spremembe  katerekoli datoteke. Ostali uporabniki bodo periodično posodabljali svojo delovno kopijo. Spremembe v skladišču bodo spojene s krajevnimi spremembami."

#. (para)
#: ../source/TortoiseGit_en.xml:8839
msgid "If you <firstterm>Get a Lock</firstterm> on a file, then only you can commit that file. Commits by all other users will be blocked until you release the lock. A locked file cannot be modified in any way in the repository, so it cannot be deleted or renamed either, except by the lock owner."
msgstr "Če za datoteko <firstterm>pridobite zaklep</firstterm>, potem lahko le vi objavite spremembe na tej datoteki. Objave s strani drugih uporabnikov bo sistem zaustavil, vse dokler zaklepa ne sprostite. Zaklenjene datoteke v skladišču ni mogoče spremeniti na noben način, tako da se je ne da izbrisati ali preimenovati, razen če niste ste lastnik zaklepa. "

#. (para)
#: ../source/TortoiseGit_en.xml:8846
msgid "However, other users will not necessarily know that you have taken out a lock. Unless they check the lock status regularly, the first they will know about it is when their commit fails, which in most cases is not very useful. To make it easier to manage locks, there is a new Git property <literal>svn:needs-lock</literal>. When this property is set (to any value) on a file, whenever the file is checked out or updated, the local copy is made read-only <emphasis>unless</emphasis> that working copy holds a lock for the file. This acts as a warning that you should not edit that file unless you have first acquired a lock. Files which are versioned and read-only are marked with a special overlay in TortoiseGit to indicate that you need to acquire a lock before editing."
msgstr "Ni pa nujno, da uporabniki vedo, da ste datoteko zaklenili. Če statusa zaklepanja ne preverjajo redno, bodo to opazili šele, ko bo puskusili datoteko objaviti in objava ne bo uspešna. To pa ni najbolj uporabno. Da bi bilo delo z zaklepi lažje, je na voljo nova lastnost <literal>svn:needs-lock</literal>. Če je ta lastnost nastavljena (na katerokoli vrednost), bo krajevna kopija datoteke ob prevzemu ali posodobitvi na voljo samo za branje, <emphasis>razen</emphasis> če je ta delovna kopija lastnica zaklepa za to datoteko. To deluje kot opozorilo, da datoteke ne urejajte, preden zanjo niste pridobili zaklepa. Datoteke pod nadzorom različic, ki so hkrati tudi označene samo za branje, imajo v programu TortoiseGit posebno prekrivno ikono, ki vas opozarja, da morate pred urejanjem pridobiti zaklep."

#. (para)
#: ../source/TortoiseGit_en.xml:8862
msgid "Locks are recorded by working copy location as well as by owner. If you have several working copies (at home, at work) then you can only hold a lock in <emphasis>one</emphasis> of those working copies."
msgstr "Zaklep se pridobi za določeno delovno kopijo in lastnika. Če imate v lasti več delovnih kopij (doma, v službi), ste lahko lastnik zaklepa datoteke samo v <emphasis>eni</emphasis> od teh delovnih kopij."

#. (para)
#: ../source/TortoiseGit_en.xml:8868
msgid "If one of your co-workers acquires a lock and then goes on holiday without releasing it, what do you do? Git provides a means to force locks. Releasing a lock held by someone else is referred to as <firstterm>Breaking</firstterm> the lock, and forcibly acquiring a lock which someone else already holds is referred to as <firstterm>Stealing</firstterm> the lock. Naturally these are not things you should do lightly if you want to remain friends with your co-workers."
msgstr "Če eden od vaših sodelavcev pridobi zaklep in odide na dopust, ne da bi zaklep sprostil, kaj storite? Git omogoča, da prisilno prevzamete zaklep. Sprostitev zaklepa nekoga drugega je znana pod imenom <firstterm>prelom</firstterm> zaklepa, prisilen prevzem zaklepa, ki je v lasti nekoga drugega, pa <firstterm>kraja</firstterm> zaklepa. Seveda teh ukazov ne smete zlorabljati, če želite ostati v dobrih odnosih s sodelavci."

#. (para)
#: ../source/TortoiseGit_en.xml:8878
msgid "Locks are recorded in the repository, and a lock token is created in your local working copy. If there is a discrepancy, for example if someone else has broken the lock, the local lock token becomes invalid. The repository is always the definitive reference."
msgstr "Zaklepi so shranjeni v skladišču, žeton za zaklep pa je shranjen v krajevni delovni kopiji. Če se zgodi prelom zaklepa, krajevni zaklep postane neveljaven. Informacija v skladišču se vedno uporablja kot edina referenčna."

#. (title)
#: ../source/TortoiseGit_en.xml:8887
msgid "Getting a Lock"
msgstr "Pridobivanje zaklepa"

#. (title)
#: ../source/TortoiseGit_en.xml:8896
msgid "The Locking Dialog"
msgstr "Okno zaklepov"

#. (para)
#: ../source/TortoiseGit_en.xml:8888
msgid "Select the file(s) in your working copy for which you want to acquire a lock, then select the command <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Get Lock...</guimenuitem></menuchoice>. <placeholder-1/> A dialog appears, allowing you to enter a comment, so others can see why you have locked the file. The comment is optional and currently only used with Svnserve based repositories. If (and <emphasis>only</emphasis> if) you need to steal the lock from someone else, check the <guilabel>Steal lock</guilabel> box, then click on <guibutton>OK</guibutton>."
msgstr "V delovni kopiji izberite datoteke, za katere želite pridobiti zaklep, potem pa izberite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Dobi zaklep...</guimenuitem></menuchoice>. <placeholder-1/> Pojavi se pogovorno okno, ki vam omogoča vpis sporočila, tako da lahko ostali uporabniki vidijo, zakaj ste datoteko zaklenili. Komentar ni obvezen in se uporablja le v primeru uporabe strežnika svnserve. Če (in <emphasis>samo</emphasis> če) morate nekomu ukrasti zaklep, potrdite polje <guilabel>Ukradi zaklep</guilabel>, potem pa kliknite na gumb <guibutton>V redu</guibutton>."

#. (para)
#: ../source/TortoiseGit_en.xml:8908
msgid "If you select a folder and then use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Get Lock...</guimenuitem></menuchoice> the lock dialog will open with <emphasis>every</emphasis> file in <emphasis>every</emphasis> sub-folder selected for locking. If you really want to lock an entire hierarchy, that is the way to do it, but you could become very unpopular with your co-workers if you lock them out of the whole project. Use with care ..."
msgstr "Če izberete mapo in potem uporabite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Dobi zaklep...</guimenuitem></menuchoice>, se bo pojavilo pogovorno okno Zaklep z <emphasis>vsemi</emphasis> datotekami v <emphasis>vseh</emphasis> podmapah. Če zares želite zakleniti celotni hierarhijo, je to pravi postopek, vendar lahko postanete zelo nepriljubljeni pri sodelavcih, če jim zaklenete celoten projekt. Bodite previdni..."

#. (title)
#: ../source/TortoiseGit_en.xml:8922
msgid "Releasing a Lock"
msgstr "Sprostitev zaklepa"

#. (para)
#: ../source/TortoiseGit_en.xml:8923
msgid "To make sure you don't forget to release a lock you don't need any more, locked files are shown in the commit dialog and selected by default. If you continue with the commit, locks you hold on the selected files are removed, even if the files haven't been modified. If you don't want to release a lock on certain files, you can uncheck them (if they're not modified). If you want to keep a lock on a file you've modified, you have to enable the <guilabel>Keep locks</guilabel> checkbox before you commit your changes."
msgstr "Da ne bi pozabili sprostiti zaklepa, ki ga ne potrebujete več, so zaklenjene datoteke prikazane v oknu za objave in izbrane. Če nadaljujete z objavo, se zaklepi na izbranih datotekah sprostijo, tudi če datotek niste spreminjali. Če določenih zaklepov ne želite sprostiti, ustreznih datotek ne označite (če jih niste spreminjali). Če želite obdržati zaklepe na datotekah, ki ste jih spreminjali, pred objavo potrdite polje <guilabel>Obdrži zaklepe</guilabel>."

#. (para)
#: ../source/TortoiseGit_en.xml:8934
msgid "To release a lock manually, select the file(s) in your working copy for which you want to release the lock, then select the command <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Release Lock</guimenuitem></menuchoice> There is nothing further to enter so TortoiseGit will contact the repository and release the locks. You can also use this command on a folder to release all locks recursively."
msgstr "Za ročno sproščanje zaklepa v delovni kopiji izberite ustrezne datoteke in izvedite ukaz <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Sprosti zaklep</guimenuitem></menuchoice> Ker dodatni podatki niso potrebni, TortoiseGit kontaktira skladišče in sprosti zaklep. Ukaz lahko izvedete tudi na mapi. V tem primeru se sprostitev izvede rekurzivno na vseh zaklenjenih datotekah."

#. (title)
#: ../source/TortoiseGit_en.xml:8947
msgid "Checking Lock Status"
msgstr "Preverjanje stanja zaklepanja"

#. (title)
#: ../source/TortoiseGit_en.xml:8950
msgid "The Check for Modifications Dialog"
msgstr "Pogovorno okno Preveri posodobitve"

#. (para)
#: ../source/TortoiseGit_en.xml:8948
msgid "<placeholder-1/> To see what locks you and others hold, you can use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Check for Modifications...</guimenuitem></menuchoice>. Locally held lock tokens show up immediately. To check for locks held by others (and to see if any of your locks are broken or stolen) you need to click on <guibutton>Check Repository</guibutton>."
msgstr "<placeholder-1/> Za preverjanje, katere zaklepe imate v lasti vi in ostali uporabiniki, lahko uporabite ukaz <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Preveri spremembe...</guimenuitem></menuchoice>. Zaklepi, ki so v vaši lasti, se pokažejo takoj. Za seznam zaklepov, ki jih imajo v lasti ostali uporabniki, uporabite gumb <guibutton>Preveri skladišče</guibutton>. S tem vidite tudi, če so kateri izmed vaših zaklepov prelomljeni ali ukradeni."

#. (para)
#: ../source/TortoiseGit_en.xml:8963
msgid "From the context menu here, you can also get and release locks, as well as breaking and stealing locks held by others."
msgstr "Iz kontekstnega menija lahko pridobite ali sprostite zaklep, prav tako pa lahko prelomite in ukradete zaklep, ki je v lasti drugih."

#. (title)
#: ../source/TortoiseGit_en.xml:8968
msgid "Avoid Breaking and Stealing Locks"
msgstr "Izognite se prelamljanju in kraji zaklepov"

#. (para)
#: ../source/TortoiseGit_en.xml:8969
msgid "If you break or steal someone else's lock without telling them, you could potentially cause loss of work. If you are working with unmergeable file types and you steal someone else's lock, once you release the lock they are free to check in their changes and overwrite yours. Git doesn't lose data, but you have lost the team-working protection that locking gave you."
msgstr "Če nekomu prelomite ali ukradete zaklep, ne da bi uporabniku to povedali, lahko povzročite izgubo podatkov. Če delate z datotekami, ki se jih ne da spajati, in nekomu ukradete zaklep, lahko ta uporabnik po vaši sprostitvi zaklepa objavi svojo različico datoteke in s tem povozi vašo. Git nikoli ne izgubi podatkov, izgubite pa lahko varnost dela v teamu, ki vam jo daje zaklepanje. "

#. (title)
#: ../source/TortoiseGit_en.xml:8981
msgid "Making Non-locked Files Read-Only"
msgstr "Nastavite nezaklenjene datoteke samo za branje"

#. (para)
#: ../source/TortoiseGit_en.xml:8982
msgid "As mentioned above, the most effective way to use locking is to set the <literal>svn:needs-lock</literal> property on files. Refer to <xref linkend=\"tsvn-dug-propertypage\"/> for instructions on how to set properties. Files with this property set will always be checked out and updated with the read-only flag set unless your working copy holds a lock. <graphic fileref=\"../images/ReadOnlyIcon.png\"/> As a reminder, TortoiseGit uses a special overlay to indicate this."
msgstr "Kot je že bilo omenjeno, je najbolj učinkovita metoda za uporabo zaklepanja uporaba lastnosti <literal>svn:needs-lock</literal>. Za več informacij o tem, kako datotekam nastaviti lastnosti, preberite <xref linkend=\"tsvn-dug-propertypage\"/>. Datoteke, ki imajo nastavljeno to lastnost, bodo ob prevzemu ali posodobitvi vedno dobile status datoteke samo za branje, razen če je delovna kopija lastnica zaklepa. <graphic fileref=\"../images/ReadOnlyIcon.png\"/> Kot opomnik, da je datoteka namenjena samo za branje, uporablja TortoiseGit posebno prekrivno ikono."

#. (para)
#: ../source/TortoiseGit_en.xml:8992
msgid "If you operate a policy where every file has to be locked then you may find it easier to use Git's auto-props feature to set the property automatically every time you add new files. Read <xref linkend=\"tsvn-dug-propertypage-auto-props\"/> for further information."
msgstr "Če velja na projektu pravilo, da je potrebno vsako datoteko zakleniti, potem bo verjetno lažje, da uporabite samodejne lastnosti (auto-props). Tako bo ta lastnost samodejno pripeta vsaki novo dodani datoteki. Za nadaljnje informacije preberite <xref linkend=\"tsvn-dug-propertypage-auto-props\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:9001
msgid "The Locking Hook Scripts"
msgstr "Ukazna datoteka akcije za zaklepanje"

#. (para)
#: ../source/TortoiseGit_en.xml:9002
msgid "When you create a new repository with Git 1.2 or higher, four hook templates are created in the repository <filename>hooks</filename> directory. These are called before and after getting a lock, and before and after releasing a lock."
msgstr "Ko ustvarite novo skladišče s sistemom Git 1.2 ali novejšim, se v podmapi <filename>hooks</filename> ustvarijo štiri predloge za ukazne datoteke akcij. Kličejo se pred in po pridobivanju zaklepa ter pred in po sprostitvi zaklepa."

#. (para)
#: ../source/TortoiseGit_en.xml:9008
msgid "It is a good idea to install a <literal>post-lock</literal> and <literal>post-unlock</literal> hook script on the server which sends out an email indicating the file which has been locked. With such a script in place, all your users can be notified if someone locks/unlocks a file. You can find an example hook script <filename>hooks/post-lock.tmpl</filename> in your repository folder."
msgstr "Na strežniku je priporočljivo nastaviti ukazne datoteke akcij za <literal>post-lock</literal> in <literal>post-unlock</literal>, ki pošljejo elektronsko pošto, ko se datoteka zaklene. S pomočjo teh datotek so vsi uporabniki obveščeni, ko nekdo zaklene/odklene datoteko. Primer ukazne datoteke se nahaja v datoteki <filename>hooks/post-lock.tmpl</filename> v mapi skladišča."

#. (para)
#: ../source/TortoiseGit_en.xml:9016
msgid "You might also use hooks to disallow breaking or stealing of locks, or perhaps limit it to a named administrator. Or maybe you want to email the owner when one of their locks is broken or stolen."
msgstr "Nastacite lahko tudi ukazno datoteko akcije, ki preprečuje prelom ali krajo zaklepa, ali pa te operacije dovoli le administratorju. Lahko pa nastavite pošiljanje elektronske pošte lastniku zaklepa, kadar mu nekdo zaklep prelomi ali ukrade."

#. (para)
#: ../source/TortoiseGit_en.xml:9022
msgid "Read <xref linkend=\"tsvn-repository-hooks\"/> to find out more."
msgstr "Za dodatne informacije preberite <xref linkend=\"tsvn-repository-hooks\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:9028
msgid "Creating and Applying Patches"
msgstr "Ustvarjanje in nameščanje popravkov"

#. (primary)
#: ../source/TortoiseGit_en.xml:9030
msgid "patch"
msgstr "popravek"

#. (primary)
#: ../source/TortoiseGit_en.xml:9036
msgid "unified diff"
msgstr "poenotena razlika"

#. (para)
#: ../source/TortoiseGit_en.xml:9040
msgid "For open source projects (like this one) everyone has read access to the repository, and anyone can make a contribution to the project. So how are those contributions controlled? If just anyone could commit changes, the project would be permanently unstable and probably permanently broken. In this situation the change is managed by submitting a <firstterm>patch</firstterm> file to the development team, who do have write access. They can review the patch first, and then either submit it to the repository or reject it back to the author."
msgstr "V primeru odprtokodnih projektov (kot je tale) imajo pravice branja skladišča vsi in vsakdo lahko prispeva k projektu. Kako pa se ti prispevki nadzorujejo? Če bi lahko vsakdo objavljal spremembe, bi projekt kmalu postal nestabilen in neuporaben. V takšnem primeru se spremembe pošljejo razvojni ekipi, ki ima pravice za objavljanje, v obliki datoteke <firstterm>popravkov</firstterm>. Ekipa popravek pregleda in ga objavi v skladišču ali pa vrne avtorju."

#. (para)
#: ../source/TortoiseGit_en.xml:9051
msgid "Patch files are simply Unified-Diff files showing the differences between your working copy and the base revision."
msgstr "Datoteke popravkov so poenotene razlike datotek, ki prikazujejo razlike med vašo delovno kopijo in osnovno revizijo."

#. (title)
#: ../source/TortoiseGit_en.xml:9056
msgid "Creating a Patch File"
msgstr "Ustvarjanje datoteke popravkov"

#. (para)
#: ../source/TortoiseGit_en.xml:9057
msgid "First you need to make <emphasis>and test</emphasis> your changes. Then instead of using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Commit...</guimenuitem></menuchoice> on the parent folder, you select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Create Patch...</guimenuitem></menuchoice>"
msgstr "Najprej morate spremembe narediti <emphasis>in jih preizkusiti</emphasis>. Potem namesto ukaza <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Objavi...</guimenuitem></menuchoice> na nadrejeni mapi uporabite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Ustvari popravek...</guimenuitem></menuchoice>"

#. (title)
#: ../source/TortoiseGit_en.xml:9071
msgid "The Create Patch dialog"
msgstr "Okno za ustvarjanje popravkov"

#. (para)
#: ../source/TortoiseGit_en.xml:9074
msgid "you can now select the files you want included in the patch, just as you would with a full commit. This will produce a single file containing a summary of all the changes you have made to the selected files since the last update from the repository."
msgstr "Sedaj izberete datoteke, ki jih želite vključiti v popravek, prav tako, kot to storite ob objavi. Ustvari se ena datoteka, ki vsebuje podatke o vseh spremembah, ki ste jih naredili na izbranih datotekah od zadnje posodobitve iz skladišča."

#. (para)
#: ../source/TortoiseGit_en.xml:9085
msgid "You can produce separate patches containing changes to different sets of files. Of course, if you create a patch file, make some more changes to the <emphasis>same</emphasis> files and then create another patch, the second patch file will include <emphasis>both</emphasis> sets of changes."
msgstr "Izdelate lahko več popravkov, ki vsebujejo spremembe različnih skupin datotek. Seveda, če izdelate datoteko popravkov, nato naredite še dodatne spremembe in izdelate novo datoteko popravkov, bo ta vsebovala spremembe <emphasis>obeh</emphasis> skupin sprememb."

#. (para)
#: ../source/TortoiseGit_en.xml:9091
msgid "Just save the file using a filename of your choice. Patch files can have any extension you like, but by convention they should use the <filename>.patch</filename> or <filename>.diff</filename> extension. You are now ready to submit your patch file."
msgstr "Shranite datoteko s poljubnim imenom. Datoteke popravkov imajo lahko poljubno končnico, vendar imajo po konvenciji končnico <filename>.patch</filename> ali <filename>.diff</filename>. Sedaj lahko datoteko oddate."

#. (para)
#: ../source/TortoiseGit_en.xml:9098
msgid "You can also save the patch to the clipboard instead of to a file. You might want to do this so that you can paste it into an email for review by others. Or if you have two working copies on one machine and you want to transfer changes from one to the other, a patch on the clipboard is a convenient way of doing this."
msgstr "Popravek lahko shranite tudi v odložišče namesto v datoteko. Nato ga lahko prilepite v elektronsko sporočilo in ga pošljete v pregled ostalim. Če imate dve delovni kopiji na enem računalniku in želite prenesti spremembe iz ene kopije v drugo, je kopiranje popravka v odložišče pripraven način za izvedbo operacije."

#. (title)
#: ../source/TortoiseGit_en.xml:9107
msgid "Applying a Patch File"
msgstr "Nameščanje datoteke popravkov"

#. (para)
#: ../source/TortoiseGit_en.xml:9108
msgid "Patch files are applied to your working copy. This should be done from the same folder level as was used to create the patch. If you are not sure what this is, just look at the first line of the patch file. For example, if the first file being worked on was <filename>doc/source/english/chapter1.xml</filename> and the first line in the patch file is <filename>Index: english/chapter1.xml</filename> then you need to apply the patch to the <filename>doc/source/</filename> folder. However, provided you are in the correct working copy, if you pick the wrong folder level, TortoiseGit will notice and suggest the correct level."
msgstr "Datoteke popravkov se namestijo v delovno kopijo. Nameščanje je potrebno narediti na istem nivoju map, na katerem je bil popravek narejen. Če ne veste, kateri nivo to je, poglejte v prvo vrstico datoteke popravkov. Primer: če je prva datoteka popravka <filename>doc/source/english/chapter1.xml</filename> in je prva vrstica popravka <filename>Index: english/chapter1.xml</filename>, potem morate popravek namestiti na mapo <filename>doc/source/</filename>. Vendar, če le delate na pravi delovni kopiji, bo TSVN zaznal, da ste izbrali napačen nivo in vam bo predlagal pravilnega."

#. (para)
#: ../source/TortoiseGit_en.xml:9122
msgid "In order to apply a patch file to your working copy, you need to have at least read access to the repository. The reason for this is that the merge program must reference the changes back to the revision against which they were made by the remote developer."
msgstr "Da bi namestili datoteko popravkov na delovni kopiji, morate imeti v skladišču vsaj pravice za branje. Razlog je v tem, da mora imeti program za spajanje referenco na revizijo, ki jo je oddaljeni programer uporabil kot osnovo."

#. (para)
#: ../source/TortoiseGit_en.xml:9129
msgid "From the context menu for that folder, click on <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Apply Patch...</guimenuitem></menuchoice> This will bring up a file open dialog allowing you to select the patch file to apply. By default only <filename>.patch</filename> or <filename>.diff</filename> files are shown, but you can opt for <quote>All files</quote>. If you previously saved a patch to the clipboard, you can use <guibutton>Open from clipboard...</guibutton> in the file open dialog."
msgstr "Iz kontekstnega menija v mapi izberite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Namesti popravek...</guimenuitem></menuchoice> Prikazalo se bo pogovorno okno za izbiro datoteke popravkov, ki jo želite namestiti. Prikazane so le datoteke s končnicami <filename>.patch</filename> in <filename>.diff</filename>, vendar pa lahko prikažete tudi <quote>Vse datoteke</quote>. Če ste popravek shranili na odložišče, lahko v oknu uporabite gumb <guibutton>Odpri iz odložišča...</guibutton>."

#. (para)
#: ../source/TortoiseGit_en.xml:9143
msgid "Alternatively, if the patch file has a <filename>.patch</filename> or <filename>.diff</filename> extension, you can right click on it directly and select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Apply Patch...</guimenuitem></menuchoice>. In this case you will be prompted to enter a working copy location."
msgstr "Če ima datoteka popravkov končnico <filename>.patch</filename> ali <filename>.diff</filename>, lahko najno kliknete z desnim gumbom in izberete <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Namesti popravek...</guimenuitem></menuchoice>. V tem primeru boste povprašani po lokaciji delovne kopije."

#. (para)
#: ../source/TortoiseGit_en.xml:9153
msgid "These two methods just offer different ways of doing the same thing. With the first method you select the WC and browse to the patch file. With the second you select the patch file and browse to the WC."
msgstr "Ti dve metodi omogočata isti postopek na različna načina. S prvo metodo izberete delovno kopijo in poiščete datoteko popravkov, z drugo pa izberete datoteko popravkov in poiščete delovno kopijo."

#. (para)
#: ../source/TortoiseGit_en.xml:9158
msgid "Once you have selected the patch file and working copy location, TortoiseMerge runs to merge the changes from the patch file with your working copy. A small window lists the files which have been changed. Double click on each one in turn, review the changes and save the merged files."
msgstr "Ko ste izbrali datoteko popravkov in lokacijo delovne kopije, TortoiseMerge začne postopek spajanja sprememb iz datoteke popravkov v delovno kopijo. Majhno okno vsebuje seznam datotek, ki so bile spremenjene. Dvokliknite na vsako izmed njih, preglejte spremembe in shranite spojene datoteke."

#. (para)
#: ../source/TortoiseGit_en.xml:9165
msgid "The remote developer's patch has now been applied to your working copy, so you need to commit to allow everyone else to access the changes from the repository."
msgstr "Popravek oddaljenega sodelavca je sedaj nameščen na vaši delovni kopiji, ki jo morate objaviti, da bodo lahko vsi uporabniki dostopali do sprememb v skladišču."

#. (title)
#: ../source/TortoiseGit_en.xml:9173
msgid "Who Changed Which Line?"
msgstr "Kdo je spremenil posamezno vrstico?"

#. (primary)
#: ../source/TortoiseGit_en.xml:9175
msgid "blame"
msgstr "okrivi"

#. (primary)
#: ../source/TortoiseGit_en.xml:9178
msgid "annotate"
msgstr "označi"

#. (primary)
#: ../source/TortoiseGit_en.xml:9181
msgid "praise"
msgstr "hvali"

#. (para)
#: ../source/TortoiseGit_en.xml:9184
msgid "Sometimes you need to know not only what lines have changed, but also who exactly changed specific lines in a file. That's when the <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Blame...</guimenuitem></menuchoice> command, sometimes also referred to as <firstterm>annotate</firstterm> command comes in handy."
msgstr "Včasih vas ne zanima samo, katere vrstice so bile spremenjene, ampak tudi, kdo je določene vrstice spremenil. Takrat je uporaben ukaz <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Okrivi...</guimenuitem></menuchoice>. Včasih ga imenujemo tudi <firstterm>pohvali</firstterm>."

#. (para)
#: ../source/TortoiseGit_en.xml:9194
msgid "This command lists, for every line in a file, the author and the revision the line was changed."
msgstr "Ta ukaz za vsako vrstico v datoteki izpiše avtorja in številko revizije, v kateri je bila vrstica spremenjena."

#. (title)
#: ../source/TortoiseGit_en.xml:9199
msgid "Blame for Files"
msgstr "Okrivi datoteke"

#. (title)
#: ../source/TortoiseGit_en.xml:9202
msgid "The Annotate / Blame Dialog"
msgstr "Okno hvali/okrivi"

#. (para)
#: ../source/TortoiseGit_en.xml:9200
msgid "<placeholder-1/> If you're not interested in changes from earlier revisions you can set the revision from which the blame should start. Set this to <literal>1</literal>, if you want the blame for <emphasis>every</emphasis> revision."
msgstr "<placeholder-1/> Če vas spremembe v zgodnejših revizijah ne zanimajo, lahko nastavite številko revizije, s katero naj se okrivljanje začne. Nastavite vrednost <literal>1</literal>, če želite okrivljanje <emphasis>vseh</emphasis> revizij."

#. (para)
#: ../source/TortoiseGit_en.xml:9209
msgid "By default the blame file is viewed using <firstterm>TortoiseBlame</firstterm>, which highlights the different revisions to make it easier to read. If you wish to print or edit the blame file, select <guilabel>Use Text viewer to view blames</guilabel>"
msgstr "Po privzetih nastavitvah se krivda prikazuje s programom <firstterm>TortoiseBlame</firstterm>, ki naglasi različne revizije, kar vam olajša branje. Če želite informacije o krivdi natisniti ali urediti, izberite <guilabel>Uporabi ogledovalnik besedila za pregled krivde</guilabel>"

#. (para)
#: ../source/TortoiseGit_en.xml:9215
msgid "You can specify the way that line ending and whitespace changes are handled. These options are described in <xref linkend=\"tsvn-dug-diff-eol-whitespace\"/>. The default behaviour is to treat all whitespace and line-end differences as real changes, but if you want to ignore an indentation change and find the original author, you can choose an appropriate option here."
msgstr "Nastavite lahko, kako se obravnavajo zaključki vrstic in presledki. Možnosti so opisane v <xref linkend=\"tsvn-dug-diff-eol-whitespace\"/>. Privzeta nastavitev je, da se zaključki vrstic in presledki obravnavajo kot vse ostale spremembe. Če pa želite zamikanje prezreti in poiskati izvirnega avtorja, lahko tu nastavite ustrezno možnost."

#. (para)
#: ../source/TortoiseGit_en.xml:9222
msgid "Once you press <guibutton>OK</guibutton> TortoiseGit starts retrieving the data to create the blame file. Please note: This can take several minutes to finish, depending on how much the file has changed and of course your network connection to the repository. Once the blame process has finished the result is written into a temporary file and you can view the results."
msgstr "Ko pritisnete na gumb <guibutton>V redu</guibutton>, začne TortoiseGit pridobivati podatke, da ustvari datoteko krivd. Pazite: to lahko traja kar nekaj minut, odvisno od tega, koliko se je datoteka spreminjala in seveda od povezave do strežnika skladišča. Po končanem procesu se rezultat zapiše v začasno datoteko in prikaže na zaslonu."

#. (title)
#: ../source/TortoiseGit_en.xml:9232
msgid "TortoiseBlame"
msgstr "TortoiseBlame"

#. (para)
#: ../source/TortoiseGit_en.xml:9230
msgid "<placeholder-1/> TortoiseBlame, which is included with TortoiseGit, makes the blame file easier to read. When you hover the mouse over a line in the blame info column, all lines with the same revision are shown with a darker background. Lines from other revisions which were changed by the same author are shown with a light background. The colouring may not work as clearly if you have your display set to 256 colour mode."
msgstr "<placeholder-1/> TortoiseBlame, ki je del paketa TortoiseGit, olajša pregledovanje datoteke krivd. Ko z miško nekaj trenutkov mirujete na vrstici v stolcu z informacijami, se vse vrstice iste revizije prikažejo s temnejšim ozadjem. Vrstice drugih revizij, ki jih je spremenil isti avtor, so prikazane s svetlim ozadjem. Barvno označevanje ne bo delovalo dobro, če uporabljate le 256 barv."

#. (para)
#: ../source/TortoiseGit_en.xml:9243
msgid "If you <action>left click</action> on a line, all lines with the same revision are highlighted, and lines from other revisions by the same author are highlighted in a lighter colour. This highlighting is sticky, allowing you to move the mouse without losing the highlights. Click on that revision again to turn off highlighting."
msgstr "Če na vrstico <action>kliknete z levim gumbom</action>, se označijo vse vrstice iste revizije, vrstice, ki jih je spremenil isti avtor, pa so označene s svetlejšo barvo. Označevanje obvelja tudi če premaknete miško. Če želite označevanje izključiti, še enkrat kliknite na vrstico."

#. (para)
#: ../source/TortoiseGit_en.xml:9250
msgid "The revision comments (log message) are shown in a hint box whenever the mouse hovers over the blame info column. If you want to copy the log message for that revision, use the context menu which appears when you right click on the blame info column."
msgstr "Komentar revizije (sporočilo dnevniškega zapisa) je prikazan v oknu z namigi, ko z miško za kratko počakate na stolpcu s krivdnimi informacijami. Če želite prekopirati dnevniško sporočilo za to revizijo, uporabite kontekstni meni, ki se pojavi ob desnem kliku."

#. (para)
#: ../source/TortoiseGit_en.xml:9256
msgid "You can search within the Blame report using <menuchoice><guimenu>Edit</guimenu><guimenuitem>Find...</guimenuitem></menuchoice>. This allows you to search for revision numbers, authors and the content of the file itself. Log messages are not included in the search - you should use the Log Dialog to search those."
msgstr "Iskanje po krivdni datoteki izvedete z ukazom <menuchoice><guimenu>Uredi</guimenu><guimenuitem>Najdi...</guimenuitem></menuchoice>. Iščete lahko po številki revizije, avtorju in po sami vsebini datoteke. Sporočila dnevniških zapisov niso vključena v iskanje - za to uporabite Dnevnik."

#. (para)
#: ../source/TortoiseGit_en.xml:9266
msgid "You can also jump to a specific line number using <menuchoice><guimenu>Edit</guimenu><guimenuitem>Go To Line...</guimenuitem></menuchoice>."
msgstr "Z ukazom <menuchoice><guimenu>Uredi</guimenu><guimenuitem>Pojdi na vrstico...</guimenuitem></menuchoice> skočite na določeno vrstico v datoteki."

#. (para)
#: ../source/TortoiseGit_en.xml:9273
msgid "When the mouse is over the blame info columns, a context menu is available which helps with comparing revisions and examining history, using the revision number of the line under the mouse as a reference. <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Blame previous revision</guimenuitem></menuchoice> generates a blame report for the same file, but using the previous revision as the upper limit. This gives you the blame report for the state of the file just before the line you are looking at was last changed. <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Show changes</guimenuitem></menuchoice> starts your diff viewer, showing you what changed in the referenced revision. <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Show log</guimenuitem></menuchoice> displays the revision log dialog starting with the referenced revision."
msgstr "Ko ste z miško nad stolcem s krivdnimi informacijami, lahko uporabite kontekstni meni, ki vam omogoča primerjanje revizij in pregled zgodovine. Številka revizije vrstice pod kazalcem miške se uporabi kot referenca. Ukaz <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Okrivi prejšnjo revizijo</guimenuitem></menuchoice> ustvari krivdno poročilo za isto datoteko, vendar uporabi predhodno revizijo kot zgornjo mejo. To vam da krivdno poročilo za stanje datoteke točno preden se je vrstica, ki jo gledate, zadnjič spremenila. Ukaz <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Pokaži spremembe</guimenuitem></menuchoice> požene pregledovalnik razlik, ki prikazuje, kaj se je spremenilo v referenčni reviziji. Ukaz <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Prikaži dnevnik</guimenuitem></menuchoice> prikaže dnevnik, ki se začne z referenčno revizijo."

#. (para)
#: ../source/TortoiseGit_en.xml:9295
msgid "If you need a better visual indicator of where the oldest and newest changes are, select <menuchoice><guimenu>View</guimenu><guimenuitem>Color age of lines</guimenuitem></menuchoice>. This will use a colour gradient to show newer lines in red and older lines in blue. The default colouring is quite light, but you can change it using the TortoiseBlame settings."
msgstr "Če potrebujete boljše vizuelno razlikovanje med starimi in novimi spremembami, izberite <menuchoice><guimenu>View</guimenu><guimenuitem>Prikaz starosti vrstic z barvami</guimenuitem></menuchoice>. Novejše vrstice bodo prikazane z rdečimi barvnimi odtenki, starejše pa z modrimi. Privzete barve so dokaj svetle, vendar jih lahko spremenite v nastavitvah za TortoiseBlame."

#. (para)
#: ../source/TortoiseGit_en.xml:9306
msgid "If you are using Merge Tracking, where lines have changed as a result of merging from another path, TortoiseBlame will show the revision and author of the last change in the original file rather than the revision where the merge took place. These lines are indicated by showing the revision and author in italics."
msgstr "Če so se vrstice spremenile kot posledica spajanja z druge poti, vam TortoiseBlame pokaže revizijo in avtorja zadnje spremembe izvorne datoteke namesto revizije, pri kateri se je zgodilo spajanje. Za te vrstice se uporablja poševna pisava. To velja le v primeru, da uporabljate sledenje spajanja."

#. (para)
#: ../source/TortoiseGit_en.xml:9313
msgid "If you want to see the paths involved in the merge, select <menuchoice><guimenu>View</guimenu><guimenuitem>Merge paths</guimenuitem></menuchoice>."
msgstr "Če želite videti poti, ki so predmet spajanja, izberite <menuchoice><guimenu>Pogled</guimenu><guimenuitem>Poti spajanja</guimenuitem></menuchoice>."

#. (para)
#: ../source/TortoiseGit_en.xml:9320
msgid "The settings for TortoiseBlame can be accessed using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Settings...</guimenuitem></menuchoice> on the TortoiseBlame tab. Refer to <xref linkend=\"tsvn-dug-settings-tortoiseblame\"/>."
msgstr "Nastavitve za TortoiseBlame prikažete z izbiro <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Nastavitve...</guimenuitem></menuchoice> na zavihku TortoiseBlame. Preberite <xref linkend=\"tsvn-dug-settings-tortoiseblame\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:9331
msgid "Blame Differences"
msgstr "Okrivi spremembe"

#. (para)
#: ../source/TortoiseGit_en.xml:9332
msgid "One of the limitations of the Blame report is that it only shows the file as it was in a particular revision, and shows the last person to change each line. Sometimes you want to know what change was made, as well as who made it. What you need here is a combination of the diff and blame reports."
msgstr "Ena od omejitev krivdnega poročila je, da vam prikaže datoteko, kot je izgledala v določeni reviziji, in avtorja zadnje spremembe posamezne vrstice. Včasih želite izvedeti, kakšna sprememba je bila narejena in kdo jo je naredil. Potrebujete kombinacijo razlikovanja in okrivljanja."

#. (term)
#: ../source/TortoiseGit_en.xml:9342
msgid "Blame Revisions"
msgstr "Okrivi revizije"

#. (para)
#: ../source/TortoiseGit_en.xml:9344
msgid "In the top pane, select 2 revisions, then select <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Blame revisions</guimenuitem></menuchoice>. This will fetch the blame data for the 2 revisions, then use the diff viewer to compare the two blame files."
msgstr "V zgornjem delu izberite dve reviziji in poženite <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Okrivi revizije</guimenuitem></menuchoice>. S tem boste prenesli krivdne podatke za dve reviziji, potem pa vam bo pregledovalnik razlik prikazal razlike med obema krivdnima datotekama."

#. (term)
#: ../source/TortoiseGit_en.xml:9356
msgid "Blame Changes"
msgstr "Okrivi spremembe"

#. (para)
#: ../source/TortoiseGit_en.xml:9358
msgid "Select one revision in the top pane, then pick one file in the bottom pane and select <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Blame changes</guimenuitem></menuchoice>. This will fetch the blame data for the selected revision and the previous revision, then use the diff viewer to compare the two blame files."
msgstr "V zgornjem delu izberite revizijo, potem pa v spodnjem delu izberite datoteko in izberite <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Okrivi spremembe</guimenuitem></menuchoice>. S tem boste prenesli krivdne podatke za izbrano revizijo in prejšnjo revizijo, potem pa vam bo pregledovalnik razlik prikazal razlike med krivdnima datotekama."

#. (term)
#: ../source/TortoiseGit_en.xml:9372
msgid "Compare and Blame with Working BASE"
msgstr "Primerjaj in okrivi z delovno osnovo BASE"

#. (para)
#: ../source/TortoiseGit_en.xml:9374
msgid "Show the log for a single file, and in the top pane, select a single revision, then select <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Compare and Blame with Working BASE</guimenuitem></menuchoice>. This will fetch the blame data for the selected revision, and for the file in the working BASE, then use the diff viewer to compare the two blame files."
msgstr "Prikažite dnevnik za eno datoteko in v zgornjem delu izberite revizijo, potem pa poženite <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Primerjaj in okrivi z delovno osnovo</guimenuitem></menuchoice>. S tem prenesete krivdne podatke za izbrano revizijo in za datoteko v delovni osnovi, potem pa se prikaže pregledovalnik razlik in premerja obe krivdni datoteki."

#. (para)
#: ../source/TortoiseGit_en.xml:9338
msgid "The revision log dialog includes several options which allow you to do this. <placeholder-1/>"
msgstr "Dnevnik ponuja več možnosti, ki vam to omogočajo. <placeholder-1/>"

#. (title)
#. (title)
#: ../source/TortoiseGit_en.xml:9392
#: ../source/TortoiseGit_en.xml:9416
msgid "The Repository Browser"
msgstr "Brskalnik po skladišču"

#. (primary)
#: ../source/TortoiseGit_en.xml:9394
msgid "repo-browser"
msgstr "brskalnik po skladišču"

#. (primary)
#: ../source/TortoiseGit_en.xml:9397
msgid "server-side actions"
msgstr "akcije na strani strežnika"

#. (primary)
#: ../source/TortoiseGit_en.xml:9406
msgid "server viewer"
msgstr "pregledovalnik strežnika"

#. (para)
#: ../source/TortoiseGit_en.xml:9409
msgid "Sometimes you need to work directly on the repository, without having a working copy. That's what the <firstterm>Repository Browser</firstterm> is for. Just as the explorer and the icon overlays allow you to view your working copy, so the Repository Browser allows you to view the structure and status of the repository. <placeholder-1/> With the Repository Browser you can execute commands like copy, move, rename, ... directly on the repository."
msgstr "Včasih morate nekaj postoriti neposredno v skladišču, brez uporabe delovne kopije. Za to se uporablja <firstterm>brskalnik po skladišču</firstterm>. Prav tako kot vam Raziskovalec in prekrivne ikone omogočajo pregled delovne kopije, vam brskalnik po skladišču omogoča vpogled v strukturo in stanje skladišča. <placeholder-1/> Z brskalnikom po skladišču lahko izvajate kopiranje, premikanje, preimenovanje... neposredno v skladišču."

#. (para)
#: ../source/TortoiseGit_en.xml:9422
msgid "The repository browser looks very similar to the Windows explorer, except that it is showing the content of the repository at a particular revision rather than files on your computer. In the left pane you can see a directory tree, and in the right pane are the contents of the selected directory. At the top of the Repository Browser Window you can enter the URL of the repository and the revision you want to browse."
msgstr "Brskalnik po skladišču je zelo podoben Raziskovalcu, s to razliko, da prikazuje vsebino skladišča v določeni reviziji namesto datotek na vašem računalniku. V levem delu lahko vidite strukturo map v obliki drevesa, v desnem pa vsebino izbrane mape.  Na vrhu okna lahko vnesete naslov URL skladišča in revizijo, ki jo želite videti."

#. (para)
#: ../source/TortoiseGit_en.xml:9431
msgid "Just like Windows explorer, you can click on the column headings in the right pane if you want to set the sort order. And as in explorer there are context menus available in both panes."
msgstr "Tako kot v Raziskovalcu lahko tudi tu kliknete na glave stolpcev na desni strani, če želite definirati vrstni red razvrščanja. In prav tako kot v Raziskovalcu so v obeh delih na voljo kontekstni meniji."

#. (para)
#: ../source/TortoiseGit_en.xml:9446
msgid "Save an unversioned copy of the file to your hard drive."
msgstr "Shranite kopijo datoteke brez različic na trdi disk."

#. (para)
#: ../source/TortoiseGit_en.xml:9451
msgid "Show the revision log for that file, or show a graph of all revisions so you can see where the file came from."
msgstr "Prikažete dnevnik za datoteko ali graf vseh revizij, tako da lahko vidite, od kje datoteka prihaja"

#. (para)
#: ../source/TortoiseGit_en.xml:9457
msgid "Blame the file, to see who changed which line and when."
msgstr "Okrivite datoteko, da vidite, kdo in kdaj je spremenil določeno vrstico."

#. (para)
#: ../source/TortoiseGit_en.xml:9462
msgid "Delete or rename the file."
msgstr "Izbrišete ali preimenujete datoteko"

#. (para)
#: ../source/TortoiseGit_en.xml:9467
msgid "Make a copy of the file, either to a different part of the repository, or to a working copy rooted in the same repository."
msgstr "Ustvarite kopijo datoteke - v drug del skladišča ali v delovno kopijo, ki kaže na isto skladišče."

#. (para)
#: ../source/TortoiseGit_en.xml:9473
msgid "View/Edit the file's properties."
msgstr "Pogledate/uredite lastnosti datoteke"

#. (para)
#: ../source/TortoiseGit_en.xml:9436
msgid "The context menu for a file allows you to: <placeholder-1/>"
msgstr "Kontekstni meni za datoteko vam omogoča, da: <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:9483
msgid "Show the revision log for that folder, or show a graph of all revisions so you can see where the folder came from."
msgstr "Prikažete dnevnik za mapo ali graf vseh revizij, da vidite, od kje mapa prihaja."

#. (para)
#: ../source/TortoiseGit_en.xml:9489
msgid "Export the folder to a local unversioned copy on your hard drive."
msgstr "Izvozite mapo v mapo brez različic na trdem disku."

#. (para)
#: ../source/TortoiseGit_en.xml:9494
msgid "Checkout the folder to produce a local working copy on your hard drive."
msgstr "Prevzamete mapo in si s tem ustvarite delovno kopijo na trdem disku."

#. (para)
#: ../source/TortoiseGit_en.xml:9499
msgid "Create a new folder in the repository."
msgstr "Ustvarite novo mapo v skladišču."

#. (para)
#: ../source/TortoiseGit_en.xml:9504
msgid "Add files or folders directly to the repository."
msgstr "Dodate datoteke ali mape neposredno v skladišče."

#. (para)
#: ../source/TortoiseGit_en.xml:9509
msgid "Delete or rename the folder."
msgstr "Izbrišete ali preimenujete mapo."

#. (para)
#: ../source/TortoiseGit_en.xml:9514
msgid "Make a copy of the folder, either to a different part of the repository, or to a working copy rooted in the same repository."
msgstr "Ustvarite kopijo mape - v drug del skladišča ali v delovno kopijo, ki kaže na isto skladišče."

#. (para)
#: ../source/TortoiseGit_en.xml:9520
msgid "View/Edit the folder's properties."
msgstr "Pogledate/uredite lastnosti mape"

#. (para)
#: ../source/TortoiseGit_en.xml:9525
msgid "Mark the folder for comparison. A marked folder is shown in bold."
msgstr "Označite mapo za primerjanje. Označena mapa je izpisana polkrepko."

#. (para)
#: ../source/TortoiseGit_en.xml:9530
msgid "Compare the folder with a previously marked folder, either as a unified diff, or as a list of changed files which can then be visually diffed using the default diff tool. This can be particularly useful for comparing two tags, or trunk and branch to see what changed."
msgstr "Primerjate mapo s predhodno označeno mapo - kot poenoteno razliko ali kot seznam spremenjenih datotek, katerih razlike lahko vizuelno pregledate s privzetim orodjem za razlikovanje. To je uporabno pri primerjanju dveh oznak ali pri primerjanju veje in glavne veje, da vidite, kaj se je spremenilo."

#. (para)
#: ../source/TortoiseGit_en.xml:9479
msgid "The context menu for a folder allows you to: <placeholder-1/>"
msgstr "Kontekstni meni za mapo vam omogoča, da: <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:9539
msgid "If you select two folders in the right pane, you can view the differences either as a unified-diff, or as a list of files which can be visually diffed using the default diff tool."
msgstr "Če na desni izberete dve mapi, lahko pregledate razlike med njima - kot poenoteno razliko ali kot seznam datotek, katerih razlike lahko vizuelno pregledate s privzetim orodjem za razlikovanje."

#. (para)
#: ../source/TortoiseGit_en.xml:9544
msgid "If you select multiple folders in the right pane, you can checkout all of them at once into a common parent folder."
msgstr "Če na desni strani izberete več map, jih lahko prevzamete sočasno v skupno mapo."

#. (para)
#: ../source/TortoiseGit_en.xml:9548
msgid "If you select 2 tags which are copied from the same root (typically <literal>/trunk/</literal>), you can use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Show Log...</guimenuitem></menuchoice> to view the list of revisions between the two tag points."
msgstr "Če izberete dve oznaki, ki sta skopirani iz iste korenske mape (ponavadi <literal>/trunk/</literal>), lahko uporabite <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Pokaži dnevnik...</guimenuitem></menuchoice> in s tem prikažete seznam revizij med obema oznakama."

#. (para)
#: ../source/TortoiseGit_en.xml:9557
msgid "You can use <keycap>F5</keycap> to refresh the view as usual. This will refresh everything which is currently displayed. If you want to pre-fetch or refresh the information for nodes which have not been opened yet, use <keycap>Ctrl-F5</keycap>. After that, expanding any node will happen instantly without a network delay while the information is fetched."
msgstr "Kot je to običajno, lahko uporabite tipko <keycap>F5</keycap> za osvežitev pogleda. S tem osvežite vse, kar je trenutno prikazano. Če želite v naprej prenesti ali osvežiti informacije o vozliščih, ki še niso bila odprta, uporabite <keycap>Ctrl-F5</keycap>. Po tem bo razširjanje kateregakoli vozlišča potekalo zelo hitro, saj ne bo zamud zaradi prenosa podatkov preko omrežja."

#. (para)
#: ../source/TortoiseGit_en.xml:9564
msgid "You can also use the repository browser for drag-and-drop operations. If you drag a folder from explorer into the repo-browser, it will be imported into the repository. Note that if you drag multiple items, they will be imported in separate commits."
msgstr "Brskalnik po skladišču lahko uporabite tudi za izvajanje operacij z metodo povleci-in-spusti. Če povlečete v brskalnik po skladišču mapo iz Raziskovalca, jo s tem uvozite. Upoštevajte, da se v primeru, ko povlečete več elementov naenkrat, elementi uvozijo v ločenih objavah."

#. (para)
#: ../source/TortoiseGit_en.xml:9570
msgid "If you want to move an item within the repository, just <action>left drag</action> it to the new location. If you want to create a copy rather than moving the item, <keycap>Ctrl</keycap>-<action>left drag</action> instead. When copying, the cursor has a <quote>plus</quote> symbol on it, just as it does in Explorer."
msgstr "Če želite elemente premikati znotraj skladišča, jih enostavno <action>povlecite z levim gumbom</action> na novo lokacijo. Če želite namesto premikanja ustvariti kopijo, ob potegu držite pritisnjeno tipko <keycap>CTRL</keycap>. Pri kopiranju ima kazalnik dodan znak <quote>plus</quote>, prav tako kot v Raziskovalcu."

#. (para)
#: ../source/TortoiseGit_en.xml:9576
msgid "If you want to copy/move a file or folder to another location and also give it a new name at the same time, you can <action>right drag</action> or <keycap>Ctrl</keycap>-<action>right drag</action> the item instead of using <action>left drag</action>. In that case, a rename dialog is shown where you can enter a new name for the file or folder."
msgstr "Če želite datoteko ali mapo premakniti/prekopirati na novo lokacijo in jo istočasno preimenovati, jo lahko <action>povlečete z desnim gumbom</action> (lahko držite pritisnjeno tipko <keycap>CTRL</keycap>) namesto <action>z levim gumbom</action>. V tem primeru se pokaže okno se vpis novega imena datoteke ali mape."

#. (para)
#: ../source/TortoiseGit_en.xml:9583
msgid "Whenever you make changes in the repository using one of these methods, you will be presented with a log message entry dialog. If you dragged something by mistake, this is also your chance to cancel the action."
msgstr "Ko ste naredili spremembe v skladišču z uporabo ene od teh metod, se pojavi okno za vnos sporočila dnevniškega zapisa. Če ste kaj premaknili po pomoti, imate sedaj možnost, da operacijo prekličete."

#. (para)
#: ../source/TortoiseGit_en.xml:9588
msgid "Sometimes when you try to open a path you will get an error message in place of the item details. This might happen if you specified an invalid URL, or if you don't have access permission, or if there is some other server problem. If you need to copy this message to include it in an email, just right click on it and use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Copy error message to clipboard</guimenuitem></menuchoice>, or simply use <keycap>Ctrl+C</keycap>."
msgstr "Včasih se pri odpiranju poti namesto vsebine prikaže sporočilo o napaki. Vzrok je lahko napačen naslov URL, nezadostne pravice ali težave s strežnikom. Če želite sporočilo o napaki prekopirati (da ga vključite v elektronsko sporočilo), iz kontekstnega menija izberite <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Kopiraj sporočilo o napaki na odložišče</guimenuitem></menuchoice> ali uporabite <keycap>Ctrl+C</keycap>."

#. (title)
#: ../source/TortoiseGit_en.xml:9603
msgid "Revision Graphs"
msgstr "Grafi revizij"

#. (primary)
#: ../source/TortoiseGit_en.xml:9608
msgid "graph"
msgstr "graf"

#. (primary)
#: ../source/TortoiseGit_en.xml:9611
msgid "revision graph"
msgstr "graf revizij"

#. (title)
#: ../source/TortoiseGit_en.xml:9615
msgid "A Revision Graph"
msgstr "Graf revizije"

#. (para)
#: ../source/TortoiseGit_en.xml:9613
msgid "<placeholder-1/> Sometimes you need to know where branches and tags were taken from the trunk, and the ideal way to view this sort of information is as a graph or tree structure. That's when you need to use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Revision Graph...</guimenuitem></menuchoice>"
msgstr "<placeholder-1/> Včasih želite izvedeti, od kje izhajajo veje in oznake in najlažji način, da to izveste, je graf revizije ali drevesne strukture. Takrat uporabite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Graf revizij...</guimenuitem></menuchoice>"

#. (para)
#: ../source/TortoiseGit_en.xml:9626
msgid "This command analyses the revision history and attempts to create a tree showing the points at which copies were taken, and when branches/tags were deleted."
msgstr "Ta ukaz analizira zgodovino revizij in poskuša ustvariti drevo, ki prikazuje, kje so se zgodila kopiranja oziroma kje so bile veje/oznake izbrisane."

#. (para)
#: ../source/TortoiseGit_en.xml:9632
msgid "In order to generate the graph, TortoiseGit must fetch all log messages from the repository root. Needless to say this can take several minutes even with a repository of a few thousand revisions, depending on server speed, network bandwidth, etc. If you try this with something like the <emphasis>Apache</emphasis> project which currently has over 500,000 revisions you could be waiting for some time."
msgstr "Za generiranje grafa mora TortoiseGit iz strežnika prenesti dnevniške zapise vseh revizij. Verjetno ni potrebno poudarjati, da lahko pri skladiščih z nekaj tisoč revizijami to traja kar nekaj minut, odvisno tudi od hitrosti strežnika, pasovne širine omrežja... Če poskusite izdelati graf revizij na projektu, kot je denimo <emphasis>Apache</emphasis>, ki ima trenutno več kot pol milijona revizij, boste čakali kar lep čas."

#. (para)
#: ../source/TortoiseGit_en.xml:9640
msgid "The good news is that if you are using Log Caching, you only have to suffer this delay once. After that, log data is held locally. Log caching is enabled in TortoiseGit's settings."
msgstr "Dobra novica je, da morate v primeru uporabe predpomnenja dnevniških zapisov čakati le enkrat. Po tem so podatki shranjeni krajevno. Predpomnenje dnevniških zapisov nastavite v oknu nastavitev TortoiseGit."

#. (title)
#: ../source/TortoiseGit_en.xml:9647
msgid "Revision Graph Nodes"
msgstr "Vozlišča grafa revizij"

#. (term)
#: ../source/TortoiseGit_en.xml:9652
msgid "Added file/folder"
msgstr "Dodana datoteka/mapa"

#. (para)
#: ../source/TortoiseGit_en.xml:9654
msgid "Items which have been added, or created by copying another file/folder are shown using a rounded rectangle."
msgstr "Dodani ali kopirani elementi so prikazani z zaokroženimi pravokotniki."

#. (term)
#: ../source/TortoiseGit_en.xml:9661
msgid "Deleted file/folder"
msgstr "Izbrisana datoteka/mapa"

#. (para)
#: ../source/TortoiseGit_en.xml:9663
msgid "Deleted items eg. a branch which is no longer required, are shown using an octagon (rectangle with corners cut off)."
msgstr "Izbrisani elementi, n. pr. veje, ki niso več potrebne, so prikazane s pravokotnikom z odsekanimi robovi."

#. (term)
#: ../source/TortoiseGit_en.xml:9670
msgid "Branch tip revision"
msgstr "Revizija na vrhu veje"

#. (para)
#: ../source/TortoiseGit_en.xml:9672
msgid "Where a branch (or trunk or tag) has been modified since the last branch node, this is shown using an ellipse. Shown when the <guilabel>Show HEAD revisions</guilabel> option is selected."
msgstr "Kjer je bila veja (ali glavna veja ali oznaka) spremenjena od trenutka, ko je bila ustvarjena, je revizija prikazana z elipso. Ta revizija je prikazana, če je izbrana možnost <guilabel>Prikaži revizije HEAD</guilabel>."

#. (term)
#: ../source/TortoiseGit_en.xml:9681
msgid "Normal file/folder"
msgstr "Običajna datoteka/mapa"

#. (para)
#: ../source/TortoiseGit_en.xml:9683
msgid "All other items are shown using a plain rectangle."
msgstr "Vsi drugi elementi so prikazani s pravokotnikom"

#. (para)
#: ../source/TortoiseGit_en.xml:9648
msgid "The revision graph shows several types of node: <placeholder-1/>"
msgstr "Graf revizij prikaže različne vrste vozlišč: <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:9690
msgid "Note that by default the graph only shows the points at which items were added or deleted. Showing every revision of a project will generate a very large graph for non-trivial cases. If you really want to see <emphasis>all</emphasis> revisions where changes were made, there is an option to do this in the <guilabel>View</guilabel> menu and on the toolbar."
msgstr "Po privzetih nastavitvah graf prikaže le točke, v katerih so bili elementi dodani ali odstranjeni. V primeru prikaza prav vseh revizij skladišča bi se velikost grafa izjemno povečala. Če zares želite videti  <emphasis>vse</emphasis> revizije, v katerih so nastale spremembe, lahko tak prikaz izberete v meniju <guilabel>Pogled</guilabel> ali z uporabo gumba v orodni vrstici."

#. (title)
#: ../source/TortoiseGit_en.xml:9699
msgid "Changing the View"
msgstr "Spreminjanje pogleda"

#. (term)
#: ../source/TortoiseGit_en.xml:9707
msgid "Group branches"
msgstr "Razdeljevanje vej v skupine"

#. (para)
#: ../source/TortoiseGit_en.xml:9709
msgid "The default behavior (grouping off) will use one row per revision and all rows are sorted strictly by revision. As a result, long-living branches occupy a whole column for only a few changes and the graph becomes very broad."
msgstr "Privzeta nastavitev (brez skupin vej) uporablja eno vrstico za revizijo, vrstice pa so razvrščene po reviziji. Rezultat tega je, da veje z dolgo življensko dobo zavzamejo celoten stolpec kljub malo spremembam, graf pa postane precej širok."

#. (para)
#: ../source/TortoiseGit_en.xml:9715
msgid "This mode groups changes by branch, so that there is no global revision ordering: Consecutive revisions on a branch will be shown in (often) consecutive lines. Sub-branches, however, are arranged in such a way that later branches will be shown in the same column above older branches to keep the graph slim. As a result, a given row may contain changes from different revisions."
msgstr "Ta način daje v skupine spremembe po vejah, tako da splošnega razvrščanja po revizijah ni. Zaporedne revizije na veji bodo prikazane v zaporednih vrsticah. Podveje so urejene tako, da se kasnejše veje prikažejo v istem stolpcu nad starejšimi vejami. Tako ostane graf ozek. Rezultat tega je, da lahko vrstica vsebuje spremembe različnih revizij."

#. (term)
#: ../source/TortoiseGit_en.xml:9727
msgid "Oldest on top"
msgstr "Starejše na vrhu"

#. (para)
#: ../source/TortoiseGit_en.xml:9729
msgid "Normally the graph shows the oldest revision at the bottom, and the tree grows upwards. Use this option to grow down from the top instead."
msgstr "Običajno graf prikazuje starejše revizije na dnu, drevo pa potem raste navzgor. Z vključitvijo te možnosti graf raste od vrha navzdol."

#. (term)
#: ../source/TortoiseGit_en.xml:9737
msgid "Show HEAD revisions"
msgstr "Pokaži revizijo HEAD"

#. (para)
#: ../source/TortoiseGit_en.xml:9739
msgid "This ensures that the latest revision on every branch is always shown on the graph."
msgstr "S to možnostjo zagotovite, da je najnovejša revizija vsake veje vedno prikazana na grafu."

#. (term)
#: ../source/TortoiseGit_en.xml:9746
msgid "Exact copy sources"
msgstr "Natančni izvori kopiranja"

#. (para)
#: ../source/TortoiseGit_en.xml:9748
msgid "When a branch/tag is made, the default behaviour is to show the branch as taken from the last node where a change was made. Strictly speaking this is inaccurate since the branches are often made from the current HEAD rather than a specific revision. So it is possible to show the more correct (but less useful) revision that was used to create the copy."
msgstr "Privzeta nastavitev je prikaz vej iz vozlišča, kjer je bila narejena zadnja sprememba. To ni povsem točno, saj se veje pogosto ustvarjajo iz revizije HEAD in ne iz neke določene revizije. S to možnostjo lahko prikažete pravilne (a manj uporabne) revizije, ki so bile uporabljene za izdelavo veje."

#. (term)
#: ../source/TortoiseGit_en.xml:9760
msgid "Fold tags"
msgstr "Zloži oznake"

#. (para)
#: ../source/TortoiseGit_en.xml:9762
msgid "If you want to see a graph of software development, tagged releases may be of little interest to you. This option hides the nodes for tags and shows them instead in the tooltip for the node that they were copied from. A tag icon on the right side of the source node indicates that tags were made."
msgstr "Če želite videti graf razvoja programskega paketa, vas označene izdaje ne zanimajo preveč. Ta možnost skrije vozlišča oznak in namesto njih prikaže namig na vozlišču, iz katerega je bila oznaka ustvarjena. Ikona oznake nakazuje, da je bila iz vozlišča ustvarjena oznaka."

#. (term)
#: ../source/TortoiseGit_en.xml:9773
msgid "Reduce cross lines"
msgstr "Zmanjšaj križanje črt"

#. (para)
#: ../source/TortoiseGit_en.xml:9775
msgid "If the layout of the graph has produced a lot of crossing lines, use this option to clean it up. This may make the layout columns appear in less logical places, for example in a diagonal line rather than a column, and it may take a little time to optimise."
msgstr "Če je oblika grafa takšna, da se na zaslonu veliko črt križa, uporabite to možnost, da se križanju izognete. Graf bo mogoče izgledal malce manj logično urejen, poleg tega pa lahko optimizacija traja kar nekaj časa."

#. (term)
#: ../source/TortoiseGit_en.xml:9786
msgid "Filter"
msgstr "Filter"

#. (para)
#: ../source/TortoiseGit_en.xml:9788
msgid "Sometimes the revision graph contains more revisions than you want to see. This option opens a dialog which allows you to restrict the range of revisions displayed, and to hide particular paths by name."
msgstr "Včasih graf revizij prikaže več podrobnosti, kot si želite. Ta možnost odpre pogovorno okno, ki omogoča omejevanje prikazanega območja revizij in skrivanje določenih poti po imenu."

#. (para)
#: ../source/TortoiseGit_en.xml:9700
msgid "Because a revision graph is often quite complex, there are a number of features which can be used to tailor the view the way you want it. These are available in the <guilabel>View</guilabel> menu and from the toolbar. <placeholder-1/>"
msgstr "Ker je graf revizij pogosto kar zapleten, imate na voljo kar nekaj možnosti, da ga priredite po svojem okusu. Te možnosti so na voljo v meniju <guilabel>Pogled</guilabel> in v orodni vrstici. <placeholder-1/>"

#. (title)
#: ../source/TortoiseGit_en.xml:9800
msgid "Using the Graph"
msgstr "Uporaba grafa revizij"

#. (para)
#: ../source/TortoiseGit_en.xml:9801
msgid "To make it easier to navigate a large graph, use the overview window. This shows the entire graph in a small window, with the currently displayed portion highlighted. You can drag the highlighted area to change the displayed region."
msgstr "Za lažjo navigacijo po grafu revizij uporabite predogledno okno. Ta prikaže celoten graf v majhnem oknu, pri tem pa je trenutno prikazan del posebej označen. Označen del lahko premikate in s tem spremenite pogled grafa."

#. (para)
#: ../source/TortoiseGit_en.xml:9807
msgid "The revision date, author and comments are shown in a hint box whenever the mouse hovers over a revision box."
msgstr "Datum revizije, avtor in komentarji so prikazani v namigu, ko miško pridržite na polju revizije."

#. (para)
#: ../source/TortoiseGit_en.xml:9811
msgid "If you select two revisions (Use <keycap>Ctrl</keycap>-<action>left click</action>), you can use the context menu to show the differences between these revisions. You can choose to show differences as at the branch creation points, but usually you will want to show the differences at the branch end points, i.e. at the HEAD revision."
msgstr "Če izberete dve reviziji (uporabite <keycap>CTRL)</keycap>-<action>levi klik</action>), lahko uporabite kontekstni meni, da prikažete razlike med revizijama. Prikažete lahko tudi razlike med začetnimi točkami vej, vendar običajno prikazujemo razlike med končnimi točkami vej (revizije HEAD)."

#. (para)
#: ../source/TortoiseGit_en.xml:9818
msgid "You can view the differences as a Unified-Diff file, which shows all differences in a single file with minimal context. If you opt to <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Compare Revisions</guimenuitem></menuchoice> you will be presented with a list of changed files. <action>Double click</action> on a file name to fetch both revisions of the file and compare them using the visual difference tool."
msgstr "Razlike lahko prikažete kot datoteko poenotene različice, ki prikaže vse razlike v eni datoteki z minimalno vsebino. Če izberete <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Primerjaj reviziji</guimenuitem></menuchoice>, se vam prikaže seznam spremenjenih datotek. <action>Dvokliknite</action> na datoteko, da prenesete obe reviziji datoteke in ju primerjate z grafičnim orodjem za razlikovanje."

#. (para)
#: ../source/TortoiseGit_en.xml:9829
msgid "If you <action>right click</action> on a revision you can use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Show Log</guimenuitem></menuchoice> to view the history."
msgstr "Če <action>kliknete z desnim gumbom</action> na revizijo, lahko uporabite  <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Pokaži dnevnik</guimenuitem></menuchoice>."

#. (para)
#: ../source/TortoiseGit_en.xml:9837
msgid "You can also merge changes in the selected revision(s) into a different working copy. A folder selection dialog allows you to choose the working copy to merge into, but after that there is no confirmation dialog, nor any opportunity to try a dry run. It is a good idea to merge into an unmodified working copy so that you can revert the changes if it doesn't work out! This is a useful feature if you want to merge selected revisions from one branch to another."
msgstr "Spremembe lahko iz izbranih revizij spojite tudi v drugo delovno kopijo. Okno za izbiro mape vam omogoča izbiro delovne kopije, v katero spajate, vendar za tem ni potrebne nobene potrditve ali možnosti poskusnega izvajanja. Zato vedno spajajte v nespremenjeno delovno kopijo, tako da lahko v primeru napake izvedete povrnitev! To je uporabna zmožnost, če želite spajati izbrane revizije iz ene veje na drugo."

#. (para)
#: ../source/TortoiseGit_en.xml:9848
msgid "Because Git cannot provide all the information required, a certain amount of interpretation is required, which can sometimes give strange results. Nevertheless, the output for the trunk will generally give useful results."
msgstr "Ker Git ne more vedno zagotoviti vseh informacij, ki jih potrebujete, je potrebna določena razlaga podatkov, kar lahko pripelje do čudnih zaključkov. Vseeno pa prikaz za glavno vejo (trunk) običajno da uporabne rezultate."

#. (para)
#: ../source/TortoiseGit_en.xml:9858
msgid "If you want to check the server again for newer information, you can simply refresh the view using <keycap>F5</keycap>. If you are using the log cache (enabled by default), this will check the repository for newer commits and fetch only the new ones. If the log cache was in offline mode, this will also attempt to go back online."
msgstr "Če želite preveriti, ali obstajajo na strežniku novejše informacije, lahko pogled osvežite z uporabe tipke <keycap>F5</keycap>. Če uporabljate predpomnilnik dnevnika (privzeta nastavitev), s tem preverite, ali se na skladišču nahajajo nove objave, in prenesete le najnovejše zapise. Če ste pred delali v nepovezanem načinu, bo TortoiseGit poskušal vzpostaviti povezavo."

#. (para)
#: ../source/TortoiseGit_en.xml:9866
msgid "If you are using the log cache and you think the message content or author may have changed, you should use the log dialog to refresh the messages you need. Since the revision graph works from the repository root, we would have to invalidate the entire log cache, and refilling it could take a <emphasis>very</emphasis> long time."
msgstr "Če uporabljate predpomnilnik dnevnika in menite, da se je sporočilo dnevniškega zapisa ali avtor spremenil, uporabite okno dnevnika za osvežitev željenih sporočil. Ker se graf revizij sestavlja iz korena skladišča, bi bilo potrebno preveriti celoten predpomnilnik. Posodabljanje bi trajalo <emphasis>zelo</emphasis> dolgo."

#. (title)
#: ../source/TortoiseGit_en.xml:9877
msgid "Exporting a Git Working Copy"
msgstr "Izvažanje delovne kopije sistema Git"

#. (primary)
#: ../source/TortoiseGit_en.xml:9879
msgid "export"
msgstr "izvoz"

#. (primary)
#: ../source/TortoiseGit_en.xml:9882
msgid "unversioned 'working copy'"
msgstr "'delovna kopija' brez različic"

#. (para)
#: ../source/TortoiseGit_en.xml:9884
msgid "Sometimes you may want a copy of your working tree without any of those <filename>.svn</filename> directories, e.g. to create a zipped tarball of your source, or to export to a web server. Instead of making a copy and then deleting all those <filename>.svn</filename> directories manually, TortoiseGit offers the command <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Export...</guimenuitem></menuchoice>. Exporting from a URL and exporting from a working copy are treated slightly differently."
msgstr "Včasih potrebujete delovno kopijo brez map <filename>.svn</filename>, n. pr. zato, da naredite paket izvorne kode ali da jo izvozite na spletni strežnik. Namesto ročnega kopiranja in brisanja map <filename>.svn</filename> TortoiseGit ponuja ukaz <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Izvozi...</guimenuitem></menuchoice>. Izvažanje neposredno iz naslova URL in izvažanje iz delovne kopije se nekoliko razlikujeta."

#. (title)
#: ../source/TortoiseGit_en.xml:9899
msgid "The Export-from-URL Dialog"
msgstr "Okno Uvoz-iz-URL"

#. (para)
#: ../source/TortoiseGit_en.xml:9897
msgid "<placeholder-1/> If you execute this command on an unversioned folder, TortoiseGit will assume that the selected folder is the target, and open a dialog for you to enter the URL and revision to export from. This dialog has options to export only the top level folder, to omit external references, and to override the line end style for files which have the <literal>svn:eol-style</literal> property set."
msgstr "<placeholder-1/> Če izvedete ta ukaz na mapi brez različic TortoiseGit predpostavlja, da je izbrana mapa cilj, in odpre pogovorno okno za vnos naslova URL in številke revizije za izvoz. Okno omogoča izvoz samo vrhnje mape, omogoča izpustitev zunanjih referenc, prav tako pa omogoča spreminjanje sloga zaključevanja vrstic pri datotekah, ki imajo nastavljeno lastnost <literal>svn:eol-style</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:9909
msgid "Of course you can export directly from the repository too. Use the Repository Browser to navigate to the relevant subtree in your repository, then use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Export</guimenuitem></menuchoice>. You will get the <guilabel>Export from URL</guilabel> dialog described above."
msgstr "Seveda lahko izvažate tudi neposredno iz skladišča. Z brskalnikom po skladišču pojdite na ustrezno poddrevo skladišča in uporabite <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Izvozi</guimenuitem></menuchoice>. Prikazalo se bo okno <guilabel>Izvoz iz URL</guilabel>, kot je to opisano zgoraj."

#. (para)
#: ../source/TortoiseGit_en.xml:9919
msgid "If you execute this command on your working copy you'll be asked for a place to save the <emphasis>clean</emphasis> working copy without the <filename>.svn</filename> folders. By default, only the versioned files are exported, but you can use the <guilabel>Export unversioned files too</guilabel> checkbox to include any other unversioned files which exist in your WC and not in the repository. External references using <literal>svn:externals</literal> can be omitted if required."
msgstr "Če izvedete ta ukaz na delovni kopiji, vas TortoiseGit vpraša, kam naj shrani <emphasis>čisto</emphasis> delovno kopijo brez map <filename>.svn</filename>. Po privzetih nastavitvah se izvozijo le datoteke pod nadzorom različic, vendar lahko potrdite polje <guilabel>Izvozi tudi datoteke brez različic</guilabel>, da izvozite tudi datoteke brez različic, ki obstajajo v delovni kopiji, ne pa tudi v skladišču. Po želji lahko izpustite zunanje reference (z nastavljeno lastnostjo <literal>svn:externals</literal>)."

#. (para)
#: ../source/TortoiseGit_en.xml:9929
msgid "Another way to export from a working copy is to <action>right drag</action> the working copy folder to another location and choose <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>SVN Export here</guimenuitem></menuchoice> or <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>SVN Export all here</guimenuitem></menuchoice>. The second option includes the unversioned files as well."
msgstr "Druga možnost za izvoz delovne kopije je, da vrhnjo mapo delovne kopije <action>povlečete z desnim gumbom</action> na drugo lokacijo in izberete <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>SVN - Izvozi sem</guimenuitem></menuchoice> ali <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>SVN - Izvozi vse sem</guimenuitem></menuchoice>. Zadnja možnost izvozi tudi datoteke brez različic."

#. (para)
#: ../source/TortoiseGit_en.xml:9943
msgid "When exporting from a working copy, if the target folder already contains a folder of the same name as the one you are exporting, you will be given the option to overwrite the existing content, or to create a new folder with an automatically generated name, eg. <literal>Target (1)</literal>."
msgstr "Pri izvažanju iz delovne kopije se v primeru, da v ciljni mapi že obstaja datoteka z enakim imenom kot tista, ki jo izvažate, pojavi okno in vam ponudi možnost, da obstoječo vsebino prepišete ali da se ustvari mapa s samodejno določenim imenom, n. pr. <literal>Cilj (1)</literal>."

#. (title)
#: ../source/TortoiseGit_en.xml:9951
msgid "Exporting single files"
msgstr "Izvažanje posameznih datotek"

#. (para)
#: ../source/TortoiseGit_en.xml:9952
msgid "The export dialog does not allow exporting single files, even though Git can."
msgstr "Pogovorno okno za izvažanje ne dovoli izvažanja posameznih datotek, čeprav je Git to zmožen narediti."

#. (para)
#: ../source/TortoiseGit_en.xml:9956
msgid "To export single files with TortoiseGit, you have to use the repository browser (<xref linkend=\"tsvn-dug-repobrowser\"/>). Simply drag the file(s) you want to export from the repository browser to where you want them in the explorer, or use the context menu in the repository browser to export the files."
msgstr "Za izvoz posamezne datoteko s programom TortoiseGit, morate uporabiti brskalnik po skladišču (<xref linkend=\"tsvn-dug-repobrowser\"/>). Datoteko, ki jo želite izvoziti, preprosto odvlečite v Raziskovalca ali pa uporabite kontekstni meni."

#. (title)
#: ../source/TortoiseGit_en.xml:9965
msgid "Removing a working copy from version control"
msgstr "Kako odstranim delovno kopijo iz nadzora različic"

#. (primary)
#. (primary)
#: ../source/TortoiseGit_en.xml:9967
#: ../source/TortoiseGit_en.xml:13486
msgid "unversion"
msgstr "brez različic"

#. (para)
#: ../source/TortoiseGit_en.xml:9969
msgid "Sometimes you have a working copy which you want to convert back to a normal folder without the <literal>.svn</literal> directories. What you really need is an export-in-place command, that just removes the control directories rather than generating a new clean directory tree."
msgstr "Včasih hočete svoje delovno kopijo pretvoriti v navadno mapo brez podmap <literal>.svn</literal>. Potrebujete ukaz izvozi-na-mestu, ki namesto ustvarjanja novega drevesa map odstrani kontrolne podmape."

#. (para)
#: ../source/TortoiseGit_en.xml:9976
msgid "The answer is surprisingly simple - export the folder to itself! TortoiseGit detects this special case and asks if you want to make the working copy unversioned. If you answer <emphasis>yes</emphasis> the control directories will be removed and you will have a plain, unversioned directory tree."
msgstr "Odgovor je presenetljivo preprost - izvozite mapo samo vase! TortoiseGit ta poseben primer zazna in vas vpraša, če želite delovno kopijo pretvoriti v mapo, ki ni pod nadzorom različic. Če odgovorite z <emphasis>da</emphasis>, se kontrolne mape odstranijo, tako da dobite navadno drevesno strukturo, ki ni pod nadzorom."

#. (title)
#: ../source/TortoiseGit_en.xml:9986
msgid "Relocating a working copy"
msgstr "Premeščanje delovne kopije"

#. (primary)
#: ../source/TortoiseGit_en.xml:9988
msgid "relocate"
msgstr "preklop"

#. (primary)
#: ../source/TortoiseGit_en.xml:9991
msgid "URL changed"
msgstr "sprememba URL"

#. (primary)
#: ../source/TortoiseGit_en.xml:9994
msgid "repository URL changed"
msgstr "spremembnjen URL naslov skladišča"

#. (primary)
#: ../source/TortoiseGit_en.xml:9997
msgid "server moved"
msgstr "strežnik preseljen"

#. (primary)
#: ../source/TortoiseGit_en.xml:10000
msgid "moved server"
msgstr "preseljen strežnik"

#. (title)
#: ../source/TortoiseGit_en.xml:10005
msgid "The Relocate Dialog"
msgstr "Okno za premeščanje"

#. (para)
#: ../source/TortoiseGit_en.xml:10003
msgid "<placeholder-1/> If your repository has for some reason changed it's location (IP/URL). Maybe you're even stuck and can't commit and you don't want to checkout your working copy again from the new location and to move all your changed data back into the new working copy, <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Relocate</guimenuitem></menuchoice> is the command you are looking for. It basically does very little: it scans all <filename>entries</filename> files in the <filename>.svn</filename> folder and changes the URL of the entries to the new value."
msgstr "<placeholder-1/> Včasih se lokacija (IP/URL) vašega skladišča spremeni. Mogoče ste celo v stiski in ne morete objavljati, nočete pa ponovno prevzeti delovne kopije iz nove lokacije in premikati spremenjenih podatkov v novo delovno kopijo. Iščete ukaz <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Premesti</guimenuitem></menuchoice>. V bistvu ta naredi zelo malo: preišče vse <filename>zapise</filename> v mapah <filename>.svn</filename> in spremeni naslove URL v vseh zapisih na novo vrednost."

#. (para)
#: ../source/TortoiseGit_en.xml:10029
msgid "The IP address of the server has changed."
msgstr "Spremenil se je IP naslov strežnika."

#. (para)
#: ../source/TortoiseGit_en.xml:10032
msgid "The protocol has changed (e.g. http:// to https://)."
msgstr "Spremenil se je protokol (n.pr. http:// v https://)."

#. (para)
#: ../source/TortoiseGit_en.xml:10035
msgid "The repository root path in the server setup has changed."
msgstr "Spremenila se je korenska pot skladišča."

#. (para)
#: ../source/TortoiseGit_en.xml:10023
msgid "<emphasis>This is a very infrequently used operation</emphasis>. The relocate command is <emphasis>only</emphasis> used if the URL of the repository root has changed. Possible reasons are: <placeholder-1/> Put another way, you need to relocate when your working copy is referring to the same location in the same repository, but the repository itself has moved."
msgstr "<emphasis>Ta operacija se uporablja zelo redko</emphasis>. Ukaz Premesti se uporablja <emphasis>le</emphasis>, če se spremeni naslov URL korenske mape skladišča. Možni razlogi za to so: <placeholder-1/> Povedano drugače, ukaz Premesti uporabite takrat, ko vaša delovna kopija kaže na isto lokacijo v istem skladišču, se je pa samo skladišče preselilo."

#. (para)
#: ../source/TortoiseGit_en.xml:10046
msgid "You want to move to a different Git repository. In that case you should perform a clean checkout from the new repository location."
msgstr "se želite premakniti v drugo skladišče Git. V tem primeru je najbolje narediti svež prevzem iz novega skladišča."

#. (para)
#: ../source/TortoiseGit_en.xml:10052
msgid "You want to switch to a different branch or directory within the same repository. To do that you should use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Switch...</guimenuitem></menuchoice>. Read <xref linkend=\"tsvn-dug-switch-1\"/> for more information."
msgstr "želite narediti preklop na drugo vejo ali mapo znotraj istega skladišča. Za to uporabite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Preklopi...</guimenuitem></menuchoice>. Za več informacij preberite <xref linkend=\"tsvn-dug-switch-1\"/>."

#. (para)
#: ../source/TortoiseGit_en.xml:10042
msgid "It does not apply if: <placeholder-1/>"
msgstr "Ne velja, če: <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:10064
msgid "If you use relocate in either of the cases above, it <emphasis>will corrupt your working copy</emphasis> and you will get many unexplainable error messages while updating, committing, etc. Once that has happened, the only fix is a fresh checkout."
msgstr "Če uporabite ukaz Premesti v kateremkoli od zgoraj naštetih dveh primerih, <emphasis>boste pokvarili svojo delovno kopijo</emphasis> in prikazalo se vam bo veliko nerazložljivih napak pri objavljanju, posodabljanju... Če se vam to zgodi, je edina rešitev svež prevzem."

#. (title)
#: ../source/TortoiseGit_en.xml:10073
msgid "Integration with Bug Tracking Systems / Issue Trackers"
msgstr "Integracija s sistemi za sledenje zadev"

#. (primary)
#: ../source/TortoiseGit_en.xml:10075
msgid "bug tracking"
msgstr "selednje hroščev"

#. (primary)
#: ../source/TortoiseGit_en.xml:10078
msgid "bug tracker"
msgstr "sledilnik zadev"

#. (primary)
#: ../source/TortoiseGit_en.xml:10081
msgid "issue tracker"
msgstr "sledilnik zadev"

#. (primary)
#: ../source/TortoiseGit_en.xml:10084
msgid "bugtracker"
msgstr "sledilnik zadev"

#. (para)
#: ../source/TortoiseGit_en.xml:10086
msgid "It is very common in Software Development for changes to be related to a specific bug or issue ID. Users of bug tracking systems (issue trackers) would like to associate the changes they make in Git with a specific ID in their issue tracker. Most issue trackers therefore provide a pre-commit hook script which parses the log message to find the bug ID with which the commit is associated. This is somewhat error prone since it relies on the user to write the log message properly so that the pre-commit hook script can parse it correctly."
msgstr "V razvoju programske opreme se pogosto dogaja, da so spremembe vezane na določenega hrošča ali številko zadeve. Uporabniki sistemov za sledenje zadev pogosto želijo asociirati spremembe v sistemu Git z določeno številko zadeve v sistemu za sledenje zadev. Večina sistemov za sledenje zadev omogoča pisanje ukaznih datotek akcije pred objavo, ki pregleda sporočilo dnevniškega zapisa in poišče številko zadeve. Tak način je podvržen napakam, saj se zanaša na dejstvo, da bodo uporabniki napisali sporočilo dnevniškega zapisa v pravilni obliki."

#. (para)
#: ../source/TortoiseGit_en.xml:10099
msgid "When the user enters a log message, a well defined line including the issue number associated with the commit can be added automatically. This reduces the risk that the user enters the issue number in a way the bug tracking tools can't parse correctly."
msgstr "Ko uporabnik vpiše sporočilo dnevniškega zapisa, lahko samodejno doda predhodno določeno vrstico, ki vsebuje številko zadeve, ki se nanaša na objavo. Tako se zmanjša možnost, da uporabnik vpiše številko zadeve v obliki, ki jo orodje za sledenje zadev ne zna pravilno razčleniti."

#. (para)
#: ../source/TortoiseGit_en.xml:10105
msgid "Or TortoiseGit can highlight the part of the entered log message which is recognized by the issue tracker. That way the user knows that the log message can be parsed correctly."
msgstr "Lahko pa TortoiseGit označi del vnešenega sporočila dnevniškega zapisa, ki ga sledilnik zadev prepozna. Tako uporabnik ve, da je sporočilo dnevniškega zapisa mogoče pravilno razčleniti."

#. (para)
#: ../source/TortoiseGit_en.xml:10112
msgid "When the user browses the log messages, TortoiseGit creates a link out of each bug ID in the log message which fires up the browser to the issue mentioned."
msgstr "Ko uporabnik brska po dnevniških zapisih, TortoiseGit ustvari povezavo za vsako številko hrošča v sporočilu dnevniškega zapisa, ki požene spletni brskalnik in naloži stran ustrezne zadeve."

#. (para)
#: ../source/TortoiseGit_en.xml:10095
msgid "TortoiseGit can help the user in two ways: <placeholder-1/>"
msgstr "TortoiseGit lahko pomaga uporabniku na dva načina: <placeholder-1/>"

#. (title)
#: ../source/TortoiseGit_en.xml:10121
msgid "Adding Issue Numbers to Log Messages"
msgstr "Dodajanje številk zadev dnevniškim zapisom"

#. (para)
#: ../source/TortoiseGit_en.xml:10122
msgid "You can integrate a bug tracking tool of your choice in TortoiseGit. To do this, you have to define some properties, which start with <literal>bugtraq:</literal>. They must be set on Folders: (<xref linkend=\"tsvn-dug-propertypage\"/>)"
msgstr "V TortoiseGit lahko integrirate sledilnik zadev po vaši izbiri. Za to morate definirati nekaj lastnosti, ki se začnejo z <literal>bugtraq:</literal>. Nastavljene morajo biti na mapah:  (<xref linkend=\"tsvn-dug-propertypage\"/>)"

#. (para)
#: ../source/TortoiseGit_en.xml:10137
msgid "Set this property to the URL of your bug tracking tool. It must be properly URI encoded and it has to contain <literal>%BUGID%</literal>. <literal>%BUGID%</literal> is replaced with the Issue number you entered. This allows TortoiseGit to display a link in the log dialog, so when you are looking at the revision log you can jump directly to your bug tracking tool. You do not have to provide this property, but then TortoiseGit shows only the issue number and not the link to it. e.g the TortoiseGit project is using <systemitem class=\"url\">http://issues.TortoiseGit.net/?do=details&amp;id=%BUGID%</systemitem>"
msgstr "Nastavite vrednost te lastnosti na naslov URL orodja za sledenje zadev. Naslov mora biti pravilne oblike (URI) in mora vsebovati niz <literal>%BUGID%</literal>. Niz <literal>%BUGID%</literal> se zamenja s številko zadeve, ki ste jo vnesli. To omogoča sistemu TortoiseGit, da prikaže povezavo v sporočilu dnevniškega zapisa, tako da pri pregledovanju dnevniških zapisov lahko skočite neposredno na stran orodja za sledenje zadev. Nastavitev te lastnosti ni nujna; če je ne nastavite, boste v sporočilu dnevniškega zapisa videli le številko zadeve namesto povezave. Primer: projekt TortoiseGit uporablja vrednost <systemitem class=\"url\">http://issues.TortoiseGit.net/?do=details&amp;id=%BUGID%</systemitem>"

#. (para)
#: ../source/TortoiseGit_en.xml:10152
msgid "You can also use relative URLs instead of absolute ones. This is useful when your issue tracker is on the same domain/server as your source repository. In case the domain name ever changes, you don't have to adjust the <literal>bugtraq:url</literal> property. There are two ways to specify a relative URL:"
msgstr "Namesto absolutnih lahko uporabljate tudi relativne naslove URL. To je uporabno v primeru, ko je sledilnik zadev na isti domeni/strežniku kot skladišče Git. Če se ime domeni kdaj spremeni, vam tako ni potrebno spreminjati lastnosti <literal>bugtraq:url</literal>. Obstajata dva načina, kako določiti relativen naslov URL:"

#. (para)
#: ../source/TortoiseGit_en.xml:10159
msgid "If it begins with the string <literal>^/</literal> it is assumed to be relative to the repository root. For example, <literal>^/../?do=details&amp;id=%BUGID%</literal> will resolve to <systemitem class=\"url\">http://TortoiseGit.net/?do=details&amp;id=%BUGID%</systemitem> if your repository is located on <systemitem class=\"url\">http://TortoiseGit.net/svn/trunk/</systemitem>."
msgstr "Če se začne z nizom <literal>^/</literal>, to pomeni pot, relativno glede na korensko mapo skadišča. Primer: <literal>^/../?do=details&amp;id=%BUGID%</literal> se razširi v <systemitem class=\"url\">http://TortoiseGit.net/?do=details&amp;id=%BUGID%</systemitem> če se skladišče nahaja na <systemitem class=\"url\">http://TortoiseGit.net/svn/trunk/</systemitem>."

#. (para)
#: ../source/TortoiseGit_en.xml:10168
msgid "A URL beginning with the string <literal>/</literal> is assumed to be relative to the server's hostname. For example <literal>/?do=details&amp;id=%BUGID%</literal> will resolve to <systemitem class=\"url\">http://TortoiseGit.net/?do=details&amp;id=%BUGID%</systemitem> if your repository is located anywhere on <systemitem class=\"url\">http://TortoiseGit.net</systemitem>."
msgstr "Naslov URL, ki se začne z nizom <literal>/</literal>, je relativen na ime strežnika. Primer: <literal>/?do=details&amp;id=%BUGID%</literal> se razširi v <systemitem class=\"url\">http://TortoiseGit.net/?do=details&amp;id=%BUGID%</systemitem>, če se skladišče nahaja kjerkoli na naslovu <systemitem class=\"url\">http://TortoiseGit.net</systemitem>."

#. (para)
#: ../source/TortoiseGit_en.xml:10182
msgid "Set this to <literal>true</literal>, if you want TortoiseGit to warn you because of an empty issue-number text field. Valid values are <literal>true/false</literal>. <emphasis> If not defined, <literal>false</literal> is assumed. </emphasis>"
msgstr "Nastavite to vrednost na <literal>true</literal>, če želite, da vas TortoiseGit opozori, če pustite polje za vnos številke zadeve prazno. Dovoljene vrednosti so <literal>true/false</literal>. <emphasis> Če vrednost ni nastavljena, se predpostavlja <literal>false</literal> (brez opozarjanja). </emphasis>"

#. (para)
#: ../source/TortoiseGit_en.xml:10128
msgid "There are two ways to integrate TortoiseGit with issue trackers. One is based on simple strings, the other is based on <emphasis>regular expressions</emphasis>. The properties used by both approaches are: <placeholder-1/>"
msgstr "V TortoiseGit lahko integrirate sisteme za sledenje na dva načina. Prvi je na osnovi enostavnih nizov, drugi pa na osnovi <emphasis>regularnih izrazov</emphasis>. Lastnosti, ki se uporabljajo pri obeh pristopih, so: <placeholder-1/>"

#. (title)
#: ../source/TortoiseGit_en.xml:10196
msgid "Issue Number in Text Box"
msgstr "Številka zadeve v vnosnem polju"

#. (para)
#: ../source/TortoiseGit_en.xml:10205
msgid "This property activates the bug tracking system in <emphasis>Input field</emphasis> mode. If this property is set, then TortoiseGit will prompt you to enter an issue number when you commit your changes. It's used to add a line at the end of the log message. It must contain <literal>%BUGID%</literal>, which is replaced with the issue number on commit. This ensures that your commit log contains a reference to the issue number which is always in a consistent format and can be parsed by your bug tracking tool to associate the issue number with a particular commit. As an example you might use <literal>Issue : %BUGID%</literal>, but this depends on your Tool."
msgstr "Ta lastnost aktivira način <emphasis>z vnosnim poljem</emphasis>. Če nastavite to lastnost, vas TortoiseGit ob objavi povpraša po številki zadeve. Številka se vnese na konec sporočila dnevniškega zapisa. Vsebovati mora niz <literal>%BUGID%</literal>, ki se ob objavi zamenja s številko zadeve. To zagotavlja, da sporočilo vedno vsebuje referenco na številko zadeve, ki je podana v pravilni obliki in jo orodje za sledenje zadev lahko razčleni ter poveže s to objavo. Primer: projekt TortoiseGit uporablja vrednost <literal>Issue : %BUGID%</literal>, vendar je to odvisno od orodja, ki ga uporabljate."

#. (para)
#: ../source/TortoiseGit_en.xml:10226
msgid "This property defines if the bug-ID is appended (true) to the end of the log message or inserted (false) at the start of the log message. Valid values are <literal>true/false</literal>. <emphasis> If not defined, <literal>true</literal> is assumed, so that existing projects don't break. </emphasis>"
msgstr "Ta lastnost določa, ali se številka hrošča (zadeve) pripne na konec sporočila dnevniškega zapisa (true) ali na začetek (false). Veljavni vrednosti sta <literal>true/false</literal>. <emphasis> Če vrednost ni nastavljena, se predpostavlja <literal>true</literal>, zato da obstojoči projekti še vedno delujejo. </emphasis>"

#. (para)
#: ../source/TortoiseGit_en.xml:10241
msgid "This text is shown by TortoiseGit on the commit dialog to label the edit box where you enter the issue number. If it's not set, <literal>Bug-ID / Issue-Nr:</literal> will be displayed. Keep in mind though that the window will not be resized to fit this label, so keep the size of the label below 20-25 characters."
msgstr "To besedilo se prikaže v oknu za objave in opisuje vnosno polje za vpis številke zadeve. Če ni nastavljeno, se pojavi napis <literal>Bug-ID / Issue-Nr:</literal>. Upoštevajte, da se okno ne bo samodejno povečalo, zato omejite število znakov v napisu na 20 do 25."

#. (para)
#: ../source/TortoiseGit_en.xml:10255
msgid "If set to <literal>true</literal> only numbers are allowed in the issue-number text field. An exception is the comma, so you can comma separate several numbers. Valid values are <literal>true/false</literal>. <emphasis> If not defined, <literal>true</literal> is assumed. </emphasis>"
msgstr "Če je vrednost nastavljena na <literal>true</literal>, je v polje za številko zadeve dovoljeno vpisati le številke. Izjema je le vejica, ki jo uporabite, da vnesete več številk zadeve. Veljavni vrednosti sta <literal>true/false</literal>. <emphasis> Če vrednost ni nastavljena, se predpostavlja <literal>true</literal>. </emphasis>"

#. (para)
#: ../source/TortoiseGit_en.xml:10197
msgid "In the simple approach, TortoiseGit shows the user a separate input field where a bug ID can be entered. Then a separate line is appended/prepended to the log message the user entered. <placeholder-1/>"
msgstr "Pri enostavnem načinu TortoiseGit uporabniku pokaže posebno polje za vnos številke hrošča. Nato se na začetek/konec dnevniškega zapisa doda posebna vrstica. <placeholder-1/>"

#. (title)
#: ../source/TortoiseGit_en.xml:10270
msgid "Issue Numbers Using Regular Expressions"
msgstr "Številka zadeve z uporabo regularnih izrazov"

#. (para)
#: ../source/TortoiseGit_en.xml:10282
msgid "This property activates the bug tracking system in <emphasis>Regex</emphasis> mode. It contains either a single regular expressions, or two regular expressions separated by a newline."
msgstr "Ta lastnost aktivira sistem sledenja zadev v načinu <emphasis>Regex</emphasis>. Vsebuje enega ali dva regularna izraza, ločena z novo vrstico."

#. (para)
#: ../source/TortoiseGit_en.xml:10288
msgid "If two expressions are set, then the first expression is used as a pre-filter to find expressions which contain bug IDs. The second expression then extracts the bare bug IDs from the result of the first regex. This allows you to use a list of bug IDs and natural language expressions if you wish. e.g. you might fix several bugs and include a string something like this: <quote>This change resolves issues #23, #24 and #25</quote>"
msgstr "Če sta nastavljena dva izraza, se prvi uporablja za iskanje izrazov, ki vsebujejo ID hrošča. Drugi izraz izlušči ID hrošča iz rezultata prvega izraza. To omogoča uporabo več IDjev hroščev v povezavi z govornimi jezikom, n. pr. če odpravite več hroščev naenkrat v vključite naslednji niz: <quote>S to spremembo so odpravljene napake  #23, #24 in #25</quote>"

#. (para)
#: ../source/TortoiseGit_en.xml:10298
msgid "If you want to catch bug IDs as used in the expression above inside a log message, you could use the following regex strings, which are the ones used by the TortoiseGit project: <literal>[Ii]ssues?:?(\\s*(,|and)?\\s*#\\d+)+</literal> and <literal>(\\d+)</literal>"
msgstr "Če želite ujeti ID hrošča v sporočilu dnevniškega zapisa, lahko uporabite naslednja regularna izraza, ki jih uporablja projekt TortoiseGit:<literal>[Nn]apak[aie]:?(\\s*(,|in)?\\s*#\\d+)+</literal> and <literal>(\\d+)</literal>"

#. (para)
#: ../source/TortoiseGit_en.xml:10305
msgid "The first expression picks out <quote>issues #23, #24 and #25</quote> from the surrounding log message. The second regex extracts plain decimal numbers from the output of the first regex, so it will return <quote>23</quote>, <quote>24</quote> and <quote>25</quote> to use as bug IDs."
msgstr "Prvi izraz iz sporočila dnevniškega zapisa izlušči niz <quote>napake #23, #24 in #25</quote>. Drugi regularni izraz iz rezultata prvega izraza izlušči številke zadev. V tem primeru vrne <quote>23</quote>, <quote>24</quote> in <quote>25</quote>, ki se uporabijo kot številke zadev."

#. (para)
#: ../source/TortoiseGit_en.xml:10312
msgid "Breaking the first regex down a little, it must start with the word <quote>issue</quote>, possibly capitalised. This is optionally followed by an <quote>s</quote> (more than one issue) and optionally a colon. This is followed by one or more groups each having zero or more leading whitespace, an optional comma or <quote>and</quote> and more optional space. Finally there is a mandatory <quote>#</quote> and a mandatory decimal number."
msgstr "Če malce razčlenimo prvi regularni izraz: začeti se mora z besedo <quote>napaka</quote>. Beseda se lahko začne z veliko začetnico, lahko pa je zapisana v obliki dvojine ali množine (<quote>[aie]</quote>). Besedi lahko sledi dvopičje. Sledi ena ali več skupin, vsaka lahko vsebuje vodilne presledke, vejico ali niz <quote>in</quote> in zaključne presledke. Na koncu se nahaja obvezen znak <quote>#</quote> in obvezna številka."

#. (para)
#: ../source/TortoiseGit_en.xml:10321
msgid "If only one expression is set, then the bare bug IDs must be matched in the groups of the regex string. Example: <literal>[Ii]ssue(?:s)? #?(\\d+)</literal> This method is required by a few issue trackers, e.g. trac, but it is harder to construct the regex. We recommend that you only use this method if your issue tracker documentation tells you to."
msgstr "Če je nastavljen le en izraz, potem mora le številka zadeve ustrezati skupini v regularnemu izrazu. Primer: <literal>[Nn]apaka(?:)? #?(\\d+)</literal> To metodo zahtevajo nekateri sledilniki zadev, n. pr. trac, in jih je težje zgraditi. Zato priporočamo, da to metodo uporabite le, če tako velevajo navodila izbranega sledilnika zadev."

#. (para)
#: ../source/TortoiseGit_en.xml:10330
msgid "If you are unfamiliar with regular expressions, take a look at the introduction at <ulink url=\"http://en.wikipedia.org/wiki/Regular_expression\"><citetitle>http://en.wikipedia.org/wiki/Regular_expression</citetitle></ulink>, and the online documentation and tutorial at <ulink url=\"http://www.regular-expressions.info/\"><citetitle>http://www.regular-expressions.info/</citetitle></ulink>."
msgstr "Če regularnih izrazov ne poznate, lahko nekaj o njih preberete na naslovu <ulink url=\"http://en.wikipedia.org/wiki/Regular_expression\"><citetitle>http://en.wikipedia.org/wiki/Regular_expression</citetitle></ulink>, dokumentacijo in priročnik pa poiščite na <ulink url=\"http://www.regular-expressions.info/\"><citetitle>http://www.regular-expressions.info/</citetitle></ulink>."

#. (para)
#: ../source/TortoiseGit_en.xml:10271
msgid "In the approach with <emphasis>regular expressions</emphasis>, TortoiseGit doesn't show a separate input field but marks the part of the log message the user enters which is recognized by the issue tracker. This is done while the user writes the log message. This also means that the bug ID can be anywhere inside a log message! This method is much more flexible, and is the one used by the TortoiseGit project itself. <placeholder-1/>"
msgstr "Pri pristopu z <emphasis>regularnimi izrazi</emphasis> TortoiseGit ne prikaže vnosnega polja, ampak označi del sporočila dnevniškega zapisa, ki ga orodje za sledenje zadev prepozna. To se dogaja med vnosom besedila. To pomeni tudi, da se številka zadeve lahko nahaja kjerkoli v sporočilu. Ta metoda je precej bolj fleksibilna in jo uporablja tudi sam projekt TortoiseGit. <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:10346
msgid "If both the <literal>bugtraq:message</literal> and <literal>bugtraq:logregex</literal> properties are set, <literal>logregex</literal> takes precedence."
msgstr "Če sta nastavljeni obe lastnosti - <literal>bugtraq:message</literal> in  <literal>bugtraq:logregex</literal> - se upošteva <literal>logregex</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:10351
msgid "Even if you don't have an issue tracker with a pre-commit hook parsing your log messages, you still can use this to turn the issues mentioned in your log messages into links!"
msgstr "Tudi če nimate orodja za sledenje zadev, ki ga nastavite v skripto akcij za akcijo pred objavo, lahko še vedno uporabljate ta sistem, da številke zadev v sporočilu spremenite v povezave!"

#. (para)
#: ../source/TortoiseGit_en.xml:10356
msgid "And even if you don't need the links, the issue numbers show up as a separate column in the log dialog, making it easier to find the changes which relate to a particular issue."
msgstr "Povezav mogoče niti ne potrebujete, številke zadev pa se vseeno pojavijo v posebnem stolpcu v dnevniku, tako da lahko hitreje najdete spremembe, ki so povezane z določeno zadevo."

#. (title)
#. (title)
#: ../source/TortoiseGit_en.xml:10369
#: ../source/TortoiseGit_en.xml:10521
msgid "Set the Properties on Folders"
msgstr "Nastavite lastnosti na mapah"

#. (para)
#. (para)
#: ../source/TortoiseGit_en.xml:10370
#: ../source/TortoiseGit_en.xml:10522
msgid "These properties must be set on folders for the system to work. When you commit a file or folder the properties are read from that folder. If the properties are not found there, TortoiseGit will search upwards through the folder tree to find them until it comes to an unversioned folder, or the tree root (eg. <literal>C:\\</literal>) is found. If you can be sure that each user checks out only from e.g <filename>trunk/</filename> and not some sub-folder, then it's enough if you set the properties on <filename>trunk/</filename>. 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 <filename>trunk/</filename>)."
msgstr "Da bo sistem deloval, morate te lastnosti nastaviti na mapah. Ko objavite datoteko ali mapo, se lastnosti preberejo iz te mape. Če TortoiseGit lastnosti ne najde, išče naprej v nadrejeni mapi, dokler ne pride do mape, ki ni pod nadzorom različic ali do korenske mape pogona (n. pr. <literal>C:\\</literal>). Če ste prepričani, da bodo uporabniki prevzemali samo iz mape n.pr. <filename>trunk/</filename> in ne iz katere od podmap, potem lahko lastnosti nastavite na mapi <filename>trunk/</filename>. Če niste prepričani, potem morate lastnosti nastaviti rekurzivno na vseh podmapah. Lastnost, nastavljena globlje v projektni hierarhiji, vedno povozi nastavitve na višjih nivojih (bližje mapi <filename>trunk/</filename>)."

#. (para)
#. (para)
#: ../source/TortoiseGit_en.xml:10384
#: ../source/TortoiseGit_en.xml:10536
msgid "For <literal>tsvn:</literal> properties <emphasis>only</emphasis> you can use the <guilabel>Recursive</guilabel> checkbox to set the property to all sub-folders in the hierarchy, without also setting it on all files."
msgstr "<emphasis>Zgolj</emphasis> za lastnosti <literal>tsvn:</literal> lahko uporabite potrditveno polje <guilabel>Rekurzivno</guilabel>. S tem nastavite lastnost na vse podmape v hierarhiji, na datoteke pa ne."

#. (para)
#: ../source/TortoiseGit_en.xml:10391
msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any Git client. For more information, read the full <ulink url=\"http://TortoiseGit.tigris.org/svn/TortoiseGit/trunk/doc/issuetrackers.txt\"><citetitle>Issue Tracker Integration Specification</citetitle></ulink>."
msgstr "Integracija s sistemi za sledenje zadev ni omejena na TortoiseGit; uporabite jo lahko s katerimkoli odjemalcem za sistem Git. Za več informacij preberite <ulink url=\"http://TortoiseGit.tigris.org/svn/TortoiseGit/trunk/doc/issuetrackers.txt\"><citetitle>Issue Tracker Integration Specification</citetitle></ulink>."

#. (title)
#: ../source/TortoiseGit_en.xml:10400
msgid "Getting Information from the Issue Tracker"
msgstr "Pridobivanje informacij iz sledilnika zadev"

#. (para)
#: ../source/TortoiseGit_en.xml:10401
msgid "The previous section deals with adding issue information to the log messages. But what if you need to get information from the issue tracker? The commit dialog has a Windows COM interface which allows integration an external program that can talk to your tracker. Typically you might want to query the tracker to get a list of open issues assigned to you, so that you can pick the issues that are being addressed in this commit."
msgstr "V prejšnjem poglavju smo predelali dodajanje informacij o zadevah v sporočila dnevniških zapisov. Kaj pa, če želite informacije dobiti iz sledilnika zadev? Okno za objave ima programski vmesnik Windows COM, ki omogoča vključevanje zunanjega programa, ki komunicira s sledilnikom zadev. Primer uporabe te zmožnosti je pregledovanje sledilnika, ki vrne odprte zadeve, ki so vam dodeljene. Tako lahko izberete zadeve, na katerih ste delali v teh objavi."

#. (para)
#: ../source/TortoiseGit_en.xml:10410
msgid "Any such interface is of course highly specific to your system, so we cannot provide this part, and describing how to create such a program is beyond the scope of this manual. The interface definition and sample programs can be obtained from the <literal>contrib</literal> folder in the in the <ulink url=\"http://TortoiseGit.tigris.org/svn/TortoiseGit/trunk/contrib/issue-tracker-plugins\"><citetitle>TortoiseGit repository</citetitle></ulink>."
msgstr "Vsak takšen vmesnik je seveda zelo specifičen, tako da te implementacije ne ponujamo. Opis, kako takšno aplikacijo razviti, pa je prav tako izven okvira tega priročnika. Definicija programskega vmesnika in primeri uporabe se nahajajo v mapi <literal>contrib</literal> na naslovu <ulink url=\"http://TortoiseGit.tigris.org/svn/TortoiseGit/trunk/contrib/issue-tracker-plugins\"><citetitle>TortoiseGit repository</citetitle></ulink>."

#. (title)
#: ../source/TortoiseGit_en.xml:10429
msgid "Example issue tracker query dialog"
msgstr "Primer poizvedovalnika sledilnika zadev"

#. (para)
#: ../source/TortoiseGit_en.xml:10421
msgid "For illustration purposes, let's suppose that your system administrator has provided you with an issue tracker plugin which you have installed, and that you have set up some of your working copies to use the plugin in TortoiseGit's settings dialog. When you open the commit dialog from a working copy to which the plugin has been assigned, you will see a new button at the top of the dialog. <placeholder-1/> In this example you can select one or more open issues. The plugin can then generate specially formatted text which it adds to your log message."
msgstr "Za ilustracijo si predstavljajmo, da vam je skrbnik sistema priskrbel vtičnik za sledilnik zadev, ki ste ga namestili, sedaj pa ga morate uporabiti pri delovnih kopijah. Vse potrebno postorite v oknu Nastavitve programa TortoiseGit. Ko odprete okno za objave v delovni kopiji, ki ima nastavljen vtičnik, se na vrhu pogovornega okna pojavi nov gumb. <placeholder-1/> V tem primeru lahko izberete eno ali več odprtih zadev. Vtičnik nato ustvari posebej oblikovano besedilo, ki ga doda v sporočilo dnevniškega zapisa."

#. (title)
#: ../source/TortoiseGit_en.xml:10439
msgid "Integration with Web-based Repository Viewers"
msgstr "Integracija z internetno naravnanimi pregledovalniki skladišč"

#. (primary)
#: ../source/TortoiseGit_en.xml:10441
msgid "web view"
msgstr "spletni pogled"

#. (primary)
#: ../source/TortoiseGit_en.xml:10444
msgid "repo viewer"
msgstr "pregledovalnik skladišča"

#. (primary)
#: ../source/TortoiseGit_en.xml:10447
msgid "ViewCS"
msgstr "ViewCS"

#. (para)
#: ../source/TortoiseGit_en.xml:10449
msgid "There are several web-based repository viewers available for use with Git such as <ulink url=\"http://www.viewvc.org/\"><citetitle>ViewVC</citetitle></ulink> and <ulink url=\"http://websvn.tigris.org/\"><citetitle>WebSVN</citetitle></ulink>. TortoiseGit provides a means to link with these viewers."
msgstr "Obstaja kar nekaj spletnih pregledovalnikov skladišč za Git, n. pr. <ulink url=\"http://www.viewvc.org/\"><citetitle>ViewVC</citetitle></ulink> in <ulink url=\"http://websvn.tigris.org/\"><citetitle>WebSVN</citetitle></ulink>. TortoiseGit nudi možnost povezave s temi pregledovalniki."

#. (para)
#: ../source/TortoiseGit_en.xml:10461
msgid "You can integrate a repo viewer of your choice in TortoiseGit. To do this, you have to define some properties which define the linkage. They must be set on Folders: (<xref linkend=\"tsvn-dug-propertypage\"/>)"
msgstr "V TortoiseGit lahko integrirate pregledovalnik skladišč po izbiri. Za to morate nastaviti nekaj lastnosti, ki definirajo povezavo. Nastavljene morajo biti na mapah: (<xref linkend=\"tsvn-dug-propertypage\"/>)"

#. (para)
#: ../source/TortoiseGit_en.xml:10471
msgid "Set this property to the URL of your repo viewer to view all changes in a specific revision. It must be properly URI encoded and it has to contain <literal>%REVISION%</literal>. <literal>%REVISION%</literal> is replaced with the revision number in question. This allows TortoiseGit to display a context menu entry in the log dialog <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>View revision in webviewer</guimenuitem></menuchoice>"
msgstr "To lastnost nastavite na naslov URL spletnega pregledovalnika, da vidite vse spremembe v določeni reviziji. Vrednost mora biti pravilno oblikovan naslov (URI) in mora vsebovati izraz <literal>%REVISION%</literal>. Ta se zamenja z zahtevano številko revizije. To sistemu TortoiseGit omogoča prikaz ukaza v kontekstnem meniju v Dnevniku - <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Poglej revizijo v spletnem brskalniku</guimenuitem></menuchoice>"

#. (para)
#: ../source/TortoiseGit_en.xml:10490
msgid "Set this property to the URL of your repo viewer to view changes to a specific file in a specific revision. It must be properly URI encoded and it has to contain <literal>%REVISION%</literal> and <literal>%PATH%</literal>. <literal>%PATH%</literal> is replaced with the path relative to the repository root. This allows TortoiseGit to display a context menu entry in the log dialog <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>View revision and path in webviewer</guimenuitem></menuchoice> For example, if you right-click in the log dialog bottom pane on a file entry <literal>/trunk/src/file</literal> then the <literal>%PATH%</literal> in the URL will be replaced with <literal>/trunk/src/file</literal>."
msgstr "Vrednost te lastnosti nastavite na naslov URL spletnega pregledovalnika, da vidite spremembe določene datoteke v določeni reviziji. Vrednost mora biti pravilno oblikovan naslov (URI) in mora vsebovati izraza <literal>%REVISION%</literal> in <literal>%PATH%</literal>. Izraz <literal>%PATH%</literal> se zamenja z relativno potjo do korenske mape skladišča. To sistemu TortoiseGit omogoča prikaz ukaza v kontekstnem meniju Dnevnika - <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Poglej revizijo in pot v spletnem brskalniku</guimenuitem></menuchoice> Primer: če v spodnjem delu dnevnika kliknete na datoteko <literal>/trunk/src/file</literal>, potem se izraz <literal>%PATH%</literal> v naslovu URL zamenja z vrednostjo <literal>/trunk/src/file</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:10512
msgid "You can also use relative URLs instead of absolute ones. This is useful in case your web viewer is on the same domain/server as your source repository. In case the domain name ever changes, you don't have to adjust the <literal>webviewer:revision</literal> and <literal>webviewer:pathrevision</literal> property. The format is the same as for the <literal>bugtraq:url</literal> property. See <xref linkend=\"tsvn-dug-bugtracker\"/>."
msgstr "Namesto absolutnih naslovov URL lahko uporabljate tudi relativne. To je uporabno, če se vaš spletni brskalnik po skladišču nahaja na isti domeni/strežniku kot skladišče. Če se ime domene kadarkoli spremeni, vam lastnosti <literal>webviewer:revision</literal> in <literal>webviewer:pathrevision</literal> ni potrebno spreminjati. Oblika je enaka kot za lastnost <literal>bugtraq:url</literal>. Poglejte  <xref linkend=\"tsvn-dug-bugtracker\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:10545
msgid "TortoiseGit's Settings"
msgstr "Nastavitve TortoiseGit"

#. (primary)
#: ../source/TortoiseGit_en.xml:10547
msgid "settings"
msgstr "nastavitve"

#. (para)
#: ../source/TortoiseGit_en.xml:10549
msgid "To find out what the different settings are for, just leave your mouse pointer a second on the editbox/checkbox... and a helpful tooltip will popup."
msgstr "Da izveste, čemu služi določena nastavitev, počakajte z miško nekaj trenutkov nad vnosnim/potrditvenim poljem... in prikazal se vam bo uporaben namig."

#. (title)
#: ../source/TortoiseGit_en.xml:10558
msgid "General Settings"
msgstr "Splošne nastavitve"

#. (primary)
#: ../source/TortoiseGit_en.xml:10560
msgid "sounds"
msgstr "zvoki"

#. (title)
#: ../source/TortoiseGit_en.xml:10564
msgid "The Settings Dialog, General Page"
msgstr "Okno za nastavitve, Splošno"

#. (para)
#: ../source/TortoiseGit_en.xml:10562
msgid "<placeholder-1/> This dialog allows you to specify your preferred language, and the Git-specific settings."
msgstr "<placeholder-1/> To okno vam omogoča nastavitev jezika in nastavitev, specifičnih za Git."

#. (term)
#: ../source/TortoiseGit_en.xml:10572
msgid "Language"
msgstr "Jezik"

#. (para)
#: ../source/TortoiseGit_en.xml:10574
msgid "Selects your user interface language. What else did you expect?"
msgstr "Izbere jezik za uporabniški vmesnik. Kaj drugega ste pa pričakovali?"

#. (term)
#: ../source/TortoiseGit_en.xml:10581
msgid "Automatically check for newer versions every week"
msgstr "Vsak teden preveri, če je na voljo novejša različica"

#. (para)
#: ../source/TortoiseGit_en.xml:10583
msgid "If checked, TortoiseGit will contact its download site once a week to see if there is a newer version of the program available. Use <guibutton>Check now</guibutton> if you want an answer right away. The new version will not be downloaded; you simply receive an information dialog telling you that the new version is available."
msgstr "Če je to polje potrjeno, bo TortoiseGit tedensko na strežniku preveril, če je morda na voljo novejša različica programa. Uporabite gumb <guibutton>Preveri zdaj</guibutton>, če želite to storiti takoj."

#. (term)
#: ../source/TortoiseGit_en.xml:10594
msgid "System sounds"
msgstr "Sistemski zvoki"

#. (para)
#: ../source/TortoiseGit_en.xml:10600
msgid "Error"
msgstr "Napaka"

#. (para)
#: ../source/TortoiseGit_en.xml:10605
msgid "Notice"
msgstr "Obvestilo"

#. (para)
#: ../source/TortoiseGit_en.xml:10610
msgid "Warning"
msgstr "Opozorilo"

#. (para)
#: ../source/TortoiseGit_en.xml:10596
msgid "TortoiseGit has three custom sounds which are installed by default. <placeholder-1/> You can select different sounds (or turn these sounds off completely) using the Windows Control Panel. <guibutton>Configure</guibutton> is a shortcut to the Control Panel."
msgstr "TortoiseGit ima tri lastne zvočne efekte, ki so vedno nameščeni. <placeholder-1/> Preko Nadzorne plošče sistema Windows lahko izberete zvoke (ali popolnoma izklopite privzete). Gumb <guibutton>Nastavi</guibutton> je bližnjica do Nadzorne plošče."

#. (term)
#: ../source/TortoiseGit_en.xml:10622
msgid "Global ignore pattern"
msgstr "Splošni vzorec prezrtih"

#. (primary)
#: ../source/TortoiseGit_en.xml:10625
msgid "exclude pattern"
msgstr "vzorec za izključevanje"

#. (primary)
#: ../source/TortoiseGit_en.xml:10628
msgid "global ignore"
msgstr "splošni vzorec prezrtih"

#. (para)
#: ../source/TortoiseGit_en.xml:10630
msgid "Global ignore patterns are used to prevent unversioned files from showing up e.g. in the commit dialog. Files matching the patterns are also ignored by an import. Ignore files or directories by typing in the names or extensions. Patterns are separated by spaces e.g. <literal>*/bin */obj *.bak *.~?? *.jar *.[Tt]mp</literal>. Remember that these patterns may be used against paths which include N levels of parent directory. Setting ignore patterns for anything other than simple file extensions is not as trivial as it first appears, so be sure to read <xref linkend=\"tsvn-dug-ignore-glob\"/> for more information on the pattern-matching syntax, and how paths are checked."
msgstr "Splošni vzorec prezrtih elementov se uporablja za skrivanje datotek brez različic v oknih (n. pr. okno za objave). Datoteke, ki ustrezajo vzorcem, se prezrejo tudi pri uvažanju. Datoteke ali mape prezrete tako, da vpišete ime ali končnico. Vzorci so ločeni s presledkom, n. pr. <literal>*/bin */obj *.bak *.~?? *.jar *.[Tt]mp</literal>. Upoštevajte, da vzorci delujejo na poljubno globokem nivoju drevesne strukture. Nastavljanje bolj kompleksnih vzorcev (več kot n. pr. vnos končnice) ni tako enostavno, ko se sprva zdi, zato preberite <xref linkend=\"tsvn-dug-ignore-glob\"/>, kjer izveste več o sintaksi in preverjanju poti."

#. (para)
#: ../source/TortoiseGit_en.xml:10644
msgid "Note that the ignore patterns you specify here will also affect other Git clients running on your PC, including the command line client."
msgstr "Upoštevajte, da bodo vzorci prezrtih elementov, ki jih nastavite tukaj, vplivali tudi na druge odjemalce za Git, ki so nameščeni na vašem računalniku, vključno z odjemalcem za ukazno vrstico."

#. (para)
#: ../source/TortoiseGit_en.xml:10650
msgid "If you use the Git configuration file to set a <literal>global-ignores</literal> pattern, it will override the settings you make here. The Git configuration file is accessed using the <guibutton>Edit</guibutton> as described below."
msgstr "Če uporabljate konfiguracijsko datoteko Git za nastavljanje <literal>splošnega vzorca prezrtih</literal>, bodo nastavitve, ki so nastavite tu, povožene. Do konfiguracijske datoteke Git dostopate z gumbom <guibutton>Uredi</guibutton>, kot je opisano spodaj."

#. (para)
#: ../source/TortoiseGit_en.xml:10658
msgid "This ignore pattern will affect all your projects. It is not versioned, so it will not affect other users. By contrast you can also use the versioned <literal>svn:ignore</literal> property to exclude files or directories from version control. Read <xref linkend=\"tsvn-dug-ignore\"/> for more information."
msgstr "Vzorec prezrtih elementov vpliva na vse vaše projekte. Ni pa pod nadzorom različic, tako da ne vpliva na druge uporabnike. Lahko pa uporabite tudi lastnost <literal>svn:ignore</literal>, ki je pod nadzorom. Z njo izključite datoteke ali mape iz nadzora različic. Za več informacij preberite <xref linkend=\"tsvn-dug-ignore\"/>."

#. (term)
#: ../source/TortoiseGit_en.xml:10670
msgid "Set file dates to the <quote>last commit time</quote>"
msgstr "Nastavi datume datotek na <quote>čas zadnje objave</quote>"

#. (para)
#: ../source/TortoiseGit_en.xml:10672
msgid "This option tells TortoiseGit to set the file dates to the last commit time when doing a checkout or an update. Otherwise TortoiseGit will use the current date. If you are developing software it is generally best to use the current date because build systems normally look at the date stamps to decide which files need compiling. If you use <quote>last commit time</quote> and revert to an older file revision, your project may not compile as you expect it to."
msgstr "Ta možnost pove sistemu TortoiseGit, naj pri prevzemu ali posodobitvi popravi časovni žig datotek na čas objave. V nasprotnem primeru TortoiseGit uporabi trenutni datum. Če razvijate programsko opremo, je najbolje, da uporabljate trenuten datum/čas, saj sistemi za gradjo običajno pogledajo datum in čas spremembe datoteke, da ugotovijo, katere je potrebno ponovno prevesti. Če uporabite <quote>zadnji čas objave</quote> in naredite povrnitev, se projekt morda ne bo prevedel tako, kot želite."

#. (term)
#: ../source/TortoiseGit_en.xml:10686
msgid "Git configuration file"
msgstr "Nastavitvena datoteka Git"

#. (para)
#: ../source/TortoiseGit_en.xml:10688
msgid "Use <guibutton>Edit</guibutton> to edit the Git configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Git <filename>config</filename> file see the <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.advanced.confarea.html\"><citetitle>Runtime Configuration Area</citetitle></ulink>. The section on <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.advanced.props.html#svn.advanced.props.auto\"><citetitle>Automatic Property Setting</citetitle></ulink> is of particular interest, and that is configured here. Note that Git can read configuration information from several places, and you need to know which one takes priority. Refer to <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.advanced.confarea.html#svn.advanced.confarea.windows-registry\"><citetitle>Configuration and the Windows Registry</citetitle></ulink> to find out more."
msgstr "Za neposredno urejanje konfiguracijske datoteke sistema Git uporabite ukaz <guibutton>Uredi</guibutton>. Nekaterih nastavitev ne morete nastaviti preko grafičnega vmesnika TortoiseGit, zato jih morate nastaviti tukaj. Za več informacij o konfiguracijski datoteki  (<filename>config</filename>) poglejte na stran <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.advanced.confarea.html\"><citetitle>Runtime Configuration Area</citetitle></ulink>. Razdelek <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.advanced.props.html#svn.advanced.props.auto\"><citetitle>Automatic Property Setting</citetitle></ulink> je še posebej zanimiv. Upoštevajte, da sistem Git lahko bere informacije o konfiguraciji na več mestih in da morate vedeti, katero mesto ima prioriteto. Za več informacij preberite <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.advanced.confarea.html#svn.advanced.confarea.windows-registry\"><citetitle>Configuration and the Windows Registry</citetitle></ulink>."

#. (term)
#: ../source/TortoiseGit_en.xml:10713
msgid "Use <filename>_svn</filename> instead of <filename>.svn</filename> directories"
msgstr "Uporabi mape <filename>_svn</filename> namesto <filename>.svn</filename>"

#. (para)
#: ../source/TortoiseGit_en.xml:10715
msgid "VS.NET when used with web projects can't handle the <literal>.svn</literal> folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET and the frontpage extensions it uses. Read <xref linkend=\"tsvn-dug-settings-asp-dot-net\"/> to find out more about this issue."
msgstr "VS.NET pri razvoju spletnih projektov ne zna delati z mapami <literal>.svn</literal>, ki jih Git uporablja za shranjevanje notranjih informacij. To ni napaka v sistemu Git, ampak v razvojnem okolju VS.NET in razširitvah frontpage, ki jih uporablja. Za več informacij o tem problemu preberite <xref linkend=\"tsvn-dug-settings-asp-dot-net\"/>."

#. (para)
#: ../source/TortoiseGit_en.xml:10722
msgid "If you want to change the behaviour of Git and TortoiseGit, you can use this checkbox to set the environment variable which controls this."
msgstr "Če želite spremeniti obnašanje programov Git in TortoiseGit, lahko uporabite to potrditveno polje, da nastavite ustrezno okoljsko spremenljivko."

#. (para)
#: ../source/TortoiseGit_en.xml:10727
msgid "You should note that changing this option will not automatically convert existing working copies to use the new admin directory. You will have to do that yourself using a script (See our FAQ) or simply check out a fresh working copy."
msgstr "Vedeti morate, da sprememba te nastavitve ne vpliva na obstoječe delovne kopije. Te boste morali popraviti sami z uporabo ukazne datoteke (preberite Pogosto zastavljena vprašanja) ali pa enostavno narediti novo delovno kopijo."

#. (title)
#: ../source/TortoiseGit_en.xml:10737
msgid "Context Menu Settings"
msgstr " Nastavitve kontekstnega menija"

#. (title)
#: ../source/TortoiseGit_en.xml:10741
msgid "The Settings Dialog, Context Menu Page"
msgstr "Okno nastavitev, Kontekstni meni"

#. (para)
#: ../source/TortoiseGit_en.xml:10739
msgid "<placeholder-1/> This page allows you to specify which of the TortoiseGit context menu entries will show up in the main context menu, and which will appear in the TortoiseGit submenu. By default most items are unchecked and appear in the submenu."
msgstr "<placeholder-1/> Ta stran omogoča nastavitev vnosov kontekstnega menija TortoiseGit, ki se pojavijo v glavnem kontekstnem meniju. Po privzetih nastavitvah večina vnosov ni izbranih in se pojavijo samo v podmeniju."

#. (para)
#: ../source/TortoiseGit_en.xml:10749
msgid "There is a special case for <guilabel>Get Lock</guilabel>. You can of course promote it to the top level using the list above, but as most files don't need locking this just adds clutter. However, a file with the <literal>svn:needs-lock</literal> property needs this action every time it is edited, so in that case it is very useful to have at the top level. Checking the box here means that when a file is selected which has the <literal>svn:needs-lock</literal> property set, <guilabel>Get Lock</guilabel> will always appear at the top level."
msgstr "Ukaz <guilabel>Dobi zaklep</guilabel> je poseben primer. Seveda ga lahko postavite v glavni kontekstni meni, kot je opisano zgoraj. Ker pa večina datotek ne potrebuje zaklepanja, je to le nepotrebna obremenitev menija. Po drugi strani pa pri datotekah, ki imajo  nastavljeno lastnost <literal>svn:needs-lock</literal>, potrebujete ta ukaz pri vsakem urejanju, zato je v tem primeru koristno, če se nahaja v glavnem kontekstnem meniju. Če potrdite potrditveno polje, se bo ukaz <guilabel>Dobi zaklep</guilabel> pojavil v glavnem meniju vsakokrat, ko izberete datoteko z nastavljeno lastnostjo <literal>svn:needs-lock</literal>."

#. (title)
#: ../source/TortoiseGit_en.xml:10761
msgid "TortoiseGit Dialog Settings 1"
msgstr "Pogovorna okna 1"

#. (title)
#: ../source/TortoiseGit_en.xml:10765
msgid "The Settings Dialog, Dialogs 1 Page"
msgstr "Okno nastavitev, Pogovorna okna 1"

#. (para)
#: ../source/TortoiseGit_en.xml:10763
msgid "<placeholder-1/> This dialog allows you to configure some of TortoiseGit's dialogs the way you like them."
msgstr "<placeholder-1/> To okno omogoča nastavitev nekaterih pogovornih oken programa TortoiseGit po vaših željah."

#. (term)
#: ../source/TortoiseGit_en.xml:10773
msgid "Default number of log messages"
msgstr "Privzeto število dnevniških zapisov"

#. (para)
#: ../source/TortoiseGit_en.xml:10775
msgid "Limits the number of log messages that TortoiseGit fetches when you first select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Show Log</guimenuitem></menuchoice> Useful for slow server connections. You can always use <guibutton>Show All</guibutton> or <guibutton>Next 100</guibutton> to get more messages."
msgstr "Omeji število dnevniških zapisov, ki jih TortoiseGit prenese, ko prvič izberete <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Pokaži dnevnik</guimenuitem></menuchoice>. Uporabno za počasne povezave. Vedno lahko uporabite gumb <guibutton>Pokaži vse</guibutton> ali gumb <guibutton>Naslednjih 100</guibutton>, če želite videti več zapisov."

#. (term)
#: ../source/TortoiseGit_en.xml:10789
msgid "Font for log messages"
msgstr "Pisava za dnevniški zapis"

#. (para)
#: ../source/TortoiseGit_en.xml:10791
msgid "Selects the font face and size used to display the log message itself in the middle pane of the Revision Log dialog, and when composing log messages in the Commit dialog."
msgstr "Izbere pisavo in velikost, ki se uporablja za izpis sporočila dnevniškega zapisa v srednjem delu dnevnika in pri sestavljanju dnevniških zapisov v oknu za objave."

#. (term)
#: ../source/TortoiseGit_en.xml:10800
msgid "Short date / time format in log messages"
msgstr "Kratka oblika datuma / ure v dnevniških zapisih"

#. (para)
#: ../source/TortoiseGit_en.xml:10802
msgid "If the standard long messages use up too much space on your screen use the short format."
msgstr "Če standardni dnevniški zapisi zavzamejo preveč prostora na zaslonu, uporabite kratek format."

#. (term)
#: ../source/TortoiseGit_en.xml:10809
msgid "Progress Dialog"
msgstr "Okno napredka"

#. (para)
#: ../source/TortoiseGit_en.xml:10811
msgid "TortoiseGit can automatically close all progress dialogs when the action is finished without error. This setting allows you to select the conditions for closing the dialogs. The default (recommended) setting is <guilabel>Close manually</guilabel> which allows you to review all messages and check what has happened. However, you may decide that you want to ignore some types of message and have the dialog close automatically if there are no critical changes."
msgstr "TortoiseGit lahko v primeru uspešne operacije samodejno zapre pogovorna okna. Ta nastavitev vam omogoča nastaviti pogoje samodejnega zapiranja. Privzeta (priporočena) nastavitev je <guilabel>Zapri ročno</guilabel>, kar vam omogoča, da pregledate sporočila in preverite, kaj se je zgodilo. Lahko pa se odločite, da vas določene vrste sporočil ne zanimajo in želite, da se takšna okna samodejno zaprejo, če se ne pojavijo kritične napake."

#. (para)
#: ../source/TortoiseGit_en.xml:10822
msgid "<guilabel>Auto-close if no merges, adds or deletes</guilabel> means that the progress dialog will close if there were simple updates, but if changes from the repository were merged with yours, or if any files were added or deleted, the dialog will remain open. It will also stay open if there were any conflicts or errors during the operation."
msgstr "Izbira <guilabel>Samodejno zapri, če ni spajanj, dodajanj ali brisanj</guilabel> pomeni, da se bo okno napredka zaprlo v primeru enostavnih posodobitev. Če pa pride do spajanja sprememb iz skladišča v delovno kopijo ali če so bile kakšne datoteke dodane ali izbrisane, bo pogovorno okno ostalo odprto. Odprto bo ostalo tudi, če se pri posodobitvi pojavijo spori ali napake."

#. (para)
#: ../source/TortoiseGit_en.xml:10830
msgid "<guilabel>Auto-close if no merges, adds or deletes for local operations</guilabel> means that the progress dialog will close as for <guilabel>Auto-close if no merges, adds or deletes</guilabel> but only for local operations like adding files or reverting changes. For remote operations the dialog will stay open."
msgstr "Izbira <guilabel>Samodejno zapri, če pri krajevnih operacijah ni spajanj, dodajanj ali brisanj</guilabel> pomeni, da se bo okno napredka zaprlo kot pri uporabi možnosti <guilabel>Samodejno zapri, če ni spajanj, dodajanj ali brisanj</guilabel>, vendar le v primeru krajevnih operacij, kot sta dodajanje datotek ali povrnitev sprememb. Pri oddaljenih operacij ostane okno odprto."

#. (para)
#: ../source/TortoiseGit_en.xml:10838
msgid "<guilabel>Auto-close if no conflicts</guilabel> relaxes the criteria further and will close the dialog even if there were merges, adds or deletes. However, if there were any conflicts or errors, the dialog remains open."
msgstr "Izbira <guilabel>Samodejno zapri, če ni sporov</guilabel> še bolj omili pogoje in zapre pogovorna okna tudi v primeru spajanja, dodajanja ali brisanja. Če pa se ob tem pojavijo spori ali napake, pa bo okno vseeno ostalo odprto."

#. (para)
#: ../source/TortoiseGit_en.xml:10845
msgid "<guilabel>Auto-close if no errors</guilabel> always closes the dialog even if there were conflicts. The only condition that keeps the dialog open is an error condition, which occurs when Git is unable to complete the task. For example, an update fails because the server is inaccessible, or a commit fails because the working copy is out-of-date."
msgstr "Izbira <guilabel>Samodejno zapri, če ni napak</guilabel> pomeni, da se pogovorno okno vedno zapre, tudi v primeru sporov. Okno ostane odprto le v primeru, če Git ne more dokončati operacije. Primer: posodobitev je neuspešna, če strežnik ni dosegljiv, objava ni uspešna, če je delovna kopija zastarela."

#. (term)
#: ../source/TortoiseGit_en.xml:10857
msgid "Use URL of WC as the default <quote>From:</quote> URL"
msgstr "Uporabi URL delovne kopije kot privzeti URL za polje <quote>Iz:<quote>"

#. (para)
#: ../source/TortoiseGit_en.xml:10859
msgid "In the merge dialog, the default behaviour is for the <guilabel>From:</guilabel> URL to be remembered between merges. However, some people like to perform merges from many different points in their hierarchy, and find it easier to start out with the URL of the current working copy. This can then be edited to refer to a parallel path on another branch."
msgstr "Po privzetih nastavitvah si okno Spoji zapomni naslov URL, ki je nastavljen v polju  <guilabel>Iz:</guilabel>. Nekateri uporabniki opravljajo spajanja iz precej različnih točk v svoji strukture map in jim je lažje, če se v polju pojavi naslov URL trenutne delovne kopije. Naslov URL potem popravijo, da ustreza vzporedni poti na drugi veji."

#. (term)
#: ../source/TortoiseGit_en.xml:10871
msgid "Default checkout path"
msgstr "Privzeta pot za prevzem"

#. (para)
#: ../source/TortoiseGit_en.xml:10873
msgid "You can specify the default path for checkouts. If you keep all your checkouts in one place, it is useful to have the drive and folder pre-filled so you only have to add the new folder name to the end."
msgstr "Nastavite lahko privzeto pot za prevzeme. Če imate vse prevzeme na enem mestu, potem je uporabno, da sta pogon in mapa predizpolnjena, tako da dodate na koncu samo ime mape."

#. (term)
#: ../source/TortoiseGit_en.xml:10882
msgid "Default checkout URL"
msgstr "Privzeti URL za prevzem"

#. (para)
#: ../source/TortoiseGit_en.xml:10884
msgid "You can also specify the default URL for checkouts. If you often checkout sub-projects of some very large project, it can be useful to have the URL pre-filled so you only have to add the sub-project name to the end."
msgstr "Lahko pa nastavite privzeti naslov URL za prevzeme. Če pogosto prevzemate podprojekte nekega velike projekta, je uporabno, če imate polje naslov URL predizpolnjeno in mu na koncu dodate samo ime podprojekta."

#. (title)
#: ../source/TortoiseGit_en.xml:10895
msgid "TortoiseGit Dialog Settings 2"
msgstr "Pogovorna okna 2"

#. (title)
#: ../source/TortoiseGit_en.xml:10899
msgid "The Settings Dialog, Dialogs 2 Page"
msgstr "Okno nastavitev, Pogovorna okna 2"

#. (term)
#: ../source/TortoiseGit_en.xml:10905
msgid "Recurse into unversioned folders"
msgstr "Vstopi rekurzivno v mape brez različic."

#. (para)
#: ../source/TortoiseGit_en.xml:10907
msgid "If this box is checked (default state), then whenever the status of an unversioned folder is shown in the <guilabel>Add</guilabel>, <guilabel>Commit</guilabel> or <guilabel>Check for Modifications</guilabel> dialog, every child file and folder is also shown. If you uncheck this box, only the unversioned parent is shown. Unchecking reduces clutter in these dialogs. In that case if you select an unversioned folder for Add, it is added recursively."
msgstr "Če je to polje potrjeno (privzeta nastavitev), potem se v oknih <guilabel>Dodaj</guilabel>, <guilabel>Objavi</guilabel> ali <guilabel>Preveri spremembe</guilabel> v primeru map brez različic  pojavijo tudi podrejene mape in datoteke brez različic. Če to polje izklopite, potem je prikazana samo vrhnja mapa. Izklop tega polja pripomore k manjši obremenjnosti pogovornih oken. Če v takšnem primeru izberete za dodajanje mapo brez različic, se rekurzivno doda vsa njena vsebina."

#. (term)
#: ../source/TortoiseGit_en.xml:10921
msgid "Use auto-completion of file paths and keywords"
msgstr "Uporabi samodokončanje poti datotek in ključnih besed"

#. (para)
#: ../source/TortoiseGit_en.xml:10923
msgid "The commit dialog includes a facility to parse the list of filenames being committed. When you type the first 3 letters of an item in the list, the auto-completion box pops up, and you can press Enter to complete the filename. Check the box to enable this feature."
msgstr "Okno za objave omogoča razčlenjevanje seznama datotek za objavo. Ko vtipkate prve tri črke elementa na seznamu, se pojavi okno za samodokončanje. Pritisnete lahko tipko ENTER in s tem vnesete predlagani niz. Za vklop te zmožnosti potrdite to polje."

#. (term)
#: ../source/TortoiseGit_en.xml:10933
msgid "Timeout in seconds to stop the auto-completion parsing"
msgstr "Časovni rok v sekundah za ustavitev razčlenjevanja samodokončanja"

#. (para)
#: ../source/TortoiseGit_en.xml:10935
msgid "The auto-completion parser can be quite slow if there are a lot of large files to check. This timeout stops the commit dialog being held up for too long. If you are missing important auto-completion information, you can extend the timeout."
msgstr "Orodje za razčlenjevanje je lahko precej počasno, če dela z velikim številom datotek. Časovni rok prepreči, da bi okno za objave čakalo predolgo časa. Če pri samodokončanju pogrešate določene informacije, podaljšajte časovni rok."

#. (term)
#: ../source/TortoiseGit_en.xml:10944
msgid "Only use spellchecker when <literal>tsvn:projectlanguage</literal> is set"
msgstr "Uporabi črkovalnik le ko je nastavljena lastnost <literal>tsvn:projectlanguage</literal>"

#. (para)
#: ../source/TortoiseGit_en.xml:10946
msgid "If you don't wish to use the spellchecker for all commits, check this box. The spellchecker will still be enabled where the project properties require it."
msgstr "Če ne želite uporabiti črkovalnika za vse objave, potrdite to polje. Črkovalnik bo še vedno omogočen tam, kjer ga zahtevajo projektne lastnosti."

#. (term)
#: ../source/TortoiseGit_en.xml:10954
msgid "Max. items to keep in the log message history"
msgstr "Največje število ohranjenih dnevniških zapisov"

#. (para)
#: ../source/TortoiseGit_en.xml:10956
msgid "TortoiseGit stores the last 25 log messages you entered for each repository. You can customize the number stored here. If you have many different repositories, you may wish to reduce this to avoid filling your registry."
msgstr "TortoiseGit si shrani zadnjih 25 vnešenih zapisov za vsako skladišče. Tukaj lahko število zapisov sprememnite. Če uporabljate veliko število skladišč, zmanjšajte število shranjenih zapisov, saj s tem zmanjšate velikost registra."

#. (term)
#: ../source/TortoiseGit_en.xml:10965
msgid "Re-open commit and branch/tag dialog after a commit failed"
msgstr "Ponovno odpri okno za objave/oznake/veje, če je bila objava neuspešna"

#. (para)
#: ../source/TortoiseGit_en.xml:10967
msgid "When a commit fails for some reason (working copy needs updating, pre-commit hook rejects commit, network error, etc), you can select this option to keep the commit dialog open ready to try again. However, you should be aware that this can lead to problems. If the failure means you need to update your working copy, and that update leads to conflicts you must resolve those first."
msgstr "Ko objava zaradi določenega razloga ni uspešna (delovno kopijo je potrebno posodobiti, skripta akcije pred objavo prepreči objavo, napake v omrežju), lahko izberete to možnost, da okno objave ostane odprto in pripravljeno na ponoven poskus. Morate pa se zavedati, da to lahko povzroči težave. Če je vzrok za napako neposodobljena delovna kopija, jo morate posodobiti, to pa lahko povzroči spore. Le-te morate najprej rešiti."

#. (term)
#: ../source/TortoiseGit_en.xml:10978
msgid "Select items automatically"
msgstr "Elemente izberi samodejno"

#. (para)
#: ../source/TortoiseGit_en.xml:10980
msgid "The normal behaviour in the commit dialog is for all modified (versioned) items to be selected for commit automatically. If you prefer to start with nothing selected and pick the items for commit manually, uncheck this box."
msgstr "Običajno obnašanje okna za objave je, da so vse spremenjene datoteke pod nadzorom izbrane samodejno. Če vam bolj ustreza, da ni izbrana nobena datoteka in boste elemente za objavo izbrali sami, izključite to možnost."

#. (term)
#: ../source/TortoiseGit_en.xml:10989
msgid "Contact the repository on startup"
msgstr "Poveži se s skladiščem ob zagonu"

#. (para)
#: ../source/TortoiseGit_en.xml:10991
msgid "The Check for Modifications dialog checks the working copy by default, and only contacts the repository when you click <guibutton>Check repository</guibutton>. If you always want to check the repository, you can use this setting to make that action happen automatically."
msgstr "Okno Preveri spremembe po privzetih nastavitvah preveri le delovno kopijo, skladišče pa preverja le, če kliknete gumb <guibutton>Preveri skladišče</guibutton>. Če želite, da se skladišče vedno samodejno preverja, potrdite to možnost."

#. (term)
#: ../source/TortoiseGit_en.xml:11001
msgid "Show Lock dialog before locking files"
msgstr "Prikaži okno zaklepov pred zaklepanjem datotek"

#. (para)
#: ../source/TortoiseGit_en.xml:11003
msgid "When you select one or more files and then use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Lock</guimenuitem></menuchoice> to take out a lock on those files, on some projects it is customary to write a lock message explaining why you have locked the files. If you do not use lock messages, you can uncheck this box to skip that dialog and lock the files immediately."
msgstr "Pri nekaterih projektih velja pravilo, da se pri zaklepanju ene ali več datotek z ukazom <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Lock</guimenuitem></menuchoice> vpiše sporočilo zaklepa z vzrokom zaklepa. Če sporočil zaklepov ne uporabljate, lahko to možnost izključite. S tem preskočite pogovorno kono za vpis sporočila in nemudoma zaklenete datoteke."

#. (para)
#: ../source/TortoiseGit_en.xml:11015
msgid "If you use the lock command on a folder, you are always presented with the lock dialog as that also gives you the option to select files for locking."
msgstr "Če uporabite zaklepanje na mapi, se vedno pojavi pogovorno okno za zaklepnaje, ki vam ponudi možnost izbire datotek za zaklepanje."

#. (para)
#: ../source/TortoiseGit_en.xml:11020
msgid "If your project is using the <literal>tsvn:lockmsgminsize</literal> property, you will see the lock dialog regardless of this setting because the project <emphasis>requires</emphasis> lock messages."
msgstr "Če vaš projekt uporablja lastnost <literal>tsvn:lockmsgminsize</literal>, se bo pogovorno okno zaklepov prikazalo ne glede na te nastavitve, ker projekt <emphasis>zahteva</emphasis> zapis zaklepa."

#. (title)
#: ../source/TortoiseGit_en.xml:11030
msgid "TortoiseGit Colour Settings"
msgstr "Nastavitev barv TortoiseGit"

#. (title)
#: ../source/TortoiseGit_en.xml:11034
msgid "The Settings Dialog, Colours Page"
msgstr "Okno nastavitev, Barve"

#. (para)
#: ../source/TortoiseGit_en.xml:11032
msgid "<placeholder-1/> This dialog allows you to configure the text colours used in TortoiseGit's dialogs the way you like them."
msgstr "<placeholder-1/> To pogovorno okno omogoča nastavljanje barve besedil v pogovornih oknih aplikacije TortoiseGit."

#. (term)
#: ../source/TortoiseGit_en.xml:11042
msgid "Possible or real conflict / obstructed"
msgstr "Možen ali resničen spor / ovirano"

#. (para)
#: ../source/TortoiseGit_en.xml:11044
msgid "A conflict has occurred during update, or may occur during merge. Update is obstructed by an existing unversioned file/folder of the same name as a versioned one."
msgstr "Do spora je prišlo med posodobitvijo ali med spajanjem. Posodobitev ovira datoteka/mapa brez različic, ki nosi isto ime kot datoteka/mapa pod nadzorom."

#. (para)
#: ../source/TortoiseGit_en.xml:11049
msgid "This colour is also used for error messages in the progress dialogs."
msgstr "Ta barva se uporablja tudi za sporočila o napakah v oknu napredka."

#. (term)
#: ../source/TortoiseGit_en.xml:11055
msgid "Added files"
msgstr "Dodane datoteke"

#. (para)
#: ../source/TortoiseGit_en.xml:11057
msgid "Items added to the repository."
msgstr "Elementi, dodani v skladišče."

#. (term)
#: ../source/TortoiseGit_en.xml:11063
msgid "Missing / deleted / replaced"
msgstr "Manjkajoče / izbrisano / zamenjano"

#. (para)
#: ../source/TortoiseGit_en.xml:11065
msgid "Items deleted from the repository, missing from the working copy, or deleted from the working copy and replaced with another file of the same name."
msgstr "Elementi, izbrisani iz skladišča, ki v delovni kopiji manjkajo, ali element, izbrisan iz delovne kopije in zamenjan z drugo datoteko z istim imenom."

#. (term)
#: ../source/TortoiseGit_en.xml:11073
msgid "Merged"
msgstr "Spojeno"

#. (para)
#: ../source/TortoiseGit_en.xml:11075
msgid "Changes from the repository successfully merged into the WC without creating any conflicts."
msgstr "Spremembe iz skladišča so bile uspešno (brez sporov) spojene v delovno kopijo."

#. (term)
#: ../source/TortoiseGit_en.xml:11082
msgid "Modified / copied"
msgstr "Spremenjeno / kopirano"

#. (para)
#: ../source/TortoiseGit_en.xml:11084
msgid "Add with history, or paths copied in the repository. Also used in the log dialog for entries which include copied items."
msgstr "Elementi, dodani z zgodovino, ali poti, kopirane v skladišču. Uporablja se tudi v Dnevniku za kopirane elemente."

#. (term)
#: ../source/TortoiseGit_en.xml:11092
msgid "Deleted node"
msgstr "Izbrisano vozlišče"

#. (para)
#: ../source/TortoiseGit_en.xml:11094
msgid "An item which has been deleted from the repository."
msgstr "Element, ki je bil izbrisan iz skladišča."

#. (term)
#: ../source/TortoiseGit_en.xml:11100
msgid "Added node"
msgstr "Dodano vozlišče"

#. (para)
#: ../source/TortoiseGit_en.xml:11102
msgid "An item which has been added to the repository, by an add, copy or move operation."
msgstr "Element, ki je bil dodan v skladišče z uporabo ukazov dodaj, kopiraj ali premakni."

#. (term)
#: ../source/TortoiseGit_en.xml:11109
msgid "Renamed node"
msgstr "Preimenovano vozlišče"

#. (para)
#: ../source/TortoiseGit_en.xml:11111
msgid "An item which has been renamed within the repository."
msgstr "Element, ki je bil preimenovan znotraj skladišča."

#. (term)
#: ../source/TortoiseGit_en.xml:11117
msgid "Replaced node"
msgstr "Zamenjano vozlišče"

#. (para)
#: ../source/TortoiseGit_en.xml:11119
msgid "The original item has been deleted and a new item with the same name replaces it."
msgstr "Izviren element je bil izbrisan. Nadomesti ga nov element z enakim imenom."

#. (title)
#: ../source/TortoiseGit_en.xml:11129
msgid "Icon Overlay Settings"
msgstr "Nastavitve prekrivnih ikon"

#. (title)
#: ../source/TortoiseGit_en.xml:11133
msgid "The Settings Dialog, Icon Overlays Page"
msgstr "Okno nastavitev, Izbor ikon"

#. (para)
#: ../source/TortoiseGit_en.xml:11131
msgid "<placeholder-1/> This page allows you to choose the items for which TortoiseGit will display icon overlays."
msgstr "<placeholder-1/> Ta stran omogoča izbiro elementov, za katere TortoiseGit prikaže prekrivne ikone."

#. (para)
#: ../source/TortoiseGit_en.xml:11139
msgid "By default, overlay icons and context menus will appear in all open/save dialogs as well as in Windows Explorer. If you want them to appear <emphasis>only</emphasis> in Windows Explorer, check the <guilabel>Show overlays and context menu only in explorer</guilabel> box."
msgstr "Po privzetih nastavitvah se prekrivne ikone in kontekstni meni pojavijo v vseh oknih Open/Save (Odpri/Shrani) in v Raziskovalcu. Če želite, da se pojavijo <emphasis>samo</emphasis> v Raziskovalcu, potrdite polje <guilabel>Pokaži prekrivanje ikon in kontekstni meni samo v raziskovalcu</guilabel>."

#. (para)
#: ../source/TortoiseGit_en.xml:11145
msgid "Ignored items and Unversioned items are not usually given an overlay. If you want to show an overlay in these cases, just check the boxes."
msgstr "Prezrti elementi in elementi brez različic so običajno brez prekrivnih ikon. Če na jih teh elementih vseeno želite, potrdite ustrezna polja."

#. (para)
#: ../source/TortoiseGit_en.xml:11149
msgid "You can also choose to mark folders as modified if they contain unversioned items. This could be useful for reminding you that you have created new files which are not yet versioned. This option is only available when you use the <emphasis>default</emphasis> status cache option (see below)."
msgstr "Če izberete privzeto možnost, lahko izberete tudi možnost označevanja map kot spremenjenih, če vsebujejo elemente brez različic. To je uporabno, saj vas opozarja, da ste ustvarili nove datoteke, ki še niso dodane v skladišče. Ta možnost je na voljo le, če uporabljate <emphasis>privzet</emphasis> način predpomnilnika stanja (spodaj)."

#. (term)
#: ../source/TortoiseGit_en.xml:11164
msgid "Default"
msgstr "Prizeto"

#. (para)
#: ../source/TortoiseGit_en.xml:11166
msgid "Caches all status information in a separate process (<filename>TSVNCache.exe</filename>). That process watches all drives for changes and fetches the status again if files inside a working copy get modified. The process runs with the least possible priority so other programs don't get hogged because of it. That also means that the status information is not <emphasis>real time</emphasis> but it can take a few seconds for the overlays to change."
msgstr "Vse informacije o stanju pridobiva poseben proces (<filename>TSVNCache.exe</filename>). Ta preverja spremembe na vseh pogonih in ponovno pridobi informacijo o stanju, če se datoteke znoraj delovne kopije spremenijo. Proces teče z najmanjšo možno prioriteto izvajanja, tako da ne upočasni ostalih aplikacij. To pa pomeni tudi, da se informacije o procesu ne prodobivajo v <emphasis>realnem času</emphasis>, zato se lahko sprememba prekrivne ikone zgodi šele čez nekaj sekund."

#. (para)
#: ../source/TortoiseGit_en.xml:11177
msgid "Advantage: the overlays show the status recursively, i.e. if a file deep inside a working copy is modified, all folders up to the working copy root will also show the modified overlay. And since the process can send notifications to the shell, the overlays on the left tree view usually change too."
msgstr "Prednost: prekrivne ikone prikazujejo status rekurzivno: če se spremeni datoteka nekje globoko v hierarhiji map, se prekrivne ikone spremenijo vsem mapam do korenske mape delovne kopije. Ker lahko proces pošilja obvestila o spremembah ukazni lupini, se običajno spremenijo tudi prekrivne ikone map na levi strani Raziskovalca (drevo strukture map)."

#. (para)
#: ../source/TortoiseGit_en.xml:11185
msgid "Disadvantage: the process runs constantly, even if you're not working on your projects. It also uses around 10-50 MB of RAM depending on number and size of your working copies."
msgstr "Slabost: proces teče neprestano, tudi če ne delate na projektih. Uporablja pa tudi 10 do 50 MB pomnilnika (RAM), odvisno od števila in velikosti delovnih kopij."

#. (term)
#: ../source/TortoiseGit_en.xml:11193
msgid "Shell"
msgstr "Lupina"

#. (para)
#: ../source/TortoiseGit_en.xml:11195
msgid "Caching is done directly inside the shell extension dll, but only for the currently visible folder. Each time you navigate to another folder, the status information is fetched again."
msgstr "Polnjenje predpomnilnika se dogaja znotraj knjižnice za razširitev lupine, vendar zgolj za trenutno vidno mapo. Vsakič, ko se premaknete na drugo mapo, se informacije o stanju ponovno pridobijo."

#. (para)
#: ../source/TortoiseGit_en.xml:11201
msgid "Advantage: needs only very little memory (around 1 MB of RAM) and can show the status in <emphasis>real time</emphasis>."
msgstr "Prednost: potrebuje zelo malo pomnilnika (približno 1MB), stanje pa lahko prikazuje v <emphasis>realnem času</emphasis>."

#. (para)
#: ../source/TortoiseGit_en.xml:11205
msgid "Disadvantage: Since only one folder is cached, the overlays don't show the status recursively. For big working copies, it can take more time to show a folder in explorer than with the default cache. Also the mime-type column is not available."
msgstr "Slabost: Ker se v predpomnilnik shranijo le informacije o eni mapi, se prekrivne ikone ne prikazujejo rekurzivno. Pri velikih delovnih kopijah lahko prikaz mape traja dalj časa kot pri privzetih nastavitvah. Stolpec, ki prikazuje tip MIME, ni na voljo."

#. (term)
#: ../source/TortoiseGit_en.xml:11215
msgid "None"
msgstr "Brez predpomnilnika"

#. (para)
#: ../source/TortoiseGit_en.xml:11217
msgid "With this setting, the TortoiseGit does not fetch the status at all in Explorer. Because of that, files don't get an overlay and folders only get a 'normal' overlay if they're versioned. No other overlays are shown, and no extra columns are available either."
msgstr "Pri tej nastavitvi TortoiseGit ne pridobiva stanja delovne kopije v Raziskovalcu. Datoteke nimajo prekrivnih ikon, mape pa imajo prekrivno ikono 'običajno', če so pod nadzorom različic. Druge prekrivne ikone se ne prikazujejo, prav tako niso na voljo dodatni stolpci z informacijami."

#. (para)
#: ../source/TortoiseGit_en.xml:11224
msgid "Advantage: uses absolutely no additional memory and does not slow down the Explorer at all while browsing."
msgstr "Prednost: ne uporablja nobenega dodatnega spomina in ne upočasni delovanja Raziskovalca med brskanjem."

#. (para)
#: ../source/TortoiseGit_en.xml:11228
msgid "Disadvantage: Status information of files and folders is not shown in Explorer. To see if your working copies are modified, you have to use the <quote>Check for modifications</quote> dialog."
msgstr "Slabost: informacija o stanju datotek in map ni prikazana v Raziskovalcu. Če želite preveriti, ali je vaša delovna kopija spremenjena, morate uporabiti okno <quote>Preveri spremembe</quote>."

#. (para)
#: ../source/TortoiseGit_en.xml:11156
msgid "Since it takes quite a while to fetch the status of a working copy, TortoiseGit uses a cache to store the status so the explorer doesn't get hogged too much when showing the overlays. You can choose which type of cache TortoiseGit should use according to your system and working copy size here: <placeholder-1/>"
msgstr "Ker pridobivanje informacij o stanju delovne kopije traja kar nekaj časa, TortoiseGit uporablja predpomnilnik, tako da prikazovanje prekrivnih ikon poteka bolj gladko. Glede na vaš sistem in velikost delovne kopije izberite ustrezen tip predpomnilnika: <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:11237
msgid "The next group allows you to select which classes of storage should show overlays. By default, only hard drives are selected. You can even disable all icon overlays, but where's the fun in that?"
msgstr "Naslednja skupina omogoča nastavite vrste elementov, za katere se prikažejo prekrivne ikone. Po privzetih nastavitvah so izbrani le trdi diski. Seveda lahko prikaz prekrivnih ikon popolnoma izključite, toda to sploh ni zabavno, kaj ne?"

#. (para)
#: ../source/TortoiseGit_en.xml:11242
msgid "Network drives can be very slow, so by default icons are not shown for working copies located on network shares."
msgstr "Omrežni pogoni so zelo počani, zato po privzetih nastavitvah prekrivne ikone delovnih kopij na omrežnih pogonih niso prikazane."

#. (para)
#: ../source/TortoiseGit_en.xml:11246
msgid "USB Flash drives appear to be a special case in that the drive type is identified by the device itself. Some appear as fixed drives, and some as removable drives."
msgstr "Pogoni USB so poseben primer, saj je njihov tip definiran s pogonom samim. Tako se nekateri pojavijo kot stalni pogoni, nekateri pa kot odstanjivi."

#. (para)
#: ../source/TortoiseGit_en.xml:11251
msgid "The <guilabel>Exclude Paths</guilabel> are used to tell TortoiseGit those paths for which it should <emphasis>not</emphasis> show icon overlays and status columns. This is useful if you have some very big working copies containing only libraries which you won't change at all and therefore don't need the overlays. For example:"
msgstr "Za poti, nastavljene v <guilabel>Izloči poti</guilabel>, TortoiseGit <emphasis>ne</emphasis> prikazuje prekrivnih ikon in stolpcev stanja. To je uporabno, če imate velike delovne kopije, ki vsebujejo le knjižnice, ki jih ne boste spreminjali in zato ne potrebujete informacij preko prekrivnih ikon. Primer:"

#. (para)
#: ../source/TortoiseGit_en.xml:11259
msgid "<filename>f:\\development\\SVN\\Git</filename> will disable the overlays <emphasis>only</emphasis> on that specific folder. You still can see the overlays on all files and folder inside that folder."
msgstr "Nastavitev <filename>f:\\development\\SVN\\Git</filename> onemogoči prikaz prekrivnih ikon <emphasis>le</emphasis> na točno tej mapi. Prekrivne ikone še vedno vidite na vseh datotekah in mapah znotraj te mape."

#. (para)
#: ../source/TortoiseGit_en.xml:11264
msgid "<filename>f:\\development\\SVN\\Git*</filename> will disable the overlays on <emphasis>all</emphasis> files and folders whose path starts with <filename>f:\\development\\SVN\\Git</filename>. That means you won't see overlays for any files and folders below that path."
msgstr "Nastavitev <filename>f:\\development\\SVN\\Git*</filename> onemogoči prikaz prekrivnih ikon na  <emphasis>vseh</emphasis> datotekah in mapah, katerih pot se začne z <filename>f:\\development\\SVN\\Git</filename>. To pomeni, da na datotekah in mapah pod to potjo ne boste videli prekrivnih ikon."

#. (para)
#: ../source/TortoiseGit_en.xml:11271
msgid "The same applies to the <guilabel>Include Paths</guilabel>. Except that for those paths the overlays are shown even if the overlays are disabled for that specific drive type, or by an exclude path specified above."
msgstr "Enako velja tudi za nastavitev <guilabel>Vključi poti</guilabel>. Za te poti se prekrivne ikone prikazujejo vedno, tudi če so sicer izklopljene za ta tip pogona ali preko zgornjih nastavitev."

#. (para)
#: ../source/TortoiseGit_en.xml:11276
msgid ""
"Users sometimes ask how these three settings interact, and the definitive answer is: <screen>\n"
"if (path is in include list)\n"
"  show overlays\n"
"if (path is allowed drive type) AND (path is not in exclude list)\n"
"  show overlays\n"
"</screen> The include list <emphasis>always</emphasis> makes the overlays show. Otherwise, overlays are shown for all marked drive types <emphasis>unless</emphasis> the path is excluded."
msgstr ""
"Uporabniki včasih vprašajo, kako te nastavitve sodelujejo. Odgovor je naslednji: <screen>\n"
"če je pot na seznamu vključenih poti\n"
"  prikaži prekrivne ikone\n"
"če je pot na dovoljeni vrsti pogona IN ni na neznamu izključenih poti\n"
"  prikaži prekrivne ikone\n"
"</screen> Če je pot na seznamu vključenih poti, so prekrivne ikone <emphasis>vedno</emphasis> prikazane. V nasprotnem primeru se prekrivne ikone prikažejo za vse označene tipe pogonov, <emphasis>razen</emphasis> če je pot na seznamu izključenih."

#. (para)
#: ../source/TortoiseGit_en.xml:11289
msgid "TSVNCache.exe also uses these paths to restrict its scanning. If you want it to look only in particular folders, disable all drive types and include only the folders you specifically want to be scanned."
msgstr "Te poti uporablja tudi TSVNCache.exe, da si omeji pregledovanje. Če želite, da pregleda samo določene mape, onemogočite vse tipe pogonov in vključite le mape, ki jih želite pregledati."

#. (title)
#: ../source/TortoiseGit_en.xml:11295
msgid "Exclude <literal>SUBST</literal> Drives"
msgstr "Izločite pogone <literal>SUBST</literal>"

#. (primary)
#: ../source/TortoiseGit_en.xml:11297
msgid "SUBST drives"
msgstr "Pogoni SUBST"

#. (para)
#: ../source/TortoiseGit_en.xml:11299
msgid ""
"It is often convenient to use a <literal>SUBST</literal> drive to access your working copies, e.g. using the command <screen>\n"
"subst T: C:\\TortoiseGit\\trunk\\doc\n"
"</screen> However this can cause the overlays not to update, as <literal>TSVNCache</literal> will only receive one notification when a file changes, and that is normally for the original path. This means that your overlays on the <literal>subst</literal> path may never be updated."
msgstr ""
"Pogosto je uporaben način dostopa do delovne kopije z uporabo ukaza <literal>SUBST</literal>, n. pr. <screen>\n"
"subst T: C:\\TortoiseGit\\trunk\\doc\n"
"</screen> Vendar se lahko pojavijo težave pri posodabljanju prekrivnih ikon. Proces <literal>TSVNCache</literal> namreč dobi samo eno sporočilo, ko se spremeni datoteka; običajno je to izvirna pot. Tako se lahko zgodi, da se prekrivne ikone na poti, ki vsebuje ime pogona, narejenega z ukazom <literal>subst</literal>, ne bodo posodabljale."

#. (para)
#: ../source/TortoiseGit_en.xml:11311
msgid "An easy way to work around this is to exclude the original path from showing overlays, so that the overlays show up on the <literal>subst</literal> path instead."
msgstr "Da se izognemu temu problemu, izvirno pot dodamo na seznam poti, ki ji TortoiseGit prezre pri posodabljanju prekrivnih ikon. Na ta način se bodo posodabljale ikone na pogonu, narejenem z ukazom <literal>subst</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:11317
msgid "Sometimes you will exclude areas that contain working copies, which saves TSVNCache from scanning and monitoring for changes, but you still want a visual indication that such folders are versioned. The <guilabel>Show excluded folders as 'normal'</guilabel> checkbox allows you to do this. With this option, versioned folders in any excluded area (drive type not checked, or specifically excluded) will show up as normal and up-to-date, with a green check mark. This reminds you that you are looking at a working copy, even though the folder overlays may not be correct. Files do not get an overlay at all. Note that the context menus still work, even though the overlays are not shown."
msgstr "Včasih izključite območja, ki vsebujejo delovne kopije, kar povzroči, da TSVNCache teh področij ne preverja. Vseeno pa želite imeti takšne mape označene, da so pod nadzorom različic. Polje <guilabel>Prikaži izločene mape kot  'običajne'</guilabel> omogoča prav to. S potrditvijo tega polja dosežete, da se datoteke v izključenih območjih (nevklučeni pogoni, izključeni pogoni) prikažejo kot običajne in sodobne, z zeleno kljukico. To vam pove, da gledate delovno kopijo, čeprav stanje, ki ga prekrivne ikone prikazujejo, morda ni pravilno. Datoteke prekrivnih ikon nimajo, vendar kontekstni meni kljub temu deluje."

#. (para)
#: ../source/TortoiseGit_en.xml:11330
msgid "As a special exception to this, drives <literal>A:</literal> and <literal>B:</literal> are never considered for the <guilabel>Show excluded folders as 'normal'</guilabel> option. This is because Windows is forced to look on the drive, which can result in a delay of several seconds when starting Explorer, even if your PC does have a floppy drive."
msgstr "Izjema sta pogona <literal>A:</literal> in <literal>B:</literal>, ki se nikoli ne upoštevata pri možnosti <guilabel>Prikaži izločene mape kot 'navadne'</guilabel>. V takem primeru bi namreč sistem Windows pregledal omenjena pogona, tudi če ju dejansko nimate, kar bi za nekaj sekund upočasnilo zaganjanje Raziskovalca."

#. (title)
#: ../source/TortoiseGit_en.xml:11339
msgid "Icon Set Selection"
msgstr "Izbira nabora ikon"

#. (title)
#: ../source/TortoiseGit_en.xml:11343
msgid "The Settings Dialog, Icon Set Page"
msgstr "Okno nastavitev, Izbor ikon"

#. (para)
#: ../source/TortoiseGit_en.xml:11341
msgid "<placeholder-1/> You can change the overlay icon set to the one you like best. Note that if you change overlay set, you may have to restart your computer for the changes to take effect."
msgstr "<placeholder-1/> Izberete si lahko tak nabor ikon, ki vam najbolj ustreza. Da bi uveljavili spremembe, boste morali mogoče ponovno zagnati računalnik."

#. (title)
#: ../source/TortoiseGit_en.xml:11354
msgid "Network Settings"
msgstr "Nastavitve omrežja"

#. (primary)
#: ../source/TortoiseGit_en.xml:11356
msgid "proxy server"
msgstr "Posredniški strežnik"

#. (title)
#: ../source/TortoiseGit_en.xml:11360
msgid "The Settings Dialog, Network Page"
msgstr "Okno nastavitev, Omrežje"

#. (para)
#: ../source/TortoiseGit_en.xml:11358
msgid "<placeholder-1/> Here you can configure your proxy server, if you need one to get through your company's firewall."
msgstr "<placeholder-1/> Tukaj lahko nastavite posredniški strežnik (proxy). Mogoče ga potrebujete, da lahko delate preko požarnega zidu v podjetju."

#. (para)
#: ../source/TortoiseGit_en.xml:11366
msgid "If you need to set up per-repository proxy settings, you will need to use the Git <filename>servers</filename> file to configure this. Use <guibutton>Edit</guibutton> to get there directly. Consult the <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.advanced.confarea.html\"><citetitle>Runtime Configuration Area</citetitle></ulink> for details on how to use this file."
msgstr "Če želite posredniški strežnik nastaviti za vsako skladišče posebej, morate za to uporabiti datoteko <filename>servers</filename> sistema Git. Za neposreden dostop do te datoteke uporabite gumb <guibutton>Uredi</guibutton>. Za več informacij preberite <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.advanced.confarea.html\"><citetitle>Runtime Configuration Area</citetitle></ulink>."

#. (para)
#: ../source/TortoiseGit_en.xml:11376
msgid "You can also specify which program TortoiseGit should use to establish a secure connection to a svn+ssh repository. We recommend that you use TortoisePlink.exe. This is a version of the popular Plink program, and is included with TortoiseGit, but it is compiled as a Windowless app, so you don't get a DOS box popping up every time you authenticate."
msgstr "Določite lahko aplikacijo, ki naj jo TortoiseGit uporabi za vzpostavitev varne povezave do skladišča svn+ssh. Priporočamo uporabo programa TortoisePlink.exe. To je posebna različica priljubljenega programa Plink in je del paketa TortoiseGit. Prevedena je kot aplikacija brez okna, tako da se ob avtentikaciji ne pojavi okno DOS."

#. (para)
#: ../source/TortoiseGit_en.xml:11384
msgid "You must specify the full path to the executable. For TortoisePlink.exe this is the standard TortoiseGit bin directory. Use the <guibutton>Browse</guibutton> button to help locate it."
msgstr "Navesti morate polno pot izvršne datoteke. Za TortoisePlink.exe je to mapa TortoiseGit bin. Da najdete ustrezno pot, uporabite gumb <guibutton>Prebrskaj</guibutton>."

#. (para)
#: ../source/TortoiseGit_en.xml:11389
msgid "One side-effect of not having a window is that there is nowhere for any error messages to go, so if authentication fails you will simply get a message saying something like <quote>Unable to write to standard output</quote>. For this reason we recommend that you first set up using standard Plink. When everything is working, you can use TortoisePlink with exactly the same parameters."
msgstr "Stranski učinek aplikacije brez okna je, da ta ne more izpisati sporočila o napaki. Če avtentikacija ne uspe, dobite sporočilo tipa <quote>Ne morem pisati na standardni izhod</quote>. Zato priporočamo, da najprej uporabite standarno različico programa Plink. Ko vse deluje, pa jo zamenjate s programom TortoisePlink. Uporabite popolnoma enake parametre."

#. (para)
#: ../source/TortoiseGit_en.xml:11398
msgid "TortoisePlink does not have any documentation of its own because it is just a minor variant of Plink. Find out about command line parameters from the <ulink url=\"http://www.chiark.greenend.org.uk/~sgtatham/putty/\"><citetitle>PuTTY website</citetitle></ulink>"
msgstr "TortoisePlink nima lastne dokumentacije, ker se le malo razlikuje od programa Plink. Parametrd ukazne vrstice lahko najdete na naslovu <ulink url=\"http://www.chiark.greenend.org.uk/~sgtatham/putty/\"><citetitle>PuTTY</citetitle></ulink>"

#. (para)
#: ../source/TortoiseGit_en.xml:11406
msgid "To avoid being prompted for a password repeatedly, you might also consider using a password caching tool such as Pageant. This is also available for download from the PuTTY website."
msgstr "Da vam ne bi bilo potrebno vsakokrat vpisovati uporabniškega imena in gesla, lahko uporabite orodje za shranjevane gesel, naprimer Pageant, ki je na voljo na domači strani PuTTY."

#. (para)
#: ../source/TortoiseGit_en.xml:11411
msgid "Finally, setting up SSH on server and clients is a non-trivial process which is beyond the scope of this help file. However, you can find a guide in the TortoiseGit FAQ listed under <ulink url=\"http://TortoiseGit.net/ssh_howto\"><citetitle>Git/TortoiseGit SSH How-To</citetitle></ulink>."
msgstr "Nastavljanje SSH na strežniku in odjemalcih je malce bolj obsežen postopek, ki ne sodi v okvir te pomoči. Navodila lahko najdete med pogosto zastavljeni vprašanji TortoiseGit: <ulink url=\"http://TortoiseGit.net/ssh_howto\"><citetitle>Git/TortoiseGit SSH How-To</citetitle></ulink>."

#. (title)
#: ../source/TortoiseGit_en.xml:11421
msgid "External Program Settings"
msgstr "Nastaviteve zunanjih programov"

#. (title)
#: ../source/TortoiseGit_en.xml:11424
msgid "The Settings Dialog, Diff Viewer Page"
msgstr "Okno nastavitev, ogledovalnik razlik"

#. (para)
#: ../source/TortoiseGit_en.xml:11422
msgid "<placeholder-1/> Here you can define your own diff/merge programs that TortoiseGit should use. The default setting is to use TortoiseMerge which is installed alongside TortoiseGit."
msgstr "<placeholder-1/> Tukaj lahko nastavite programe za razlikovanje/spajanje, ki naj jih TortoiseGit uporabi. Privzeta nastavitev je uporaba programa TortoiseMerge, ki se namesti skupaj s TortoiseGit."

#. (para)
#: ../source/TortoiseGit_en.xml:11432
msgid "Read <xref linkend=\"tsvn-dug-diff-tools\"/> for a list of some of the external diff/merge programs that people are using with TortoiseGit."
msgstr "Preberite <xref linkend=\"tsvn-dug-diff-tools\"/>, kjer so navedena nekatera zunanja orodja za razlikovanje/spajanje, ki jih uporabniki uporabljajo skupaj s sistemom TortoiseGit."

#. (title)
#: ../source/TortoiseGit_en.xml:11437
msgid "Diff Viewer"
msgstr "Pregledovalnik razlik"

#. (para)
#: ../source/TortoiseGit_en.xml:11452
msgid "The original file without your changes"
msgstr "Izvirna datoteka brez vaših sprememb"

#. (para)
#. (para)
#: ../source/TortoiseGit_en.xml:11460
#: ../source/TortoiseGit_en.xml:11569
msgid "The window title for the base file"
msgstr "Naslov okna osnovne datoteke"

#. (para)
#: ../source/TortoiseGit_en.xml:11468
msgid "Your own file, with your changes"
msgstr "Vaša lastna datoteka z vašimi spremembami"

#. (para)
#. (para)
#: ../source/TortoiseGit_en.xml:11476
#: ../source/TortoiseGit_en.xml:11585
msgid "The window title for your file"
msgstr "Naslov okna za vašo datoteko"

#. (para)
#: ../source/TortoiseGit_en.xml:11439
msgid "An external diff program may be used for comparing different revisions of files. The external program will need to obtain the filenames from the command line, along with any other command line options. TortoiseGit uses substitution parameters prefixed with <literal>%</literal>. When it encounters one of these it will substitute the appropriate value. The order of the parameters will depend on the Diff program you use. <placeholder-1/>"
msgstr "Za primerjanje razlik med različnimi revizijami datotek lahko uporabljate zunanji program za razlikovanje. Zunanji program mora v ukazni vrstici dobiti imena datotek in parametre ukazne vrstice. TortoiseGit uporablja parametre za zamenjavo s predpono <literal>%</literal>. Ko naleti na parameter, ga zamenja z ustrezno vrednostjo. Vrstni red parametrov je odvisen od programa za razlikovanje, ki ga uporabljate. <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:11483
msgid "The window titles are not pure filenames. TortoiseGit treats that as a name to display and creates the names accordingly. So e.g. if you're doing a diff from a file in revision 123 with a file in your working copy, the names will be <filename>filename : revision 123</filename> and <filename>filename : working copy</filename>"
msgstr "Naslovi oken niso zgolj imena datotek. TortoiseGit jih obravnava kot nazive za prikaz in ustvari ustrezna imena. N. pr. če razlikujete datoteko revizije 123 z datoteko v delovni kopiji, bosta imeni za prikaz <filename>imedatoteke : revizija 123</filename> in <filename>ime datoteke : delovna kopija</filename>."

#. (para)
#: ../source/TortoiseGit_en.xml:11493
msgid ""
"For example, with ExamDiff Pro: <screen>\n"
"C:\\Path-To\\ExamDiff.exe %base %mine --left_display_name:%bname\n"
"    --right_display_name:%yname\n"
"</screen> or with KDiff3: <screen>\n"
"C:\\Path-To\\kdiff3.exe %base %mine --L1 %bname --L2 %yname\n"
"</screen> or with WinMerge: <screen>\n"
"C:\\Path-To\\WinMerge.exe -e -ub -dl %bname -dr %yname %base %mine\n"
"</screen> or with Araxis: <screen>\n"
"C:\\Path-To\\compare.exe /max /wait /title1:%bname /title2:%yname\n"
"    %base %mine\n"
"</screen>"
msgstr ""
"Naprimer: z ExamDiff Pro: <screen>\n"
"C:\\Pot-do\\ExamDiff.exe %base %mine\n"
"</screen> ali s KDiff3: <screen>\n"
"C:\\Pot-do\\kdiff3.exe %base %mine --L1 %bname --L2 %yname\n"
"</screen> ali z WinMerge: <screen>\n"
"C:\\Pot-do\\WinMerge.exe -e -ub -dl %bname -dr %yname %base %mine\n"
"</screen> ali z Araxis: <screen>\n"
"C:\\Pot-do\\compare.exe /max /wait /title1:%bname /title2:%yname\n"
"    %base %mine\n"
"</screen>"

#. (para)
#: ../source/TortoiseGit_en.xml:11513
msgid "If you use the <literal>svn:keywords</literal> property to expand keywords, and in particular the <emphasis>revision</emphasis> of a file, then there may be a difference between files which is purely due to the current value of the keyword. Also if you use <literal>svn:eol-style = native</literal> the BASE file will have pure <literal>LF</literal> line endings whereas your file will have <literal>CR-LF</literal> line endings. TortoiseGit will normally hide these differences automatically by first parsing the BASE file to expand keywords and line endings before doing the diff operation. However, this can take a long time with large files. If <guilabel>Convert files when diffing against BASE</guilabel> is unchecked then TortoiseGit will skip pre-processing the files."
msgstr "Če uporabljate lastnost <literal>svn:keywords</literal> za razširitev ključnih besed, posebej če uporabite <emphasis>revizijo</emphasis> datoteke, se med datotekami pojavi razlike zgolj zaradi različne vrednosti ključnih besed. Podobno je pri uporabi lastnosti <literal>svn:eol-style = native</literal>: osnovna datoteka  (BASE) bo uporabljala <literal>LF</literal> za zaključek vrstice, vaša datoteka pa <literal>CR-LF</literal>. TortoiseGit običajno te razlike skrije, tako da pred primerjanjem tudi v osnovni datoteki razširi ključne besede in spremeni zaključke vrstic. To pa lahko traja precej časa, če delamo z dolgimi datotekami. Če je polje <guilabel>Pri razlikovanju glede na BASE pretvori datoteke</guilabel> izklopljeno, bo TortoiseGit preskočil predprocesiranje datotek."

#. (para)
#: ../source/TortoiseGit_en.xml:11527
msgid "You can also specify a different diff tool to use on Git properties. Since these tend to be short simple text strings, you may want to use a simpler more compact viewer."
msgstr "Lahko pa določite tudi drugo orodje za razlikovanje lastnosti v sistemu Git. Ker so lastnosti ponavadi enostavna kratka besedila, vam bo mogoče bolj ustrezal enostavnejši pregledovalnik."

#. (para)
#: ../source/TortoiseGit_en.xml:11532
msgid "If you have configured an alternate diff tool, you can access TortoiseMerge <emphasis>and</emphasis> the third party tool from the context menus. <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Diff</guimenuitem></menuchoice> uses the primary diff tool, and <keycap>Shift</keycap>+ <menuchoice><guimenu>Context menu</guimenu><guimenuitem>Diff</guimenuitem></menuchoice> uses the secondary diff tool."
msgstr "Če ste nastavili dodatna orodja za razlikovanje, lahko iz kontekstnega menija izbere TortoiseMerge <emphasis>in</emphasis> ostala orodja. <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Razlikuj</guimenuitem></menuchoice> uporabi osnovno orodje za razlikovanje, <keycap>Shift</keycap>+<menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Razlikuj</guimenuitem></menuchoice> pa dodatnega."

#. (title)
#: ../source/TortoiseGit_en.xml:11550
msgid "Merge Tool"
msgstr "Orodje za spajanje"

#. (para)
#: ../source/TortoiseGit_en.xml:11560
msgid "the original file without your or the others changes"
msgstr "izvirna datoteka brez vaših sprememb ali sprememb ostalih"

#. (para)
#: ../source/TortoiseGit_en.xml:11577
msgid "your own file, with your changes"
msgstr "vaša datoteka z vašimi spremembami"

#. (para)
#: ../source/TortoiseGit_en.xml:11593
msgid "the file as it is in the repository"
msgstr "datoteka, kot se nahaja v skladišču"

#. (para)
#: ../source/TortoiseGit_en.xml:11601
msgid "The window title for the file in the repository"
msgstr "naslov okna za datoteko v skladišču"

#. (para)
#: ../source/TortoiseGit_en.xml:11609
msgid "the conflicted file, the result of the merge operation"
msgstr "sporna datoteka, rezultat spajanja"

#. (para)
#: ../source/TortoiseGit_en.xml:11618
msgid "The window title for the merged file"
msgstr "naslov okna za spojeno datoteko"

#. (para)
#: ../source/TortoiseGit_en.xml:11552
msgid "An external merge program used to resolve conflicted files. Parameter substitution is used in the same way as with the Diff Program. <placeholder-1/>"
msgstr "Zunanji program za spajanje, uporabljen za reševaje spornih datotek. Zamenjava parametrov se uporablja prav tako kot pri programu za razlikovanje. <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:11625
msgid ""
"For example, with Perforce Merge: <screen>\n"
"C:\\Path-To\\P4Merge.exe %base %theirs %mine %merged\n"
"</screen> or with KDiff3: <screen>\n"
"C:\\Path-To\\kdiff3.exe %base %mine %theirs -o %merged\n"
"    --L1 %bname --L2 %yname --L3 %tname\n"
"</screen> or with Araxis: <screen>\n"
"C:\\Path-To\\compare.exe /max /wait /3 /title1:%tname /title2:%bname\n"
"    /title3:%yname %theirs %base %mine %merged /a2\n"
"</screen> or with WinMerge (2.8 or later): <screen>\n"
"C:\\Path-To\\WinMerge.exe %merged\n"
"</screen>"
msgstr ""
"Naprimer: s Perforce Merge: <screen>\n"
"C:\\Path-To\\P4Merge.exe %base %theirs %mine %merged\n"
"</screen> ali s KDiff3: <screen>\n"
"C:\\Path-To\\kdiff3.exe %base %mine %theirs -o %merged\n"
"    --L1 %bname --L2 %yname --L3 %tname\n"
"</screen> ali z Araxis: <screen>\n"
"C:\\Path-To\\compare.exe /max /wait /3 /title1:%tname /title2:%bname\n"
"    /title3:%yname %theirs %base %mine %merged /a2\n"
"</screen> ali z WinMerge (2.8 ali novejši): <screen>\n"
"C:\\Path-To\\WinMerge.exe %merged\n"
"</screen>"

#. (title)
#: ../source/TortoiseGit_en.xml:11647
msgid "Diff/Merge Advanced Settings"
msgstr "Napredne nastavitve za razlikovanje/spajanje"

#. (title)
#: ../source/TortoiseGit_en.xml:11651
msgid "The Settings Dialog, Diff/Merge Advanced Dialog"
msgstr "Okno nastavitev, napredne nastavitve razlikovanja/spajanja"

#. (para)
#: ../source/TortoiseGit_en.xml:11649
msgid "<placeholder-1/> In the advanced settings, you can define a different diff and merge program for every file extension. For instance you could associate Photoshop as the <quote>Diff</quote> Program for <filename>.jpg</filename> files :-) You can also associate the <literal>svn:mime-type</literal> property with a diff or merge program."
msgstr "<placeholder-1/> V naprednih nastavitvah lahko nastavite različna orodja za razlikovanje in spajanje glede na končnico datoteke. Primer: Photoshop nastavite kot program za <quote>razlikovanje</quote> datotek <filename>.jpg</filename> :-) Tudi lastnost <literal>svn:mime-type</literal> lahko asociirate s programom za razlikovanje ali spajanje."

#. (para)
#: ../source/TortoiseGit_en.xml:11660
msgid "To associate using a file extension, you need to specify the extension. Use <literal>.bmp</literal> to describe Windows bitmap files. To associate using the <literal>svn:mime-type</literal> property, specify the mime type, including a slash, for example <literal>text/xml</literal>."
msgstr "Za povezavo orodij s končnico datotek morate navesti končnico. Uporabite <literal>.bmp</literal> za datoteke bitmap sistema Windows. Za povezavo orodij z lastnostjo <literal>svn:mime-type</literal> nastavite tip MIME, vključno s poševnico, n.pr. <literal>text/xml</literal>."

#. (title)
#: ../source/TortoiseGit_en.xml:11669
msgid "Unified Diff Viewer"
msgstr "Pregledovalnik za poenotene razlike"

#. (para)
#: ../source/TortoiseGit_en.xml:11671
msgid "A viewer program for unified-diff files (patch files). No parameters are required. The <guilabel>Default</guilabel> option is to check for a file association for <filename>.diff</filename> files, and then for <filename>.txt</filename> files. If you don't have a viewer for <filename>.diff</filename> files, you will most likely get NotePad."
msgstr "Pregledovalnik za poenotene razlike (datoteke popravkov). Noben parameter ni obvezen. Možnost <guilabel>Default</guilabel> pove, da je potrebno poiskati program, ki je povezan s končnico <filename>.diff</filename> in s končnico <filename>.txt</filename>. Če pregledovalnika za datoteke <filename>.diff</filename> nimate, vam bo po vsej verjetnosti ponujena Beležka."

#. (para)
#: ../source/TortoiseGit_en.xml:11680
msgid "The original Windows NotePad program does not behave well on files which do not have standard CR-LF line-endings. Since most unified diff files have pure LF line-endings, they do not view well in NotePad. However, you can download a free NotePad replacement <ulink url=\"http://www.flos-freeware.ch/notepad2.html\"><citetitle>Notepad2</citetitle></ulink> which not only displays the line-endings correctly, but also colour codes the added and removed lines."
msgstr "Originalna Beležka sistema Windows ne deluje najbolje pri datotekah, ki imajo nestandardne zaključke vrstic CR-LF. Ker imajo datoteke poenotene razlike večinoma le zaključke LF, se jih v Beležki ne da dobro pregledovati. Lahko pa si prenesete brezplačno zamenjavo za Beležko. <ulink url=\"http://www.flos-freeware.ch/notepad2.html\"><citetitle>Notepad2</citetitle></ulink>, poleg tega, da pravilno prikaže zaključke datotek, uporablja tudi barvno kodiranje za dodane in odstranjene vrstice."

#. (title)
#: ../source/TortoiseGit_en.xml:11696
msgid "Saved Data Settings"
msgstr "Shranjeni podatki"

#. (title)
#: ../source/TortoiseGit_en.xml:11699
msgid "The Settings Dialog, Saved Data Page"
msgstr "Okno nastavitev, Shranjeni podatki"

#. (para)
#: ../source/TortoiseGit_en.xml:11697
msgid "<placeholder-1/> For your convenience, TortoiseGit saves many of the settings you use, and remembers where you have been lately. If you want to clear out that cache of data, you can do it here."
msgstr "<placeholder-1/> Za večjo uporabnost TortoiseGit shrani veliko nastavitev, ki jih uporabljate, in si zapomni vaše zadnje operacije. Če želite, lahko tu te podatke izbrišete."

#. (term)
#: ../source/TortoiseGit_en.xml:11708
msgid "URL history"
msgstr "Zgodovina naslovov URL"

#. (para)
#: ../source/TortoiseGit_en.xml:11710
msgid "Whenever you checkout a working copy, merge changes or use the repository browser, TortoiseGit keeps a record of recently used URLs and offers them in a combo box. Sometimes that list gets cluttered with outdated URLs so it is useful to flush it out periodically."
msgstr "Ko naredite prevzem delovne kopije, spojite spremembe ali uporabite brskalnik po skladišču, vam TortoiseGit ponudi shranjene zadnje uporabljene naslove URL v spustnem meniju. Včasih je seznam poln starih naslovov in ga je zato koristno počistiti."

#. (para)
#: ../source/TortoiseGit_en.xml:11717
msgid "If you want to remove a single item from one of the combo boxes you can do that in-place. Just click on the arrow to drop the combo box down, move the mouse over the item you want to remove and type <keycap>Shift+Del</keycap>."
msgstr "Če želite iz spustnega polja izbrisati posamezne elemente, lahko to storite kar na polju samem. Kliknite na puščico za spust spustnega polja, premaknite miško na element, ki ga želite odstraniti in stisnite <keycap>Shift+Del</keycap>."

#. (term)
#: ../source/TortoiseGit_en.xml:11726
msgid "Log messages (Input dialog)"
msgstr "Dnevniška sporočila (vnosno okno)"

#. (para)
#: ../source/TortoiseGit_en.xml:11728
msgid "TortoiseGit stores recent commit log messages that you enter. These are stored per repository, so if you access many repositories this list can grow quite large."
msgstr "TortoiseGit shrani zadnjih nekaj sporočil dnevniških zapisov, ki jih vnesete in sicer za vsako skladišče posebej. Če uporabljate veliko skladišč, postane ta seznam precej dolg."

#. (term)
#: ../source/TortoiseGit_en.xml:11736
msgid "Log messages (Show log dialog)"
msgstr "Dnevniška sporočila (okno Prikaži dnevnik)"

#. (para)
#: ../source/TortoiseGit_en.xml:11738
msgid "TortoiseGit caches log messages fetched by the Show Log dialog to save time when you next show the log. If someone else edits a log message and you already have that message cached, you will not see the change until you clear the cache. Log message caching is enabled on the <guilabel>Log Cache</guilabel> tab."
msgstr "TortoiseGit si ob prikazu okna sporočila dnevniških zapisov shrani v predpomnilnik, tako da naslednjič, ko jih mora prikazati, prihrani čas. Če nekdo dnevniški zapis popravi, vi pa ta zapis že imate v predpomnilniku, te spremembe ne boste videli, dokler ne izbrišete predpomnilnika. Predpomnenje dnevniških zapisov se vključi v zavihku <guilabel>Predpomnilnik dnevnika</guilabel>."

#. (term)
#: ../source/TortoiseGit_en.xml:11749
msgid "Dialog sizes and positions"
msgstr "Velikosti in položaji pogovornih oken"

#. (para)
#: ../source/TortoiseGit_en.xml:11751
msgid "Many dialogs remember the size and screen position that you last used."
msgstr "Veliko oken si zapomni velikost in položaj na zaslonu ob zadnji uporabi."

#. (term)
#: ../source/TortoiseGit_en.xml:11758
msgid "Authentication data"
msgstr "Podatki avtentikacije"

#. (para)
#: ../source/TortoiseGit_en.xml:11760
msgid "When you authenticate with a Git server, the username and password are cached locally so you don't have to keep entering them. You may want to clear this for security reasons, or because you want to access the repository under a different username ... does John know you are using his PC?"
msgstr "Ko uporabljate avtentikacijo s strežnikom Git, se uporabniško ime in geslo shranita v krajevni datoteki in vam ju tako ni potrebno vedno znova vnašati. Te podatke boste morda želeli izbrisati - zaradi varnostnih razlogov ali pa zato, ker želite do skladišča dostopati z drugim uporabniškim imenom ... ali Janez ve, da uporabljate njegov PC?"

#. (para)
#: ../source/TortoiseGit_en.xml:11767
msgid "If you want to clear authentication data for one particular server only, read <xref linkend=\"tsvn-dug-general-auth\"/> for instructions on how to find the cached data."
msgstr "Če želite izbrisati podatke o avtentikaciji samo za nek točno določen strežnik, preberite <xref linkend=\"tsvn-dug-general-auth\"/>. Tu je opisano, kje najdete podatke predpomnilnika."

#. (term)
#: ../source/TortoiseGit_en.xml:11775
msgid "Action log"
msgstr "Zapisi dejanj"

#. (para)
#: ../source/TortoiseGit_en.xml:11777
msgid "TortoiseGit keeps a log of everything written to its progress dialogs. This can be useful when, for example, you want to check what happened in a recent update command."
msgstr "TortoiseGit hrani zapise vsega, kaj se izpisuje v pogovorna okna napredka. To je uporabno, če želite, na primer, preveriti, kaj se je zgodilo pri zadnji posodobitvi delovne kopije."

#. (para)
#: ../source/TortoiseGit_en.xml:11782
msgid "The log file is limited in length and when it grows too big the oldest content is discarded. By default 4000 lines are kept, but you can customize that number."
msgstr "Datoteka zapisa je omejena na določeno dolžino. Ko to dolžino preseže, se najstarejši zapisi odstranijo. Po privzetih nastavitvah se ohrani 4000 vrstic, vendar lahko to številko spremenite."

#. (para)
#: ../source/TortoiseGit_en.xml:11787
msgid "From here you can view the log file content, and also clear it."
msgstr "Tukaj lahko pogledate vsebino zapisov, prav tako pa lahko vsebino počistite."

#. (title)
#: ../source/TortoiseGit_en.xml:11796
msgid "Log Caching"
msgstr "Predpomnenje dnevnika"

#. (primary)
#: ../source/TortoiseGit_en.xml:11798
msgid "log cache"
msgstr "predpomnilnik dnevnika"

#. (title)
#: ../source/TortoiseGit_en.xml:11802
msgid "The Settings Dialog, Log Cache Page"
msgstr "Okno nastavitev, Predpomnilnik dnevnika"

#. (para)
#: ../source/TortoiseGit_en.xml:11800
msgid "<placeholder-1/> This dialog allows you to configure the log caching feature of TortoiseGit, which retains a local copy of log messages and changed paths to avoid time-consuming downloads from the server. Using the log cache can dramatically speed up the log dialog and the revision graph. Another useful feature is that the log messages can still be accessed when offline."
msgstr "<placeholder-1/> To okno omogoča nastavitev predpomnenja. Predpomnenje shrani krajevno kopijo dnevniških zapisov in sprememb poti, tako da se prihrani dolgotrajno prenašanje teh podatkov s strežnika. Uporaba predpomnenja drastično skrajša čas, potreben za prikaz okna dnevniških zapisov in grafa revizij. Dodatna prednost je, da so ti podatki na voljo, ko stežnik ni dosegljiv."

#. (term)
#: ../source/TortoiseGit_en.xml:11815
msgid "Enable log caching"
msgstr "Omogoči predpomnilnik dnevnika"

#. (para)
#: ../source/TortoiseGit_en.xml:11817
msgid "Enables log caching whenever log data is requested. If checked, data will be retrieved from the cache when available, and any messages not in the cache will be retrieved from the server and added to the cache."
msgstr "Omogoči predpomnenje dnevnika ob vsakem zahtevku. Če je možnost omogočena, se podatki - če so na voljo - preberejo iz predpomnilnika. Če podatkov ni, se preberejo iz strežnika in dodajo v predpomnilnik."

#. (para)
#: ../source/TortoiseGit_en.xml:11823
msgid "If caching is disabled, data will always be retrieved directly from the server and not stored locally."
msgstr "Če je predpomnenje onemogočeno, se podatki vedno prenesejo neposredno s strežnika in se ne shranjujejo na krajevnem pogonu."

#. (term)
#: ../source/TortoiseGit_en.xml:11830
msgid "If the repository cannot be contacted"
msgstr "Če se s skladiščem ni mogoče povezati"

#. (para)
#: ../source/TortoiseGit_en.xml:11832
msgid "If you are working offline, or if the repository server is down, the log cache can still be used to supply log messages already held in the cache. Of course the cache may not be up-to-date, so there are options to allow you to select whether this feature should be used."
msgstr "Če delate nepovezano ali če je strežnik skladišča nedostopen, lahko predpomnilnik uporabljate za pregled dnevniških zapisov, ki se že nahajajo na krajevnem pogonu. Seveda je predpomnilnik lahko zastarel, zato lahko izbirate, ali boste to možnost sploh uporabljali."

#. (para)
#: ../source/TortoiseGit_en.xml:11839
msgid "When log data is being taken from the cache without contacting the server, the dialog using those message will show the offline state in its title bar."
msgstr "Če so podatki o dnevniku pridobljeni brez dostopa do strežnika, je to stanje prikazano v naslovni vrstici pogovornega okna."

#. (term)
#: ../source/TortoiseGit_en.xml:11847
msgid "Timeout before updating the HEAD revision"
msgstr "Časovni rok pred posodabljanjem revizije HEAD"

#. (para)
#: ../source/TortoiseGit_en.xml:11849
msgid "When you invoke the log dialog you will normally want to contact the server to check for any newer log messages. If the timeout set here is non-zero then the server will only be contacted when the timeout has elapsed since the last time contact. This can reduce server round-trips if you open the log dialog frequently and the server is slow, but the data shown may not be completely up-to-date. If you want to use this feature we suggest using a value of 300 (5 minutes) as a compromise."
msgstr "Ko odprete pogovorno okno dnevnika, ponavadi želite na strežniku preveriti, ali obstajajo novejši zapisi. Če je ta vrednost različna od nič, se bo preverjanje zgodilo le v primeru, da je od zadnjega preverjanja pretekel nastavljeni čas. S tem zmanjšate število dostopov do strežnika, vendar podatki morda ne bodo najsodobnejši. Če želite uporabljati to zmožnost, priporočamo uporabo vrednosti 300 (5 minut) kot dober kompromis."

#. (para)
#: ../source/TortoiseGit_en.xml:11864
msgid "Below the settings you can see a list of the repositories that are cached locally, and the space used for the cache. If you select one of the repositories you can then use the buttons underneath."
msgstr "Pod nastavitvami vidite seznam skladišč, ki so shranjena v predpomnilniku, in porabljen prostor. Z izbiro posameznega skladišča lahko uporabite spodnje gumbe."

#. (title)
#: ../source/TortoiseGit_en.xml:11871
msgid "Log Cache Statistics"
msgstr "Statistika predpomnilnika dnevnika"

#. (title)
#: ../source/TortoiseGit_en.xml:11874
msgid "The Settings Dialog, Log Cache Statistics"
msgstr "Okno nastavitev, Statistika predpomnilnika dnevnika"

#. (term)
#: ../source/TortoiseGit_en.xml:11883
msgid "RAM"
msgstr "RAM"

#. (para)
#: ../source/TortoiseGit_en.xml:11885
msgid "The amount of memory required to service this cache."
msgstr "Spomin, potreben za uporabo predpomnilnika"

#. (term)
#: ../source/TortoiseGit_en.xml:11891
msgid "Disk"
msgstr "Disk"

#. (para)
#: ../source/TortoiseGit_en.xml:11893
msgid "The amount of disk space used for the cache. Data is compressed, so disk usage is generally fairly modest."
msgstr "Velikost predpomnilnika na disku. Podatki so stisnjeni, tako da je količina porabljenega prostora dokaj skromna."

#. (term)
#: ../source/TortoiseGit_en.xml:11900
msgid "Connection"
msgstr "Povezava"

#. (para)
#: ../source/TortoiseGit_en.xml:11902
msgid "Shows whether the repository was available last time the cache was used."
msgstr "Pove, ali je bilo skladišče dostopno ob zadnji uporabi predpomnilnika."

#. (term)
#: ../source/TortoiseGit_en.xml:11909
msgid "Last update"
msgstr "Zadnja posodobitev"

#. (para)
#: ../source/TortoiseGit_en.xml:11911
msgid "The last time the cache content was changed."
msgstr "Čas zadnje spremembe vsebine predpomnilnika."

#. (term)
#: ../source/TortoiseGit_en.xml:11917
msgid "Last head update"
msgstr "Zadnja posodobitev revizije HEAD"

#. (para)
#: ../source/TortoiseGit_en.xml:11919
msgid "The last time we requested the HEAD revision from the server."
msgstr "Čas zadnjega zahtevka revizije HEAD s strežnika"

#. (term)
#: ../source/TortoiseGit_en.xml:11926
msgid "Authors"
msgstr "Avtorji"

#. (para)
#: ../source/TortoiseGit_en.xml:11928
msgid "The number of different authors with messages recorded in the cache."
msgstr "Število avtorjev dnevniških zapisov v predpomnilniku."

#. (term)
#: ../source/TortoiseGit_en.xml:11935
msgid "Paths"
msgstr "Poti"

#. (para)
#: ../source/TortoiseGit_en.xml:11937
msgid "The number of paths listed, as you would see using <literal>svn log -v</literal>."
msgstr "Število poti, kot jih prikaže ukaz <literal>svn log -v</literal>."

#. (term)
#: ../source/TortoiseGit_en.xml:11944
msgid "Skip ranges"
msgstr "Število lukenj predpomnilnika"

#. (para)
#: ../source/TortoiseGit_en.xml:11946
msgid "The number of revision ranges which we have not fetched, simply because they haven't been requested. This is a measure of the number of holes in the cache."
msgstr "Število območij revizij, ki niso bila prenesena zato, ker niso bila zahtevana. To je merilo za luknjavost predpomnilnika."

#. (term)
#: ../source/TortoiseGit_en.xml:11954
msgid "Max revision"
msgstr "Najvišja revizija"

#. (para)
#: ../source/TortoiseGit_en.xml:11956
msgid "The highest revision number stored in the cache."
msgstr "Najvišja revizija v predpomnilniku"

#. (term)
#: ../source/TortoiseGit_en.xml:11962
msgid "Revision count"
msgstr "Število revizij"

#. (para)
#: ../source/TortoiseGit_en.xml:11964
msgid "The number of revisions stored in the cache. This is another measure of cache completeness."
msgstr "Število revizij v predpomnilniku. To je še eno merilo popolnosti predpomnilnika."

#. (para)
#: ../source/TortoiseGit_en.xml:11872
msgid "<placeholder-1/> Click on the <guibutton>Details</guibutton> button to see detailed statistics for a particular cache. Many of the fields shown here are mainly of interest to the developers of TortoiseGit, so they are not all described in detail. <placeholder-2/>"
msgstr "<placeholder-1/> Za podrobno statistiko posameznega predpomnilnika kliknite na gumb <guibutton>Podrobnosti</guibutton>. Veliko polj je zanimivih zgolj za razvijalce sistema TortoiseGit, zato le-ta niso podrobneje razložena. <placeholder-2/>"

#. (para)
#: ../source/TortoiseGit_en.xml:11973
msgid "Click on the <guibutton>Update</guibutton> to completely refresh the cache and fill in any holes. For a large repository this could be very time consuming, but useful if you are about to go offline and want the best available cache."
msgstr "Za popolno osvežitev predpomnilnika in krpanje lukenj kliknite na gumb <guibutton>Posodobi</guibutton>. Pri velikih skladiščih bo posodobitev trajala precej časa. Postopek je uporaben, če nameravate delati nepovezano in želite imeti najboljši možni predpomnilnik."

#. (para)
#: ../source/TortoiseGit_en.xml:11979
msgid "Click on the <guibutton>Export</guibutton> button to export the entire cache as a set of CSV files. This could be useful if you want to process the log data using an external program, although it is mainly useful to the developers."
msgstr "Kliknite na gumb <guibutton>Izvozi</guibutton>, če želite izvoziti celoten predpomnilnik v datoteko CSV. To je uporabno, če želite predelati podatke z uporabo zunanjega orodja. V glavnem pa ta ukaz uporabljajo razvijalci sistema."

#. (para)
#: ../source/TortoiseGit_en.xml:11985
msgid "Click on <guibutton>Delete</guibutton> to remove all cached data for the selected repositories. This does not disable caching for the repository so the next time you request log data, a new cache will be created."
msgstr "Če želite izbrisati celoten predpomnilnik za izbrano skladišče, kliknite na gumb <guibutton>Izbriši</guibutton>. S tem ne onemogočite predpomnenja, tako da se bo ob naslednjih zahtevkih predpomnilnik ponovno pričel polniti."

#. (title)
#: ../source/TortoiseGit_en.xml:11992
msgid "Client Side Hook Scripts"
msgstr "Ukazne datoteke akcij na strani odjemalca"

#. (primary)
#: ../source/TortoiseGit_en.xml:11996
msgid "client hooks"
msgstr "ukazne datoteke akcij odjemalca"

#. (title)
#: ../source/TortoiseGit_en.xml:12003
msgid "The Settings Dialog, Hook Scripts Page"
msgstr "Okno nastavitev, Ukazne datoteke akcij"

#. (para)
#: ../source/TortoiseGit_en.xml:12001
msgid "<placeholder-1/> This dialog allows you to set up hook scripts which will be executed automatically when certain Git actions are performed. As opposed to the hook scripts explained in <xref linkend=\"tsvn-repository-hooks\"/>, these scripts are executed locally on the client."
msgstr "<placeholder-1/> To okno vam omogoča nastavitev ukaznih datotek akcij, ki se izvedejo samodejno ob določeni operaciji sistema Git. V nasprotju s ukaznimi datotekami akcij, ki so razložene v <xref linkend=\"tsvn-repository-hooks\"/>, se te datoteke izvedejo krajevno na strani odjemalca."

#. (para)
#: ../source/TortoiseGit_en.xml:12011
msgid "One application for such hooks might be to call a program like <literal>SubWCRev.exe</literal> to update version numbers after a commit, and perhaps to trigger a rebuild."
msgstr "Ena možnost uporabe skripte akcije je klicanje programa <literal>SubWCRev.exe</literal>, ki zamenja številke revizij po objavi, ali pa sproži ponovno gradnjo projekta."

#. (para)
#: ../source/TortoiseGit_en.xml:12016
msgid "For various security and implementation reasons, hook scripts are defined locally on a machine, rather than as project properties. You define what happens, no matter what someone else commits to the repository. Of course you can always choose to call a script which is itself under version control."
msgstr "Zaradi različnih varnostnih in izvedbenih razlogov so ukazne datoteke akcij definirane krajevno na računalniku namesto v projektnih lastnostih. Tako sami definirate, kaj se bo zgodilo, ne glede na to, kaj nek drug uporabnik objavi v skladišču. Seveda pa lahko ukazno datoteko akcije nastavite tako, da kliče datoteko, ki je sama pod nadzorom različic."

#. (title)
#: ../source/TortoiseGit_en.xml:12024
msgid "The Settings Dialog, Configure Hook Scripts"
msgstr "Okno nastavitev, nastavitev ukaznih datotek akcij"

#. (para)
#: ../source/TortoiseGit_en.xml:12022
msgid "<placeholder-1/> To add a new hook script, simply click <guibutton>Add</guibutton> and fill in the details."
msgstr "<placeholder-1/> Za dodajanje nove ukazne datoteke akcije preprosto kliknite na gumb <guibutton>Dodaj</guibutton> in izpolnite podrobnosti."

#. (term)
#. (term)
#: ../source/TortoiseGit_en.xml:12034
#: ../source/TortoiseGit_en.xml:12104
msgid "Start-commit"
msgstr "Akcija pred prikazom okna objave"

#. (para)
#: ../source/TortoiseGit_en.xml:12036
msgid "Called before the commit dialog is shown. You might want to use this if the hook modifies a versioned file and affects the list of files that need to be committed and/or commit message."
msgstr "Pokliče se, preden se prikaže okno za objave. To uporabite, če skripta akcije spremeni datoteko pod nadzorom in tako vpliva na seznam datotek, ki jih je potrebno objaviti, ali na sporočilo zapisa."

#. (term)
#. (term)
#: ../source/TortoiseGit_en.xml:12045
#: ../source/TortoiseGit_en.xml:12108
msgid "Pre-commit"
msgstr "Akcija pred objavo"

#. (para)
#: ../source/TortoiseGit_en.xml:12047
msgid "Called after the user clicks <guibutton>OK</guibutton> in the commit dialog, and before the actual commit begins."
msgstr "Pokliče se po kliku na gumb <guibutton>V redu</guibutton> v oknu za objave in preden se objava dejansko začne."

#. (term)
#. (term)
#: ../source/TortoiseGit_en.xml:12054
#: ../source/TortoiseGit_en.xml:12112
msgid "Post-commit"
msgstr "Akcija po objavi"

#. (para)
#: ../source/TortoiseGit_en.xml:12056
msgid "Called after the commit finishes (whether successful or not)."
msgstr "Pokliče se, ko se objava zaključi (usprešno ali neuspešno)."

#. (term)
#. (term)
#: ../source/TortoiseGit_en.xml:12062
#: ../source/TortoiseGit_en.xml:12116
msgid "Start-update"
msgstr "Akcija pred prikazom okna posodobitve"

#. (para)
#: ../source/TortoiseGit_en.xml:12064
msgid "Called before the update-to-revision dialog is shown."
msgstr "Pokliče se, preden se prikaže pogovorno okno \"Posodobi na revizijo\"."

#. (term)
#. (term)
#: ../source/TortoiseGit_en.xml:12070
#: ../source/TortoiseGit_en.xml:12120
msgid "Pre-update"
msgstr "Akcija pred posodobitvijo"

#. (para)
#: ../source/TortoiseGit_en.xml:12072
msgid "Called before the actual Git update begins."
msgstr "Pokliče se, preden se posodobitev začne."

#. (term)
#. (term)
#: ../source/TortoiseGit_en.xml:12078
#: ../source/TortoiseGit_en.xml:12124
msgid "Post-update"
msgstr "Akcija po posodobitvi"

#. (para)
#: ../source/TortoiseGit_en.xml:12080
msgid "Called after the update finishes (whether successful or not)."
msgstr "Pokliče se, ko se posodobitev zaključi (uspešno ali neuspešno)."

#. (para)
#: ../source/TortoiseGit_en.xml:12030
msgid "There are currently six types of hook script available <placeholder-1/>"
msgstr "Zaenkrat je na razpolago šest tipov ukaznih datotek akcij <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:12087
msgid "A hook is defined for a particular working copy path. You only need to specify the top level path; if you perform an operation in a sub-folder, TortoiseGit will automatically search upwards for a matching path."
msgstr "Ukazna datoteka akcije se definira za določeno pot v delovni kopiji. Nastaviti jo morate le za najvišjo mapo. Če operacijo izvedete na neki podmapi, bo TortoiseGit samodejno iskal navzgor po hierarhiji."

#. (para)
#: ../source/TortoiseGit_en.xml:12092
msgid "Next you must specify the command line to execute, starting with the path to the hook script or executable. This could be a batch file, an executable file or any other file which has a valid windows file association, eg. a perl script."
msgstr "Nato morate določiti ukazno vrstico, ki naj se izvede, začenši s potjo do ukazne ali izvršne datoteke. Določite lahko paketno datoteko, izvršno datoteko ali katerokoli datoteko, ki ima veljavno asociacijo s programom v sistemu Windows, n. pr. ukazno datoteko v jeziku perl."

#. (para)
#: ../source/TortoiseGit_en.xml:12098
msgid "The command line includes several parameters which get filled in by TortoiseGit. The parameters available depend upon which hook is called. Each hook has its own parameters which are passed in the following order: <placeholder-1/>"
msgstr "Ukazna vrstica lahko vsebuje več parametrov, ki jih vnese TortoiseGit. Kateri parametri so na voljo, je odvisno od tipa akcije. Vsaka skripta akcije ima svoje parametere, ki so poslani v naslednjem vrstnem redu: <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:12135
msgid "A path to a temporary file which contains all the paths for which the operation was started. Each path is on a separate line in the temp file."
msgstr "Pot do začasne datoteke, ki vsebuje vse poti, za katere je bila izvedena operacija. Vsaka pot je v svoji vrstici začasne datoteke."

#. (para)
#: ../source/TortoiseGit_en.xml:12145
msgid "The depth with which the commit/update is done."
msgstr "Globina, do katere se izvede objava/posodobitev."

#. (literal)
#: ../source/TortoiseGit_en.xml:12155
msgid "svn_depth_unknown"
msgstr "svn_depth_unknown"

#. (literal)
#: ../source/TortoiseGit_en.xml:12163
msgid "svn_depth_exclude"
msgstr "svn_depth_exclude"

#. (literal)
#: ../source/TortoiseGit_en.xml:12171
msgid "svn_depth_empty"
msgstr "svn_depth_empty"

#. (literal)
#: ../source/TortoiseGit_en.xml:12179
msgid "svn_depth_files"
msgstr "svn_depth_files"

#. (literal)
#: ../source/TortoiseGit_en.xml:12187
msgid "svn_depth_immediates"
msgstr "svn_depth_immediates"

#. (literal)
#: ../source/TortoiseGit_en.xml:12195
msgid "svn_depth_infinity"
msgstr "svn_depth_infinity"

#. (para)
#: ../source/TortoiseGit_en.xml:12148
msgid "Possible values are: <placeholder-1/>"
msgstr "Možne vrednosti spremenljivk: <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:12206
msgid "Path to a file containing the log message for the commit. The file contains the text in UTF-8 encoding. After successful execution of the start-commit hook, the log message is read back, giving the hook a chance to modify it."
msgstr "Pot do datoteke, ki vsebuje dnevniški zapis za objavo. Datoteka vsebuje besedilo v obliki UTF8. Po uspešni izvršbi se besedilo dnevniškega zapisa prebere, tako da ga akcijska ukazna datoteka lahko spremeni."

#. (para)
#: ../source/TortoiseGit_en.xml:12218
msgid "The repository revision to which the update should be done or after a commit completes."
msgstr "Revizija skladišča, na katero je potrebno posodobiti delovno kopijo, ali revizija po uspešni objavi."

#. (para)
#: ../source/TortoiseGit_en.xml:12227
msgid "Path to a file containing the error message. If there was no error, the file will be empty."
msgstr "Pot do datoteke, ki vsebuje sporočilo o napaki. Če napake ni, bo datoteka prazna."

#. (para)
#: ../source/TortoiseGit_en.xml:12236
msgid "The current working directory with which the script is run. This is set to the common root directory of all affected paths."
msgstr "Trenutna delovna mapa, na kateri se izvede ukazna datoteka. Nastavljena na skupno korensko mapo vseh uporabljenih poti."

#. (para)
#: ../source/TortoiseGit_en.xml:12129
msgid "The meaning of each of these parameters is described here: <placeholder-1/>"
msgstr "Pomen vsakega izmed teh parametrov je podan tukaj: <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:12244
msgid "If you want the Git operation to hold off until the hook has completed, check <guilabel>Wait for the script to finish</guilabel>."
msgstr "Če želite, da operacija Git čaka, dokler se ukazna datoteka akcije ne zaključi, potrdite polje <guilabel>Počakaj, da ukazna datoteka konča izvajanje</guilabel>."

#. (para)
#: ../source/TortoiseGit_en.xml:12248
msgid "Normally you will want to hide ugly DOS boxes when the script runs, so <guilabel>Hide the script while running</guilabel> is checked by default."
msgstr "Običajno ne želite videti neprivlačnih oken sistema DOS, ko poženete ukazno datoteko, zato je možnost <guilabel>Med izvajanjem skrij ukazno datoteko</guilabel> po privzetih nastavitvah vključena."

#. (title)
#: ../source/TortoiseGit_en.xml:12253
msgid "Issue Tracker Integration"
msgstr "Integracija sledilnika zadev"

#. (para)
#: ../source/TortoiseGit_en.xml:12256
msgid "TortoiseGit can use a COM plugin to query issue trackers when in the commit dialog. The use of such plugins is described in <xref linkend=\"tsvn-dug-bugtracker-ref\"/>. If your system administrator has provided you with a plugin, which you have already installed and registered, this is the place to specify how it integrates with your working copy."
msgstr "TortoiseGit lahko uporabi vtičnik COM za pregledovanje sledilnika zadev v pogovornem oknu za objave. Uporaba vtičnikov je opisana v <xref linkend=\"tsvn-dug-bugtracker-ref\"/>. Če vam je skrbnik sistema dodelil vtičnik, ki ste ga že namestili in registrirali, sedaj tu določite, kako se vključi v delovno kopijo."

#. (title)
#: ../source/TortoiseGit_en.xml:12266
msgid "The Settings Dialog, Issue Tracker Integration Page"
msgstr "Okno za nastavitve, Okno za integracijo sledilnika zadev"

#. (para)
#: ../source/TortoiseGit_en.xml:12264
msgid "<placeholder-1/> Click on <guibutton>Add...</guibutton> to use the plugin with a particular working copy. Here you can specify the working copy path, choose which plugin to use from a drop down list of all registered issue tracker plugins, and any parameters to pass. The parameters will be specific to the plugin, but might include your user name on the issue tracker so that the plugin can query for issues which are assigned to you."
msgstr "<placeholder-1/> Za uporabo vtičnika na določeni delovni kopiji kliknite na gumb <guibutton>Dodaj...</guibutton>. Tu določite pot delovne kopije, iz spustnega seznama registriranih vtičnikov izberete vtičnik, ki ga želite uporabiti, in navedete parametre. Parametri so odvisni od vtičnika, pametno pa je vključiti uporabniško ime sledilnika zadev, tako da vtičnik lahko poišče zadeve, ki so določene vam."

#. (title)
#: ../source/TortoiseGit_en.xml:12281
msgid "TortoiseBlame Settings"
msgstr "Nastavitve TortoiseBlame"

#. (title)
#: ../source/TortoiseGit_en.xml:12284
msgid "The Settings Dialog, TortoiseBlame Page"
msgstr "Okno za nastavitve, TortoiseBlame"

#. (para)
#: ../source/TortoiseGit_en.xml:12282
msgid "<placeholder-1/> The settings used by TortoiseBlame are controlled from the main context menu, not directly with TortoiseBlame itself."
msgstr "<placeholder-1/> Nastavitve, ki jih uporablja TortoiseBlame, se nastavljejo v glavnem kontekstnem meniju in ne neposredno v programu TortoiseBlame."

#. (term)
#: ../source/TortoiseGit_en.xml:12292
msgid "Colors"
msgstr "Barve"

#. (para)
#: ../source/TortoiseGit_en.xml:12294
msgid "TortoiseBlame can use the background colour to indicate the age of lines in a file. You set the endpoints by specifying the colours for the newest and oldest revisions, and TortoiseBlame uses a linear interpolation between these colours according to the repository revision indicated for each line."
msgstr "TortoiseBlame lahko uporablja različne barve ozadja za označevanje starosti vrstic v datoteki. Nastavite začetno in končno barvo za najnovejšo in najstarejšo revizijo, TortoiseBlame pa uporabi linearno interpolacijo za določitev barve posameznih vrstic glede na številko revizije."

#. (term)
#: ../source/TortoiseGit_en.xml:12304
msgid "Font"
msgstr "Pisava"

#. (para)
#: ../source/TortoiseGit_en.xml:12306
msgid "You can select the font used to display the text, and the point size to use. This applies both to the file content, and to the author and revision information shown in the left pane."
msgstr "Izberete lahko tip in velikost pisave za prikazano besedilo. Nastavitev velja tako za vsebino datoteke kot za informacije na levi strani (avtor, revizija)."

#. (term)
#: ../source/TortoiseGit_en.xml:12314
msgid "Tabs"
msgstr "Tabulatorji"

#. (para)
#: ../source/TortoiseGit_en.xml:12316
msgid "Defines how many spaces to use for expansion when a tab character is found in the file content."
msgstr "Definira, koliko presledkov nadomesti tabulatorje, ki jih najde v datoteki."

#. (title)
#: ../source/TortoiseGit_en.xml:12325
msgid "Registry Settings"
msgstr "Nastavitve registra"

#. (primary)
#: ../source/TortoiseGit_en.xml:12327
msgid "registry"
msgstr "register"

#. (para)
#: ../source/TortoiseGit_en.xml:12329
msgid "A few infrequently used settings are available only by editing the registry directly."
msgstr "Nekaj redko uporabljenih nastavitev je možno nastaviti le s spreminjanjem vrednosti nesposredno v registru."

#. (para)
#: ../source/TortoiseGit_en.xml:12337
msgid "You can specify a different location for the Git configuration file using registry location <literal>HKCU\\Software\\TortoiseGit\\ConfigDir</literal>. This will affect all TortoiseGit operations."
msgstr "Konfiguracijsko datoteko za Git lahko postavite na drugo lokacijo z uporabo naslednje lokacije v registru: <literal>HKCU\\Software\\TortoiseGit\\ConfigDir</literal>. Sprememba ima vpliv na vse operacije TortoiseGit."

#. (term)
#: ../source/TortoiseGit_en.xml:12346
msgid "Cache tray icon"
msgstr "Ikona predpomnilnika v sistemskem traku"

#. (para)
#: ../source/TortoiseGit_en.xml:12348
msgid "To add a cache tray icon for the TSVNCache program, create a <literal>DWORD</literal> key with a value of 1 at <literal>HKCU\\Software\\TortoiseGit\\CacheTrayIcon</literal>. This is really only useful for developers as it allows you to terminate the program gracefully."
msgstr "Če želite dodati za program TSVNCache ikono v sistemski trak, ustvarite ključ <literal>DWORD</literal> z vrednostjo na lokaciji <literal>HKCU\\Software\\TortoiseGit\\CacheTrayIcon</literal>. V resnici je to uporabno le za razvijalce, ki želijo pravilno zaustaviti program."

#. (term)
#: ../source/TortoiseGit_en.xml:12358
msgid "Filenames without extensions in auto-completion list"
msgstr "Imena datotek brez končnic v seznamu za samodokončanje"

#. (para)
#: ../source/TortoiseGit_en.xml:12360
msgid "The auto-completion list shown in the commit message editor displays the names of files listed for commit. To also include these names with extensions removed, create a <literal>DWORD</literal> key with a value of 1 at <literal>HKCU\\Software\\TortoiseGit\\AutocompleteRemovesExtensions</literal>."
msgstr "Seznam za samodokončanje, ki se prikaže v urejevalniku sporočil v oknu za objave, prikaže datoteke, ki so predvidene za objavo. Če želite, da se prikažejo tudi imena brez končnic, na naslovu <literal>HKCU\\Software\\TortoiseGit\\AutocompleteRemovesExtensions</literal> ustvarite ključ <literal>DWORD</literal> z vrednostjo 1"

#. (term)
#: ../source/TortoiseGit_en.xml:12370
msgid "Explorer columns everywhere"
msgstr "Stolpci v Raziskovalcu vsepovsod"

#. (para)
#: ../source/TortoiseGit_en.xml:12372
msgid "The extra columns the TortoiseGit adds to the details view in Windows Explorer are normally only active in a working copy. If you want those to be accessible everywhere, not just in working copies, create a <literal>DWORD</literal> key with a value of 1 at <literal>HKCU\\Software\\TortoiseGit\\ColumnsEveryWhere</literal>."
msgstr "Dodatni stolpci, ki jih TortoiseGit doda podrobnemu pogledu v Raziskovalcu, so običajno vidni le v delovni kopiji. Če želite, da so dostopni tudi drugje, na naslovu <literal>HKCU\\Software\\TortoiseGit\\ColumnsEveryWhere</literal> ustvarite ključ <literal>DWORD</literal> z vrednostjo 1."

#. (term)
#: ../source/TortoiseGit_en.xml:12383
msgid "Merge log separator"
msgstr "Ločilnik dnevniškega zapisa spajanja"

#. (para)
#: ../source/TortoiseGit_en.xml:12385
msgid "When you merge revisions from another branch, and merge tracking information is available, the log messages from the revisions you merge will be collected to make up a commit log message. A pre-defined string is used to separate the individual log messages of the merged revisions. If you prefer, you can create a <literal>SZ</literal> key at <literal>HKCU\\Software\\TortoiseGit\\MergeLogSeparator</literal> containing a separator string of your choice."
msgstr "Pri spajanju revizij z druge veje in če so informacije o sledenju spajnja na voljo, se sporočila dnevniških zapisov zberejo in tvorijo novo sporočilo objave. Za ločitev posameznih sporočil spojenih revizij se uporabi prednastavljeni niz. Če želite uporabiti svoj niz, ustvarite na naslovu <literal>HKCU\\Software\\TortoiseGit\\MergeLogSeparator</literal> ključ <literal>SZ</literal>, kot vrednost pa vpišite izbrani niz."

#. (term)
#: ../source/TortoiseGit_en.xml:12398
msgid "Always blame changes with TortoiseMerge"
msgstr "Vedno pokaži krivdne informacije z uporabo programa TortoiseMerge"

#. (para)
#: ../source/TortoiseGit_en.xml:12400
msgid "TortoiseGit allows you to assign external diff viewer. Most such viewers, however, are not suited for change blaming (<xref linkend=\"tsvn-dug-blame-diffs\"/>), so you might wish to fall back to TortoiseMerge in this case. To do so, create a <literal>DWORD</literal> key with a value of 1 at <literal>HKCU\\Software\\TortoiseGit\\DiffBlamesWithTortoiseMerge</literal>."
msgstr "TortoiseGit omogoča uporabo zunanjega pregledovalnika razlik. Večina pregledovalnikov pa ni primerna za prikaz krivdnih informacij (<xref linkend=\"tsvn-dug-blame-diffs\"/>), zato v tem primeru raje uporabite TortoiseMerge. Da bi to storili, ustvarite ključ <literal>DWORD</literal> z vrednostjo 1 na lokaciji <literal>HKCU\\Software\\TortoiseGit\\DiffBlamesWithTortoiseMerge</literal>."

#. (title)
#: ../source/TortoiseGit_en.xml:12413
msgid "Git Working Folders"
msgstr "Delovne mape Git"

#. (primary)
#: ../source/TortoiseGit_en.xml:12415
msgid ".svn folder"
msgstr ".svn folder"

#. (primary)
#: ../source/TortoiseGit_en.xml:12418
msgid "_svn folder"
msgstr "_svn folder"

#. (para)
#: ../source/TortoiseGit_en.xml:12420
msgid "VS.NET 2003 when used with web projects can't handle the <literal>.svn</literal> folders that Git uses to store its internal information. This is not a bug in Git. The bug is in VS.NET 2003 and the frontpage extensions it uses."
msgstr "Ko VS.NET 2003 uporabljate za spletne projekte, ne more delati z mapami <literal>.svn</literal>, ki jih Git uporablja za shranjevanje notranjih informacij. To ni napaka sistema Git. To je napaka razvojnega okolja VS.NET 2003 in dodatkov za FrontPage, ki jih uporablja."

#. (para)
#: ../source/TortoiseGit_en.xml:12427
msgid "Note that the bug is fixed in VS2005 and later versions."
msgstr "Napaka je odpravljena v VS2005 in novejših različicah."

#. (para)
#: ../source/TortoiseGit_en.xml:12431
msgid "As of Version 1.3.0 of Git and TortoiseGit, you can set the environment variable <literal>SVN_ASP_DOT_NET_HACK</literal>. If that variable is set, then Git will use <literal>_svn</literal> folders instead of <literal>.svn</literal> folders. You must restart your shell for that environment variable to take effect. Normally that means rebooting your PC. To make this easier, you can now do this from the general settings page using a simple checkbox - refer to <xref linkend=\"tsvn-dug-settings-main\"/>."
msgstr "Od različice 1.3.0 sistemov Git in TortoiseGit naprej lahko nastavite okoljsko spremenljivko <literal>SVN_ASP_DOT_NET_HACK</literal>. Če je le-ta nastavljena, bo Git namesto map <literal>.svn</literal> uporabljal mape <literal>_svn</literal>. Da bi se sprememba okoljske spremenljivke upoštevala, morate ponovno zagnati lupino. Običajno to pomeni ponoven zagon računalnika. Sedaj lahko to nastavitev opravite v oknu za nastavitve z uporabo preprostega potrditvenega polja - poglejte na <xref linkend=\"tsvn-dug-settings-main\"/>."

#. (para)
#: ../source/TortoiseGit_en.xml:12441
msgid "For more information, and other ways to avoid this problem in the first place, check out the article about this in our <ulink url=\"http://TortoiseGit.net/aspdotnethack\"><citetitle>FAQ</citetitle></ulink>."
msgstr "Za več informacij in ostale načine, kako se tem težavam izogniti, preberite članek o tem v <ulink url=\"http://TortoiseGit.net/aspdotnethack\"><citetitle>pogosto zastavljenih vprašanjih</citetitle></ulink>."

#. (title)
#: ../source/TortoiseGit_en.xml:12451
msgid "Final Step"
msgstr "Zadnji korak"

#. (title)
#: ../source/TortoiseGit_en.xml:12457
msgid "Donate!"
msgstr "Darujte!"

#. (para)
#: ../source/TortoiseGit_en.xml:12458
msgid "Even though TortoiseGit and TortoiseMerge are free, you can support the developers by sending in patches and play an active role in the development. You can also help to cheer us up during the endless hours we spend in front of our computers."
msgstr "Čeprav sta programa TortoiseGit in TortoiseMerge brezplačna, lahko pomagate razvijalcem s pošiljanjem popravkov in igranjem aktivne vloge pri razvoju. Lahko nas tudi pomagate razvedriti med neštetimi urami, ki jih prebijemo pred računalnikom."

#. (para)
#: ../source/TortoiseGit_en.xml:12464
msgid "While working on TortoiseGit we love to listen to music. And since we spend many hours on the project we need a <emphasis>lot</emphasis> of music. Therefore we have set up some wish-lists with our favourite music CDs and DVDs: <ulink url=\"http://TortoiseGit.tigris.org/donate.html\"><citetitle>http://TortoiseGit.tigris.org/donate.html</citetitle></ulink> Please also have a look at the list of people who contributed to the project by sending in patches or translations."
msgstr "Med delom na projektu TortoiseGit radi poslušamo glasbo. In ker delamo na projektu veliko časa, potrebujemo <emphasis>veliko</emphasis> glasbe. Zato smo sestavili seznam želja z našimi priljubljenimi CDji in DVDji:  <ulink url=\"http://TortoiseGit.tigris.org/donate.html\"><citetitle>http://TortoiseGit.tigris.org/donate.html</citetitle></ulink>. Prosimo, poglejte tudi seznam ljudi, ki so prispevali k projektu s popravki ali prevodi."

#. (title)
#: ../source/TortoiseGit_en.xml:12478
msgid "The SubWCRev Program"
msgstr "Program SubWCRev"

#. (primary)
#: ../source/TortoiseGit_en.xml:12480
msgid "version extraction"
msgstr "izluščenje verzije"

#. (primary)
#: ../source/TortoiseGit_en.xml:12483
msgid "SubWCRev"
msgstr "SubWCRev"

#. (primary)
#: ../source/TortoiseGit_en.xml:12486
msgid "COM"
msgstr "COM"

#. (primary)
#: ../source/TortoiseGit_en.xml:12489
msgid "version number in files"
msgstr "revizija v datoteki"

#. (para)
#: ../source/TortoiseGit_en.xml:12492
msgid "SubWCRev is Windows console program which can be used to read the status of a Git working copy and optionally perform keyword substitution in a template file. This is often used as part of the build process as a means of incorporating working copy information into the object you are building. Typically it might be used to include the revision number in an <quote>About</quote> box."
msgstr "SubWCRev je konzolna aplikacija, ki se uporablja za pridobivanje informacij o stanju delovne kopije z možnostjo zamenjave ključnih besed v predlogi. Postopek se pogosto uporablja kot del procesa gradnje projekta. S tem se v elemente projekta, ki se gradi, vnese informacije o delovni kopiji. Tipičen primer uporabe je prikaz številke revizije v pogovornem oknu <quote>O programu</quote>."

#. (title)
#: ../source/TortoiseGit_en.xml:12506
msgid "The SubWCRev Command Line"
msgstr "Program SubWCRev za ukazno vrtico"

#. (para)
#: ../source/TortoiseGit_en.xml:12507
msgid "SubWCRev reads the Git status of all files in a working copy, excluding externals by default. It records the highest commit revision number found, and the commit timestamp of that revision, It also records whether there are local modifications in the working copy, or mixed update revisions. The revision number, update revision range and modification status are displayed on stdout."
msgstr "SubWCRev prebere stanje vseh datotek v delovni kopiji, razen datotek zunanjih projektov (po privzetih nastavitvah). Zapomni si najvišjo najdeno številko revizije in časovni žig te revizije. Prav tako si zapomni, ali so v delovni kopiji narejene krajevne spremembe ali datoteke mešanih revizij. Na standardnem izhodu (stdout) se izpiše številka revizije, območje posodobitve revizij in stanje sprememb."

#. (para)
#: ../source/TortoiseGit_en.xml:12515
msgid ""
"SubWCRev.exe is called from the command line or a script, and is controlled using the command line parameters. <screen>\n"
"SubWCRev WorkingCopyPath [SrcVersionFile DstVersionFile] [-nmdfe]\n"
"</screen>"
msgstr ""
"SubWCRev.exe kličemo iz ukazne vrstice ali iz ukazne datoteke in nastavljamo s pomočjo parameterov ukazne vrstice. <screen>\n"
"SubWCRev PotDelovneKopije [IzvirnaDatoteka CiljnaDatoteka] [-nmdfe]\n"
"</screen>"

#. (para)
#: ../source/TortoiseGit_en.xml:12522
msgid "<literal>WorkingCopyPath</literal> is the path to the working copy being checked. You can only use SubWCRev on working copies, not directly on the repository. The path may be absolute or relative to the current working directory."
msgstr "<literal>PotDelovneKopije</literal> je pot do delovne kopije, ki se preverja. SubWCRev lahko uporabljate le na delovni kopiji, ne pa tudi neposredno na skladišču. Pot je lahko absolutna ali relativna na trenutno mapo."

#. (para)
#: ../source/TortoiseGit_en.xml:12528
msgid "If you want SubWCRev to perform keyword substitution, so that fields like repository revision and URL are saved to a text file, you need to supply a template file <literal>SrcVersionFile</literal> and an output file <literal>DstVersionFile</literal> which contains the substituted version of the template."
msgstr "Če želite, da SubWCRev opravi zamenjavo ključnih besed, tako da so polja revizija in naslov URL shranjena v besedilni datoteki, morate podati predlogo <literal>IzvirnaDatoteka</literal> in izhodno datoteko <literal>CiljnaDatoteka</literal>, ki vsebuje zamenjano verzijo predloge."

#. (title)
#. (title)
#: ../source/TortoiseGit_en.xml:12544
#: ../source/TortoiseGit_en.xml:12629
msgid "List of available command line switches"
msgstr "Seznam stikal ukazne vrstice, ki so na voljo"

#. (entry)
#. (entry)
#. (title)
#. (glossterm)
#: ../source/TortoiseGit_en.xml:12550
#: ../source/TortoiseGit_en.xml:13765
#: ../source/TortoiseGit_en.xml:14860
#: ../source/TortoiseGit_en.xml:15870
msgid "Switch"
msgstr "Preklop"

#. (entry)
#. (entry)
#. (entry)
#. (entry)
#. (entry)
#: ../source/TortoiseGit_en.xml:12551
#: ../source/TortoiseGit_en.xml:12636
#: ../source/TortoiseGit_en.xml:12844
#: ../source/TortoiseGit_en.xml:14021
#: ../source/TortoiseGit_en.xml:14430
msgid "Description"
msgstr "Opis"

#. (literal)
#: ../source/TortoiseGit_en.xml:12559
msgid "ERRORLEVEL 7"
msgstr "ERRORLEVEL 7"

#. (entry)
#: ../source/TortoiseGit_en.xml:12557
msgid "If this switch is given, SubWCRev will exit with <placeholder-1/> if the working copy contains local modifications. This may be used to prevent building with uncommitted changes present."
msgstr "Ob uporabi tega stikala se SubWCRev zaključi s številko napake <placeholder-1/>, če delovna kopija vsebuje krajevne spremembe. To stikalo se uporablja, da se prepreči gradnja projekta, ki vsebuje neobjavljene spremembe."

#. (literal)
#: ../source/TortoiseGit_en.xml:12568
msgid "ERRORLEVEL 8"
msgstr "ERRORLEVEL 8"

#. (entry)
#: ../source/TortoiseGit_en.xml:12566
msgid "If this switch is given, SubWCRev will exit with <placeholder-1/> if the working copy contains mixed revisions. This may be used to prevent building with a partially updated working copy."
msgstr "Ob uporabi tega stikala se SubWCRev zaključi s številko napake <placeholder-1/>, če delovna kopija vsebuje mešane revizije. To stikalo se uporablja, da se prepreči gradnja projekta, ki vsebuje delno posodoboljeno delovno kopijo."

#. (literal)
#: ../source/TortoiseGit_en.xml:12577
msgid "ERRORLEVEL 9"
msgstr "ERRORLEVEL 9"

#. (entry)
#: ../source/TortoiseGit_en.xml:12575
msgid "If this switch is given, SubWCRev will exit with <placeholder-1/> if the destination file already exists."
msgstr "Ob uporabi tega stikala se SubWCRev zaključi s številko napake <placeholder-1/>, če ciljna datoteka že obstaja."

#. (entry)
#: ../source/TortoiseGit_en.xml:12583
msgid "If this switch is given, SubWCRev will include the last-changed revision of folders. The default behaviour is to use only files when getting the revision numbers."
msgstr "Ob uporabi tega stikala SubWCRev pri iskanju najvišje revizije vključi tudi mape. Po privzetih nastavitvah se išče najvišja revizija le na datotekah."

#. (literal)
#: ../source/TortoiseGit_en.xml:12595
msgid "svn:externals"
msgstr "svn:externals"

#. (entry)
#: ../source/TortoiseGit_en.xml:12592
msgid "If this switch is given, SubWCRev will examine directories which are included with <placeholder-1/>, but only if they are from the same repository. The default behaviour is to ignore externals."
msgstr "Ob uporabi tega stikala SubWCRev pregleda mape, ki so označene z lastnostjo  <placeholder-1/>, vendar le, če se nahajajo v istem skladišču. Privzeta nastavitev ne upošteva zunanjih datotek."

#. (entry)
#: ../source/TortoiseGit_en.xml:12602
msgid "If this switch is given, SubWCRev will output the revision numbers in HEX."
msgstr "Ob uporabi tega stikala SubWCRev izpiše številke revizij v šestnajstiški obliki"

#. (entry)
#: ../source/TortoiseGit_en.xml:12609
msgid "If this switch is given, SubWCRev will output the revision numbers in HEX, with '0X' prepended."
msgstr "Ob uporabi tega stikala SubWCRev izpiše številke revizij v šestnajstiški obliki s predpono '0X'."

#. (para)
#: ../source/TortoiseGit_en.xml:12537
msgid "There are a number of optional switches which affect the way SubWCRev works. If you use more than one, they must be specified as a single group, eg. <literal>-nm</literal>, not <literal>-n -m</literal>. <placeholder-1/>"
msgstr "Obstaja več opcijskih stikal, ki vplivajo na to, kako SubWCRev deluje. Če uporabite več kot eno, jih morate navesti kot eno skupino, n. pr. <literal>-nm</literal>, in ne <literal>-n -m</literal>. <placeholder-1/>"

#. (title)
#: ../source/TortoiseGit_en.xml:12624
msgid "Keyword Substitution"
msgstr "Zamenjava ključnih besed"

#. (entry)
#: ../source/TortoiseGit_en.xml:12635
msgid "Keyword"
msgstr "Ključna beseda"

#. (entry)
#: ../source/TortoiseGit_en.xml:12642
msgid "Replaced with the highest commit revision in the working copy."
msgstr "Zamenjano z najvišjo revizijo v delovni kopiji."

#. (literal)
#: ../source/TortoiseGit_en.xml:12653
msgid "yyyy-mm-dd hh:mm:ss"
msgstr "yyyy-mm-dd hh:mm:ss"

#. (literal)
#: ../source/TortoiseGit_en.xml:12655
msgid "strftime()"
msgstr "strftime()"

#. (literal)
#: ../source/TortoiseGit_en.xml:12657
msgid "$WCDATE=%a %b %d %I:%M:%S %p$"
msgstr "$WCDATE=%a %b %d %I:%M:%S %p$"

#. (citetitle)
#: ../source/TortoiseGit_en.xml:12660
msgid "online reference"
msgstr "spletna navodila"

#. (entry)
#: ../source/TortoiseGit_en.xml:12649
msgid "Replaced with the commit date/time of the highest commit revision. By default, international format is used: <placeholder-1/>. Alternatively, you can specify a custom format which will be used with <placeholder-2/>, for example: <placeholder-3/>. For a list of available formatting characters, look at the <ulink url=\"http://www.cppreference.com/stddate/strftime.html\"><placeholder-4/></ulink>."
msgstr "Zamenjano z datumom/uro objave najvišje revizije. Po privzetih nastavitvah je uporabljena mednarodna oblika: <placeholder-1/>. Lahko pa uporabite lastno obliko s <placeholder-2/>, n. pr. : <placeholder-3/>. Za seznam znakov za oblikovanje poglejte na <ulink url=\"http://www.cppreference.com/stddate/strftime.html\"><placeholder-4/></ulink>."

#. (entry)
#: ../source/TortoiseGit_en.xml:12666
msgid "Replaced with the current system date/time. This can be used to indicate the build time. Time formatting is as described above."
msgstr "Zamenjano s s trenutnim sistemskim datumom/časom. Uporablja se za zapis časa gradnje. Uporabljena je zgoraj opisana oblika."

#. (entry)
#: ../source/TortoiseGit_en.xml:12674
msgid "Replaced with the update revision range in the working copy. If the working copy is in a consistent state, this will be a single revision. If the working copy contains mixed revisions, either due to being out of date, or due to a deliberate update-to-revision, then the range will be shown in the form 100:200"
msgstr "Zamenjano z območjem revizij delovne kopije. Če je delovna kopija v konsistentnem stanju, bo to le ena številka. Če delovna kopija vsebuje mešane revizije - ker je zastarela ali zaradi namerne uporabe ukaza posodobi-na-revizijo - se območje prikaže v obliki 100:200."

#. (literal)
#: ../source/TortoiseGit_en.xml:12687
msgid "$WCMIXED?TText:FText$"
msgstr "$WCMIXED?TText:FText$"

#. (literal)
#. (literal)
#. (literal)
#. (literal)
#. (literal)
#: ../source/TortoiseGit_en.xml:12688
#: ../source/TortoiseGit_en.xml:12696
#: ../source/TortoiseGit_en.xml:12723
#: ../source/TortoiseGit_en.xml:12731
#: ../source/TortoiseGit_en.xml:12740
msgid "TText"
msgstr "TText"

#. (literal)
#. (literal)
#. (literal)
#. (literal)
#. (literal)
#: ../source/TortoiseGit_en.xml:12689
#: ../source/TortoiseGit_en.xml:12697
#: ../source/TortoiseGit_en.xml:12724
#: ../source/TortoiseGit_en.xml:12733
#: ../source/TortoiseGit_en.xml:12741
msgid "FText"
msgstr "FText"

#. (entry)
#: ../source/TortoiseGit_en.xml:12686
msgid "<placeholder-1/> is replaced with <placeholder-2/> if there are mixed update revisions, or <placeholder-3/> if not."
msgstr "<placeholder-1/> se zamenja z vrednostjo <placeholder-2/>, če obstajajo mešane revizije, in z vrednostjo <placeholder-3/>, če ne obstajajo."

#. (literal)
#: ../source/TortoiseGit_en.xml:12695
msgid "$WCMODS?TText:FText$"
msgstr "$WCMODS?TText:FText$"

#. (entry)
#: ../source/TortoiseGit_en.xml:12694
msgid "<placeholder-1/> is replaced with <placeholder-2/> if there are local modifications, or <placeholder-3/> if not."
msgstr "<placeholder-1/> se zamenja z vrednostjo <placeholder-2/>, če obstajajo krajevne spremembe, in z vrednostjo <placeholder-3/>, če krajevnih sprememb ni."

#. (entry)
#: ../source/TortoiseGit_en.xml:12702
msgid "Replaced with the repository URL of the working copy path passed to SubWCRev."
msgstr "Zamenjano z naslovom URL delovne kopije, ki je bil podan programu SubWCRev."

#. (entry)
#: ../source/TortoiseGit_en.xml:12709
msgid "Replaced with the current time and date"
msgstr "Zamenjano s trenutnih časom in datumom"

#. (entry)
#: ../source/TortoiseGit_en.xml:12715
msgid "Replaced with the current time and date in standard format"
msgstr "Zamenjano s trenutnim časom in datumom v standardni obliki"

#. (literal)
#: ../source/TortoiseGit_en.xml:12722
msgid "$WCINSVN?TText:FText$"
msgstr "$WCINSVN?TText:FText$"

#. (entry)
#: ../source/TortoiseGit_en.xml:12721
msgid "<placeholder-1/> is replaced with <placeholder-2/> if the entry is versioned, or <placeholder-3/> if not."
msgstr "<placeholder-1/> se zamenja z vrednostjo <placeholder-2/>, če je element pod nadzorom, in z vrednostjo <placeholder-3/>, če ni."

#. (literal)
#: ../source/TortoiseGit_en.xml:12730
msgid "$WCNEEDSLOCK?TText:FText$"
msgstr "$WCNEEDSLOCK?TText:FText$"

#. (literal)
#: ../source/TortoiseGit_en.xml:12732
msgid "svn:needs-lock"
msgstr "svn:needs-lock"

#. (entry)
#: ../source/TortoiseGit_en.xml:12729
msgid "<placeholder-1/> is replaced with <placeholder-2/> if the entry has the <placeholder-3/> property set, or <placeholder-4/> if not."
msgstr "<placeholder-1/> se zamenja z vrednostjo <placeholder-2/>, če ima element nastavljeno lastnost <placeholder-3/>, in z vrednostjo <placeholder-4/>, če je nima."

#. (literal)
#: ../source/TortoiseGit_en.xml:12739
msgid "$WCISLOCKED?TText:FText$"
msgstr "$WCISLOCKED?TText:FText$"

#. (entry)
#: ../source/TortoiseGit_en.xml:12738
msgid "<placeholder-1/> is replaced with <placeholder-2/> if the entry is locked, or <placeholder-3/> if not."
msgstr "<placeholder-1/> se zamenja z vrednostjo <placeholder-2/>, če je element zaklenjen, in z vrednostjo <placeholder-3/>, če ni."

#. (entry)
#: ../source/TortoiseGit_en.xml:12746
msgid "Replaced with the lock date"
msgstr "Zamenjano z datumom zaklepa"

#. (entry)
#: ../source/TortoiseGit_en.xml:12752
msgid "Replaced with the name of the lock owner"
msgstr "Zamenjano z imenom lastnika zaklepa"

#. (entry)
#: ../source/TortoiseGit_en.xml:12758
msgid "Replaced with the comment of the lock"
msgstr "Zamenjano s komentarjem zaklepa"

#. (para)
#: ../source/TortoiseGit_en.xml:12625
msgid "If a source and destination files are supplied, SubWCRev copies source to destination, performing keyword substitution as follows: <placeholder-1/>"
msgstr "Če podamo začetno in ciljno datoteko, SubWCRev prekopira začetno datoteko v ciljno, pri tem pa izvede zamenjavo ključnih besed: <placeholder-1/>"

#. (title)
#: ../source/TortoiseGit_en.xml:12771
msgid "Keyword Example"
msgstr "Primer uprabe ključne besede"

#. (para)
#: ../source/TortoiseGit_en.xml:12772
msgid "The example below shows how keywords in a template file are substituted in the output file."
msgstr "Spodnji primer prikazuje, kako se ključne besede v predlogi zamenjajo v izhodni datoteki."

#. (programlisting)
#: ../source/TortoiseGit_en.xml:12776
#, no-wrap
msgid ""
"\n"
"// Test file for SubWCRev: testfile.tmpl\n"
"\n"
"char *Revision = \"$WCREV$\";\n"
"char *Modified = \"$WCMODS?Modified:Not modified$\";\n"
"char *Date     = \"$WCDATE$\";\n"
"char *Range    = \"$WCRANGE$\";\n"
"char *Mixed    = \"$WCMIXED?Mixed revision WC:Not mixed$\";\n"
"char *URL      = \"$WCURL$\";\n"
"\n"
"#if $WCMODS?1:0$\n"
"#error Source is modified\n"
"#endif\n"
"\n"
"// End of file\n"
msgstr ""
"\n"
"// Preizkusna datoteka za SubWCRev: testfile.tmpl\n"
"\n"
"char *Revision = \"$WCREV$\";\n"
"char *Modified = \"$WCMODS?Spremenjeno:Nespremenjeno$\";\n"
"char *Date     = \"$WCDATE$\";\n"
"char *RevRange = \"$WCRANGE$\";\n"
"char *Mixed    = \"$WCMIXED?Mešana delovna kopija:Nemešana$\";\n"
"char *URL      = \"$WCURL$\";\n"
"\n"
"#if $WCMODS?1:0$\n"
"#error Vir spremenjen\n"
"#endif\n"
"\n"
"// EndOfFile\n"

#. (para)
#: ../source/TortoiseGit_en.xml:12792
msgid "After running <literal>SubWCRev.exe path\\to\\workingcopy testfile.tmpl testfile.txt</literal>, the output file <literal>testfile.txt</literal> would looks like this:"
msgstr "Po zagonu programa <literal>SubWCRev.exe pot\\do\\delovnekopije testfile.tmpl testfile.txt</literal> bo izhodna datoteka <literal>testfile.txt</literal> izgledala takole:"

#. (programlisting)
#: ../source/TortoiseGit_en.xml:12796
#, no-wrap
msgid ""
"\n"
"// Test file for SubWCRev: testfile.txt\n"
"\n"
"char *Revision = \"3701\";\n"
"char *Modified = \"Modified\";\n"
"char *Date     = \"2005/06/15 11:15:12\";\n"
"char *Range    = \"3699:3701\";\n"
"char *Mixed    = \"Mixed revision WC\";\n"
"char *URL      = \"http://TortoiseGit.tigris.org/svn/TortoiseGit/...\n"
"trunk/src/SubWCRev\";\n"
"\n"
"#if 1\n"
"#error Source is modified\n"
"#endif\n"
"\n"
"// End of file\n"
msgstr ""
"\n"
"// Preizkusna datoteka za SubWCRev: testfile.txt\n"
"\n"
"char *Revision = \"3701\";\n"
"char *Modified = \"Spremenjeno\";\n"
"char *Date     = \"2005/06/15 11:15:12\";\n"
"char *RevRange = \"3699:3701\";\n"
"char *Mixed    = \"Mešana delovna kopija\";\n"
"char *URL      = \"http://TortoiseGit.tigris.org/svn/TortoiseGit/...\n"
"trunk/src/SubWCRev\";\n"
"\n"
"#if 1\n"
"#error Vir spremenjen\n"
"#endif\n"
"\n"
"// EndOfFile\n"

#. (para)
#: ../source/TortoiseGit_en.xml:12814
msgid "A file like this will be included in the build so you would expect it to be versioned. Be sure to version the template file, not the generated file, otherwise each time you regenerate the version file you need to commit the change, which in turn means the version file needs to be updated."
msgstr "Takšna datoteka je vključena v proces gradnje, zato bi pričakovali, da bo pod nadzorom. Pod nadzor dajte predlogo datoteke in ne samodejno ustvarjene datoteke, v nasprotnem primeru boste morali ob vsakem usvarjanju datoteke narediti objavo, kar pa bi pomenilo, da je potrebno datoteko spet posodobiti."

#. (title)
#: ../source/TortoiseGit_en.xml:12827
msgid "COM interface"
msgstr "Vmesnik COM"

#. (primary)
#: ../source/TortoiseGit_en.xml:12829
msgid "COM SubWCRev interface"
msgstr "vmesnik COM SubWCRev"

#. (title)
#: ../source/TortoiseGit_en.xml:12837
msgid "COM/automation methods supported"
msgstr "Podprte COM/avtomatizacijske metode"

#. (entry)
#: ../source/TortoiseGit_en.xml:12843
msgid "Method"
msgstr "Način"

#. (literal)
#: ../source/TortoiseGit_en.xml:12856
msgid "-f"
msgstr "-f"

#. (literal)
#: ../source/TortoiseGit_en.xml:12859
msgid "-e"
msgstr "-e"

#. (entry)
#: ../source/TortoiseGit_en.xml:12850
msgid "This method traverses the working copy gathering the revision information. Naturally you must call this before you can access the information using the remaining methods. The first parameter is the path. The second parameter should be true if you want to include folder revisions. Equivalent to the <placeholder-1/> command line switch. The third parameter should be true if you want to include svn:externals. Equivalent to the <placeholder-2/> command line switch."
msgstr "Metoda pregleda delovno kopijo in pridobi informacije o revizijah. Klicati jo morate pred metodami, ki so opisane v nadaljevanju. Prvi parameter je pot. Drugi parameter mora imeti vrednost true, če želite upoštevati tudi revizije map. Ta parameter je ekvivalenten stikalu <placeholder-1/> v ukazni vrstici. Tretji parameter mora biti true, če želite vključiti tudi zunanje elemente. Ta paramter je ekvivalenten stikalu <placeholder-2/> v ukazni vrstici."

#. (literal)
#: ../source/TortoiseGit_en.xml:12867
msgid "$WCREV$"
msgstr "$WCREV$"

#. (entry)
#: ../source/TortoiseGit_en.xml:12865
msgid "The highest commit revision in the working copy. Equivalent to <placeholder-1/>"
msgstr "Najvišja objavljena revizija v delovni kopiji. Isto kot spremenljivka <placeholder-1/>."

#. (literal)
#: ../source/TortoiseGit_en.xml:12874
msgid "$WCDATE$"
msgstr "$WCDATE$"

#. (entry)
#: ../source/TortoiseGit_en.xml:12872
msgid "The commit date/time of the highest commit revision. Equivalent to <placeholder-1/>"
msgstr "Datum/čas objave najvišje revizije. Isto kot spremenljivka <placeholder-1/>"

#. (entry)
#: ../source/TortoiseGit_en.xml:12879
msgid "The author of the highest commit revision, that is, the last person to commit changes to the working copy."
msgstr "Avtor najvišje objavljene revizije, to je zadnji avtor, ki je objavil spremembe delovne kopije."

#. (literal)
#. (literal)
#: ../source/TortoiseGit_en.xml:12886
#: ../source/TortoiseGit_en.xml:12890
msgid "$WCRANGE$"
msgstr "$WCRANGE$"

#. (entry)
#: ../source/TortoiseGit_en.xml:12886
msgid "The minimum update revision, as shown in <placeholder-1/>"
msgstr "Najnižja revizija posodobitve, kot je prikazana z <placeholder-1/>"

#. (entry)
#: ../source/TortoiseGit_en.xml:12890
msgid "The maximum update revision, as shown in <placeholder-1/>"
msgstr "Najvišja revizija posodobitve, kot je prikazana z <placeholder-1/>"

#. (entry)
#: ../source/TortoiseGit_en.xml:12894
msgid "True if there are local modifications"
msgstr "'True', če obstajajo krajevne spremembe"

#. (literal)
#: ../source/TortoiseGit_en.xml:12900
msgid "GetWCInfo"
msgstr "GetWCInfo"

#. (literal)
#: ../source/TortoiseGit_en.xml:12901
msgid "$WCURL$"
msgstr "$WCURL$"

#. (entry)
#: ../source/TortoiseGit_en.xml:12898
msgid "Replaced with the repository URL of the working copy path used in <placeholder-1/>. Equivalent to <placeholder-2/>"
msgstr "Zamenjano z naslovom URL skladišča poti delovne kopije, uporabljene pri <placeholder-1/>. Isto kot spremenljivka <placeholder-2/>"

#. (para)
#: ../source/TortoiseGit_en.xml:12831
msgid "If you need to access Git revision information from other programs, you can use the COM interface of SubWCRev. The object to create is <literal>SubWCRev.object</literal>, and the following methods are supported: <placeholder-1/>"
msgstr "Če morate do informacij o reviziji dostopati iz drugih programov, lahko uporabite vmesnik COM programa SubWCRev. Ustvariti morate objekt <literal>SubWCRev.object</literal>, na katerem so podprte naslednje metode: <placeholder-1/>"

#. (programlisting)
#: ../source/TortoiseGit_en.xml:12910
#, no-wrap
msgid ""
"\n"
"// testCOM.js - javascript file\n"
"// test script for the SubWCRev COM/Automation-object\n"
"\n"
"filesystem = new ActiveXObject(\"Scripting.FileSystemObject\");\n"
"\n"
"SubWCRev1 = new ActiveXObject(\"SubWCRev.object\");\n"
"SubWCRev2 = new ActiveXObject(\"SubWCRev.object\");\n"
"SubWCRev3 = new ActiveXObject(\"SubWCRev.object\");\n"
"\n"
"SubWCRev1.GetWCInfo(filesystem.GetAbsolutePathName(\".\"), 0, 0);\n"
"SubWCRev2.GetWCInfo(filesystem.GetAbsolutePathName(\"..\"), 1, 1);\n"
"SubWCRev3.GetWCInfo(filesystem.GetAbsolutePathName(\"SubWCRev.cpp\"), \n"
"                    0, 0);\n"
"\n"
"sInfo1 = \"Revision = \" + SubWCRev1.Revision + \n"
"         \"\\n"
"Min Revision = \" + SubWCRev1.MinRev +\n"
"         \"\\n"
"Max Revision = \" + SubWCRev1.MaxRev +\n"
"         \"\\n"
"Date = \" + SubWCRev1.Date +\n"
"         \"\\n"
"URL = \" + SubWCRev1.Url +\n"
"         \"\\n"
"Author = \" + SubWCRev1.Author +\n"
"         \"\\n"
"HasMods = \" + SubWCRev1.HasModifications;\n"
"sInfo2 = \"Revision = \" + SubWCRev2.Revision +\n"
"         \"\\n"
"Min Revision = \" + SubWCRev2.MinRev +\n"
"         \"\\n"
"Max Revision = \" + SubWCRev2.MaxRev +\n"
"         \"\\n"
"Date = \" + SubWCRev2.Date +\n"
"         \"\\n"
"URL = \" + SubWCRev2.Url +\n"
"         \"\\n"
"Author = \" + SubWCRev2.Author +\n"
"         \"\\n"
"HasMods = \" + SubWCRev2.HasModifications;\n"
"sInfo3 = \"Revision = \" + SubWCRev3.Revision +\n"
"         \"\\n"
"Min Revision = \" + SubWCRev3.MinRev +\n"
"         \"\\n"
"Max Revision = \" + SubWCRev3.MaxRev +\n"
"         \"\\n"
"Date = \" + SubWCRev3.Date +\n"
"         \"\\n"
"URL = \" + SubWCRev3.Url +\n"
"         \"\\n"
"Author = \" + SubWCRev3.Author +\n"
"         \"\\n"
"HasMods = \" + SubWCRev3.HasModifications;\n"
"\n"
"WScript.Echo(sInfo1);\n"
"WScript.Echo(sInfo2);\n"
"WScript.Echo(sInfo3);\n"
msgstr ""
"\n"
"// testCOM.js - datoteka javascript\n"
"// Preizkusna datoteka za SubWCRev COM/avtomatizacijski objekt\n"
"\n"
"filesystem = new ActiveXObject(\"Scripting.FileSystemObject\");\n"
"\n"
"SubWCRev1 = new ActiveXObject(\"SubWCRev.object\");\n"
"SubWCRev2 = new ActiveXObject(\"SubWCRev.object\");\n"
"SubWCRev3 = new ActiveXObject(\"SubWCRev.object\");\n"
"\n"
"SubWCRev1.GetWCInfo(filesystem.GetAbsolutePathName(\".\"), 0, 0);\n"
"SubWCRev2.GetWCInfo(filesystem.GetAbsolutePathName(\"..\"), 1, 1);\n"
"SubWCRev3.GetWCInfo(filesystem.GetAbsolutePathName(\"SubWCRev.cpp\"), \n"
"                    0, 0);\n"
"\n"
"sInfo1 = \"Revizija = \" + SubWCRev1.Revision + \n"
"         \"\\n"
"Min revizija = \" + SubWCRev1.MinRev +\n"
"         \"\\n"
"Max revizija = \" + SubWCRev1.MaxRev +\n"
"         \"\\n"
"Datum = \" + SubWCRev1.Date +\n"
"         \"\\n"
"URL = \" + SubWCRev1.Url +\n"
"         \"\\n"
"Avtor = \" + SubWCRev1.Author +\n"
"         \"\\n"
"Spremembe = \" + SubWCRev1.HasModifications;\n"
"sInfo2 = \"Revizija = \" + SubWCRev2.Revision +\n"
"         \"\\n"
"Min revizija = \" + SubWCRev2.MinRev +\n"
"         \"\\n"
"Max revizija = \" + SubWCRev2.MaxRev +\n"
"         \"\\n"
"Datum = \" + SubWCRev2.Date +\n"
"         \"\\n"
"URL = \" + SubWCRev2.Url +\n"
"         \"\\n"
"Avtor = \" + SubWCRev2.Author +\n"
"         \"\\n"
"Spremembe = \" + SubWCRev2.HasModifications;\n"
"sInfo3 = \"Revizija = \" + SubWCRev3.Revision +\n"
"         \"\\n"
"Min revizija = \" + SubWCRev3.MinRev +\n"
"         \"\\n"
"Max revizija = \" + SubWCRev3.MaxRev +\n"
"         \"\\n"
"Datum = \" + SubWCRev3.Date +\n"
"         \"\\n"
"URL = \" + SubWCRev3.Url +\n"
"         \"\\n"
"Avtor = \" + SubWCRev3.Author +\n"
"         \"\\n"
"Spremmebe = \" + SubWCRev3.HasModifications;\n"
"\n"
"WScript.Echo(sInfo1);\n"
"WScript.Echo(sInfo2);\n"
"WScript.Echo(sInfo3);\n"

#. (para)
#: ../source/TortoiseGit_en.xml:12908
msgid "The following example shows how the interface might be used. <placeholder-1/>"
msgstr "Naslednji primer prikazuje uporabo vmesnika. <placeholder-1/>"

#. (title)
#: ../source/TortoiseGit_en.xml:12955
msgid "Frequently Asked Questions (FAQ)"
msgstr "Pogosto zastavljena vprašanja (FAQ)"

#. (primary)
#: ../source/TortoiseGit_en.xml:12957
msgid "FAQ"
msgstr "Pogosto zastavljena vprašanja"

#. (para)
#: ../source/TortoiseGit_en.xml:12960
msgid "Because TortoiseGit is being developed all the time it is sometimes hard to keep the documentation completely up to date. We maintain an <ulink url=\"http://TortoiseGit.tigris.org/faq.html\"><citetitle>online FAQ</citetitle></ulink> which contains a selection of the questions we are asked the most on the TortoiseGit mailing lists <email>tortoisegit-dev@googlegroups.com </email> and <email>tortoisegit-users@googlegroups.com </email>."
msgstr "Ker se TortoiseGit nenehno razvija, je včasih težko vzdrževati dokumentacijo, tako da je ta vedno v skladu z aplikacijo. Vzdržujemo <ulink url=\"http://TortoiseGit.tigris.org/faq.html\"><citetitle>spletno stran z najpogosteje zastavljenimi vprašanji</citetitle></ulink>, ki vsebujejo izbor vprašanj, ki se najpogosteje pojavljajo na dopisnih seznamih projekta TortoiseGit <email>tortoisegit-dev@googlegroups.com </email> in <email>tortoisegit-users@googlegroups.com </email>."

#. (para)
#: ../source/TortoiseGit_en.xml:12972
msgid "We also maintain a project <ulink url=\"http://issues.TortoiseGit.net\"><citetitle>Issue Tracker</citetitle></ulink> which tells you about some of the things we have on our To-Do list, and bugs which have already been fixed. If you think you have found a bug, or want to request a new feature, check here first to see if someone else got there before you."
msgstr "Vzdržujemo tudi <ulink url=\"http://issues.TortoiseGit.net\"><citetitle>sledilnik zadev</citetitle></ulink>, kjer lahko izveste, kaj nameravamo dodati aplikaciji v prihodnje in kateri hrošči so že odpravljeni. Če ste v programu našlji napako ali želite predlagati izboljšavo, najprej preverite, če tega ni storil že kdo pred vami."

#. (para)
#: ../source/TortoiseGit_en.xml:12982
msgid "If you have a question which is not answered anywhere else, the best place to ask it is on one of the mailing lists. <email>tortoisegit-users@googlegroups.com </email> is the one to use if you have questions about using TortoiseGit. If you want to help out with the development of TortoiseGit, then you should take part in discussions on <email>tortoisegit-dev@googlegroups.com </email>."
msgstr "Če odgovora na svoje vprašanje ne najdete nikjer drugje, uporabite naše dopisne sezname. Naslov <email>tortoisegit-users@googlegroups.com </email> uporabite v primeru vprašanje glede uporabe programa  TortoiseGit. Če želite sodelovati pri razvoju  TortoiseGit, lahko sodelujete v debatah na naslovu <email>tortoisegit-dev@googlegroups.com </email>."

#. (title)
#: ../source/TortoiseGit_en.xml:12998
msgid "How Do I..."
msgstr "Kako naredim..."

#. (para)
#: ../source/TortoiseGit_en.xml:13000
msgid "This appendix contains solutions to problems/questions you might have when using TortoiseGit."
msgstr "Ta dodatek vsebuje rešitve težav/vprašanj, ki se lahko pojavijo pri uporabi TortoiseGit."

#. (title)
#: ../source/TortoiseGit_en.xml:13006
msgid "Move/copy a lot of files at once"
msgstr "Kako premaknem/kopiram večje število datotek naenkrat"

#. (primary)
#: ../source/TortoiseGit_en.xml:13008
msgid "moving"
msgstr "premikanje"

#. (primary)
#: ../source/TortoiseGit_en.xml:13014
msgid "reorganize"
msgstr "uredi"

#. (para)
#: ../source/TortoiseGit_en.xml:13016
msgid "Moving/Copying single files can be done by using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Rename...</guimenuitem></menuchoice>. But if you want to move/copy a lot of files, this way is just too slow and too much work."
msgstr "Premikanje/kopiranje posameznih datotek se izvaja z ukazom <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Preimenuj...</guimenuitem></menuchoice>. Če premikate/kopirate večje število datotek, je ta postopek počasen in zahteva preveč dela."

#. (para)
#: ../source/TortoiseGit_en.xml:13025
msgid "The recommended way is by <action>right-dragging</action> the files to the new location. Simply <action>right-click</action> on the files you want to move/copy without releasing the mouse button. Then drag the files to the new location and release the mouse button. A context menu will appear where you can either choose <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>SVN Copy versioned files here</guimenuitem></menuchoice>. or <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>SVN Move versioned files here</guimenuitem></menuchoice>."
msgstr "Priporočamo, da datoteke <action>povlečete z desnim gumbom</action> na novo lokacijo. Enostavno <action>kliknite z desnim gumbom</action> na datoteke, ki jih želite premakniti/prekopirati, ne da spustite miškin gumb. Potem datoteke povlecite na novo lokacijo in spustite miškin gumb. Prikazal se bo kontekstni meni, kjer lahko izberete <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>SVN - Kopiraj datoteke pod nadzorom sem</guimenuitem></menuchoice> ali  <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>SVN - Premakni datoteke pod nadzorom sem</guimenuitem></menuchoice>."

#. (title)
#: ../source/TortoiseGit_en.xml:13048
msgid "Force users to enter a log message"
msgstr "Kako prisilim uporabnika, da vnese sporočilo dnevniškega zapisa"

#. (primary)
#: ../source/TortoiseGit_en.xml:13050
msgid "log message"
msgstr "zapis dnevnika"

#. (primary)
#: ../source/TortoiseGit_en.xml:13053
msgid "commit message"
msgstr "spročilo objave"

#. (primary)
#: ../source/TortoiseGit_en.xml:13056
msgid "empty message"
msgstr "pravzno sporočilo"

#. (para)
#: ../source/TortoiseGit_en.xml:13058
msgid "There are two ways to prevent users from committing with an empty log message. One is specific to TortoiseGit, the other works for all Git clients, but requires access to the server directly."
msgstr "Obstajata dva načina, kako uporabnikom preprečiti objavljanje s praznim sporočilom dnevniškega zapisa. Eden je poseben za TortoiseGit, drugi pa je uporaben za vse odjemalce Git, vendar morate za nastavitev imeti neposreden dostop do strežnika."

#. (title)
#: ../source/TortoiseGit_en.xml:13064
msgid "Hook-script on the server"
msgstr "Ukazna datoteka akcije na strežniku"

#. (para)
#: ../source/TortoiseGit_en.xml:13065
msgid "If you have direct access to the repository server, you can install a pre-commit hook script which rejects all commits with an empty or too short log message."
msgstr "Če imate neposreden dostop do strežnika skladišča, lahko nastavite ukazno datoteko za akcijo pred objavo, ki zavrne vse objave s praznim sporočilom dnevniškega zapisa ali s prekratkim sporočilom."

#. (para)
#: ../source/TortoiseGit_en.xml:13070
msgid "In the repository folder on the server, there's a sub-folder <filename>hooks</filename> which contains some example hook scripts you can use. The file <filename>pre-commit.tmpl</filename> contains a sample script which will reject commits if no log message is supplied, or the message is too short. The file also contains comments on how to install/use this script. Just follow the instructions in that file."
msgstr "V mapi skladišča na strežniku se nahaja podmapa z imenom <filename>hooks</filename>, ki vsebuje nekaj primerov ukaznih datotek akcij, ki jih lahko uporabite. Datoteka <filename>pre-commit.tmpl</filename> vsebuje primer, ki zavrne objavo brez sporočila dnevniškega zapisa ali s prekratkim sporočilom. Zraven so zapisana tudi navodila za namestitev/uporabo ukazne datoteke. Sledite jim."

#. (para)
#: ../source/TortoiseGit_en.xml:13080
msgid "This method is the recommended way if your users also use other Git clients than TortoiseGit. The drawback is that the commit is rejected by the server and therefore users will get an error message. The client can't know before the commit that it will be rejected. If you want to make TortoiseGit have the <guibutton>OK</guibutton> button disabled until the log message is long enough then please use the method described below."
msgstr "Ta metoda je priporočljiva, če uporabniki poleg TortoiseGit uporabljajo še druge odjemalce za Git. Slaba stran metode je, da objavo zavrne strežnik, zato bodo uporabniki dobili sporočilo o napaki. Odjemalec namreč ne more vnaprej vedeti, da bo objava zavrnjena. Če želite, da TortoiseGit onemogoči gumb <guibutton>V redu</guibutton>, dokler ni vneseno sporočilo dnevniškega zapisa predpisane dolžine, uporabite metodo, ki je opisana spodaj."

#. (title)
#: ../source/TortoiseGit_en.xml:13091
msgid "Project properties"
msgstr "Lasnosti projekta"

#. (para)
#: ../source/TortoiseGit_en.xml:13092
msgid "TortoiseGit uses properties to control some of its features. One of those properties is the <literal>tsvn:logminsize</literal> property."
msgstr "TortoiseGit uporablja lastnosti, da kontrolira nekatere zmožnosti programa. Ena takšnih je lastnost <literal>tsvn:logminsize</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:13096
msgid "If you set that property on a folder, then TortoiseGit will disable the <guibutton>OK</guibutton> button in all commit dialogs until the user has entered a log message with at least the length specified in the property."
msgstr "Če nastavite to lastnost na mapi, bo TortoiseGit onemogočil gumb <guibutton>V redu</guibutton> v vseh oknih objave, dokler uporabnik ne bo vnesel sporočila dnevniškega zapisa predpisane dolžine."

#. (para)
#: ../source/TortoiseGit_en.xml:13101
msgid "For detailed information on those project properties, please refer to <xref linkend=\"tsvn-dug-propertypage\"/>"
msgstr "Za podrobne informacije o projektnih lastnostih poglejte <xref linkend=\"tsvn-dug-propertypage\"/>"

#. (title)
#: ../source/TortoiseGit_en.xml:13108
msgid "Update selected files from the repository"
msgstr "Kako posodobim izbrane datoteke iz skladišča"

#. (para)
#: ../source/TortoiseGit_en.xml:13112
msgid "Normally you update your working copy using <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Update</guimenuitem></menuchoice>. But if you only want to pick up some new files that a colleague has added without merging in any changes to other files at the same time, you need a different approach."
msgstr "Običajno posodobite delovno kopijo z ukazom <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Posodobi</guimenuitem></menuchoice>. Če pa želite posodobiti le nekaj novih datotek, ki jih je dodal vaš sodelavec, ne želite pa hkrati spajati ostalih datotek, uporabite drugačen pristop."

#. (para)
#: ../source/TortoiseGit_en.xml:13122
msgid "Use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Check for Modifications</guimenuitem></menuchoice>. and click on <guibutton>Check repository</guibutton> to see what has changed in the repository. Select the files you want to update locally, then use the context menu to update just those files."
msgstr "Uporabite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Preveri spremembe</guimenuitem></menuchoice> in kliknite na gumb <guibutton>Preveri skladišče</guibutton>. S tem vidite, kaj se je spremenilo v skladišču. Izberite datoteke, ki jih želite posodobiti v delovni kopiji, potem pa izvedite posodobitev preko ukazov kontekstnega menija."

#. (title)
#: ../source/TortoiseGit_en.xml:13134
msgid "Roll back (Undo) revisions in the repository"
msgstr "Kako prevrtim nazaj revizije v skladišču"

#. (primary)
#: ../source/TortoiseGit_en.xml:13136
msgid "rollback"
msgstr "povrnitev"

#. (primary)
#: ../source/TortoiseGit_en.xml:13142
msgid "undo commit"
msgstr "razveljavi objavo"

#. (primary)
#: ../source/TortoiseGit_en.xml:13145
msgid "undo change"
msgstr "razveljavi spremembo"

#. (title)
#: ../source/TortoiseGit_en.xml:13148
msgid "Use the revision log dialog"
msgstr "Uporabite okno za prikaz dnevniških zapisov"

#. (para)
#: ../source/TortoiseGit_en.xml:13149
msgid "The easiest way to revert the changes from a single revision, or from a range of revisions, is to use the revision log dialog. This is also the method to use of you want to discard recent changes and make an earlier revision the new HEAD."
msgstr "Najlažji način, kako povrniti spremembe iz ene revizije ali obsega revizij je z uporabo okna dnevnika. S to metodo lahko pozabite na zadnje spremembe in določite starejšo revizijo za novo revizijo HEAD."

#. (para)
#: ../source/TortoiseGit_en.xml:13158
msgid "Select the file or folder in which you need to revert the changes. If you want to revert all changes, this should be the top level folder."
msgstr "Izberite datoteko ali mapo, kateri želite povrniti spremembe. Če želite povrniti vse spremembe, izberite vrhnjo datoteko."

#. (para)
#: ../source/TortoiseGit_en.xml:13165
msgid "Select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Show Log</guimenuitem></menuchoice> to display a list of revisions. You may need to use <guibutton>Show All</guibutton> or <guibutton>Next 100</guibutton> to show the revision(s) you are interested in."
msgstr "Za seznam revizij izberite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Pokaži dnevnik</guimenuitem></menuchoice>. Mogoče boste morali uporabiti gumb <guibutton>Pokaži vse</guibutton> ali gumb <guibutton>Naslednjih 100</guibutton>, da bi videli revizijo(e), ki vas zanima."

#. (para)
#: ../source/TortoiseGit_en.xml:13178
msgid "Select the revision you wish to revert. If you want to undo a range of revisions, select the first one and hold the <keycap>Shift</keycap> key while selecting the last one. Note that for multiple revisions, the range must be unbroken with no gaps. <action>Right click</action> on the selected revision(s), then select <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Revert changes from this revision</guimenuitem></menuchoice>."
msgstr "Izberite revizije, ki jih želite povrniti. Če želite povrniti območje revizij, izberite prvo izmed njih, držite tipko <keycap>Shift</keycap> in izberite zadnjo izmed njih. Upoštevajte, da mora biti območje neprekinjeno, brez lukenj. <action>Kliknite z desnim gumbom</action> na izbrane revizije in izberite <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Povrni spremembe te revizije</guimenuitem></menuchoice>."

#. (para)
#: ../source/TortoiseGit_en.xml:13193
msgid "Or if you want to make an earlier revision the new HEAD revision, <action>right click</action> on the selected revision, then select <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Revert to this revision</guimenuitem></menuchoice>. This will discard <emphasis>all</emphasis> changes after the selected revision."
msgstr "Če želite staro revizijo postaviti za novo revizijo HEAD, <action>kliknite z desnim gumbom</action> na izbrano revizijo in izberite <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Povrni na to revizijo</guimenuitem></menuchoice>. S tem boste izbrisali <emphasis>vse</emphasis> spremembe, narejene po izbrani reviziji."

#. (para)
#. (para)
#: ../source/TortoiseGit_en.xml:13206
#: ../source/TortoiseGit_en.xml:13263
msgid "You have reverted the changes within your working copy. Check the results, then commit the changes."
msgstr "Povrnili ste spremembe znotraj delovne kopije. Preverite rezultate in potem objavite spremembe."

#. (title)
#: ../source/TortoiseGit_en.xml:13212
msgid "Use the merge dialog"
msgstr "Uporabite okno za spajanje"

#. (para)
#: ../source/TortoiseGit_en.xml:13213
msgid "To undo a larger range of revisions, you can use the Merge dialog. The previous method uses merging behind the scenes; this method uses it explicitly."
msgstr "Da bi razveljavili spremembe večjega števila revizij, lahko uporabite okno za spajanje. Prejšnja metoda v ozadju uporablja spajanje; ta metoda ga uporablja direktno."

#. (para)
#: ../source/TortoiseGit_en.xml:13220
msgid "In your working copy select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Merge</guimenuitem></menuchoice>."
msgstr "V delovni kopiji izberite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Spoji</guimenuitem></menuchoice>."

#. (para)
#: ../source/TortoiseGit_en.xml:13229
msgid "In the <guilabel>From:</guilabel> field enter the full folder URL of the branch or tag containing the changes you want to revert in your working copy. This should come up as the default URL."
msgstr "V polje <guilabel>Iz:</guilabel> vnesite naslov URL mape veje ali oznake, ki vsebuje spremembe, ki jih želite povrniti v delovni kopiji. Pojaviti se mora prednastavljeni naslov URL."

#. (para)
#: ../source/TortoiseGit_en.xml:13237
msgid "In the <guilabel>From Revision</guilabel> field enter the revision number that you are currently at. If you are sure there is no-one else making changes, you can use the HEAD revision."
msgstr "V polje <guilabel>Iz revizije</guilabel> vnesite trenutno številko revizije. Če ste prepričani, da sprememb ne objavlja nihče drug, lahko izberete revizijo HEAD."

#. (para)
#: ../source/TortoiseGit_en.xml:13245
msgid "make sure the <guilabel>Use \"From:\" URL</guilabel> checkbox is checked."
msgstr "Prepričajte se, da je polje <guilabel>Uporabite URL \"Od:\"</guilabel> potrjeno."

#. (para)
#: ../source/TortoiseGit_en.xml:13251
msgid "In the <guilabel>To Revision</guilabel> field enter the revision number that you want to revert to, namely the one <emphasis>before</emphasis> the first revision to be reverted."
msgstr "V polje <guilabel>Do revizije</guilabel> vnesite številko revizije, na katero želite povrniti delovno kopijo. To pomeni na revizijo <emphasis>pred</emphasis> prvo revizijo, ki vsebuje spremembe, ki jih želite povrniti."

#. (para)
#: ../source/TortoiseGit_en.xml:13258
msgid "Click <guibutton>OK</guibutton> to complete the merge."
msgstr "Za zaključek spajanja kliknite na gumb <guibutton>V redu</guibutton>."

#. (title)
#: ../source/TortoiseGit_en.xml:13269
msgid "Use <literal>svndumpfilter</literal>"
msgstr "Uporabite <literal>svndumpfilter</literal>"

#. (para)
#: ../source/TortoiseGit_en.xml:13270
msgid "Since TortoiseGit never loses data, your <quote>rolled back</quote> revisions still exist as intermediate revisions in the repository. Only the HEAD revision was changed to a previous state. If you want to make revisions disappear completely from your repository, erasing all trace that they ever existed, you have to use more extreme measures. Unless there is a really good reason to do this, it is <emphasis>not recommended</emphasis>. One possible reason would be that someone committed a confidential document to a public repository."
msgstr "Ker TortoiseGit nikoli ne izgubi podatkov, revizije, ki ste jih povrnili, še vedno obstajajo v skladišču. Vse, kar ste naredili, je, da ste spremenili zadnjo (HEAD) revizijo na vsebino predhodnje revizije. Če želite, da določene revizije izginejo iz skladišča in da se za njimi izgubi vsaka sled, morate uporabiti bolj drastične ukrepe. Razen v primeru zelo dobrega razloga to <emphasis>ni priporočljivo</emphasis>. Eden od možnih razlogov za uporabo te metode je objava zaupnega dokumenta v javno skladišče."

#. (para)
#: ../source/TortoiseGit_en.xml:13281
msgid "The only way to remove data from the repository is to use the Git command line tool <literal>svnadmin</literal>. You can find a description of how this works in the <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.reposadmin.maint.html\"><citetitle>Repository Maintenance</citetitle></ulink>."
msgstr "Edini način, kako odstraniti podatke is skladišča, je z uporabo odjemalca za ukazno vrstico Git <literal>svnadmin</literal>. Kako postopek deluje, si lahko preberete na strani <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.reposadmin.maint.html\"><citetitle>Repository Maintenance</citetitle></ulink>."

#. (title)
#: ../source/TortoiseGit_en.xml:13292
msgid "Compare two revisions of a file"
msgstr "Kako primerjam dve reviziji datoteke"

#. (primary)
#: ../source/TortoiseGit_en.xml:13294
msgid "compare files"
msgstr "primerja datoteke"

#. (primary)
#: ../source/TortoiseGit_en.xml:13297
msgid "changes"
msgstr "spremembe"

#. (para)
#: ../source/TortoiseGit_en.xml:13299
msgid "If you want to compare two revisions in a file's history, for example revisions 100 and 200 of the same file, just use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Show Log</guimenuitem></menuchoice> to list the revision history for that file. Pick the two revisions you want to compare then use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Compare Revisions</guimenuitem></menuchoice>."
msgstr "Če želite primerjati dve reviziji v zgodovini datoteke, na primer reviziji 100 in 200 iste datoteke, uporabite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Pokaži dnevnik</guimenuitem></menuchoice> in prikaže se vam seznam revizij za izbrano datoteko. Izberite reviziji, ki ju želite primerjati, potem pa uporabite ukaz <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Primerjaj reviziji</guimenuitem></menuchoice>."

#. (para)
#: ../source/TortoiseGit_en.xml:13313
msgid "If you want to compare the same file in two different trees, for example the trunk and a branch, you can use the repository browser to open up both trees, select the file in both places, then use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Compare Revisions</guimenuitem></menuchoice>."
msgstr "Če želite primerjati datoteko v dveh različnih drevesih, n. pr. v glavni veji in v neki drugi veji, uporabite brskalnik po skladišču in odprite obe poti. Izberite datoteko v obeh poteh in uporabite <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Primerjaj reviziji</guimenuitem></menuchoice>."

#. (para)
#: ../source/TortoiseGit_en.xml:13323
msgid "If you want to compare two trees to see what has changed, for example the trunk and a tagged release, you can use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Revision Graph</guimenuitem></menuchoice> Select the two nodes to compare, then use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Compare HEAD Revisions</guimenuitem></menuchoice>. This will show a list of changed files, and you can then select individual files to view the changes in detail. Alternatively use <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Unified Diff of HEAD Revisions</guimenuitem></menuchoice> to see a summary of all differences, with minimal context."
msgstr "Če želite primerjati dve poti, da bi videli, kaj se je spremenilo, n. pr. med glavno vejo in neko oznako, uporabite  <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Graf revizij</guimenuitem></menuchoice>. Izberite dve vozlišči, ki ju želite primerjati, potem pa uporabite <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Primerjaj reviziji HEAD</guimenuitem></menuchoice>. Prikazal se bo seznam spremenjenih datotek, iz katerega lahko izberete posamezne datoteke, pri katerih vas zanimajo spremembe. Uporabite lahko tudi <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Poenotene razlike revizij HEAD</guimenuitem></menuchoice>. S tem vidite povzetek vseh sprememb z minimalnim sobesedilom."

#. (title)
#: ../source/TortoiseGit_en.xml:13346
msgid "Include a common sub-project"
msgstr "Kako vključim skupni podprojekt"

#. (primary)
#: ../source/TortoiseGit_en.xml:13348
msgid "common projects"
msgstr "skupni projekti"

#. (primary)
#: ../source/TortoiseGit_en.xml:13354
msgid "vendor projects"
msgstr "veje zunanjih izvajalcev"

#. (para)
#: ../source/TortoiseGit_en.xml:13356
msgid "Sometimes you will want to include another project within your working copy, perhaps some library code. You don't want to make a duplicate of this code in your repository because then you would lose connection with the original (and maintained) code. Or maybe you have several projects which share core code. There are at least 3 ways of dealing with this."
msgstr "Včasih želite vključiti v delovno kopijo še en projekt, mogoče izvorno kodo za knjižnico, ki jo uporabljate. Ne želite narediti dvojnika izvorne kode v svojem skladišču, saj s tem izgubite povezavo z izvirno (vzdrževano) kodo. Ali pa imate več projektov, ki si delijo skupno kodo. Obstajajo vsaj trije načini, kako se spopasti s tem."

#. (title)
#: ../source/TortoiseGit_en.xml:13366
msgid "Use svn:externals"
msgstr "Uporabite lastnost svn:externals"

#. (para)
#: ../source/TortoiseGit_en.xml:13367
msgid "Set the <literal>svn:externals</literal> property for a folder in your project. This property consists of one or more lines; each line has the name of a sub-folder which you want to use as the checkout folder for common code, and the repository URL that you want to be checked out there. For full details refer to <xref linkend=\"tsvn-dug-import-4\"/>."
msgstr "Mapi v projektu nastavite lastnost <literal>svn:externals</literal>. Ta lastnost vsebuje eno ali več vrstic; vsaka vrstica vsebuje ime podmape, ki jo želite uporabiti kot prevzemno mapo za skupno kodo in naslov URL skladišča, od koder naj se opravi prevzem. Za natančnejše informacije poglejte <xref linkend=\"tsvn-dug-import-4\"/>."

#. (para)
#: ../source/TortoiseGit_en.xml:13375
msgid "Commit the new folder. Now when you update, Git will pull a copy of that project from its repository into your working copy. The sub-folders will be created automatically if required. Each time you update your main working copy, you will also receive the latest version of all external projects."
msgstr "Objavite novo mapo. Pri posodobitvi bo Git potegnil kopijo projekta iz skladišča v vašo delovno kopijo. Če je to potrebno, se podmape ustvarijo samodejno. Ob vsaki posodobitvi delovne kopije boste posodobili tudi vse zunanje projekte."

#. (para)
#: ../source/TortoiseGit_en.xml:13394
msgid "Of the three methods described, this is the only one which needs no setup on the client side. Once externals are specified in the folder properties, all clients will get populated folders when they update."
msgstr "Od vseh treh opisanih možnosti je ta edina, ki ne potrebuje namestitve na strani odjemalca. Ko so zunanje datoteke določene v lastnostih map, bodo ob posodobitvi vsi odjemalci popolnili mape."

#. (title)
#: ../source/TortoiseGit_en.xml:13402
msgid "Use a nested working copy"
msgstr "Uporabite vgnezdeno delovno kopijo"

#. (para)
#: ../source/TortoiseGit_en.xml:13403
msgid "Create a new folder within your project to contain the common code, but do not add it to Git"
msgstr "Ustvarite novo mapo znotraj svojega projekta, ki naj vsebuje skupno kodo, vendar je ne dodajte v sistem Git."

#. (para)
#: ../source/TortoiseGit_en.xml:13407
msgid "Select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Checkout</guimenuitem></menuchoice> for the new folder and checkout a copy of the common code into it. You now have a separate working copy nested within your main working copy."
msgstr "Na novi mapi izvedite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Prevzem</guimenuitem></menuchoice> skupne kode. Sedaj imate ločeno delovno kopijo vgnezdeno v svoji glavni delovni kopiji."

#. (para)
#: ../source/TortoiseGit_en.xml:13417
msgid "The two working copies are independent. When you commit changes to the parent, changes to the nested WC are ignored. Likewise when you update the parent, the nested WC is not updated."
msgstr "Ti dve delovni kopiji sta neodvisni. Ko objavite spremembe na korenski delovni kopiji, se spremembe na vgnezdeni delovni kopij prezrejo. Podobno je v primeru posodobitve: ko posodobite korensko delovno kopijo, je vgnezdena prezrta."

#. (title)
#: ../source/TortoiseGit_en.xml:13424
msgid "Use a relative location"
msgstr "Uporabite relativno lokacijo"

#. (para)
#: ../source/TortoiseGit_en.xml:13425
msgid ""
"If you use the same common core code in several projects, and you do not want to keep multiple working copies of it for every project that uses it, you can just check it out to a separate location which is related to all the other projects which use it. For example: <screen>\n"
"C:\\Projects\\Proj1\n"
"C:\\Projects\\Proj2\n"
"C:\\Projects\\Proj3\n"
"C:\\Projects\\Common\n"
"</screen> and refer to the common code using a relative path, eg. <filename>..\\..\\Common\\DSPcore</filename>."
msgstr ""
"Če na več projektih uporabljate skupno kodo in ne želite imeti več delovnih kopij te kode, jo lahko prevzamete v posebno mapo, nato pa naredite povezavo nanjo v vseh projektih. Primer: <screen>\n"
"C:\\Projekti\\Proj1\n"
"C:\\Projekti\\Proj2\n"
"C:\\Projekti\\Proj3\n"
"C:\\Projekti\\Skupno\n"
"</screen> in naredite povezavo na skupno kodo z uporabo relativne poti, n. pr. <filename>..\\..\\Skupno\\SkupnaKoda</filename>."

#. (para)
#: ../source/TortoiseGit_en.xml:13440
msgid ""
"If your projects are scattered in unrelated locations you can use a variant of this, which is to put the common code in one location and use drive letter substitution to map that location to something you can hard code in your projects, eg. Checkout the common code to <filename>D:\\Documents\\Framework</filename> or <filename>C:\\Documents and Settings\\{login}\\My Documents\\framework</filename> then use <screen>\n"
"SUBST X: \"D:\\Documents\\framework\"\n"
"</screen> to create the drive mapping used in your source code. Your code can then use absolute locations. <screen>\n"
"#include \"X:\\superio\\superio.h\"\n"
"</screen>"
msgstr ""
"Če so vaši projekti razmetani na nepovezanih lokacijah, lahko uporabite posebno variacijo zgornje rešitve. Skupno kodo shranite v svojo mapo, nato pa uporabite preslikavo pogonov in preslikate to lokacijo v nekaj, kar lahko uporabite v svojih projektih. Primer: prevzemite skupno kodo v <filename>D:\\Documents\\Framework</filename> ali <filename>C:\\Documents and Settings\\{login}\\My Documents\\framework</filename> in potem uporabite <screen>\n"
"SUBST X: \"D:\\Documents\\framework\"\n"
"</screen> da ustvarite preslikavo pogona za uporabo v izvorni kodi. V kodi sedaj uporabljate absolutne lokacije.<screen>\n"
"#include \"X:\\superio\\superio.h\"\n"
"</screen>"

#. (para)
#: ../source/TortoiseGit_en.xml:13458
msgid "This method will only work in an all-PC environment, and you will need to document the required drive mappings so your team know where these mysterious files are. This method is strictly for use in closed development environments, and not recommended for general use."
msgstr "Ta metoda deluje le v okoljih, kjer vsi uporabniki uporabljajo računalnike PC. Preslikave pogonov boste morali dokumentirati, da bodo ostali člani teama vedeli, od kje prihajajo te skrivnostne datoteke. Metoda naj se uporablja v zaprtem krogu razvijalcev, za splošno uporabo pa ni priporočljiva."

#. (title)
#: ../source/TortoiseGit_en.xml:13468
msgid "Create a shortcut to a repository"
msgstr "Kako ustvarim bližnjico do skladišča"

#. (primary)
#: ../source/TortoiseGit_en.xml:13470
msgid "shortcut"
msgstr "bližnjica"

#. (para)
#: ../source/TortoiseGit_en.xml:13472
msgid ""
"If you frequently need to open the repository browser at a particular location, you can create a desktop shortcut using the automation interface to TortoiseProc. Just create a new shortcut and set the target to: <screen>\n"
"TortoiseProc.exe /command:repobrowser /path:\"url/to/repository\"\n"
"</screen> Of course you need to include the real repository URL."
msgstr ""
"Če pogosto odpirate brskalnik po skladišču na določeni lokaciji, si lahko na namizju ustvarite bližnjico z uporabo avtomatizacijskega vmesnika do TortoiseProc. Ustvarite novo bližnjico in nastavite cilj na: <screen>\n"
"TortoiseProc.exe /command:repobrowser /path:\"url/do/skladišča\"\n"
"</screen> Seveda morate podati pravi naslov URL skladišča."

#. (title)
#: ../source/TortoiseGit_en.xml:13484
msgid "Ignore files which are already versioned"
msgstr "Kako dodam na seznam prezrtih datoteke, ki so že pod nadzorom"

#. (primary)
#: ../source/TortoiseGit_en.xml:13489
msgid "remove versioning"
msgstr "odstrani verzioniranje"

#. (primary)
#: ../source/TortoiseGit_en.xml:13492
msgid "detach from repository"
msgstr "odstrani iz skladišča"

#. (para)
#: ../source/TortoiseGit_en.xml:13494
msgid "If you accidentally added some files which should have been ignored, how do you get them out of version control without losing them? Maybe you have your own IDE configuration file which is not part of the project, but which took you a long time to set up just the way you like it."
msgstr "Če ste pomotoma dodali nekatere datoteke, ki bi jih morali preskočiti, kako jih dobite iz sistema nadzora, ne da bi jih izgubili? Mogoče imate svojo konfiguracijsko datoteko za razvojno okolje, ki ni del projekta, ste pa porabili kar nekaj časa, da ste si okolje nastavili po svojih željah."

#. (para)
#: ../source/TortoiseGit_en.xml:13501
msgid "If you have not yet committed the add, then all you have to do is use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Revert...</guimenuitem></menuchoice> to undo the add. You should then add the file(s) to the ignore list so they don't get added again later by mistake."
msgstr "Če dodane datoteke še niste objavili, lahko uporabite ukaz <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Povrni...</guimenuitem></menuchoice>, s čimer prekličete dodano datoteko. Nato datoteko(e) dodate na seznam prezrtih elementov, da je ne bi naslednjič pomotoma spet dodali."

#. (para)
#: ../source/TortoiseGit_en.xml:13516
msgid "Hold the <keycap>Shift</keycap> key to get the extended context menu and use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Delete (keep local)</guimenuitem></menuchoice> to mark the file/folder for deletion from the repository without losing the local copy."
msgstr "Pritisnite tipko <keycap>Shift</keycap>, da dobite razšijeni kontekstni meni, in uporabite ukaz  <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Izbriši (ohrani krajevno)</guimenuitem></menuchoice>. S tem označite datoteko za brisanje iz skladišča, vendar se pri tem ohrani krajevna kopija datoteke."

#. (para)
#: ../source/TortoiseGit_en.xml:13528
msgid "<menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Commit</guimenuitem></menuchoice> the parent folder."
msgstr "V delovni kopiji izberite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Objavi</guimenuitem></menuchoice>."

#. (para)
#: ../source/TortoiseGit_en.xml:13537
msgid "Add the file/folder to the ignore list so you don't get into the same trouble again."
msgstr "Dodajte datoteko/mapo na seznam prezrtih, da drugič ne naletite na enake težave."

#. (para)
#: ../source/TortoiseGit_en.xml:13511
msgid "If the files are already in the repository, you have to do a little more work. <placeholder-1/>"
msgstr "Če so datoteke že v skladišču, imate malce več dela. <placeholder-1/>"

#. (title)
#: ../source/TortoiseGit_en.xml:13546
msgid "Unversion a working copy"
msgstr "Odstranjevanje delovne kopije iz nadzora različic"

#. (para)
#: ../source/TortoiseGit_en.xml:13547
msgid "If you have a working copy which you want to convert back to a plain folder tree without the <literal>.svn</literal> directories, you can simply export it to itself. Read <xref linkend=\"tsvn-dug-export-unversion\"/> to find out how."
msgstr "Če imate delovno kopijo, ki jo želite pretvoriti v navadno drevesno strukturo brez podmap <literal>.svn</literal>, jo lahko izvozite samo vase.  Več o tem pove <xref linkend=\"tsvn-dug-export-unversion\"/>."

#. (title)
#: ../source/TortoiseGit_en.xml:13555
msgid "Remove a working copy"
msgstr "Kako odstranim delovno kopijo"

#. (para)
#: ../source/TortoiseGit_en.xml:13556
msgid "If you have a working copy which you no longer need, how do you get rid of it cleanly? Easy - just delete it in Windows Explorer! Working copies are private local entities, and they are self-contained."
msgstr "Če imate delovno kopijo, ki je ne potrebujete več, kako se je znebite? Enostavno - izbrišite jo iz Raziskovalca! Delovne kopije so zasebne krajevne enote."

#. (title)
#: ../source/TortoiseGit_en.xml:13564
msgid "Useful Tips For Administrators"
msgstr "Uporabni namigi za skrbnike sistema"

#. (para)
#: ../source/TortoiseGit_en.xml:13566
msgid "This appendix contains solutions to problems/questions you might have when you are responsible for deploying TortoiseGit to multiple client computers."
msgstr "Ta dodatek podaja rešitve problemov/vprašanj, ki se lahko pojavijo skrbnikom, ki so zadolženi za namestitev TortoiseGit na večje število računalnikov."

#. (title)
#: ../source/TortoiseGit_en.xml:13573
msgid "Deploy TortoiseGit via group policies"
msgstr "Namestitev TortoiseGit preko pravic skupin"

#. (primary)
#. (primary)
#: ../source/TortoiseGit_en.xml:13575
#: ../source/TortoiseGit_en.xml:13700
msgid "group policies"
msgstr "pravice skupin"

#. (primary)
#. (glossterm)
#: ../source/TortoiseGit_en.xml:13578
#: ../source/TortoiseGit_en.xml:15678
msgid "GPO"
msgstr "GPO"

#. (primary)
#: ../source/TortoiseGit_en.xml:13581
msgid "msi"
msgstr "msi"

#. (primary)
#: ../source/TortoiseGit_en.xml:13584
msgid "domain controller"
msgstr "domenski kontroler"

#. (primary)
#: ../source/TortoiseGit_en.xml:13587
msgid "deploy"
msgstr "namestitev"

#. (para)
#: ../source/TortoiseGit_en.xml:13589
msgid "The TortoiseGit installer comes as an MSI file, which means you should have no problems adding that MSI file to the group policies of your domain controller."
msgstr "Namestitveni program TortoiseGit je oblike datoteke MSI, kar pomeni, da ne bi smeli imeti nobenih težav pri dodajanju namestitve v pravice skupin (group policies) domenskega kontrolerja."

#. (para)
#: ../source/TortoiseGit_en.xml:13594
msgid "A good walk-through on how to do that can be found in the knowledge base article 314934 from Microsoft: <ulink url=\"http://support.microsoft.com/?kbid=314934\"><citetitle>http://support.microsoft.com/?kbid=314934</citetitle></ulink>."
msgstr "Dober članek na to temo se nahaja v bazi znanja podjetja Microsoft pod številko 314934: <ulink url=\"http://support.microsoft.com/?kbid=314934\"><citetitle>http://support.microsoft.com/?kbid=314934</citetitle></ulink>."

#. (para)
#: ../source/TortoiseGit_en.xml:13601
msgid "Versions 1.3.0 and later of TortoiseGit must be installed under <emphasis>Computer Configuration</emphasis> and not under <emphasis>User Configuration</emphasis>. This is because those versions need the new CRT and MFC DLLs, which can only be deployed <emphasis>per computer</emphasis> and not <emphasis>per user</emphasis>. If you really must install TortoiseGit on a per user basis, then you must first install the MFC and CRT package version 8 from Microsoft on each computer you want to install TortoiseGit as per user."
msgstr "Različice TortoiseGit 1.3.0 in novejše je potrebno namestiti pod <emphasis>Računalniško konfiguracijo (Computer Configuration)</emphasis> in ne pod <emphasis>Uporabniško konfiguracijo (User Configuration)</emphasis>. Razlog je v tem, da potrebujejo nove različice nove knjižnice CRT in MFC DLL, ki se lahko namestijo le <emphasis>za računalnik</emphasis> in ne <emphasis>za uporabnika</emphasis>. Če morate TortoiseGit res namestiti za uporabnika, potem morate najprej namestiti paket MFC in CRT verzije 8 na vsak računalnik, kjer želite namestitev TortoiseGit za uporabnika."

#. (title)
#: ../source/TortoiseGit_en.xml:13613
msgid "Redirect the upgrade check"
msgstr "Preusmerjanje iskanja najnovejše različice"

#. (primary)
#: ../source/TortoiseGit_en.xml:13615
msgid "upgrade check"
msgstr "iskanje najnovejše verzije"

#. (primary)
#: ../source/TortoiseGit_en.xml:13618
msgid "check new version"
msgstr "preveri obstoj nove verzije"

#. (primary)
#: ../source/TortoiseGit_en.xml:13621
msgid "version"
msgstr "verzija"

#. (para)
#: ../source/TortoiseGit_en.xml:13623
msgid "TortoiseGit checks if there's a new version available every few days. If there is a newer version available, a dialog shows up informing the user about that."
msgstr "TortoiseGit vsakih nekaj dni preveri, če obstaja novejša različica aplikacije. Če novejša različica obstaja, se pojavi okno, ki o tem obvesti uporabnika."

#. (title)
#: ../source/TortoiseGit_en.xml:13629
msgid "The upgrade dialog"
msgstr "Okno za nadgradnjo"

#. (para)
#: ../source/TortoiseGit_en.xml:13632
msgid "If you're responsible for a lot of users in your domain, you might want your users to use only versions you have approved and not have them install always the latest version. You probably don't want that upgrade dialog to show up so your users don't go and upgrade immediately."
msgstr "Če ste odgovorni za veliko število uporabnikov v vaši domeni, verjetno želite, da vaši uporabniki uporabljajo le verzije, ki ste jih odobrili, in da si ne namestijo vedno zadnje verzije. Verjetno ne želite, da se pojavi pogovorno okno za nadgradnjo, da ne bi uporabniki sami nadredili nadgradnje."

#. (para)
#: ../source/TortoiseGit_en.xml:13638
msgid ""
"Versions 1.4.0 and later of TortoiseGit allow you to redirect that upgrade check to your intranet server. You can set the registry key <filename>HKCU\\Software\\TortoiseGit\\UpdateCheckURL</filename> (string value) to an URL pointing to a text file in your intranet. That text file must have the following format: <screen>\n"
"1.4.1.6000\n"
"A new version of TortoiseGit is available for you to download!\n"
"http://192.168.2.1/downloads/TortoiseGit-1.4.1.6000-svn-1.4.0.msi\n"
"</screen> The first line in that file is the version string. You must make sure that it matches the exact version string of the TortoiseGit installation package. The second line is a custom text, shown in the upgrade dialog. You can write there whatever you want. Just note that the space in the upgrade dialog is limited. Too long messages will get truncated! The third line is the URL to the new installation package. This URL is opened when the user clicks on the custom message label in the upgrade dialog. You can also just point the user to a web page instead of the MSI file directly. The URL is opened with the default web browser, so if you specify a web page, that page is opened and shown to the user. If you specify the MSI package, the browser will ask the user to save the MSI file locally."
msgstr ""
"TortoiseGit različice 1.4.0 in novejše omogoča, da preusmerite preverjanje na svoj intranetni strežnik. Nastavite ključ v registru <filename>HKCU\\Software\\TortoiseGit\\UpdateCheckURL</filename> (niz) na naslov URL, ki kaže na besedilno datoteko v intranetu. Besedilna datoteka mora imeti naslednjo obliko: <screen>\n"
"1.4.1.6000\n"
"Na voljo je nova različica programa TortoiseGit!\n"
"http://192.168.2.1/downloads/TortoiseGit-1.4.1.6000-svn-1.4.0.msi\n"
"</screen> V prvi vrstici se nahaja različica TortoiseGit. Zagotoviti morate, da ustreza namestitveni datoteki. V drugi vrstici se nahaja besedilo, ki se prikaže v oknu z obvestilom o novi različici. Vpišete lahko karkoli želite, upoštevajte le, da je prostor omejen. V primeru predolgega besedila bo le-to skrajšano. V tretji vrstici se nahaja naslov URL namestitvenega paketa. Ta naslov se odpre, ko uporabnik klikne na sporočilo v pogovornem oknu. Uporabnika lahko pošljete tudi na spletno stran namesto neposredno na namestitveni paket. Naslov se odpre v privzetem brskalniku in če nastavite spletno stran, se bo odprla le-ta in prikazala uporabniku. Če nastavite namestitveni paket MSI, bo brskalnik uporabnika pozval, naj ga shrani na krajevnem disku."

#. (title)
#: ../source/TortoiseGit_en.xml:13663
msgid "Setting the <literal>SVN_ASP_DOT_NET_HACK</literal> environment variable"
msgstr "Nastavljanje okoljske spremenljivke <literal>SVN_ASP_DOT_NET_HACK</literal>"

#. (primary)
#: ../source/TortoiseGit_en.xml:13665
msgid "SVN_ASP_DOT_NET_HACK"
msgstr "SVN_ASP_DOT_NET_HACK"

#. (primary)
#: ../source/TortoiseGit_en.xml:13668
msgid "VS2003"
msgstr "VS2003"

#. (primary)
#: ../source/TortoiseGit_en.xml:13671
msgid "ASP projects"
msgstr "projekti ASP"

#. (para)
#: ../source/TortoiseGit_en.xml:13673
msgid "As of version 1.4.0 and later, the TortoiseGit installer doesn't provide the user with the option to set the <literal>SVN_ASP_DOT_NET_HACK</literal> environment variable anymore, since that caused many problems and confusions with users which always install <emphasis>everything</emphasis> no matter if they know what it is for."
msgstr "Od verzije 1.4.0. naprej namestitveni program TortoiseGit uporabniku ne ponudi več možnosti uporabe okoljske spremenljivke <literal>SVN_ASP_DOT_NET_HACK</literal>. Ta možnost je povzročila mnogo težav in zmed pri uporabnikih, ki vedno namestijo <emphasis>prav vse</emphasis>, ne glede na to, ali vedo, zakaj se določena zmožnost uporablja ali ne."

#. (para)
#: ../source/TortoiseGit_en.xml:13681
msgid ""
"But that option is only hidden for the user. You still can force the TortoiseGit installer to set that environment variable by setting the <literal>ASPDOTNETHACK</literal> property to TRUE. For example, you can start the installer like this: <screen>\n"
"msiexec /i TortoiseGit-1.4.0.msi ASPDOTNETHACK=TRUE\n"
"</screen>"
msgstr ""
"Ta možnost še obstaja, vendar je uporabniku skrita. Še vedno pa lahko prisilite namestitveni program TortoiseGit, da nastavi okoljsko sprememnljivko z nastavitvijo lastnosti <literal>ASPDOTNETHACK</literal> na TRUE. Primer: nasmestitveni program lahko poženete takole: <screen>\n"
"msiexec /i TortoiseGit-1.4.0.msi ASPDOTNETHACK=TRUE\n"
"</screen>"

#. (title)
#: ../source/TortoiseGit_en.xml:13692
msgid "Disable context menu entries"
msgstr "Onemogočanje kontekstnega menija"

#. (primary)
#: ../source/TortoiseGit_en.xml:13694
msgid "context menu entries"
msgstr "elementi kontekstnega menija"

#. (primary)
#: ../source/TortoiseGit_en.xml:13697
msgid "disable functions"
msgstr "onemogoči funkcije"

#. (para)
#: ../source/TortoiseGit_en.xml:13702
msgid "As of version 1.5.0 and later, TortoiseGit allows you to disable (actually, hide) context menu entries. Since this is a feature which should not be used lightly but only if there is a compelling reason, there is no GUI for this and it has to be done directly in the registry. This can be used to disable certain commands for users who should not use them. But please note that only the context menu entries in the <emphasis>explorer</emphasis> are hidden, and the commands are still available through other means, e.g. the command line or even other dialogs in TortoiseGit itself!"
msgstr "Od različice 1.5.0 naprej TortoiseGit ponuja onemogočanje (pravzaprav skrivanje) elementov v kontekstnem meniju. Ker je to zmožnost, ki se uporablja le z dobrim razlogom, uporabniškega vmesnika ni na voljo, zato je treba nastavitve opraviti neposredno v registru. Uporablja se za onemogočanje določenih ukazov, ki naj jih uporabnik ne bi uporabljal. Vendar upoštevajte, da s tem skrijete le elemente v kontekstnem meniju <emphasis>Raziskovalca</emphasis> in da so ukazi še vedno na razpolago na druge načine, n. pr. preko odjemalca za ukazno vrstico ali celo iz drugih pogovornih oken programa TortoiseGit samega!"

#. (para)
#: ../source/TortoiseGit_en.xml:13712
msgid "The registry keys which hold the information on which context menus to show are <filename>HKEY_CURRENT_USER\\Software\\TortoiseGit\\ContextMenuEntriesMaskLow</filename> and <filename>HKEY_CURRENT_USER\\Software\\TortoiseGit\\ContextMenuEntriesMaskHigh</filename>."
msgstr "Ključa registra, ki vsebujejo informacije o elementih kontekstnega menija, ki jih je potrebno prikazati, sta <filename>HKEY_CURRENT_USER\\Software\\TortoiseGit\\ContextMenuEntriesMaskLow</filename> in <filename>HKEY_CURRENT_USER\\Software\\TortoiseGit\\ContextMenuEntriesMaskHigh</filename>."

#. (para)
#: ../source/TortoiseGit_en.xml:13717
msgid "Each of these registry entries is a <literal>DWORD</literal> value, with each bit corresponding to a specific menu entry. A set bit means the corresponding menu entry is deactivated."
msgstr "Vsak izmed teh vnosov v registru je vrednost <literal>DWORD</literal>, pri kateri vsak bit ustreza določenemu elementu v kontekstnem meniju. Nastavljen bit pomeni, da je ta element v meniju onemogočen."

#. (title)
#: ../source/TortoiseGit_en.xml:13724
msgid "Menu entries and their values"
msgstr "Elementi menija in njihove vrednosti"

#. (entry)
#: ../source/TortoiseGit_en.xml:13730
msgid "Value"
msgstr "Vrednost"

#. (entry)
#: ../source/TortoiseGit_en.xml:13731
msgid "Menu entry"
msgstr "Vnos v meniju"

#. (entry)
#. (title)
#. (glossterm)
#: ../source/TortoiseGit_en.xml:13737
#: ../source/TortoiseGit_en.xml:14554
#: ../source/TortoiseGit_en.xml:15578
msgid "Checkout"
msgstr "Prevzemi"

#. (entry)
#. (title)
#. (glossterm)
#: ../source/TortoiseGit_en.xml:13741
#: ../source/TortoiseGit_en.xml:14572
#: ../source/TortoiseGit_en.xml:15884
msgid "Update"
msgstr "Posodobi"

#. (entry)
#. (title)
#. (glossterm)
#: ../source/TortoiseGit_en.xml:13745
#: ../source/TortoiseGit_en.xml:14611
#: ../source/TortoiseGit_en.xml:15604
msgid "Commit"
msgstr "Objavi"

#. (entry)
#. (title)
#. (glossterm)
#: ../source/TortoiseGit_en.xml:13749
#: ../source/TortoiseGit_en.xml:14923
#: ../source/TortoiseGit_en.xml:15521
msgid "Add"
msgstr "Dodaj"

#. (entry)
#. (title)
#. (glossterm)
#: ../source/TortoiseGit_en.xml:13753
#: ../source/TortoiseGit_en.xml:14780
#: ../source/TortoiseGit_en.xml:15817
msgid "Revert"
msgstr "Povrni"

#. (entry)
#. (glossterm)
#: ../source/TortoiseGit_en.xml:13761
#: ../source/TortoiseGit_en.xml:15805
msgid "Resolve"
msgstr "Reši"

#. (entry)
#. (title)
#. (glossterm)
#: ../source/TortoiseGit_en.xml:13773
#: ../source/TortoiseGit_en.xml:14884
#: ../source/TortoiseGit_en.xml:15659
msgid "Export"
msgstr "Izvozi"

#. (entry)
#: ../source/TortoiseGit_en.xml:13777
msgid "Create Repository here"
msgstr "Ustvari skladišče tu"

#. (entry)
#. (title)
#: ../source/TortoiseGit_en.xml:13781
#: ../source/TortoiseGit_en.xml:14836
msgid "Branch/Tag"
msgstr "Veja/Oznaka"

#. (entry)
#. (title)
#. (glossterm)
#: ../source/TortoiseGit_en.xml:13785
#: ../source/TortoiseGit_en.xml:14867
#: ../source/TortoiseGit_en.xml:15731
msgid "Merge"
msgstr "Spoji"

#. (entry)
#. (title)
#. (glossterm)
#: ../source/TortoiseGit_en.xml:13789
#: ../source/TortoiseGit_en.xml:14774
#: ../source/TortoiseGit_en.xml:15638
msgid "Delete"
msgstr "Izbriši"

#. (entry)
#. (title)
#: ../source/TortoiseGit_en.xml:13793
#: ../source/TortoiseGit_en.xml:14768
msgid "Rename"
msgstr "Preimenuj"

#. (entry)
#: ../source/TortoiseGit_en.xml:13797
msgid "Update to revision"
msgstr "Posodobi na revizijo"

#. (entry)
#. (title)
#. (glossterm)
#: ../source/TortoiseGit_en.xml:13801
#: ../source/TortoiseGit_en.xml:14658
#: ../source/TortoiseGit_en.xml:15650
msgid "Diff"
msgstr "Razlikuj"

#. (entry)
#. (title)
#: ../source/TortoiseGit_en.xml:13805
#: ../source/TortoiseGit_en.xml:14679
msgid "Show Log"
msgstr "Pokaži dnevnik"

#. (entry)
#. (title)
#: ../source/TortoiseGit_en.xml:13809
#: ../source/TortoiseGit_en.xml:14754
msgid "Edit Conflicts"
msgstr "Uredi spore"

#. (entry)
#. (title)
#. (glossterm)
#: ../source/TortoiseGit_en.xml:13813
#: ../source/TortoiseGit_en.xml:14909
#: ../source/TortoiseGit_en.xml:15777
msgid "Relocate"
msgstr "Premakni"

#. (entry)
#: ../source/TortoiseGit_en.xml:13817
msgid "Check for modifications"
msgstr "Preveri spremembe"

#. (entry)
#: ../source/TortoiseGit_en.xml:13821
msgid "Ignore"
msgstr "Prezri"

#. (entry)
#: ../source/TortoiseGit_en.xml:13825
msgid "Repository Browser"
msgstr "Brskalnik po skladišču"

#. (entry)
#. (title)
#. (glossterm)
#: ../source/TortoiseGit_en.xml:13829
#: ../source/TortoiseGit_en.xml:14943
#: ../source/TortoiseGit_en.xml:15542
msgid "Blame"
msgstr "Okrivi"

#. (entry)
#. (title)
#: ../source/TortoiseGit_en.xml:13833
#: ../source/TortoiseGit_en.xml:14969
msgid "Create Patch"
msgstr "Ustvari popravek"

#. (entry)
#. (title)
#: ../source/TortoiseGit_en.xml:13837
#: ../source/TortoiseGit_en.xml:14979
msgid "Apply Patch"
msgstr "Namesti popravek"

#. (entry)
#: ../source/TortoiseGit_en.xml:13841
msgid "Revision graph"
msgstr "Revision graph"

#. (entry)
#. (glossterm)
#: ../source/TortoiseGit_en.xml:13845
#: ../source/TortoiseGit_en.xml:15703
msgid "Lock"
msgstr "Zaklep"

#. (entry)
#: ../source/TortoiseGit_en.xml:13849
msgid "Remove Lock"
msgstr "Odstrani zaklep"

#. (entry)
#: ../source/TortoiseGit_en.xml:13853
msgid "Properties"
msgstr "Lastnosti"

#. (entry)
#: ../source/TortoiseGit_en.xml:13857
msgid "Diff with URL"
msgstr "Razlikuj z URL"

#. (entry)
#: ../source/TortoiseGit_en.xml:13861
msgid "Delete unversioned items"
msgstr "Izbriši datoteke brez različic"

#. (entry)
#: ../source/TortoiseGit_en.xml:13865
msgid "Settings"
msgstr "Nastavitve"

#. (entry)
#: ../source/TortoiseGit_en.xml:13869
msgid "Help"
msgstr "Pomoč"

#. (entry)
#: ../source/TortoiseGit_en.xml:13873
msgid "About"
msgstr "O programu"

#. (para)
#: ../source/TortoiseGit_en.xml:13879
msgid ""
"Example: to disable the <quote>Relocate</quote> the <quote>Delete unversioned items</quote> and the <quote>Settings</quote> menu entries, add the values assigned to the entries like this: <screen>\n"
"  0x0000000000080000\n"
"+ 0x0000000080000000\n"
"+ 0x2000000000000000\n"
"= 0x2000000080080000\n"
"</screen> The lower <literal>DWORD</literal> value (<literal>0x80080000</literal>) must then be stored in <filename>HKEY_CURRENT_USER\\Software\\TortoiseGit\\ContextMenuEntriesMaskLow</filename>, the higher <literal>DWORD</literal> value (<literal>0x20000000</literal>) in <filename>HKEY_CURRENT_USER\\Software\\TortoiseGit\\ContextMenuEntriesMaskHigh</filename>."
msgstr ""
"Primer: če želite onemogočiti elemente menija <quote>Premesti</quote>, <quote>Izbriši elemente brez različic</quote> in <quote>Nastavitve</quote>, seštejte vrednosti, dodeljene elementom: <screen>\n"
"  0x0000000000080000\n"
"+ 0x0000000080000000\n"
"+ 0x2000000000000000\n"
"= 0x2000000080080000\n"
"</screen> Spodnjo vrednost <literal>DWORD</literal> (<literal>0x80080000</literal>) je potrebno shraniti v <filename>HKEY_CURRENT_USER\\Software\\TortoiseGit\\ContextMenuEntriesMaskLow</filename>, zgornjo vrednost <literal>DWORD</literal> (<literal>0x20000000</literal>) pa v <filename>HKEY_CURRENT_USER\\Software\\TortoiseGit\\ContextMenuEntriesMaskHigh</filename>."

#. (para)
#: ../source/TortoiseGit_en.xml:13896
msgid "To enable the menu entries again, simply delete the two registry keys."
msgstr "Za ponoven prikaz teh elementov izbrišite zgornja vnosa v registru."

#. (title)
#: ../source/TortoiseGit_en.xml:13902
msgid "Automating TortoiseGit"
msgstr "Avtomatizacija TortoiseGit"

#. (para)
#: ../source/TortoiseGit_en.xml:13904
msgid "Since all commands for TortoiseGit are controlled through command line parameters, you can automate it with batch scripts or start specific commands and dialogs from other programs (e.g. your favourite text editor)."
msgstr "Ker je vse ukaze TortoiseGit možno krmiliti preko parameterov ukazne vrstice, lahko za avtomatizacijo uporabite paketno datoteko ali pa ukaze in pogovorna okna poganjate z določeni parameteri znotraj drugih programov (n. pr. iz vašega priljubljenega urejevalnika besedil)."

#. (para)
#: ../source/TortoiseGit_en.xml:13910
msgid "Remember that TortoiseGit is a GUI client, and this automation guide shows you how to make the TortoiseGit dialogs appear to collect user input. If you want to write a script which requires no input, you should use the official Git command line client instead."
msgstr "Upoštevajte, da je TortoiseGit odjemalec z grafičnim uporabniškim vmesnikom, to poglavje pa vam pove, kako lahko prikažete okna programa TortoiseGit, tako da od uporabnika pridobite informacije. Če želite napisati ukazno datoteko, ki ne potrebuje vnosa s strani uporabnika, namesto TortoiseGit uporabite uradni odjemalec Git za ukazno vrstico."

#. (title)
#. (title)
#: ../source/TortoiseGit_en.xml:13922
#: ../source/TortoiseGit_en.xml:14552
msgid "TortoiseGit Commands"
msgstr "Ukazi TortoiseGit"

#. (primary)
#. (primary)
#: ../source/TortoiseGit_en.xml:13924
#: ../source/TortoiseGit_en.xml:14397
msgid "automation"
msgstr "avtomatizacija"

#. (primary)
#. (primary)
#: ../source/TortoiseGit_en.xml:13927
#: ../source/TortoiseGit_en.xml:14400
msgid "command line"
msgstr "ukazna vrstica"

#. (para)
#: ../source/TortoiseGit_en.xml:13929
msgid "The TortoiseGit GUI program is called <literal>TortoiseProc.exe</literal>. All commands are specified with the parameter <option>/command:abcd</option> where <literal>abcd</literal> is the required command name. Most of these commands need at least one path argument, which is given with <option>/path:\"some\\path\"</option>. In the following table the command refers to the <option>/command:abcd</option> parameter and the path refers to the <option>/path:\"some\\path\"</option> parameter."
msgstr "Program TortoiseGit se imenuje <literal>TortoiseProc.exe</literal>. Vse ukaze kličemo s parametrom <option>/command:abcd</option>, kjer je <literal>abcd</literal> ime zahtevanega ukaza. Večina ukazov potrebuje vsaj eno pot kot parameter, ki ga podamo z <option>/path:\"neka\\pot\"</option>. V spodnji tabeli ukaz ustreza <option>/command:abcd</option>, pot pa parametru <option>/path:\"neka\\pot\"</option>."

#. (para)
#: ../source/TortoiseGit_en.xml:13938
msgid "Since some of the commands can take a list of target paths (e.g. committing several specific files) the <option>/path</option> parameter can take several paths, separated by a <literal>*</literal> character."
msgstr "Ker nekateri ukazi sprejmejo seznam ciljnih poti (n. pr. ko objavljate več datotek), lahko podamo parametru <option>/path</option> več poti, ki jih ločimo z znakom <literal>*</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:13943
msgid "TortoiseGit uses temporary files to pass multiple arguments between the shell extension and the main program. From TortoiseGit 1.5.0 on and later, <option>/notempfile</option> parameter is obsolete and there is no need to add it anymore."
msgstr "TortoiseGit za pošiljanje več parametrov med lupino in glavnim programom uporablja začasne datoteke. Od verzije 1.5.0 naprej je parameter <option>/notempfile</option> zastarel in ga ni potrebno več podajati."

#. (para)
#: ../source/TortoiseGit_en.xml:13949
msgid "The progress dialog which is used for commits, updates and many more commands usually stays open after the command has finished until the user presses the <guibutton>OK</guibutton> button. This can be changed by checking the corresponding option in the settings dialog. But using that setting will close the progress dialog, no matter if you start the command from your batch file or from the TortoiseGit context menu."
msgstr "Pogovorno okno, ki se uporablja pri objavah, posodobitvah in ostalih ukazih  običajno ostane odprto dokler ne pritisnemo na gumb <guibutton>V redu</guibutton>. To obnašanje lahko spremenimo z nastavitvami aplikacije. Vendar se bo pogovorno okno zaprlo v vsakem primeru - če ga pokličete iz paketne datoteke ali iz kontekstnega menija."

#. (para)
#: ../source/TortoiseGit_en.xml:13957
msgid "To specify a different location of the configuration file, use the parameter <option>/configdir:\"path\\to\\config\\directory\"</option>. This will override the default path, including any registry setting."
msgstr "Za nastavitev druge lokacije konfiguracijske datoteke uporabite parameter <option>/configdir:\"pot\\do\\konfiguracijske\\mape\"</option>. S tem preprišete privzete vrednosti, vključno z zapisi v registru."

#. (para)
#: ../source/TortoiseGit_en.xml:13968
msgid "<option>/closeonend:0</option> don't close the dialog automatically"
msgstr "<option>/closeonend:0</option> okna ne zapri samodejno"

#. (para)
#: ../source/TortoiseGit_en.xml:13973
msgid "<option>/closeonend:1</option> auto close if no errors"
msgstr "<option>/closeonend:1</option> samodejno zapri, če ni napak"

#. (para)
#: ../source/TortoiseGit_en.xml:13978
msgid "<option>/closeonend:2</option> auto close if no errors and conflicts"
msgstr "<option>/closeonend:2</option> samodejno zapri, če ni napak in sporov"

#. (para)
#: ../source/TortoiseGit_en.xml:13983
msgid "<option>/closeonend:3</option> auto close if no errors, conflicts and merges"
msgstr "<option>/closeonend:3</option> samodejno zapri, če ni napak, sporov ali spajanj"

#. (para)
#: ../source/TortoiseGit_en.xml:13988
msgid "<option>/closeonend:4</option> auto close if no errors, conflicts and merges for local operations"
msgstr "<option>/closeonend:4</option> samodejno zapri, če ni pri krajevnih operacijah ni napak, sporov ali spajanj"

#. (para)
#: ../source/TortoiseGit_en.xml:13962
msgid "To close the progress dialog at the end of a command automatically without using the permanent setting you can pass the <option>/closeonend</option> parameter. <placeholder-1/>"
msgstr "Pogovorno okno po zaključku izvedbe ukaza zaprete z uporabo parametra <option>/closeonend</option>. Na ta način ne izgubite stalne nastavitve. <placeholder-1/>"

#. (para)
#: ../source/TortoiseGit_en.xml:13995
msgid "The table below lists all the commands which can be accessed using the TortoiseProc.exe command line. As described above, these should be used in the form <literal>/command:abcd</literal>. In the table, the <literal>/command</literal> prefix is omitted to save space."
msgstr "Spodnja tabela prikazuje vse ukaze, do katerih lahko dostopate preko programa TortoiseProc.exe.  Ko smo že omenili zgoraj, uporabljamo obliko <literal>/command:abcd</literal>. V tabeli smo zaradi varčevanja s prostorom opustili predpono <literal>/command</literal>."

#. (title)
#: ../source/TortoiseGit_en.xml:14014
msgid "List of available commands and options"
msgstr "Seznam ukazov in možnosti"

#. (entry)
#: ../source/TortoiseGit_en.xml:14020
msgid "Command"
msgstr "Ukaz"

#. (entry)
#: ../source/TortoiseGit_en.xml:14027
msgid "Shows the about dialog. This is also shown if no command is given."
msgstr "Pokaže pogovorno okno \"O programu\". Prikaže se tudi, če ne podamo pokaza."

#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#. (option)
#: ../source/TortoiseGit_en.xml:14035
#: ../source/TortoiseGit_en.xml:14046
#: ../source/TortoiseGit_en.xml:14054
#: ../source/TortoiseGit_en.xml:14061
#: ../source/TortoiseGit_en.xml:14073
#: ../source/TortoiseGit_en.xml:14090
#: ../source/TortoiseGit_en.xml:14098
#: ../source/TortoiseGit_en.xml:14106
#: ../source/TortoiseGit_en.xml:14113
#: ../source/TortoiseGit_en.xml:14122
#: ../source/TortoiseGit_en.xml:14128
#: ../source/TortoiseGit_en.xml:14135
#: ../source/TortoiseGit_en.xml:14136
#: ../source/TortoiseGit_en.xml:14138
#: ../source/TortoiseGit_en.xml:14144
#: ../source/TortoiseGit_en.xml:14160
#: ../source/TortoiseGit_en.xml:14168
#: ../source/TortoiseGit_en.xml:14189
#: ../source/TortoiseGit_en.xml:14196
#: ../source/TortoiseGit_en.xml:14206
#: ../source/TortoiseGit_en.xml:14212
#: ../source/TortoiseGit_en.xml:14245
#: ../source/TortoiseGit_en.xml:14251
#: ../source/TortoiseGit_en.xml:14264
#: ../source/TortoiseGit_en.xml:14273
#: ../source/TortoiseGit_en.xml:14279
#: ../source/TortoiseGit_en.xml:14287
#: ../source/TortoiseGit_en.xml:14322
#: ../source/TortoiseGit_en.xml:14332
#: ../source/TortoiseGit_en.xml:14339
#: ../source/TortoiseGit_en.xml:14346
#: ../source/TortoiseGit_en.xml:14355
#: ../source/TortoiseGit_en.xml:14372
msgid "/path"
msgstr "/path"

#. (option)
#. (option)
#: ../source/TortoiseGit_en.xml:14038
#: ../source/TortoiseGit_en.xml:14214
msgid "/startrev:xxx"
msgstr "/startrev:xxx"

#. (option)
#. (option)
#: ../source/TortoiseGit_en.xml:14039
#: ../source/TortoiseGit_en.xml:14215
msgid "/endrev:xxx"
msgstr "/endrev:xxx"

#. (option)
#: ../source/TortoiseGit_en.xml:14040
msgid "/strict"
msgstr "/strict"

#. (entry)
#: ../source/TortoiseGit_en.xml:14034
msgid "Opens the log dialog. The <placeholder-1/> specifies the file or folder for which the log should be shown. Three additional options can be set: <placeholder-2/>, <placeholder-3/> and <placeholder-4/>"
msgstr "Odpre dnevnik. <placeholder-1/> določa datoteko ali mapo, za katero želite prikazati dnevnik. Nastavite lahko tri dodatne možnosti: <placeholder-2/>, <placeholder-3/> in <placeholder-4/>"

#. (option)
#. (option)
#: ../source/TortoiseGit_en.xml:14047
#: ../source/TortoiseGit_en.xml:14170
msgid "/url"
msgstr "/url"

#. (entry)
#: ../source/TortoiseGit_en.xml:14045
msgid "Opens the checkout dialog. The <placeholder-1/> specifies the target directory and the <placeholder-2/> specifies the URL to checkout from."
msgstr "Odpre okno za prevzem. <placeholder-1/> določa ciljno mapo, <placeholder-2/> pa naslov, s katerega želite prevzeti vsebino."

#. (entry)
#: ../source/TortoiseGit_en.xml:14053
msgid "Opens the import dialog. The <placeholder-1/> specifies the directory with the data to import."
msgstr "Odpre okno za uvoz. <placeholder-1/> določa mapo s podatki, ki jih želite uvoziti."

#. (option)
#: ../source/TortoiseGit_en.xml:14062
msgid "/rev"
msgstr "/rev"

#. (option)
#: ../source/TortoiseGit_en.xml:14065
msgid "/rev:1234"
msgstr "/rev:1234"

#. (option)
#: ../source/TortoiseGit_en.xml:14066
msgid "/nonrecursive"
msgstr "/nonrecursive"

#. (option)
#: ../source/TortoiseGit_en.xml:14067
msgid "/ignoreexternals"
msgstr "/ignoreexternals"

#. (entry)
#: ../source/TortoiseGit_en.xml:14060
msgid "Updates the working copy in <placeholder-1/> to HEAD. If the option <placeholder-2/> is given then a dialog is shown to ask the user to which revision the update should go. To avoid the dialog specify a revision number <placeholder-3/>. Other options are <placeholder-4/> and <placeholder-5/>."
msgstr "Posodobi delovno kopijo v <placeholder-1/> na revizijo HEAD. Če je podana možnost <placeholder-2/>, se prikaže pogovorno okno, ki uporabniku ponudi vnos določene revizije, na katero naj se delovna kopija posodobi. Če se oknu želite izogniti, podajte določeno revizijo kot <placeholder-3/>. Ostali možnosti sta <placeholder-4/> in <placeholder-5/>."

#. (option)
#. (option)
#: ../source/TortoiseGit_en.xml:14075
#: ../source/TortoiseGit_en.xml:14172
msgid "/logmsg"
msgstr "/logmsg"

#. (option)
#. (option)
#: ../source/TortoiseGit_en.xml:14078
#: ../source/TortoiseGit_en.xml:14175
msgid "/logmsgfile:path"
msgstr "/logmsgfile:pot"

#. (option)
#. (option)
#: ../source/TortoiseGit_en.xml:14079
#: ../source/TortoiseGit_en.xml:14176
msgid "path"
msgstr "pot"

#. (option)
#: ../source/TortoiseGit_en.xml:14083
msgid "/bugid:\"the bug id here\""
msgstr "/bugid:\"številka hrošča\""

#. (entry)
#: ../source/TortoiseGit_en.xml:14072
msgid "Opens the commit dialog. The <placeholder-1/> specifies the target directory or the list of files to commit. You can also specify the <placeholder-2/> switch to pass a predefined log message to the commit dialog. Or, if you don't want to pass the log message on the command line, use <placeholder-3/>, where <placeholder-4/> points to a file containing the log message. To pre-fill the bug ID box (in case you've set up integration with bug trackers properly), you can use the <placeholder-5/> to do that."
msgstr "Odpre pogovorno okno za objave. <placeholder-1/> določa ciljno mapo ali seznam datotek za objavo. Določite lahko tudi stikalo <placeholder-2/>, s katerim določite sporočilo dnevniškega zapisa. Če pa ne želite podati sporočila v ukazni vrstici, uporabite <placeholder-3/>, kjer <placeholder-4/> kaže na datoteko, ki vsebuje sporočilo zapisa. Za izpolnitev polja ID hrošča (če ste pravilno nastavili integracijo s sledilnikom zadev) lahko uporabite <placeholder-5/>."

#. (entry)
#: ../source/TortoiseGit_en.xml:14089
msgid "Adds the files in <placeholder-1/> to version control."
msgstr "Doda datoteke v <placeholder-1/> v sistem verzioniranja."

#. (entry)
#: ../source/TortoiseGit_en.xml:14096
msgid "Reverts local modifications of a working copy. The <placeholder-1/> tells which items to revert."
msgstr "Povrne krajevne spremembe v delovni kopiji. <placeholder-1/> pove, katere elemente je potrebno povrniti."

#. (entry)
#: ../source/TortoiseGit_en.xml:14104
msgid "Cleans up interrupted or aborted operations and unlocks the working copy in <placeholder-1/>."
msgstr "Počisti preklicane ali prekinjene operacije in odklene delovno kopijo v <placeholder-1/>."

#. (option)
#. (option)
#. (option)
#: ../source/TortoiseGit_en.xml:14114
#: ../source/TortoiseGit_en.xml:14199
#: ../source/TortoiseGit_en.xml:14365
msgid "/noquestion"
msgstr "/noquestion"

#. (entry)
#: ../source/TortoiseGit_en.xml:14111
msgid "Marks a conflicted file specified in <placeholder-1/> as resolved. If <placeholder-2/> is given, then resolving is done without asking the user first if it really should be done."
msgstr "Označi sporno datoteko, podano v <placeholder-1/>, kot rešeno. Če je podana možnost <placeholder-2/>, se označevanje izvede brez uporanikove potrditve."

#. (entry)
#: ../source/TortoiseGit_en.xml:14121
msgid "Creates a repository in <placeholder-1/>"
msgstr "V <placeholder-1/> ustvari skladišče"

#. (entry)
#: ../source/TortoiseGit_en.xml:14127
msgid "Opens the switch dialog. The <placeholder-1/> specifies the target directory."
msgstr "Odpre okno za preklop. <placeholder-1/> določa ciljno mapo."

#. (entry)
#: ../source/TortoiseGit_en.xml:14134
msgid "Exports the working copy in <placeholder-1/> to another directory. If the <placeholder-2/> points to an unversioned directory, a dialog will ask for an URL to export to the directory in <placeholder-3/>."
msgstr "Izvozi delovno kopijo v <placeholder-1/> v drugo mapo. Če <placeholder-2/> kaže na mapo brez različic, se pojavi pogovorno okno, ki uporabnika vpraša po naslovu, ki naj se izvozi v <placeholder-3/>."

#. (option)
#. (option)
#: ../source/TortoiseGit_en.xml:14147
#: ../source/TortoiseGit_en.xml:14150
msgid "/fromurl:URL"
msgstr "/fromurl:URL"

#. (option)
#: ../source/TortoiseGit_en.xml:14148
msgid "/revrange:string"
msgstr "/revrange:string"

#. (option)
#: ../source/TortoiseGit_en.xml:14151
msgid "/tourl:URL"
msgstr "/tourl:URL"

#. (option)
#: ../source/TortoiseGit_en.xml:14152
msgid "/fromrev:xxx"
msgstr "/fromrev:xxx"

#. (option)
#: ../source/TortoiseGit_en.xml:14153
msgid "/torev:xxx"
msgstr "/torev:xxx"

#. (entry)
#: ../source/TortoiseGit_en.xml:14143
msgid "Opens the merge dialog. The <placeholder-1/> specifies the target directory. For merging a revision range, the following options are available: <placeholder-2/>, <placeholder-3/>. For merging two repository trees, the following options are available: <placeholder-4/>, <placeholder-5/>, <placeholder-6/> and <placeholder-7/>. These pre-fill the relevant fields in the merge dialog."
msgstr "Odpre okno za spajanje. <placeholder-1/> določa ciljno mapo. Za spajanje območja revizij so na voljo naslednje možnosti: <placeholder-2/>, <placeholder-3/>. Za spajanje dveh dreves skladišča so na voljo naslednje možnosti: <placeholder-4/>, <placeholder-5/>, <placeholder-6/> and <placeholder-7/>. S tem se nastavijo ustrezns polja v konu za spajanje."

#. (entry)
#: ../source/TortoiseGit_en.xml:14159
msgid "Opens the merge all dialog. The <placeholder-1/> specifies the target directory."
msgstr "Odpre okno za spajanje. <placeholder-1/> določa ciljno mapo."

#. (entry)
#: ../source/TortoiseGit_en.xml:14166
msgid "Brings up the branch/tag dialog. The <placeholder-1/> is the working copy to branch/tag from. And the <placeholder-2/> is the target URL. You can also specify the <placeholder-3/> switch to pass a predefined log message to the branch/tag dialog. Or, if you don't want to pass the log message on the command line, use <placeholder-4/>, where <placeholder-5/> points to a file containing the log message."
msgstr "Prikaže okno za ustvarjanje vej/oznak. <placeholder-1/> je delovna kopija, iz katere želite ustvariti vejo/oznako. <placeholder-2/> je ciljni naslov URL. Nastavite pa lahko tudi stikalo <placeholder-3/>, s katerim določite sporočilo dnevniškega zapisa. Če pa sporočila dnevniškega zapisa ne želite podati v kazni vrstici, uporabite  <placeholder-4/>, kjer <placeholder-5/> kaže na datoteko s sporočilom dnevniškega zapisa."

#. (entry)
#: ../source/TortoiseGit_en.xml:14182
msgid "Opens the settings dialog."
msgstr "Odpre okno za nastavitve"

#. (entry)
#: ../source/TortoiseGit_en.xml:14188
msgid "Removes the file(s) in <placeholder-1/> from version control."
msgstr "Odstrani datoteke v <placeholder-1/> iz sistema Git."

#. (entry)
#: ../source/TortoiseGit_en.xml:14195
msgid "Renames the file in <placeholder-1/>. The new name for the file is asked with a dialog. To avoid the question about renaming similar files in one step, pass <placeholder-2/>."
msgstr "Preimenuje datoteko v <placeholder-1/>. Novo ime vpišete v pogovornem oknu. Če se želite izgoniti vprašanju o preimenovanju podobnih datotek v enem koraku, podajte <placeholder-2/>."

#. (option)
#. (option)
#. (option)
#: ../source/TortoiseGit_en.xml:14208
#: ../source/TortoiseGit_en.xml:14210
#: ../source/TortoiseGit_en.xml:14216
msgid "/path2"
msgstr "/path2"

#. (option)
#: ../source/TortoiseGit_en.xml:14216
msgid "/blame"
msgstr "/blame"

#. (entry)
#: ../source/TortoiseGit_en.xml:14204
msgid "Starts the external diff program specified in the TortoiseGit settings. The <placeholder-1/> specifies the first file. If the option <placeholder-2/> is set, then the diff program is started with those two files. If <placeholder-3/> is omitted, then the diff is done between the file in <placeholder-4/> and its BASE. To explicitly set the revision numbers use <placeholder-5/> and <placeholder-6/>. If <placeholder-7/> is set and <placeholder-8/> is not set, then the diff is done by first blaming the files with the given revisions."
msgstr "Požene zunanje orodje za razlikovanje, ki je navedeno v nastavitvah TortoiseGit. <placeholder-1/> določa prvo datoteko. Če je možnost  <placeholder-2/> nastavljena, se program zažene z navedenima datotekama. Če je možnost <placeholder-3/> izpuščena, potem se razlikovanje opravi med datoteko <placeholder-4/> in njeno osnovo (BASE). Za določitev številk revizij uporabite <placeholder-5/> in <placeholder-6/>. Če je nastavljena možnost <placeholder-7/> in možnost <placeholder-8/> ni nastavljena, potem se razlikovanje naredi tako, da se naprej okrivi obe datoteki glede na podani reviziji."

#. (para)
#: ../source/TortoiseGit_en.xml:14224
msgid "Depending on the URLs and revisions to compare, this either shows a unified diff (if the option <option>unified</option> is set), a dialog with a list of files that have changed or if the URLs point to files starts the diff viewer for those two files."
msgstr "Odvisno od naslovov URL in revizij, ki jih želite primerjati, se prikaže poenotena razlika (če je nastavljena možnost <option>unified</option>), seznam spremenjenih datotek ali (v primeru, da naslov URL kaže na datoteko) pregledovalnik sprememb za ti dve datoteki."

#. (para)
#: ../source/TortoiseGit_en.xml:14231
msgid "The options <option>url1</option>, <option>url2</option>, <option>revision1</option> and <option>revision2</option> must be specified. The options <option>pegrevision</option>, <option>ignoreancestry</option>, <option>blame</option> and <option>unified</option> are optional."
msgstr "Možnosti <option>url1</option>, <option>url2</option>, <option>revision1</option> in <option>revision2</option> so obvezne, možnosti <option>pegrevision</option>, <option>ignoreancestry</option>, <option>blame</option> in <option>unified</option> pa opcijske."

#. (entry)
#: ../source/TortoiseGit_en.xml:14242
msgid "Starts the conflict editor specified in the TortoiseGit settings with the correct files for the conflicted file in <placeholder-1/>."
msgstr "Zažene urejevalnik sporov, ki je naveden v nastavitvah TortoiseGit, s pravilnimi datotekami za sporno datoteko <placeholder-1/>."

#. (entry)
#: ../source/TortoiseGit_en.xml:14250
msgid "Opens the relocate dialog. The <placeholder-1/> specifies the working copy path to relocate."
msgstr "Odpre pogovorno okno za premestitev. <placeholder-1/> določa pot delovne kopije za premestitev."

#. (entry)
#: ../source/TortoiseGit_en.xml:14257
msgid "Opens the help file."
msgstr "Odpre datoteko pomoči."

#. (entry)
#: ../source/TortoiseGit_en.xml:14263
msgid "Opens the check-for-modifications dialog. The <placeholder-1/> specifies the working copy directory."
msgstr "Odpre pogovorno okno za preverjanje sprememb. <placeholder-1/> določa mapo delovne kopije."

#. (option)
#. (option)
#: ../source/TortoiseGit_en.xml:14275
#: ../source/TortoiseGit_en.xml:14277
msgid "/rev:xxx"
msgstr "/rev:xxx"

#. (option)
#: ../source/TortoiseGit_en.xml:14280
msgid "/projectpropertiespath:path/to/wc"
msgstr "/projectpropertiespath:pot/do/delovne/kopije"

#. (entry)
#: ../source/TortoiseGit_en.xml:14270
msgid "Starts the repository browser dialog, pointing to the URL of the working copy given in <placeholder-1/> or <placeholder-2/> points directly to an URL. An additional option <placeholder-3/> can be used to specify the revision which the repository browser should show. If the <placeholder-4/> is omitted, it defaults to HEAD. If <placeholder-5/> points to an URL, the <placeholder-6/> specifies the path from where to read and use the project properties."
msgstr "Zažene skladiščni brskalnik, ki kaže na naslov URL delovne kopije, podane v <placeholder-1/> ali <placeholder-2/> kaže neposredno na naslov URL. Dodatna možnost <placeholder-3/> omogoča nastavitev revizije, ki naj jo skladiščni brskalnik prikaže. Če možnost <placeholder-4/> ni uporabljena, je privzeta nastavitev HEAD. Če <placeholder-5/> kaže na naslov URL, <placeholder-6/> določa pot, iz katere preberemo in uporabimo projektne lastnosti."

#. (literal)
#: ../source/TortoiseGit_en.xml:14288
msgid "svn:ignore"
msgstr "svn:ignore"

#. (entry)
#: ../source/TortoiseGit_en.xml:14286
msgid "Adds all targets in <placeholder-1/> to the ignore list, i.e. adds the <placeholder-2/> property to those files."
msgstr "Doda vse cilje v <placeholder-1/> na seznam prezrtih elementov, to pomeni, da datotekam doda lastnost <placeholder-2/>."

#. (para)
#: ../source/TortoiseGit_en.xml:14295
msgid "Opens the blame dialog for the file specified in <option>/path</option>."
msgstr "Odpre pogovorno okno Okrivi za datoteko, podano z opcijo <option>/path</option>."

#. (para)
#: ../source/TortoiseGit_en.xml:14299
msgid "If the options <option>/startrev</option> and <option>/endrev</option> are set, then the dialog asking for the blame range is not shown but the revision values of those options are used instead."
msgstr "Če sta nastavljevni možnosti <option>/startrev</option> in <option>/endrev</option>, se ne pojavi pogovorno okno za vnos območja revizij, ampak se uporabita navedeni vrednosti."

#. (para)
#: ../source/TortoiseGit_en.xml:14306
msgid "If the option <option>/line:nnn</option> is set, TortoiseBlame will open with the specified line number showing."
msgstr "Če je nastavljena opcija <option>/line:nnn</option>, se ob zagonu TortoiseBlame prikaže navedena vrstica."

#. (para)
#: ../source/TortoiseGit_en.xml:14311
msgid "The options <option>/ignoreeol</option>, <option>/ignorespaces</option> and <option>/ignoreallspaces</option> are also supported."
msgstr "Podprte so tudi možnosti <option>/ignoreeol</option>, <option>/ignorespaces</option> in <option>/ignoreallspaces</option>."

#. (option)
#: ../source/TortoiseGit_en.xml:14323
msgid "/savepath:path"
msgstr "/savepath:pot"

#. (option)
#: ../source/TortoiseGit_en.xml:14324
msgid "/revision:xxx"
msgstr "/revision:xxx"

#. (entry)
#: ../source/TortoiseGit_en.xml:14320
msgid "Saves a file from an URL or working copy path given in <placeholder-1/> to the location given in <placeholder-2/>. The revision is given in <placeholder-3/>. This can be used to get a file with a specific revision."
msgstr "Shrani datoteko z naslova URL ali delovne kopije, navedene v <placeholder-1/>, na lokacijo <placeholder-2/>. <placeholder-3/> predstavlja številko revizije. S tem lahko prevzamemo datoteko v določeni reviziji."

#. (entry)
#: ../source/TortoiseGit_en.xml:14330
msgid "Creates a patch file for the path given in <placeholder-1/>."
msgstr "Ustvari popravek za pot <placeholder-1/>."

#. (entry)
#: ../source/TortoiseGit_en.xml:14337
msgid "Shows the revision graph for the path given in <placeholder-1/>."
msgstr "Prikaže graf revizij za pot, podano v <placeholder-1/>."

#. (entry)
#: ../source/TortoiseGit_en.xml:14344
msgid "Locks a file or all files in a directory given in <placeholder-1/>. The 'lock' dialog is shown so the user can enter a comment for the lock."
msgstr "Zaklene datoteko ali vse datoteke v mapi, podani v <placeholder-1/>. Pogovorno okno za zaklepanje se pojavi, da lahko uporabnik vnese sporočilo zaklepanja."

#. (entry)
#: ../source/TortoiseGit_en.xml:14353
msgid "Unlocks a file or all files in a directory given in <placeholder-1/>."
msgstr "Odklene datoteko ali vse datoteke v mapi, podani v <placeholder-1/>."

#. (entry)
#: ../source/TortoiseGit_en.xml:14360
msgid "Rebuilds the windows icon cache. Only use this in case the windows icons are corrupted. A side effect of this (which can't be avoided) is that the icons on the desktop get rearranged. To suppress the message box, pass <placeholder-1/>."
msgstr "Ponovno zgradi predpomnilnik ikon sistema. Ta ukaz uporabite le v primeru, če se ikone na nek način poškodujejo. Neizogiben stranski učinek tega postopka je, da se ikone na namizju prerazporedijo po svoje. Če sporočila ne želite videti, podajte <placeholder-1/>."

#. (entry)
#: ../source/TortoiseGit_en.xml:14370
msgid "Shows the properties dialog for the path given in <placeholder-1/>."
msgstr "Za pot, podano v <placeholder-1/>, prikaže okno z lastnostmi."

#. (para)
#: ../source/TortoiseGit_en.xml:14379
msgid ""
"Examples (which should be entered on one line): <screen>\n"
"TortoiseProc.exe /command:commit\n"
"                 /path:\"c:\\svn_wc\\file1.txt*c:\\svn_wc\\file2.txt\"\n"
"                 /logmsg:\"test log message\" /closeonend:0\n"
"\n"
"TortoiseProc.exe /command:update /path:\"c:\\svn_wc\\\" /closeonend:0\n"
"\n"
"TortoiseProc.exe /command:log /path:\"c:\\svn_wc\\file1.txt\"\n"
"                 /startrev:50 /endrev:60 /closeonend:0\n"
"</screen>"
msgstr ""
"Primeri (vpisati jih je potrebno v eno vrstico): <screen>\n"
"TortoiseProc.exe /command:commit\n"
"                 /path:\"c:\\svn_wc\\file1.txt*c:\\svn_wc\\file2.txt\"\n"
"                 /logmsg:\"sporočilo\" /closeonend:0\n"
"\n"
"TortoiseProc.exe /command:update /path:\"c:\\svn_wc\\\" /closeonend:0\n"
"\n"
"TortoiseProc.exe /command:log /path:\"c:\\svn_wc\\file1.txt\"\n"
"                 /startrev:50 /endrev:60 /closeonend:0\n"
"</screen>"

#. (title)
#: ../source/TortoiseGit_en.xml:14395
msgid "TortoiseIDiff Commands"
msgstr "Ukazi TortoiseIDiff"

#. (para)
#: ../source/TortoiseGit_en.xml:14402
msgid "The image diff tool has a few command line options which you can use to control how the tool is started. The program is called <literal>TortoiseIDiff.exe</literal>."
msgstr "Orodje za razlikovanje slik omogoča nekaj možnosti ukazne vrstice, s katerimi lahko določite, kako se orodje zažene. Program se imenuje <literal>TortoiseIDiff.exe</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:14407
msgid "The table below lists all the options which can be passed to the image diff tool on the command line."
msgstr "Spodnja tabela vsebuje seznam vseh možnosti, ki jih lahko v ukazni vrstici podate orodju za razlikovanje slik."

#. (title)
#: ../source/TortoiseGit_en.xml:14423
msgid "List of available options"
msgstr "Seznam možnosti"

#. (entry)
#: ../source/TortoiseGit_en.xml:14429
msgid "Option"
msgstr "Možnost"

#. (entry)
#: ../source/TortoiseGit_en.xml:14436
msgid "Path to the file shown on the left."
msgstr "Pot do datoteke, prikazane na levi."

#. (entry)
#. (entry)
#: ../source/TortoiseGit_en.xml:14442
#: ../source/TortoiseGit_en.xml:14455
msgid "A title string. This string is used in the image view title instead of the full path to the image file."
msgstr "Naslov. Uporablja se pri prikazu slike namesto polne poti datoteke."

#. (entry)
#: ../source/TortoiseGit_en.xml:14449
msgid "Path to the file shown on the right."
msgstr "Pot do datoteke, prikazane na desni."

#. (entry)
#: ../source/TortoiseGit_en.xml:14462
msgid "If specified, the image diff tool switches to the overlay mode (alpha blend)."
msgstr "Če je parameter podan, orodje za razlikovanje slik uporablja prekrivni način (alpha blend)."

#. (entry)
#: ../source/TortoiseGit_en.xml:14469
msgid "If specified, the image diff tool fits both images together."
msgstr "Če je parameter podan, orodje za razlikovanje slik stlači sliki v okno."

#. (entry)
#: ../source/TortoiseGit_en.xml:14476
msgid "Shows the image info box."
msgstr "Pokaže okno z informacijami o sliki."

#. (para)
#: ../source/TortoiseGit_en.xml:14484
msgid ""
"Example (which should be entered on one line): <screen>\n"
"TortoiseIDiff.exe /left:\"c:\\images\\img1.jpg\" /lefttitle:\"image 1\"\n"
"                  /right:\"c:\\images\\img2.jpg\" /righttitle:\"image 2\"\n"
"                  /fit /overlay\n"
"</screen>"
msgstr ""
"Primer (vpisati ga je potrebno v eni vrstici): <screen>\n"
"TortoiseIDiff.exe /left:\"c:\\images\\img1.jpg\" /lefttitle:\"image 1\"\n"
"                  /right:\"c:\\images\\img2.jpg\" /righttitle:\"image 2\"\n"
"                  /fit /overlay\n"
"</screen>"

#. (title)
#: ../source/TortoiseGit_en.xml:14496
msgid "Command Line Interface Cross Reference"
msgstr "Ustrezni ukazi v odjemalcu za ukazno vrstico"

#. (primary)
#: ../source/TortoiseGit_en.xml:14498
msgid "command line client"
msgstr "odjemalec za ukazno vrstico"

#. (primary)
#: ../source/TortoiseGit_en.xml:14501
msgid "CLI"
msgstr "CLI"

#. (para)
#: ../source/TortoiseGit_en.xml:14504
msgid "Sometimes this manual refers you to the main Git documentation, which describes Git in terms of the Command Line Interface (CLI). To help you understand what TortoiseGit is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseGit's GUI operations."
msgstr "Ta priročnik vas včasih pozove, da pogledate dokumentacijo sistema Git, ki opisuje sistem Git z vidika uporabe preko ukazne vrstice (Command Line Interface - CLI). Da bi lažje razumeli, kaj se dogaja v ozadju, je tu seznam ukazov TortoiseGit in ekvivalentnih ukazov odjemalca za ukazno vrstico."

#. (para)
#: ../source/TortoiseGit_en.xml:14513
msgid "Even though there are CLI equivalents to what TortoiseGit does, remember that TortoiseGit does <emphasis>not</emphasis> call the CLI but uses the Git library directly."
msgstr "Čeprav za ukaze TortoiseGit obstajajo ekvivalentni ukazi v ukazni vrstici, ne pozabite, da TortoiseGit ukazne vrstice <emphasis>ne</emphasis> uporablja, ampak neposredno uporablja knjižnice sistema Git."

#. (para)
#: ../source/TortoiseGit_en.xml:14519
msgid "If you think you have found a bug in TortoiseGit, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseGit issues from Git issues. This reference tells you which command to try."
msgstr "Če mislite, da ste našli napako v programu TortoiseGit, vas bomo mogoče prosili, da jo poskusite ponoviti z uporabo odjemalca ukazne vrstice za Git. S tem ločimo napake programa TortoiseGit od napak programa Git. Ta razpredelnica vam pove, katere ukaze poskusite."

#. (title)
#: ../source/TortoiseGit_en.xml:14527
msgid "Conventions and Basic Rules"
msgstr "Konvencije in osnovna pravila"

#. (para)
#: ../source/TortoiseGit_en.xml:14528
msgid "In the descriptions which follow, the URL for a repository location is shown simply as <literal>URL</literal>, and an example might be <systemitem class=\"url\">http://TortoiseGit.tigris.org/svn/TortoiseGit/trunk</systemitem>. The working copy path is shown simply as <literal>PATH</literal>, and an example might be <filename>C:\\TortoiseGit\\trunk</filename>."
msgstr "V naslednjih opisih je naslov URL za lokacijo skladišča prikazan kot <literal>URL</literal>, n. pr. <systemitem class=\"url\">http://TortoiseGit.tigris.org/svn/TortoiseGit/trunk</systemitem>. Delovno kopijo prikazujemo kot <literal>PATH</literal>, n. pr. <literal>C:\\TortoiseGit\\trunk</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:14538
msgid "Because TortoiseGit is a Windows Shell Extension, it is not able to use the notion of a current working directory. All working copy paths must be given using the absolute path, not a relative path."
msgstr "Ker je TortoiseGit razširitev lupine Windows, ne more uporabljati trenutne mape. Vse poti delovne kopije morajo biti podane z absolutno in ne z relativno potjo."

#. (para)
#: ../source/TortoiseGit_en.xml:14545
msgid "Certain items are optional, and these are often controlled by checkboxes or radio buttons in TortoiseGit. These options are shown in [square brackets] in the command line definitions."
msgstr "Določeni elementi so opcijski in se ponavadi v TortoiseGit nastavijo preko potrditvenih polj ali radijskih gumbov. Te opcije so v definicijah ukazne vrstice prikazane v [oglatih oklepajih]."

#. (screen)
#: ../source/TortoiseGit_en.xml:14555
#, no-wrap
msgid ""
"\n"
"svn checkout [-N] [--ignore-externals] [-r rev] URL PATH\n"
msgstr ""
"\n"
"svn checkout [-N] [--ignore-externals] [-r rev] URL POT\n"

#. (para)
#: ../source/TortoiseGit_en.xml:14558
msgid "If <guilabel>Only checkout the top folder</guilabel> is checked, use the <literal>-N</literal> switch."
msgstr "Če je potrjena opcija <guilabel>Prevzemi vrhnjo mapo</guilabel>, uporabi stikalo <literal>-N</literal>."

#. (para)
#. (para)
#: ../source/TortoiseGit_en.xml:14562
#: ../source/TortoiseGit_en.xml:14605
msgid "If <guilabel>Omit externals</guilabel> is checked, use the <literal>--ignore-externals</literal> switch."
msgstr "Če je potrjeno polje <guilabel>Izpusti zunanje</guilabel>, uporabi stikalo <literal>--ignore-externals</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:14566
msgid "If you are checking out a specific revision, specify that after the URL using <literal>-r</literal> switch."
msgstr "Če prevzemate določeno revizijo, pove to po navedbi naslova URL s stikalom <literal>-r</literal>."

#. (screen)
#: ../source/TortoiseGit_en.xml:14573
#, no-wrap
msgid ""
"\n"
"svn info URL_of_WC\n"
"svn update [-r rev] PATH\n"
msgstr ""
"\n"
"svn info URL_delovne_kopije\n"
"svn update [-r rev] POT\n"

#. (para)
#: ../source/TortoiseGit_en.xml:14577
msgid "Updating multiple items is currently not an atomic operation in Git. So TortoiseGit first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy."
msgstr "Posodabljanje večjega števila elementov v sistemu Git ni atomična operacija. TortoiseGit najprej najde revizijo HEAD v skladišču in potem posodobi vse elemente na to določeno številko revizije, da se izogne ustarjanju mešane delovne kopije."

#. (para)
#: ../source/TortoiseGit_en.xml:14584
msgid "If only one item is selected for updating or the selected items are not all from the same repository, TortoiseGit just updates to HEAD."
msgstr "Če je za posodobitev izbran le en element ali če niso vsi izbrani elementi iz istega skladišča, TortoiseGit posodobi na revizijo HEAD."

#. (para)
#: ../source/TortoiseGit_en.xml:14589
msgid "No command line options are used here. <guilabel>Update to revision</guilabel> also implements the update command, but offers more options."
msgstr "Tu se ne uporabljajo možnosti ukazne vrstice. <guilabel>Posodobi na revizijo</guilabel> prav tako izvede posodabljanje, a ponudi več možnosti."

#. (title)
#: ../source/TortoiseGit_en.xml:14596
msgid "Update to Revision"
msgstr "Posodobi na revizijo"

#. (screen)
#: ../source/TortoiseGit_en.xml:14597
#, no-wrap
msgid ""
"\n"
"svn info URL_of_WC\n"
"svn update [-r rev] [-N] [--ignore-externals] PATH\n"
msgstr ""
"\n"
"svn info URL_delovne_kopije\n"
"svn update [-r rev] [-N] [--ignore-externals] POT\n"

#. (para)
#: ../source/TortoiseGit_en.xml:14601
msgid "If <guilabel>Only update the top folder</guilabel> is checked, use the <literal>-N</literal> switch."
msgstr "Če je potrjeno polje <guilabel>Posodobi le vrhnjo mapo</guilabel>, uporabi stikalo <literal>-N</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:14612
msgid "In TortoiseGit, the commit dialog uses several Git commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit."
msgstr "V programu TortoiseGit pogovorno okno za objavo uporablja več ukazov sistema Git. Prvi ukaz je preverjanje stanja, ki v delovni kopiji najde elemente, ki so kandidati za objavo. Seznam lahko pregledate, pogledate spremembe datotek glede na revizijo BASE in izberete elemente, ki jih želite objaviti."

#. (screen)
#. (screen)
#. (screen)
#: ../source/TortoiseGit_en.xml:14619
#: ../source/TortoiseGit_en.xml:14781
#: ../source/TortoiseGit_en.xml:14809
#, no-wrap
msgid ""
"\n"
"svn status -v PATH\n"
msgstr ""
"\n"
"svn status -v POT\n"

#. (para)
#. (para)
#: ../source/TortoiseGit_en.xml:14622
#: ../source/TortoiseGit_en.xml:14710
msgid "If <guilabel>Show unversioned files</guilabel> is checked, TortoiseGit will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Git, as the <literal>svn status</literal> command does not descend into unversioned folders."
msgstr "Če je potrjena možnost <guilabel>Prikaži datoteke brez različic</guilabel>, bo TortoiseGit prikazal vse datoteke in mape brez različic v hierarhiji delovne kopije, pri tem pa upošteval pravila za prezrte elemente. Ta zmožnost nima neposrednega ekvivalentnega ukaza v sistemu Git, ker se ukaz <literal>svn status</literal> ne ukvarja z datotekami brez različic."

#. (para)
#: ../source/TortoiseGit_en.xml:14630
msgid "If you check any unversioned files and folders, those items will first be added to your working copy."
msgstr "Če potrdite datoteke in mape brez različic, se le-te najprej dodajo v delovno kopijo."

#. (screen)
#. (screen)
#: ../source/TortoiseGit_en.xml:14634
#: ../source/TortoiseGit_en.xml:14924
#, no-wrap
msgid ""
"\n"
"svn add PATH...\n"
msgstr ""
"\n"
"svn add POT...\n"

#. (para)
#: ../source/TortoiseGit_en.xml:14637
msgid "When you click on OK, the Git commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (<literal>-N</literal>) must be used, and every path must be specified individually on the commit command line."
msgstr "Ko kliknete na gumb V redu, se spremembe objavijo. Če ste pustili vsa potrditvena polja za izbiro datotek v privzetem stanju, TortoiseGit uporabi enojno rekurzivno objavo delovne kopije. Če nekatere datoteke izločite, mora uporabiti nerekurzivno objavo (<literal>-N</literal>). Vsaka pot mora biti posamično navedena v ukazni vrstici ob objavi."

#. (screen)
#: ../source/TortoiseGit_en.xml:14645
#, no-wrap
msgid ""
"\n"
"svn commit -m \"LogMessage\" [-N] [--no-unlock] PATH...\n"
msgstr ""
"\n"
"svn commit -m \"Sporočilo\" [-N] [--no-unlock] POT...\n"

#. (para)
#. (para)
#. (para)
#: ../source/TortoiseGit_en.xml:14648
#: ../source/TortoiseGit_en.xml:14854
#: ../source/TortoiseGit_en.xml:14937
msgid "<literal>LogMessage</literal> here represents the contents of the log message edit box. This can be empty."
msgstr "<literal>Sporočilo</literal> predstavlja vsebino vnosnega polja sporočila dnevniškega zapisa. Lahko je prazno."

#. (para)
#: ../source/TortoiseGit_en.xml:14652
msgid "If <guilabel>Keep locks</guilabel> is checked, use the <literal>--no-unlock</literal> switch."
msgstr "Če je potrjena možnost <guilabel>Ohrani zaklepe</guilabel>, uporabi stikalo  <literal>--no-unlock</literal>."

#. (screen)
#: ../source/TortoiseGit_en.xml:14659
#, no-wrap
msgid ""
"\n"
"svn diff PATH\n"
msgstr ""
"\n"
"svn diff POT\n"

#. (para)
#: ../source/TortoiseGit_en.xml:14662
msgid "If you use Diff from the main context menu, you are diffing a modified file against its BASE revision. The output from the CLI command above also does this and produces output in unified-diff format. However, this is not what TortoiseGit is using. TortoiseGit uses TortoiseMerge (or a diff program of your choosing) to display differences visually between full-text files, so there is no direct CLI equivalent."
msgstr "Če uporabljate ukaz Razlikuj iz glavnega kontekstnega menija, gledate spremembe v primerjavi z revizijo BASE. To se zgodi tudi pri uporabi ukazne vrstice, izhod pa je podan v obliki poenotene razlike. Vendar za prikaz razlik med dvema datotekama TortoiseGit ne uporablja te možnosti, ampak TortoiseMerge (ali kak drug program za razlikovanje, ki ste ga izbrali), torej ekvivalentnega ukaza za ukazno vrstico ni."

#. (para)
#: ../source/TortoiseGit_en.xml:14671
msgid "You can also diff any 2 files using TortoiseGit, whether or not they are version controlled. TortoiseGit just feeds the two files into the chosen diff program and lets it work out where the differences lie."
msgstr "S TortoiseGit lahko razlikujete katerikoli dve datoteki, ne glede na to, ali sta pod nadzorom različic ali ne. TortoiseGit enostavno pošlje datoteki v izbrani program za razlikovanje in mu prepusti, da vam pokaže razlike v datotekah."

#. (screen)
#: ../source/TortoiseGit_en.xml:14680
#, no-wrap
msgid ""
"\n"
"svn log -v -r 0:N --limit 100 [--stop-on-copy] PATH\n"
"  or\n"
"svn log -v -r M:N [--stop-on-copy] PATH\n"
msgstr ""
"\n"
"svn log -v -r 0:N --limit 100 [--stop-on-copy] POT\n"
"  or\n"
"svn log -v -r M:N [--stop-on-copy] POT\n"

#. (para)
#: ../source/TortoiseGit_en.xml:14685
msgid "By default, TortoiseGit tries to fetch 100 log messages using the --limit method. If the settings instruct it to use old APIs, then the second form is used to fetch the log messages for 100 repository revisions."
msgstr "Po privezetih nastavitvah TortoiseGit poskuša pridobiti 100 dnevniških zapisov z uporabo parametra --limit. Če nastavitve zahtevajo uporabo starega aplikacijskega vmesnika, potem se za pridobivanje 100 revizij dnevniških zapisov iz skladišča uporablja druga oblika."

#. (para)
#: ../source/TortoiseGit_en.xml:14691
msgid "If <guilabel>Stop on copy/rename</guilabel> is checked, use the <literal>--stop-on-copy</literal> switch."
msgstr "Če je potrjeno polje <guilabel>Ustavi ob kopiranju/preimenovanju</guilabel>, uporabi stikalo <literal>--stop-on-copy</literal>."

#. (screen)
#: ../source/TortoiseGit_en.xml:14698
#, no-wrap
msgid ""
"\n"
"svn status -v PATH\n"
"  or\n"
"svn status -u -v PATH\n"
msgstr ""
"\n"
"svn status -v POT\n"
"  ali\n"
"svn status -u -v POT\n"

#. (para)
#: ../source/TortoiseGit_en.xml:14703
msgid "The initial status check looks only at your working copy. If you click on <guibutton>Check repository</guibutton> then the repository is also checked to see which files would be changed by an update, which requires the <literal>-u</literal> switch."
msgstr "Najprej se stanje preveri le v delovni kopiji. Če pa kliknete na <guibutton>Preveri skladišče</guibutton>, potem se preveri tudi stanje v skladišču, da se izve, katere datoteke bi se spremenile v primeru posodobitve. To zahteva stikalo <literal>-u</literal>."

#. (title)
#: ../source/TortoiseGit_en.xml:14720
msgid "Revision Graph"
msgstr "Graf revizij"

#. (para)
#: ../source/TortoiseGit_en.xml:14721
msgid "The revision graph is a feature of TortoiseGit only. There's no equivalent in the command line client."
msgstr "Graf revizij je zmožnost aplikacije TortoiseGit. Ekvivalenten ukaz v ukazni vrstici ne obstaja."

#. (para)
#: ../source/TortoiseGit_en.xml:14725
msgid ""
"What TortoiseGit does is an <screen>\n"
"svn info URL_of_WC\n"
"svn log -v URL\n"
"</screen> where URL is the repository <emphasis>root</emphasis> and then analyzes the data returned."
msgstr ""
"TortoiseGit naredi naslednje:  <screen>\n"
"svn info URL_delovne_kopije\n"
"svn log -v URL\n"
"</screen>kjer je URL korenska pot skladišča, in potem analizira vrnjene podatke."

#. (title)
#: ../source/TortoiseGit_en.xml:14736
msgid "Repo Browser"
msgstr "Brskalnik po skladišču"

#. (screen)
#: ../source/TortoiseGit_en.xml:14737
#, no-wrap
msgid ""
"\n"
"svn info URL_of_WC\n"
"svn list [-r rev] -v URL\n"
msgstr ""
"\n"
"svn info URL_delovne_kopije\n"
"svn list [-r rev] -v URL\n"

#. (para)
#: ../source/TortoiseGit_en.xml:14741
msgid "You can use <literal>svn info</literal> to determine the repository root, which is the top level shown in the repository browser. You cannot navigate <literal>Up</literal> above this level. Also, this command returns all the locking information shown in the repository browser."
msgstr "Da najdete korensko mapo skladišča, lahko uporabite ukaz <literal>svn info</literal>. Ta mapa se prikaže kot vrhnja mapa v brskalniku po skladišču. <literal>Višje</literal> od te mape ne morete. Ta ukaz vrne tudi vse informacije o zaklepih, ki se prav tako prikažejo v brskalniku po skladišču."

#. (para)
#: ../source/TortoiseGit_en.xml:14748
msgid "The <literal>svn list</literal> call will list the contents of a directory, given a URL and revision."
msgstr "Ukaz <literal>svn list</literal> s parametrom URL in številko revizije vrne vsebino mape."

#. (para)
#: ../source/TortoiseGit_en.xml:14755
msgid "This command has no CLI equivalent. It invokes TortoiseMerge or an external 3-way diff/merge tool to look at the files involved in the conflict and sort out which lines to use."
msgstr "Ekvivalenten ukaz za ukazno vrstico ne obstaja. Uporabi se orodje TortoiseMerge ali kakšen drug tristranski program za razlikovanje/spajanje, s pomočjo katerega se odločimo, kako bomo spore rešili."

#. (title)
#: ../source/TortoiseGit_en.xml:14762
msgid "Resolved"
msgstr "Rešeno"

#. (screen)
#: ../source/TortoiseGit_en.xml:14763
#, no-wrap
msgid ""
"\n"
"svn resolved PATH\n"
msgstr ""
"\n"
"svn resolved POT\n"

#. (screen)
#: ../source/TortoiseGit_en.xml:14769
#, no-wrap
msgid ""
"\n"
"svn rename CURR_PATH NEW_PATH\n"
msgstr ""
"\n"
"svn rename TRENUTNA_POT NOVA_POT\n"

#. (screen)
#: ../source/TortoiseGit_en.xml:14775
#, no-wrap
msgid ""
"\n"
"svn delete PATH\n"
msgstr ""
"\n"
"svn delete POT\n"

#. (para)
#: ../source/TortoiseGit_en.xml:14784
msgid "The first stage is a status check which determines the items in your working copy which can potentially be reverted. You can review the list, diff files against BASE and select the items you want to be included in the revert."
msgstr "Prva faza predstavlja preverjanje stanja, s čemer ugotovimo, katere elemente v delovni kopiji je mogoče povrniti. Seznam lahko pregledate, pogledate razlike v primerjavi z revizijo BASE in izberete elemente, ki jih želite povrniti."

#. (para)
#: ../source/TortoiseGit_en.xml:14790
msgid "When you click on OK, the Git revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseGit uses a single recursive (<literal>-R</literal>) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line."
msgstr "Ko kliknete na gumb V redu, se zgodi povrnitev. Če izbire niste spreminjali, uporabi TortoiseGit eno samo rekurzivno (<literal>-R</literal>) povrnitev delovne kopije. Če ste izklopili nekatere datoteke, potem mora pri uporabi ukaza v ukazni vrstici podati vsako pot posebej. "

#. (screen)
#: ../source/TortoiseGit_en.xml:14797
#, no-wrap
msgid ""
"\n"
"svn revert [-R] PATH...\n"
msgstr ""
"\n"
"svn revert [-R] POT...\n"

#. (screen)
#: ../source/TortoiseGit_en.xml:14803
#, no-wrap
msgid ""
"\n"
"svn cleanup PATH\n"
msgstr ""
"\n"
"svn cleanup POT\n"

#. (title)
#: ../source/TortoiseGit_en.xml:14808
msgid "Get Lock"
msgstr "Dobi zaklep"

#. (para)
#: ../source/TortoiseGit_en.xml:14812
msgid "The first stage is a status check which determines the files in your working copy which can potentially be locked. You can select the items you want to be locked."
msgstr "Prva faza je preverjanje stanja, ki ugotovi, katere datoteke v delovni kopiji lahko zaklenete. Nato izberete datoteke, ki jih želite zakleniti."

#. (screen)
#: ../source/TortoiseGit_en.xml:14817
#, no-wrap
msgid ""
"\n"
"svn lock -m \"LockMessage\" [--force] PATH...\n"
msgstr ""
"\n"
"svn lock -m \"Sporočilo\" [--force] POT...\n"

#. (para)
#: ../source/TortoiseGit_en.xml:14820
msgid "<literal>LockMessage</literal> here represents the contents of the lock message edit box. This can be empty."
msgstr "<literal>Sporočilo</literal> predstavlja vsebina sporočila zaklepa. Lahko je prazno."

#. (para)
#: ../source/TortoiseGit_en.xml:14824
msgid "If <guilabel>Steal the locks</guilabel> is checked, use the <literal>--force</literal> switch."
msgstr "Če je potrjeno polje <guilabel>Ukradi zaklep</guilabel>, uporabi stikalo <literal>--force</literal>."

#. (title)
#: ../source/TortoiseGit_en.xml:14830
msgid "Release Lock"
msgstr "Odstrani zaklep"

#. (screen)
#: ../source/TortoiseGit_en.xml:14831
#, no-wrap
msgid ""
"\n"
"svn unlock PATH\n"
msgstr ""
"\n"
"svn unlock POT\n"

#. (screen)
#: ../source/TortoiseGit_en.xml:14837
#, no-wrap
msgid ""
"\n"
"svn copy -m \"LogMessage\" URL URL\n"
"  or\n"
"svn copy -m \"LogMessage\" URL@rev URL@rev\n"
"  or\n"
"svn copy -m \"LogMessage\" PATH URL\n"
msgstr ""
"\n"
"svn copy -m \"Sporočilo\" URL URL\n"
"  ali\n"
"svn copy -m \"Sporočilo\" URL@rev URL@rev\n"
"  ali\n"
"svn copy -m \"Sporočilo\" POT URL\n"

#. (listitem)
#: ../source/TortoiseGit_en.xml:14849
msgid "Specific revision in repository"
msgstr "Določena revizija v skladišču"

#. (para)
#: ../source/TortoiseGit_en.xml:14844
msgid "The Branch/Tag dialog performs a copy to the repository. There are 3 radio button options: <placeholder-1/> which correspond to the 3 command line variants above."
msgstr "Okno Veja/Oznaka izdela kopijo skladišča. Na voljo so trije radijski gumbi: <placeholder-1/> Ti ustrezajo trem opisanim variacijam ukazne vrstice. "

#. (screen)
#: ../source/TortoiseGit_en.xml:14861
#, no-wrap
msgid ""
"\n"
"svn info URL_of_WC\n"
"svn switch [-r rev] URL PATH\n"
msgstr ""
"\n"
"svn info URL_delovne_kopije\n"
"svn switch [-r rev] URL POT\n"

#. (screen)
#: ../source/TortoiseGit_en.xml:14868
#, no-wrap
msgid ""
"\n"
"svn merge [--dry-run] --force From_URL@revN To_URL@revM PATH\n"
msgstr ""
"\n"
"svn merge [--dry-run] --force Iz_URL@revN V_URL@revM POT\n"

#. (para)
#: ../source/TortoiseGit_en.xml:14871
msgid "The <guibutton>Dry run</guibutton> performs the same merge with the <literal>--dry-run</literal> switch."
msgstr "<guibutton>Izvedi poskusno</guibutton> izvede enako spajanje z uporabo stikala <literal>--dry-run</literal>."

#. (screen)
#: ../source/TortoiseGit_en.xml:14875
#, no-wrap
msgid ""
"\n"
"svn diff From_URL@revN To_URL@revM\n"
msgstr ""
"\n"
"svn diff Iz_URL@revN V_URL@revM\n"

#. (para)
#: ../source/TortoiseGit_en.xml:14878
msgid "The <guibutton>Unified diff</guibutton> shows the diff operation which will be used to do the merge."
msgstr "Gumb <guibutton>Poenotena različica</guibutton> pokaže operacijo razlikovanja, ki bo uporabljena za spajanje."

#. (screen)
#: ../source/TortoiseGit_en.xml:14885
#, no-wrap
msgid ""
"\n"
"svn export [-r rev] [--ignore-externals] URL Export_PATH\n"
msgstr ""
"\n"
"svn export [-r rev] [--ignore-externals] URL POT_za_izboz\n"

#. (para)
#: ../source/TortoiseGit_en.xml:14888
msgid "This form is used when accessed from an unversioned folder, and the folder is used as the destination."
msgstr "Ta oblika se uporablja v mapi brez različic, kadar je ta mapa tudi ciljna mapa."

#. (para)
#: ../source/TortoiseGit_en.xml:14892
msgid "Exporting a working copy to a different location is done without using the Git library, so there's no matching command line equivalent."
msgstr "Izvoz delovne kopije na drugo lokacijo se ne izvede s pomočjo knjižnice Git, zato ekvivalentnega ukaza ni."

#. (para)
#: ../source/TortoiseGit_en.xml:14897
msgid "What TortoiseGit does is to copy all files to the new location while showing you the progress of the operation. Unversioned files/folders can optionally be exported too."
msgstr "TortoiseGit prekopira vse datoteke na novo lokacijo, hkrati pa prikazuje napredek operacije. Nastavite lahko, da se izvozijo tudi datoteke/mape brez različic."

#. (para)
#: ../source/TortoiseGit_en.xml:14902
msgid "In both cases, if <guilabel>Omit externals</guilabel> is checked, use the <literal>--ignore-externals</literal> switch."
msgstr "Če je potrjeno potrditveno polje <guilabel>Izpusti zunanje</guilabel>, v obeh primerih uporabi stikalo <literal>--ignore-externals</literal>."

#. (screen)
#: ../source/TortoiseGit_en.xml:14910
#, no-wrap
msgid ""
"\n"
"svn switch --relocate From_URL To_URL\n"
msgstr ""
"\n"
"svn switch --relocate Iz_URL V_URL\n"

#. (title)
#: ../source/TortoiseGit_en.xml:14915
msgid "Create Repository Here"
msgstr "Tu ustvari skladišče"

#. (screen)
#: ../source/TortoiseGit_en.xml:14916
#, no-wrap
msgid ""
"\n"
"svnadmin create --fs-type fsfs PATH\n"
"  or\n"
"svnadmin create --fs-type bdb PATH\n"
msgstr ""
"\n"
"svnadmin create --fs-type fsfs POT\n"
"  ali\n"
"svnadmin create --fs-type bdb POT\n"

#. (para)
#: ../source/TortoiseGit_en.xml:14927
msgid "If you selected a folder, TortoiseGit first scans it recursively for items which can be added."
msgstr "Če izberete mapo, jo TortoiseGit najprej rekurzivno pregleda, da najde elemente, ki jih je možno dodati."

#. (screen)
#: ../source/TortoiseGit_en.xml:14934
#, no-wrap
msgid ""
"\n"
"svn import -m LogMessage PATH URL\n"
msgstr ""
"\n"
"svn import -m Sporočilo POT URL\n"

#. (screen)
#: ../source/TortoiseGit_en.xml:14944
#, no-wrap
msgid ""
"\n"
"svn blame -r N:M -v PATH\n"
"svn log -r N:M PATH\n"
msgstr ""
"\n"
"svn blame -r N:M -v POT\n"
"svn log -r N:M POT\n"

#. (para)
#: ../source/TortoiseGit_en.xml:14948
msgid "If you use TortoiseBlame to view the blame info, the file log is also required to show log messages in a tooltip. If you view blame as a text file, this information is not required."
msgstr "Če za pregled krivdnih informacij uporabljate TortoiseBlame, potem potrebujete tudi informacije o dnevniških zapisih datoteke, ki se prikažejo kot namig. Če krivdne informacije pregledujete v obliki besedilne datoteke, to ni potrebno."

#. (title)
#: ../source/TortoiseGit_en.xml:14956
msgid "Add to Ignore List"
msgstr "Dodaj na seznam prezrtih"

#. (screen)
#: ../source/TortoiseGit_en.xml:14957
#, no-wrap
msgid ""
"\n"
"svn propget svn:ignore PATH &gt; tempfile\n"
"{edit new ignore item into tempfile}\n"
"svn propset svn:ignore -F tempfile PATH\n"
msgstr ""
"\n"
"svn propget svn:ignore POT &gt; začasnadatoteka\n"
"{vstavi nov prezrti element v začasno datoteko}\n"
"svn propset svn:ignore -F začasnadatoteka POT\n"

#. (para)
#: ../source/TortoiseGit_en.xml:14962
msgid "Because the <literal>svn:ignore</literal> property is often a multi-line value, it is shown here as being changed via a text file rather than directly on the command line."
msgstr "Ker lastnost <literal>svn:ignore</literal> pogosto obsega več vrstic, tukaj prikazujemo, kako jo spreminjamo preko besedilne datoteke namesto neposredno v ukazni vrstici."

#. (screen)
#: ../source/TortoiseGit_en.xml:14970
#, no-wrap
msgid ""
"\n"
"svn diff PATH &gt; patch-file\n"
msgstr ""
"\n"
"svn diff POT &gt; datotekapopravkov\n"

#. (para)
#: ../source/TortoiseGit_en.xml:14973
msgid "TortoiseGit creates a patch file in unified diff format by comparing the working copy with its BASE version."
msgstr "TortoiseGit ustvari datoteko popravkov v obliki poenotene razlike s primerjanjem delovne kopije in verzije BASE."

#. (para)
#: ../source/TortoiseGit_en.xml:14980
msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Git."
msgstr "Nameščanje datotek popravkov je zahtevno opravilo, razen če imata datoteka popravkov in delovna kopija isto številko revizije. Na srečo lahko uporabite orodje TortoiseMerge, ki nima ekvivalentnega orodja v sistemu Git."

#. (title)
#: ../source/TortoiseGit_en.xml:14994
msgid "Implementation Details"
msgstr "Podrobnosti o izvedbi"

#. (para)
#: ../source/TortoiseGit_en.xml:14996
msgid "This appendix contains a more detailed discussion of the implementation of some of TortoiseGit's features."
msgstr "Ta dodatek vsebuje podrobno razlago izvedbe nekaterih zmožnosti programa TortoiseGit."

#. (primary)
#: ../source/TortoiseGit_en.xml:15004
msgid "overlay priority"
msgstr "prioriteta prekrivnih ikon"

#. (para)
#: ../source/TortoiseGit_en.xml:15009
msgid "Every file and folder has a Git status value as reported by the Git library. In the command line client, these are represented by single letter codes, but in TortoiseGit they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values."
msgstr "Vsaka datoteka in mapa pod nadzorom ima v sistemu Git stanje, ki ga sporoči knjižnica Git. V odjemalcu za ukazno vrstico je status prikazan z črko, v programu TortoiseGit pa je prikazan grafično s prekrivnimi ikonami. Ker je število prekrivnih ikon zelo omejeno, lahko vsaka ikona predstavlja več vrednosti stanja."

#. (para)
#: ../source/TortoiseGit_en.xml:15017
msgid "<graphic fileref=\"images/ConflictIcon.png\"/> The <emphasis>Conflicted</emphasis> overlay is used to represent the <literal>conflicted</literal> state, where an update or switch results in conflicts between local changes and changes downloaded from the repository. It is also used to indicate the <literal>obstructed</literal> state, which can occur when an operation is unable to complete."
msgstr "<graphic fileref=\"images/ConflictIcon.png\"/> Prekrivna ikona za  <emphasis>spor</emphasis> se uporablja za prikaz <literal>spornega stanja</literal>. Pri posodobitvi ali preklopu se pri spajanju krajevnih sprememb in sprememb iz skladišča pojavijo spori. Uporablja se tudi za prikaz <literal>oviranega</literal> stanja, ki se pojavi, ko operacije ni mogoče zaključiti."

#. (para)
#: ../source/TortoiseGit_en.xml:15026
msgid "<graphic fileref=\"images/ModifiedIcon.png\"/> The <emphasis>Modified</emphasis> overlay represents the <literal>modified</literal> state, where you have made local modifications, the <literal>merged</literal> state, where changes from the repository have been merged with local changes, and the <literal>replaced</literal> state, where a file has been deleted and replaced by another different file with the same name."
msgstr "<graphic fileref=\"images/ModifiedIcon.png\"/> Prekrivna ikona  <emphasis>spremenjeno</emphasis> predstavlja <literal>spremenjeno</literal> stanje pri krajevnih spremembah, <literal>spojeno</literal> stanje, ko so bile spremembe iz skladišča spojene s krajevnimi spremembami in <literal>zamenjano</literal> stanje, ko je bila datoteka izbrisana in nadomeščena z drugo datoteko z istim imenom."

#. (para)
#: ../source/TortoiseGit_en.xml:15036
msgid "<graphic fileref=\"images/DeletedIcon.png\"/> The <emphasis>Deleted</emphasis> overlay represents the <literal>deleted</literal> state, where an item is scheduled for deletion, or the <literal>missing</literal> state, where an item is not present. Naturally an item which is missing cannot have an overlay itself, but the parent folder can be marked if one of its child items is missing."
msgstr "<graphic fileref=\"images/DeletedIcon.png\"/> Prekrivna ikona  <emphasis>izbrisano</emphasis> predstavlja <literal>izbrisano</literal> stanje, kjer je element označen za brisanje ali stanje <literal>manjkajoče</literal>, ko elementa ni v delovni kopiji. Seveda element, ki ne obstaja, ne more imeti prekrivne ikone, zato je ikona za manjkajoč element pripeta na nadrejeno mapo."

#. (para)
#: ../source/TortoiseGit_en.xml:15045
msgid "<graphic fileref=\"images/AddedIcon.png\"/> The <emphasis>Added</emphasis> overlay is simply used to represent the <literal>added</literal> status when an item has been added to version control."
msgstr "<graphic fileref=\"images/AddedIcon.png\"/> Prekrivna ikona  <emphasis>dodano</emphasis> predstavlja <literal>dodano</literal> stanje, ko je element dodan sistemu za nadzor različic."

#. (para)
#: ../source/TortoiseGit_en.xml:15051
msgid "<graphic fileref=\"images/InGitIcon.png\"/> The <emphasis>In Git</emphasis> overlay is used to represent an item which is in the <literal>normal</literal> state, or a versioned item whose state is not yet known. Because TortoiseGit uses a background caching process to gather status, it may take a few seconds before the overlay updates."
msgstr "<graphic fileref=\"images/InGitIcon.png\"/> Prekrivna ikona <emphasis>V sistemu Git</emphasis> predstavlja <literal>običajno</literal> stanje ali element pod nadzorom, katerega stanje še ni znano. Ker TortoiseGit uporablja poseben proces za predpomnenje stanja, lahko traja nekaj sekund, preden se prekrivna ikona posodobi."

#. (para)
#: ../source/TortoiseGit_en.xml:15060
msgid "<graphic fileref=\"images/ReadOnlyIcon.png\"/> The <emphasis>Needs Lock</emphasis> overlay is used to indicate when a file has the <literal>svn:needs-lock</literal> property set. For working copies which were created using Git 1.4.0 and later, the <literal>svn:needs-lock</literal> status is cached locally by Git and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseGit shows this overlay when the file has read-only status. Note that Git automatically upgrades working copies when you update them, although the caching of the <literal>svn:needs-lock</literal> property may not happen until the file itself is updated."
msgstr "<graphic fileref=\"images/ReadOnlyIcon.png\"/> Prekrivna ikona <emphasis>Potrebuje zaklep</emphasis> se uporablja za datoteke, ki imajo nastavljeno lastnost <literal>svn:needs-lock</literal>. Za delovne kopije, ustvarjene z različico Git 1.4.0 ali novejšo, je stanje <literal>svn:needs-lock</literal> predpomnjeno krajevno in se uporablja tudi za prikaz prekrivne ikone. Za delovne kopije, ustvarjene z različico 1.4.x ali starejšo TortoiseGit prikaže to ikono v primeru datoteke, ki je namenjena samo za branje. Upoštevajte, da Git samodejno nadgradi delovne kopije, ko jih posodobite. Predpomnenje lastnosti <literal>svn:needs-lock</literal> se morda ne bo zgodilo, dokler ne boste posodobili datoteke."

#. (para)
#: ../source/TortoiseGit_en.xml:15074
msgid "<graphic fileref=\"images/LockedIcon.png\"/> The <emphasis>Locked</emphasis> overlay is used when the local working copy holds a lock for that file."
msgstr "<graphic fileref=\"images/LockedIcon.png\"/> Prekrivna ikona  <emphasis>zaklenjeno</emphasis> se uporablja, kadar je delovna kopija lastnica zaklepa za datoteko."

#. (para)
#: ../source/TortoiseGit_en.xml:15079
msgid "<graphic fileref=\"images/IgnoredIcon.png\"/> The <emphasis>Ignored</emphasis> overlay is used to represent an item which is in the <literal>ignored</literal> state, either due to a global ignore pattern, or the <literal>svn:ignore</literal> property of the parent folder. This overlay is optional."
msgstr "<graphic fileref=\"images/IgnoredIcon.png\"/> Ikona za <emphasis>prezrte</emphasis> elemente se uporablja za elemente, ki so <literal>prezrti</literal> zaradi splošnega vzorca prezrtih elementov ali zaradi nastavljene lastnosti <literal>svn:ignore</literal> na nadrejeni mapi. Prikaz je možno izključiti."

#. (para)
#: ../source/TortoiseGit_en.xml:15087
msgid "<graphic fileref=\"images/UnversionedIcon.png\"/> The <emphasis>Unversioned</emphasis> overlay is used to represent an item which is in the <literal>unversioned</literal> state. This is an item in a versioned folder, but which is not under version control itself. This overlay is optional."
msgstr "<graphic fileref=\"images/UnversionedIcon.png\"/> Ta ikona se uporablja za elemente <literal>brez različic</literal>. To so elementi, ki se nahajajo znotraj mape pod nadzorom, sami pa niso pod nadzorom. Prikaz te ikone je možno izključiti."

#. (para)
#: ../source/TortoiseGit_en.xml:15095
msgid "If an item has Git status <literal>none</literal> (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the <emphasis>Ignored</emphasis> and <emphasis>Unversioned</emphasis> overlays then no overlay will be shown for those files either."
msgstr "Če je stanje elementa <literal>brez stanja</literal> (element se ne nahaja v delovni kopiji), prekrivna ikona ni prikazana. Če ste izključili prikaz prekrivnih ikon za <emphasis>prezrte</emphasis> elemente in elemente <emphasis>brez različic</emphasis>, potem prekrivne ikone ne bodo prikazane tudi za te elemente."

#. (para)
#: ../source/TortoiseGit_en.xml:15102
msgid "An item can only have one Git status value. For example a file could be locally modified and it could be marked for deletion at the same time. Git returns a single status value - in this case <literal>deleted</literal>. Those priorities are defined within Git itself."
msgstr "Element ima lahko le eno stanje sistema Git. Primer: datoteka je krajevno spremenjena in hkrati označena za brisanje. Git vrne eno samo stanje - v tem primeru <literal>izbrisano</literal>. Prioritete stanj definira Git."

#. (para)
#: ../source/TortoiseGit_en.xml:15109
msgid "When TortoiseGit displays the status recursively (the default setting), each folder displays an overlay reflecting its own status and the status of all its children. In order to display a single <emphasis>summary</emphasis> overlay, we use the priority order shown above to determine which overlay to use, with the <emphasis>Conflicted</emphasis> overlay taking highest priority."
msgstr "Kadar TortoiseGit prikazuje stanje rekurzivno (privzeta nastavitev), vsaka mapa prikazuje svoje stanje in stanje vseh svojih elementov. Da prikažemo le eno vrednost stanja - prekrivno ikono za <emphasis>povzetek</emphasis> - uporabljamo prioritetni red, ki je prikazan zgoraj. Najvišo prioriteto ima stanje <emphasis>sporno</emphasis>."

#. (para)
#: ../source/TortoiseGit_en.xml:15118
msgid "In fact, you may find that not all of these icons are used on your system. This is because the number of overlays allowed by Windows is limited to 15. Windows uses 4 of those, and the remaining 11 can be used by other applications. If there are not enough overlay slots available, TortoiseGit tries to be a <quote>Good Citizen (TM)</quote> and limits its use of overlays to give other apps a chance."
msgstr "Lahko pa ugotovite, da omenjene ikone niso vse na voljo na vašem sistemu. Razlog je v omejitvi sistema Windows, ki omogoča le petnajst prekrivnih ikon. Štiri uporablja operacijski sistem sam, enajst pa jih je na razpolago ostalim aplikacijam. Če na sistemu ni na voljo dovolj prostih mest,  poskuša biti TortoiseGit<quote>pošten državljan (TM)</quote> in ne uporablja veliko prekrivnih ikon, da ostane prostor tudi za ostale aplikacije."

#. (para)
#: ../source/TortoiseGit_en.xml:15129
msgid "<emphasis>Normal</emphasis>, <emphasis>Modified</emphasis> and <emphasis>Conflicted</emphasis> are always loaded and visible."
msgstr "Ikone <emphasis>Navadno</emphasis>, <emphasis>Spremenjeno</emphasis> in <emphasis>Sporno</emphasis> se vedno naložijo in so vidne."

#. (para)
#: ../source/TortoiseGit_en.xml:15137
msgid "<emphasis>Deleted</emphasis> is loaded if possible, but falls back to <emphasis>Modified</emphasis> if there are not enough slots."
msgstr "Ikona <emphasis>Izbrisano</emphasis> se naloži, če je to mogoče, če pa prostih mest ni dovolj, se prikaže ikona <emphasis>Spremenjeno</emphasis>."

#. (para)
#: ../source/TortoiseGit_en.xml:15144
msgid "<emphasis>Read-Only</emphasis> is loaded if possible, but falls back to <emphasis>Normal</emphasis> if there are not enough slots."
msgstr "Ikona <emphasis>Samo za branje</emphasis> se naloži, če je to mogoče, če pa prostih mest ni dovolj, se prikaže ikona <emphasis>Običajno</emphasis>."

#. (para)
#: ../source/TortoiseGit_en.xml:15151
msgid "<emphasis>Locked</emphasis> is only loaded if there are fewer than 13 overlays already loaded. It falls back to <emphasis>Normal</emphasis> if there are not enough slots."
msgstr "Ikona <emphasis>Zaklenjeno</emphasis> se naloži, če je naloženih manj kot trinajst ikon, v nasprotnem primeru pa se prikaže ikona <emphasis>Običajno</emphasis>."

#. (para)
#: ../source/TortoiseGit_en.xml:15159
msgid "<emphasis>Added</emphasis> is only loaded if there are fewer than 14 overlays already loaded. It falls back to <emphasis>Modified</emphasis> if there are not enough slots."
msgstr "Ikona <emphasis>Dodano</emphasis> se naloži, če je naloženih manj kot štirinajst ikon, v nasprotnem primeru pa se prikaže ikona <emphasis>Spremenjeno</emphasis>."

#. (title)
#: ../source/TortoiseGit_en.xml:15170
msgid "Securing Svnserve using SSH"
msgstr "Zavarovanje strežnika Svnserve z SSL"

#. (para)
#: ../source/TortoiseGit_en.xml:15172
msgid "This section provides a step-by-step guide to setting up Git and TortoiseGit to use the <literal>svn+ssh</literal> protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Git book. If you are not using SSH but would like to do so to protect your Git installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every Git user."
msgstr "V tem razdelku so opisani koraki, ki jih je potrebno izvesti, če želite pri sistemu Git in TortoiseGit uporabljati protokol <literal>svn+ssh</literal>. Če za dostop do strežnika Git in avtentikacijo že uporabljate SSH, potem tega ne potrebujete; kaj več o tem si lahko preberete v knjigi The Git Book. Če še ne uporabljate SSH in želite svoj sistem Git zaščititi, vam ta razdelek ponuja enostaven način, kako to storite, ne da bi morali za vsakega uporabnika sistema Git ustvariti tudi račun SSH na strežniku."

#. (para)
#: ../source/TortoiseGit_en.xml:15182
msgid "In this implementation we create a single SSH user account for all Git users, and use different authentication keys to differentiate between the real Git users."
msgstr "Pri tem načinu ustvarimo en račun SSH za vse uporabnike sistema Git in uporabimo različne ključe za avtentikacijo, da ločimo med posameznimi uporabniki sistema Git."

#. (para)
#: ../source/TortoiseGit_en.xml:15187
msgid "In this appendix we assume that you already have the Git tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should <emphasis>not</emphasis> start svnserve as a service or daemon when used with SSH."
msgstr "V tem dodatku predpostavljamo, da imate nameščena vsa potrebna orodja in ustvarjeno skladišče, kot je opisano v predhodnjih poglavjih.  Pri uporabi SSH strežnika svnserve <emphasis>ne</emphasis> smete poganjati kot storitev ali prikriti process."

#. (para)
#: ../source/TortoiseGit_en.xml:15193
msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at <ulink url=\"http://www.logemann.org/2007/03/13/Git-TortoiseGit-ssh-howto/\"><citetitle>www.logemann.org</citetitle></ulink> Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!"
msgstr "Veliko informacij smo povzeli po učbeniku Marca Logemanna, ki ga najdete na povezavi <ulink url=\"http://www.logemann.org/2007/03/13/Git-TortoiseGit-ssh-howto/\"><citetitle>www.logemann.org</citetitle></ulink> Dodatne informacije v zvezi s postavitvijo strežnika v sistemu Windows je podal Thorsten Müller. Hvala obema!"

#. (title)
#: ../source/TortoiseGit_en.xml:15204
msgid "Setting Up a Linux Server"
msgstr "Nameščanje strežnika na operacijskem sistemu Linux"

#. (para)
#: ../source/TortoiseGit_en.xml:15205
msgid ""
"You need to have SSH enabled on the server, and here we assume that you will be using OpenSSH. On most distributions this will already be installed. To find out, type: <screen>\n"
"ps xa | grep sshd\n"
"</screen> and look for ssh jobs."
msgstr ""
"Na strežniku morate omogočiti SSH. Tu predpostavljamo, da uporabljate sistem OpenSSH. Na večini sistemov je OpenSSH že nameščen. Vtipkajte: <screen>\n"
"ps xa | grep sshd\n"
"</screen> in prikaže se vam seznam opravil SSH."

#. (para)
#: ../source/TortoiseGit_en.xml:15214
msgid "One point to note is that if you build Git from source and do not provide any argument to <filename>./configure</filename>, Git creates a <filename>bin</filename> directory under <filename>/usr/local</filename> and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place <filename>/usr/local/bin</filename> into the <literal>PATH</literal> variable or create symbolic links of your binaries to the <filename>/usr/sbin</filename> directory, or to any other directory which is commonly in the <literal>PATH</literal>."
msgstr "Če zgradite Git sami iz izvorne kode in ne podate parametra v <filename>./configure</filename>, Git ustvari podmapo <filename>bin</filename> v mapi <filename>/usr/local</filename> in tja shrani binarne datoteke. Če želite uporabiti tunelski način s SSH, se morate zavedati, da prijava uporabnika preko SSH zahteva izvržbo programa svnserve in še nekaterih knjižnic. Zato dodajte mapo  <filename>/usr/local/bin</filename> v okoljsko spremenljivko <literal>PATH</literal> ali ustvarite simbolično povezavo binarnih datotek v mapo <filename>/usr/sbin</filename> ali katerokoli mapo, ki se nahaja v okoljski spremenljivki <literal>PATH</literal>."

#. (para)
#: ../source/TortoiseGit_en.xml:15227
msgid ""
"To check that everything is OK, login in as the target user with SSH and type: <screen>\n"
"which svnserve\n"
"</screen> This command should tell you if svnserve is reachable."
msgstr ""
"Preverite, če vse deluje, tako da se s SSH prijavite kot ciljni uporabnik, in vtipkajte: <screen>\n"
"which svnserve\n"
"</screen> Ta ukaz vam pove, če je strežnik svnserve dosegljiv."

#. (para)
#: ../source/TortoiseGit_en.xml:15235
msgid ""
"Create a new user which we will use to access the svn repository: <screen>\n"
"useradd -m svnuser\n"
"</screen> Be sure to give this user full access rights to the repository."
msgstr ""
"Ustvarite novega uporabnika, ki bo imel dostop do skladišča Git: <screen>\n"
"useradd -m svnuporabnik\n"
"</screen> Uporabniku dajte popoln dostop do skladišča."

#. (title)
#: ../source/TortoiseGit_en.xml:15244
msgid "Setting Up a Windows Server"
msgstr "Nameščanje strežnika na operacijskem sistemu Windows"

#. (para)
#: ../source/TortoiseGit_en.xml:15245
msgid "Install Cygwin SSH daemon as described here: <ulink url=\"http://pigtail.net/LRP/printsrv/cygwin-sshd.html\"><citetitle>http://pigtail.net/LRP/printsrv/cygwin-sshd.html</citetitle></ulink>"
msgstr "Namestite Cygwin SSH daemon, kot je opisano na naslednjem naslovu: <ulink url=\"http://pigtail.net/LRP/printsrv/cygwin-sshd.html\"><citetitle>http://pigtail.net/LRP/printsrv/cygwin-sshd.html</citetitle></ulink>"

#. (para)
#: ../source/TortoiseGit_en.xml:15251
msgid "Create a new Windows user account <literal>svnuser</literal> which we will use to access the repository. Be sure to give this user full access rights to the repository."
msgstr "Ustvarite nov račun v sistemu Windows in ga poimenujte <literal>svnuporabnik</literal>. S tem računom bomo dostopali do skladišča. Temu računu dajte popoln dostop do skladišča."

#. (para)
#: ../source/TortoiseGit_en.xml:15256
msgid ""
"If there is no password file yet then create one from the Cygwin console using: <screen>\n"
"mkpasswd -l &gt; /etc/passwd\n"
"</screen>"
msgstr ""
"Če datoteka gesel še ne obstaja, jo ustvarite iz ukazne vrstice Cygwina: <screen>\n"
"mkpasswd -l &gt; /etc/passwd\n"
"</screen>"

#. (title)
#: ../source/TortoiseGit_en.xml:15264
msgid "SSH Client Tools for use with TortoiseGit"
msgstr "Odjemalci SSH za uporabo s TortoiseGit"

#. (para)
#: ../source/TortoiseGit_en.xml:15265
msgid "Grab the tools we need for using SSH on the windows client from this site: <ulink url=\"http://www.chiark.greenend.org.uk/~sgtatham/putty/\"><citetitle>http://www.chiark.greenend.org.uk/~sgtatham/putty/</citetitle></ulink> Just go to the download section and get <filename>Putty</filename>, <filename>Plink</filename>, <filename>Pageant</filename> and <filename>Puttygen</filename>."
msgstr "Orodja, ki jih potrebujemo za delo s SSH na sistemu Windows, dobite na naslednjem naslovu: <ulink url=\"http://www.chiark.greenend.org.uk/~sgtatham/putty/\"><citetitle>http://www.chiark.greenend.org.uk/~sgtatham/putty/</citetitle></ulink> Pojdi na odsek Download in prenesite aplikacije <filename>Putty</filename>, <filename>Plink</filename>, <filename>Pageant</filename> in <filename>Puttygen</filename>."

#. (title)
#: ../source/TortoiseGit_en.xml:15278
msgid "Creating OpenSSH Certificates"
msgstr "Ustvarjanje certifikatov OpenSSH"

#. (para)
#: ../source/TortoiseGit_en.xml:15279
msgid "The next step is to create a key pair for authentication. There are two possible ways to create keys. The first is to create the keys with PuTTYgen on the client, upload the public key to your server and use the private key with PuTTY. The other is to create the key pair with the OpenSSH tool ssh-keygen, download the private key to your client and convert the private key to a PuTTY-style private key."
msgstr "V naslednjem koraku izdelamo par ključev za avtentikacijo. Za izdelavo ključev obstajata dva načina. Prvi način: ključa ustvarimo s programom PuTTYgen na strani odjemalca, javni ključ naložimo na strežnik, zasebni ključ pa uporabljamo s programom PuTTY. Drugi način: par ključev ustvarimo s programom ssh-keygen, ki je del OpenSSH, prenesemo zasebni ključ v odjemalca in ga pretvorimo v obliko PuTTY."

#. (title)
#: ../source/TortoiseGit_en.xml:15289
msgid "Create Keys using ssh-keygen"
msgstr "Ustvarjanje ključev s ssh-keygen"

#. (para)
#: ../source/TortoiseGit_en.xml:15290
msgid ""
"Login to the server as <literal>root</literal> or <literal>svnuser</literal> and type: <screen>\n"
"ssh-keygen -b 1024 -t dsa -N passphrase -f keyfile\n"
"</screen> substituting a real pass-phrase (which only you know) and key file. We just created a SSH2 DSA key with 1024 bit key-phrase. If you type <screen>\n"
"ls -l keyfile*\n"
"</screen> you will see two files, <filename>keyfile</filename> and <filename>keyfile.pub</filename>. As you might guess, the <filename>.pub</filename> file is the public key file, the other is the private one."
msgstr ""
"Na strežnik se prijavite z uporabniškim imenom <literal>root</literal> ali <literal>svnupornik</literal> in vnesite: <screen>\n"
"ssh-keygen -b 1024 -t dsa -N šifrirnafraza -f datotekaključev\n"
"</screen> pri čemer šifrino frazo (ki jo poznate le vi) in datoteko ključev zamenjate z dejanskimi vrednostmi. Pravkar smo ustvarili ključ SSH2 DSA s 1024-bitno frazo. Če vnesete <screen>\n"
"ls -l datotekaključev*\n"
"</screen>vidite dve datoteki, <filename>datotekaključev</filename> in <filename>datotekaključev.pub</filename>. Datoteka <filename>.pub</filename> je javni ključ, datoteka brez končnice pa zasebni."

#. (para)
#: ../source/TortoiseGit_en.xml:15307
msgid ""
"Append the public key to those in the <filename>.ssh</filename> folder within the <literal>svnuser</literal> home directory: <screen>\n"
"cat keyfile.pub &gt;&gt; /home/svnuser/.ssh/authorized_keys\n"
"</screen>"
msgstr ""
"Javni ključ pripnite ključem v mapi <filename>.ssh</filename> znotraj domače mape uporabnika <literal>svnuporabnik</literal>: <screen>\n"
"cat keyfile.pub &gt;&gt; /home/svnuporabnik/.ssh/authorized_keys\n"
"</screen>"

#. (para)
#: ../source/TortoiseGit_en.xml:15314
msgid "In order to use the private key we generated, we have to convert it to a putty format. This is because the private key file format is not specified by a standards body. After you download the private key file to your client PC, start PuTTYgen and use <menuchoice><guimenu>Conversions</guimenu><guimenuitem>Import key</guimenuitem></menuchoice>. Browse to your file <filename>keyfile</filename> which you got from the server the passphrase you used when creating the key. Finally click on <guibutton>Save private key</guibutton> and save the file as <filename>keyfile.PPK</filename>."
msgstr "Da zasebni ključ, ki smo ga ustvarili, lahko uporabimo, ga moramo pretvoriti v obliko PuTTY. Oblika privatnega ključa namreč ni standardizirana. Ko ste zasebni ključ prenesli na odjemalca, zaženite orodje PuTTYgen in izberite  <menuchoice><guimenu>Conversions</guimenu><guimenuitem>Import key</guimenuitem></menuchoice>. Poiščite svojo <filename>datotekoključev</filename>, ki ste jo dobili s strežnika, in uporabite širfrirno frazo, ki ste jo uporabili pri ustvarjanju ključa. Nazadnje kliknite na gumb <guibutton>Save private key</guibutton> in shranite datoteko z kot <filename>datotekaključev.PPK</filename>."

#. (title)
#: ../source/TortoiseGit_en.xml:15331
msgid "Create Keys using PuTTYgen"
msgstr "Ustvarjanje ključev s programom PuTTYgen"

#. (para)
#: ../source/TortoiseGit_en.xml:15332
msgid ""
"Use PuTTYgen to generate a public-key/private-key pair and save it. Copy the public key to the server and append it to those in the <filename>.ssh</filename> folder within the <literal>svnuser</literal> home directory: <screen>\n"
"cat keyfile.pub &gt;&gt; /home/svnuser/.ssh/authorized_keys\n"
"</screen>"
msgstr ""
"Za ustvarjanje para javnega in zasebnega ključa uporabite PuTTYgen. Ključa shranite. Javni ključ prekopirajte na strežnik in ga dodajte ključem v mapi <filename>.ssh</filename> znotraj domače mape uporabnika <literal>svnuporabnik</literal>: <screen>\n"
"cat keyfile.pub &gt;&gt; /home/svnuporabnik/.ssh/authorized_keys\n"
"</screen>"

#. (title)
#: ../source/TortoiseGit_en.xml:15344
msgid "Test using PuTTY"
msgstr "Preiskušanje s programom PuTTY"

#. (para)
#: ../source/TortoiseGit_en.xml:15345
msgid "To test the connection we will use PuTTY. Start the program and on the <guilabel>Session</guilabel> tab set the hostname to the name or IP address of your server, the protocol to SSH and save the session as <literal>SvnConnection</literal> or whatever name you prefer. On the <guilabel>SSH</guilabel> tab set the preferred SSH protocol version to 2 and from <guilabel>Auth</guilabel> set the full path to the <literal>.PPK</literal> private key file you converted earlier. Go back to the <guilabel>Sessions</guilabel> tab and hit the <guilabel>Save</guilabel> button. You will now see <literal>SvnConnection</literal> in the list of saved sessions."
msgstr "Za preizkus povezave uporabimo PuTTY. Zaženite program in v zavihku <guilabel>Session</guilabel> nastavite ime gostitelja ali naslov IP vašega strežnika, nastavite protokol SSH in shranite sejo s poljubnim imenom, npr <literal>SvnPovezava</literal>. Na zavihku <guilabel>SSH</guilabel> nastavite verzijo protokola na 2 in v zavihku <guilabel>Auth</guilabel> nastavite polno pot do datoteke zasebnega ključa <literal>.PKK</literal>, ki ste ga pred tem pretvorili. Vrnite se na zavihek <guilabel>Sessions</guilabel> in kliknite na gumb <guilabel>Save</guilabel>. Seja <literal>SvnPovezava</literal> bo sedaj navedena med shranjenimi sejami."

#. (para)
#: ../source/TortoiseGit_en.xml:15358
msgid "Click on <guilabel>Open</guilabel> and you should see a telnet style login prompt. Use <literal>svnuser</literal> as the user name and if all is well you should connect directly without being prompted for a password."
msgstr "Kliknite <guilabel>Open</guilabel> in prikazalo sem vam bo okno za prijavo, podobno kot v programu telnet. Za uporabniško ime uporabite <literal>svnuporabnik</literal> in če ste vse naredili pravilno, se boste povezali na strežnik brez vnosa gesla."

#. (para)
#: ../source/TortoiseGit_en.xml:15364
msgid ""
"You may need to edit <filename>/etc/sshd_config</filename> on the server. Edit lines as follows and restart the SSH service afterwards. <screen>\n"
"PubkeyAuthentication yes\n"
"PasswordAuthentication no\n"
"PermitEmptyPasswords no\n"
"ChallengeResponseAuthentication no\n"
"</screen>"
msgstr ""
"Na strežniku boste mogoče morali urediti datoteko <filename>/etc/sshd_config</filename>. Uredite datoteko, kot je navedeno spodaj, nato pa ponovno zaženite storitev SSH.<screen>\n"
"PubkeyAuthentication yes\n"
"PasswordAuthentication no\n"
"PermitEmptyPasswords no\n"
"ChallengeResponseAuthentication no\n"
"</screen>"

#. (title)
#: ../source/TortoiseGit_en.xml:15376
msgid "Testing SSH with TortoiseGit"
msgstr "Preizkušanje SSH s TortoiseGit"

#. (para)
#: ../source/TortoiseGit_en.xml:15377
msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify <filename>/home/svnuser/.ssh/authorized_keys</filename> as follows to allow many Git authors to use the same system account, <literal>svnuser</literal>. Note that every Git author uses the same login but a different authentication key, thus you have to add one line for every author."
msgstr "Preverili smo le, če se lahko prijavite preko SSH. Sedaj moramo zagotoviti, da ta povezava lahko poganja svnserve. Na strežniku spremenite datoteko <filename>/home/svnuser/.ssh/authorized_keys</filename>, kot je navedeno spodaj. S tem omogočite, da več uporabnikov sistema Git istočasno uporablja isti sistemski račun,  <literal>svnuporabnik</literal>. Upoštevajte, da vsak uporabnik sistema Git uporablja iste podatke za prijavo, vendar ima drugačen avtentikacijski ključ, zato morate dodati za vsakega uporabnika eno vrstico."

#. (para)
#: ../source/TortoiseGit_en.xml:15386
msgid ""
"Note: This is all on one very long line. <screen>\n"
"command=\"svnserve -t -r &lt;ReposRootPath&gt; --tunnel-user=&lt;author&gt;\",\n"
"            no-port-forwarding,no-agent-forwarding,no-X11-forwarding,\n"
"            no-pty ssh-rsa &lt;PublicKey&gt; &lt;Comment&gt;\n"
"</screen> There are several values that you need to set according to your setup."
msgstr ""
"Opomba: besedilo je potrebno podati v eni vrstici. <screen>\n"
"command=\"svnserve -t -r &lt;ReposRootPath&gt; --tunnel-user=&lt;author&gt;\",\n"
"            no-port-forwarding,no-agent-forwarding,no-X11-forwarding,\n"
"            no-pty ssh-rsa &lt;PublicKey&gt; &lt;Comment&gt;\n"
"</screen> Vrednosti morate nastaviti tako, da ustrezajo vašemu sistemu."

#. (para)
#: ../source/TortoiseGit_en.xml:15395
msgid "<literal>&lt;ReposRootPath&gt;</literal> should be replaced with the path to the directory containing your repositories. This avoids the need to specify full server paths within URLs. Note that you must use forward slashes even on a Windows server, e.g. <filename>c:/svn/reposroot</filename>. In the examples below we assume that you have a repository folder within the repository root called <filename>repos</filename>."
msgstr "<literal>&lt;ReposRootPath&gt;</literal> je potrebno zamenjati s potjo do mape, ki vsebuje vaša skladišča. Na ta način nam ni potrebno navajati polnih poti pri navajanju naslovov URL. Upoštevajte, da je potrebno tudi v primeru uporabe operacijskega sistema Windows uporabiti poševnice, n. pr. <filename>c:/svn/reposroot</filename>. V naslednjih primerih predpostavljamo, da se skladiščna mapa nahaja v mapi <filename>sklad</filename> v korenski mapi skladišča."

#. (para)
#: ../source/TortoiseGit_en.xml:15404
msgid "<literal>&lt;author&gt;</literal> should be replaced with the svn author that you want to be stored on commit. This also allows svnserve to use its own access rights within <filename>svnserve.conf</filename>."
msgstr "Niz <literal>&lt;author&gt;</literal> je potrebno zamenjati z uporabniškim imenom avtorja, ki naj se uporabi pri objavi. Prav tako s tem omogočimo procesu svnserve uporabo lastne avtorizacije z datoteko <filename>svnserve.conf</filename>."

#. (para)
#: ../source/TortoiseGit_en.xml:15409
msgid "<literal>&lt;PublicKey&gt;</literal> should be replaced with the public key that you generated earlier."
msgstr "<literal>&lt;PublicKey&gt;</literal> je potrebno nadomestiti z javnim ključem, ki ste ga pred tem ustvarili."

#. (para)
#: ../source/TortoiseGit_en.xml:15413
msgid "<literal>&lt;Comment&gt;</literal> can be any comment you like, but it is useful for mapping an svn author name to the person's real name."
msgstr "<literal>&lt;Comment&gt;</literal> je lahko poljuben komentar, vendar je na tem mestu priporočljivo zapisati uporabniško ime v sistemu Git in pravo ime uporabnika."

#. (para)
#: ../source/TortoiseGit_en.xml:15417
msgid ""
"Right click on any folder in Windows Explorer and select <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Repo-Browser</guimenuitem></menuchoice>. You will be prompted to enter a URL, so enter one in this form: <screen>\n"
"svn+ssh://svnuser@SvnConnection/repos\n"
"</screen> What does this URL mean? The Schema name is <literal>svn+ssh</literal> which tells TortoiseGit how to handle the requests to the server. After the double slash, you specify the user to connect to the server, in our case <literal>svnuser</literal>. After the <literal>@</literal> we supply our PuTTY session name. This session name contains all details like where to find the private key and the server's IP or DNS. Lastly we have to provide the path to the repository, relative to the repository root on the server, as specified in the <filename>authorized_keys</filename> file."
msgstr ""
"Desno kliknite na katerokoli mapo v Raziskovalcu in izberite  <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Brskalnik po skladišču</guimenuitem></menuchoice>. Vnesti boste morali naslov URL. Vnesite ga v naslednji obliki: <screen>\n"
"svn+ssh://svnuporabnik@SvnPovezava/sklad\n"
"</screen> Kaj ta naslov pomeni? Ime sheme je <literal>svn+ssh</literal>. To programu TortoiseGit pove, kako obravnavati zahteve do strežnika. Za dvojno poševnico sledi ime uporabnika, ki se priklaplja na strežnik, v našem primeru je to <literal>svnuporabnik</literal>. Po znaku <literal>@</literal> sledi ime seje v programu PuTTY. Seja vsebuje podatke o zasebnem ključu, IP naslovu strežnika, DNS strežniku. Nazadnje podamo še pot do skladišča in sicer relativno na korensko mapo skladišč na strežniku, kot je podano v datoteki <filename>authorized_keys</filename>."

#. (para)
#: ../source/TortoiseGit_en.xml:15437
msgid "Click on <guibutton>OK</guibutton> and you should be able to browse the repository content. If so you now have a running SSH tunnel in conjunction with TortoiseGit."
msgstr "Kliknite na gumb <guibutton>V redu</guibutton> in sedaj naj bi imeli možnost brskanja po vsebini skladišča. Če je res tako, imate delujoč tunel SSH v povezavi s TortoiseGit."

#. (para)
#: ../source/TortoiseGit_en.xml:15442
msgid "Note that by default TortoiseGit uses its own version of Plink to connect. This avoids a console window popping up for every authentication attempt, but it also means that there is nowhere for error messages to appear. If you receive the error <quote>Unable to write to standard output</quote>, you can try specifying Plink as the client in TortoiseGit's network settings. This will allow you to see the real error message generated by Plink."
msgstr "Upoštevajte, da po privzetih nastavitvah TortoiseGit za povezavo uporablja lastno različico aplikacije Plink. S tem se izgognemo pojavljanju konzolnih oken ob vsakem poskusu avtentikacije, hkrati pa to pomeni, da sporočil o napakah ni možno prikazati. Če se pojavi napaka <quote>Unable to write to standard output</quote>, lahko poskusite nastaviti Plink za odjemalca v mrežnih nastavitvah TortoiseGit. Tako boste lahko videli dejansko obvestilo o napaki, ki ga vrne Plink."

#. (title)
#: ../source/TortoiseGit_en.xml:15452
msgid "SSH Configuration Variants"
msgstr "Variacije konfiguracije SSH"

#. (para)
#: ../source/TortoiseGit_en.xml:15453
msgid ""
"One way to simplify the URL in TortoiseGit is to set the user inside the PuTTY session. For this you have to load your already defined session <literal>SvnConnection</literal> in PuTTY and in the <guilabel>Connection</guilabel> tab set <guilabel>Auto login user</guilabel> to the user name, e.g. <literal>svnuser</literal>. Save your PuTTY session as before and try the following URL inside TortoiseGit: <screen>\n"
"svn+ssh://SvnConnection/repos\n"
"</screen> This time we only provide the PuTTY session <literal>SvnConnection</literal> to the SSH client TortoiseGit uses (TortoisePlink.exe). This client will check the session for all necessary details."
msgstr ""
"Eden izmed načinov, kako poenostavimo naslov URL v TortoiseGit, je, da nastavimo uporabnika znotraj seje PuTTY. Naložite že narejeno sejo <literal>SvnPovezava</literal> v PuTTY in v zavihku <guilabel>Connection</guilabel> nastavite <guilabel>Auto login user</guilabel> na uporabniško ime, n. pr. <literal>svnuporabnik</literal>. Sejo shranite in poskusite v TortoiseGit uporabiti naslednji naslov URL: <screen>\n"
"svn+ssh://SvnPovezava/sklad\n"
"</screen> V tem primeru odjemalcu SSH, ki ga uporablja TortoiseGit (TortoisePlink.exe), podamo le ime seje. Odjemalec bo podatke pridobil iz navedene seje."

#. (para)
#: ../source/TortoiseGit_en.xml:15468
msgid "At the time of writing PuTTY does not check all saved configurations, so if you have multiple configurations with the same server name, it will pick the first one which matches. Also, if you edit the default configuration and save it, the auto login user name is <emphasis>not</emphasis> saved."
msgstr "V trenutni različici orodja PuTTY le-ta ne preverja vseh shranjenih konfiguracij. Če imate več konfiguracij, ki se nanašajo na isti strežnik, PuTTY uporabi privega ustreznega. Poleg tega se lahko zgodi, da se pri urejanju privzete konfiguracije in njenem shranjevanu <emphasis>ne</emphasis> shrani uporabniško ime, ki se uporablja za samodejno prijavo."

#. (para)
#: ../source/TortoiseGit_en.xml:15475
msgid "Many people like to use Pageant for storing all their keys. Because a PuTTY session is capable of storing a key, you don't always need Pageant. But imagine you want to store keys for several different servers; in that case you would have to edit the PuTTY session over and over again, depending on the server you are trying to connect with. In this situation Pageant makes perfect sense, because when PuTTY, Plink, TortoisePlink or any other PuTTY-based tool is trying to connect to an SSH server, it checks all private keys that Pageant holds to initiate the connection."
msgstr "Veliko ljudi uporablja Pageant za shranjevanje ključev. Ker je seja PuTTY sposobna shranjevati ključe, programa Pageant ne potrebujete vedno. Predstavljajte pa si, da želite shraniti ključe za različne strežnike; v tem primeru bi morali sejo PuTTY urejevati znova in znova, odvisno od strežnika, s katerim bi se želeli povezati. V tem primeru je uporaba programa Pageant zelo smiselna. Ko PuTTY, Plink, TortoisePlink ali katerikoli program, ki temelji na programu PuTTY, poskuša narediti povezavo do strežnika SSH, le-ta preveri vse ključe, ki jih ima shranjene Pageant, da ustvari povezavo."

#. (para)
#: ../source/TortoiseGit_en.xml:15486
msgid "For this task, simply run Pageant and add the private key. It should be the same private key you defined in the PuTTY session above. If you use Pageant for private key storage, you can delete the reference to the private key file in your saved PuTTY session. You can add more keys for other servers, or other users of course."
msgstr "Poženite Pageant in dodajte zasebni ključ. Uporabiti morate istega kot v seji programa PuTTY zgoraj. Če uporabljate program Pageant za shranjevanje zasebnih ključev, lahko zbrišete referenco na zasebni ključ, ki ste ga shranili v seji PuTTY. Seveda lahko dodate tudi ključe za druge strežnike ali uporabnike."

#. (para)
#: ../source/TortoiseGit_en.xml:15493
msgid "If you don't want to repeat this procedure after every reboot of your client, you should place Pageant in the auto-start group of your Windows installation. You can append the keys with complete paths as command line arguments to Pageant.exe"
msgstr "Če tega postopka ne želite ponavljati ob vsakem zagonu računalnika, dodajte Pageant v mapo za samodejni zagon (Startup). Ključe vključno s potmi lahko dodate kot parametre ukazne vrstice programa Pageant.exe"

#. (para)
#: ../source/TortoiseGit_en.xml:15499
msgid ""
"The last way to connect to an SSH server is simply by using this URL inside TortoiseGit: <screen>\n"
"svn+ssh://svnuser@100.101.102.103/repos\n"
"svn+ssh://svnuser@mydomain.com/repos\n"
"</screen> As you can see, we don't use a saved PuTTY session but an IP address (or domain name) as the connection target. We also supply the user, but you might ask how the private key file will be found. Because TortoisePlink.exe is just a modified version of the standard Plink tool from the PuTTY suite, TortoiseGit will also try all the keys stored in Pageant."
msgstr ""
"Zadni način priklopa na strežnik SSH je z uporabo naslednjega naslova URL znotraj TortoiseGit: <screen>\n"
"svn+ssh://svnuporabnik@100.101.102.103/sklad\n"
"svn+ssh://svnuporabnik@mojadomena.si/sklad\n"
"</screen> Kot vidite, ne uporabljamo shranjene seje programa PuTTY, ampak naslov IP (ali domeno) kot cilj priklopa. Dodamo tudi uporabnika. Verjetno se vprašate, kako najdemo zasebni ključ. Ker je TortoisePlink.exe le predelana verzija standardnega programa Plink iz svežnja programov PuTTY, TortoiseGit poskusi uporabiti vse ključe, ki so shranjeni v Pageantu."

#. (title)
#: ../source/TortoiseGit_en.xml:15519
msgid "Glossary"
msgstr "Slovar"

#. (para)
#: ../source/TortoiseGit_en.xml:15523
msgid "A Git command that is used to add a file or directory to your working copy. The new items are added to the repository when you commit."
msgstr "Ukaz Git, ki se uporablja za dodajanje datoteke ali mape v delovno kopijo. Novi elementi so dodani v skladišče, ko naredite objavo."

#. (glossterm)
#: ../source/TortoiseGit_en.xml:15531
msgid "BASE revision"
msgstr "Revizija BASE"

#. (para)
#: ../source/TortoiseGit_en.xml:15533
msgid "The current base revision of a file or folder in your <emphasis>working copy</emphasis>. This is the revision the file or folder was in, when the last checkout, update or commit was run. The BASE revision is normally not equal to the HEAD revision."
msgstr "Trenutna osnovna revizija datoteke v vaši <emphasis>delovni kopiji</emphasis>. To je različica datoteke, kakršna je bila pri zadnjem prevzemu, posodobitvi ali objavi. Revizija BASE običajno ni ista kot revizija HEAD."

#. (para)
#: ../source/TortoiseGit_en.xml:15544
msgid "This command is for text files only, and it annotates every line to show the repository revision in which it was last changed, and the author who made that change. Our GUI implementation is called TortoiseBlame and it also shows the commit date/time and the log message when you hover the mouse of the revision number."
msgstr "Ta ukaz se uporablja samo pri besedilnih datotekah. Vsako vrstico datoteke označi z informacijo, v kateri reviziji je bila nazadnje spremenjena in kdo je spremembo naredil. Grafični ekvivalent temu ukazu je TortoiseBlame, ki vam pokaže tudi datum in dnevniški zapis, če greste z miško na številko revizije."

#. (glossterm)
#: ../source/TortoiseGit_en.xml:15554
msgid "BDB"
msgstr "BDB"

#. (para)
#: ../source/TortoiseGit_en.xml:15556
msgid "Berkeley DB. A well tested database backend for repositories, that cannot be used on network shares. Default for pre 1.2 repositories."
msgstr "Berkeley DB. Dobro preizkušena baza podatkov za skladišča, ki se ne more uporabljati v mapah v skupni rabi v omrežju. To je privzeta baza za skladišča pred različico 1.2."

#. (glossterm)
#: ../source/TortoiseGit_en.xml:15563
msgid "Branch"
msgstr "Veja"

#. (para)
#: ../source/TortoiseGit_en.xml:15565
msgid "A term frequently used in revision control systems to describe what happens when development forks at a particular point and follows 2 separate paths. You can create a branch off the main development line so as to develop a new feature without rendering the main line unstable. Or you can branch a stable release to which you make only bug fixes, while new developments take place on the unstable trunk. In Git a branch is implemented as a <quote>cheap copy</quote>."
msgstr "Ta izraz, ki se pri nadzoru različic pogosto uporablja, opisuje, kaj se zgodi, ko se razvoj prelomi v določeni točki in se nadaljuje v dveh smereh. Iz glavne veje lahko ustvarite vejo, da razvijate novo zmožnost programa, ne da bi naredili glavno vejo nestabilno. Lahko pa naredite vejo iz stabilne verzije programa, da naredite popravke, razvoj pa se nadaljuje na nestabilni veji. V sistemu Git so veje izvedene kot <quote>poceni kopije</quote>."

#. (para)
#: ../source/TortoiseGit_en.xml:15580
msgid "A Git command which creates a local working copy in an empty directory by downloading versioned files from the repository."
msgstr "Ukaz, ki ustvari krajevno delovno kopijo v prazni mapi in prenese datoteke pod nadzorom iz skladišča."

#. (para)
#: ../source/TortoiseGit_en.xml:15589
msgid "To quote from the Git book: <quote> Recursively clean up the working copy, removing locks and resuming unfinished operations. If you ever get a <emphasis>working copy locked</emphasis> error, run this command to remove stale locks and get your working copy into a usable state again. </quote> Note that in this context <emphasis>lock</emphasis> refers to local filesystem locking, not repository locking."
msgstr "Citat iz knjige The Git Book: <quote> Rekurzivno počisti delovno kopijo, tako da odstrani zaklepe in zaključi nedokončane operacije. Če se vam kdaj prikaže sporočilo <emphasis>delovna kopija zaklenjena</emphasis>, poženite ta ukaz, da ostranite zaklepe in naredite delovno kopijo spet uporabno.</quote> Upoštevajte, da v tem kontekstu <emphasis>zaklep</emphasis> pomeni zaklepanje datotečnega sistema in ne zaklepanje skladišča."

#. (para)
#: ../source/TortoiseGit_en.xml:15606
msgid "This Git command is used to pass the changes in your local working copy back into the repository, creating a new repository revision."
msgstr "Ta ukaz sistema Git se uporablja za pošiljanje sprememb v delovni kopiji nazaj na skladišče. S tem se tam ustvari nova revizija."

#. (glossterm)
#: ../source/TortoiseGit_en.xml:15614
msgid "Conflict"
msgstr "Spor"

#. (para)
#: ../source/TortoiseGit_en.xml:15616
msgid "When changes from the repository are merged with local changes, sometimes those changes occur on the same lines. In this case Git cannot automatically decide which version to use and the file is said to be in conflict. You have to edit the file manually and resolve the conflict before you can commit any further changes."
msgstr "Ko spremembe iz skladišča spojimo s krajevnimi spremembami, se včasih spremembe zgodijo na isti vrstici. V takšnem primeru se Git ne more sam odločiti, katero različico naj uporabi in datoteka je v spornem stanju. Pred objavo morate datoteko ročno urediti in rešiti spor."

#. (glossterm)
#: ../source/TortoiseGit_en.xml:15626
msgid "Copy"
msgstr "Kopiraj"

#. (para)
#: ../source/TortoiseGit_en.xml:15628
msgid "In a Git repository you can create a copy of a single file or an entire tree. These are implemented as <quote>cheap copies</quote> which act a bit like a link to the original in that they take up almost no space. Making a copy preserves the history of the item in the copy, so you can trace changes made before the copy was made."
msgstr "V skladišču Git lahko naredite kopijo datoteke ali celotnega drevesa. Kopije so izvedene kot <quote>poceni kopije</quote>, kar je nekaj podobnega kot povezava na originalen element in ne zavzema skoraj nič prostora. Kopija ohrani zgodovino originala, tako da lahko vedno pogledate spremembe, ki so bile narejene preden se je element prekopiral."

#. (para)
#: ../source/TortoiseGit_en.xml:15640
msgid "When you delete a versioned item (and commit the change) the item no longer exists in the repository after the committed revision. But of course it still exists in earlier repository revisions, so you can still access it. If necessary, you can copy a deleted item and <quote>resurrect</quote> it complete with history."
msgstr "Ko izbrišete datoteko pod nadzorom (in objavite spremembo), tega elementa ni več v skladišču od objavljene revizije naprej. Seveda pa še vedno obstaja v prejšnjih revizijah skladišča in tako lahko še vedno dostopate do njega. Če je potrebno, lahko skopirate izbrisan element in ga pripeljete nazaj med žive s celotno zgodovino."

#. (para)
#: ../source/TortoiseGit_en.xml:15652
msgid "Shorthand for <quote>Show Differences</quote>. Very useful when you want to see exactly what changes have been made."
msgstr "Bližnica za <quote>Prikaži razlike</quote>. Zelo uporabno, ko želite vedeti, kaj točno se je spremenilo."

#. (para)
#: ../source/TortoiseGit_en.xml:15661
msgid "This command produces a copy of a versioned folder, just like a working copy, but without the local <literal>.svn</literal> folders."
msgstr "Ta ukaz ustvari kopijo mape pod nadzorom, prav takšno, kot je delovna kopija, vendar brez krajevnih map <literal>.svn</literal>."

#. (glossterm)
#: ../source/TortoiseGit_en.xml:15669
msgid "FSFS"
msgstr "FSFS"

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

#. (para)
#: ../source/TortoiseGit_en.xml:15680
msgid "Group policy object"
msgstr "Group policy object"

#. (glossterm)
#: ../source/TortoiseGit_en.xml:15686
msgid "HEAD revision"
msgstr "Revizija HEAD"

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

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

#. (para)
#: ../source/TortoiseGit_en.xml:15705
msgid "When you take out a lock on a versioned item, you mark it in the repository as non-committable, except from the working copy where the lock was taken out."
msgstr "Ko element pod nadzorom zaklenete, ga s tem označite v skladišču in preprečite objave, razen iz delovne kopije, ki je zaklep zahtevala."

#. (glossterm)
#: ../source/TortoiseGit_en.xml:15713
msgid "Log"
msgstr "Dnevnik"

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

#. (glossterm)
#: ../source/TortoiseGit_en.xml:15722
msgid "History"
msgstr "Zgodovina"

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

#. (para)
#: ../source/TortoiseGit_en.xml:15733
msgid "The process by which changes from the repository are added to your working copy without disrupting any changes you have already made locally. Sometimes these changes cannot be reconciled automatically and the working copy is said to be in conflict."
msgstr "Proces dodajanja sprememb iz skladišča v vašo delovno kopijo, ne da ob tem povozite krajevne spremembe. Včasih sprememb ni možno samodejno spojiti in takrat je delovna kopija sporna."

#. (para)
#: ../source/TortoiseGit_en.xml:15739
msgid "Merging happens automatically when you update your working copy. You can also merge specific changes from another branch using TortoiseGit's Merge command."
msgstr "Spajanje se zgodi samodejno, ko posodabljate delovno kopijo. Lahko pa opravljate spajanje specifičnih sprememb iz druge veje z uporabo ukaza Spoji."

#. (glossterm)
#: ../source/TortoiseGit_en.xml:15747
msgid "Patch"
msgstr "Popravek"

#. (para)
#: ../source/TortoiseGit_en.xml:15749
msgid "If a working copy has changes to text files only, it is possible to use Git's Diff command to generate a single file summary of those changes in Unified Diff format. A file of this type is often referred to as a <quote>Patch</quote>, and it can be emailed to someone else (or to a mailing list) and applied to another working copy. Someone without commit access can make changes and submit a patch file for an authorized committer to apply. Or if you are unsure about a change you can submit a patch for others to review."
msgstr "Če so se v delovni kopiji spremenile le besedilne datoteke, je možno z ukazom Razlikuj ustvariti datoteko s povzetkom sprememb v obliki poenotene razlike (unified diff). Datoteka takšnega tipa se pogosto imenuje <quote>popravek</quote> in se lahko uporablja za pošiljanje sprememb po elektronski pošti vašemu sodelavcu ali dopisnemu seznamu. Ta datoteka se potem uporabi na neki drugi delovni kopiji. Nekdo, ki nima pravic pisanja po skladišču, lahko naredi spremembe in ustvari popravek, ki ga objavi nek drug uporabnik, ki ustrezne pravice ima. Ali pa če niste prepričani, da so vaše spremembe dobre, lahko na ta način drugim uporabnikom pošljete spremembe v pregled."

#. (glossterm)
#: ../source/TortoiseGit_en.xml:15762
msgid "Property"
msgstr "Lastnost"

#. (para)
#: ../source/TortoiseGit_en.xml:15764
msgid "In addition to versioning your directories and files, Git allows you to add versioned metadata - referred to as <quote>properties</quote> to each of your versioned directories and files. Each property has a name and a value, rather like a registry key. Git has some special properties which it uses internally, such as <literal>svn:eol-style</literal>. TortoiseGit has some too, such as <literal>tsvn:logminsize</literal>. You can add your own properties with any name and value you choose."
msgstr "Poleg vodenja različic map in datotek Git omogoča tudi vodenje različic meta podatkov - rečemo jim <quote>lastnosti</quote> - za vsak element pod nadzorom. Vsaka lastnost ima ime in vrednost, podobno kot register. Git interno uporablja nekaj posebnih lastnosti, n. pr. <literal>svn:eol-style</literal>. Tudi TortoiseGit uporablja nekaj internih lastnosti, n. pr. <literal>tsvn:logminsize</literal>. Lahko pa dodate svoje lastnosti s poljubnim imenom in vrednostjo."

#. (para)
#: ../source/TortoiseGit_en.xml:15779
msgid "If your repository moves, perhaps because you have moved it to a different directory on your server, or the server domain name has changed, you need to <quote>relocate</quote> your working copy so that its repository URLs point to the new location."
msgstr "Če se skladišče premakne (ker ste ga premaknili v drugo mapo na strežniku ali pa se je spremenilo domensko ime),  morate narediti <quote>premik</quote> delovne kopije, da bodo poti URL do skladišča kazale na novo lokacijo."

#. (para)
#: ../source/TortoiseGit_en.xml:15785
msgid "Note: you should only use this command if your working copy is referring to the same location in the same repository, but the repository itself has moved. In any other circumstance you probably need the <quote>Switch</quote> command instead."
msgstr "Opomba: ta ukaz uporabljajte le, če delovna kopija kaže na isto lokacijo znotraj istega skladišča, skladišče pa se je premaknilo na drugo lokacijo. V vseh ostalih primerih uporabite ukaz <quote>Preklopi</quote>."

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

#. (para)
#: ../source/TortoiseGit_en.xml:15796
msgid "A repository is a central place where data is stored and maintained. A repository can be a place where multiple databases or files are located for distribution over a network, or a repository can be a location that is directly accessible to the user without having to travel across a network."
msgstr "Skladišče je središčna lokacija, kjer se podatki shranjujejo in vzdržujejo. Skladišče je lahko lokacija, kjer so shranjene številne baze podatkov ali datoteke za distibucijo preko omrežja, lahko pa je tudi lokacija, ki je neposredno dostopna uporabniku, ne da bi uporabljal omrežje."

#. (para)
#: ../source/TortoiseGit_en.xml:15807
msgid "When files in a working copy are left in a conflicted state following a merge, those conflicts must be sorted out by a human using an editor (or perhaps TortoiseMerge). This process is referred to as <quote>Resolving Conflicts</quote>. When this is complete you can mark the conflicted files as being resolved, which allows them to be committed."
msgstr "Ko so datoteke v delovni kopiji sporne (zaradi spajanja), mora uporabnik te spore rešiti z uporabo urejevalnika (ali pa programa TortoiseMerge). Procesu rečemo <quote>reševanje sporov</quote>. Ko ste spore rešili, označite datoteko kot rešeno, kar vam omogoča njeno objavo."

#. (para)
#: ../source/TortoiseGit_en.xml:15819
msgid "Git keeps a local <quote>pristine</quote> copy of each file as it was when you last updated your working copy. If you have made changes and decide you want to undo them, you can use the <quote>revert</quote> command to go back to the pristine copy."
msgstr "Git hrani krajevno <quote>izvirno</quote> kopijo vsake datoteke, kakršna je bila ob zadnji posodobitvi. Če ste na datoteki naredili spremembe in jih želite povrniti, uporabite ukaz <quote>povrni</quote>, da dobite nazaj izvirno datoteko."

#. (glossterm)
#: ../source/TortoiseGit_en.xml:15828
msgid "Revision"
msgstr "Revizija"

#. (para)
#: ../source/TortoiseGit_en.xml:15830
msgid "Every time you commit a set of changes, you create one new <quote>revision</quote> in the repository. Each revision represents the state of the repository tree at a certain point in its history. If you want to go back in time you can examine the repository as it was at revision N."
msgstr "Vsakič ko objavite spremembe, naredite novo <quote>revizijo</quote> v skladišču. Vsaka revizija predstavlja stanje skladišča ob določeni točki v njegovi zgodovini. Če želite, si lahko ogledate skladišče, kakršno je bilo ob reviziji številka N."

#. (para)
#: ../source/TortoiseGit_en.xml:15837
msgid "In another sense, a revision can refer to the set of changes that were made when that revision was created."
msgstr "Drug pogled: revizija je množica sprememb, ki so bile narejene, ko je bila revizija ustvarjena."

#. (glossterm)
#: ../source/TortoiseGit_en.xml:15844
msgid "Revision Property (revprop)"
msgstr "Lastnost revizije (revprop)"

#. (para)
#: ../source/TortoiseGit_en.xml:15846
msgid "Just as files can have properties, so can each revision in the repository. Some special revprops are added automatically when the revision is created, namely: <literal>svn:date svn:author svn:log</literal> which represent the commit date/time, the committer and the log message respectively. These properties can be edited, but they are not versioned, so any change is permanent and cannot be undone."
msgstr "Prav tako, kot imajo lastnosti datoteke, jih imajo tudi revizije v skladišču. Nekatere posebne se dodajo samodejno, ko se revizija ustvari: <literal>svn:date svn:author svn:log</literal>, ki predstavljajo datum/čas objave, avtorja in sporočilo dnevniškega zapisa. Vrednosti teh lastnosti lahko urejate, vendar upoštevajte, da niso pod nadzorom različic, tako da so spremembe trajne in se jih ne da povrniti."

#. (glossterm)
#: ../source/TortoiseGit_en.xml:15858
msgid "SVN"
msgstr "SVN"

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

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

#. (para)
#: ../source/TortoiseGit_en.xml:15872
msgid "Just as <quote>Update-to-revision</quote> changes the time window of a working copy to look at a different point in history, so <quote>Switch</quote> changes the space window of a working copy so that it points to a different part of the repository. It is particularly useful when working on trunk and branches where only a few files differ. You can switch your working copy between the two and only the changed files will be transferred."
msgstr "Prav tako kot ukaz <quote>posodobi-na-revizijo</quote> spremeni časovno okno delovne kopije, da izgleda tako, kot v neki določeni točki v zgodovini, ukaz <quote>Preklopi</quote> spremeni prostorsko okno delovne kopije, da kaže na drugo mesto v skladišču. To je uporabno predvsem takrat, kot delate na glavni veji in na stranskih vejah, na katerih je spremenjenih le nekaj datotek. Delovno kopijo lahko preklapljate, prenesejo pa se le spremenjene datoteke."

#. (para)
#: ../source/TortoiseGit_en.xml:15886
msgid "This Git command pulls down the latest changes from the repository into your working copy, merging any changes made by others with local changes in the working copy."
msgstr "Ta ukaz prenese vse zadnje spremembe iz skladišča v delovno kopijo, pri tem pa spoji spremebe, ki so jih naredili ostali uporabniki, z vašimi spremembami v delovni kopiji."

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

#. (para)
#: ../source/TortoiseGit_en.xml:15896
msgid "This is your local <quote>sandbox</quote>, the area where you work on the versioned files, and it normally resides on your local hard disk. You create a working copy by doing a <quote>Checkout</quote> from a repository, and you feed your changes back into the repository using <quote>Commit</quote>."
msgstr "To je vaš krajeni <quote>peskovnik</quote>, področje, kjer lahko delate z datotekami pod nadzorom in se običajno nahaja na vašem trdem disku. Z uporabno ukaza <quote>Prevzemi</quote> naredite delovno kopijo iz skladišča, spremembe, ki jih naredite, pa shranite v skladišče z ukazom <quote>Objavi</quote>."

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

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

#~ msgid "/mergefrom:xxx"
#~ msgstr "/mergefrom:xxx"
#~ msgid "/mergeto:xxx"
#~ msgstr "/mergeto:xxx"
#~ msgid "Merge All Changes"
#~ msgstr "Spoji vse spremembe"
#~ msgid "merge all"
#~ msgstr "spoji vse"
#~ msgid ""
#~ "If you use this feature you must be sure that all clients are using merge "
#~ "tracking, otherwise the merge history may be incomplete. Also, if the "
#~ "server does not have a merge tracking database, gathering the information "
#~ "will be very slow."
#~ msgstr ""
#~ "Če uporabljate to zmožnost, morate zagotoviti, da vsi odjemalci "
#~ "uporabljajo sledenje spajanja, drugače se lahko zgodi, da bo zgodovina "
#~ "spajanja nepopolna. Če stežnik nima baze podatkov o spajanju, bo "
#~ "pridobivanje informacij potekalo zelo počasi."