"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 <dev@TortoiseGit.tigris.org>\n"
+"Language-Team: TortoiseGit translation team <tortoisegit-dev@googlegroups.com >\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. (subtitle)
#: ../source/TortoiseGit_en.xml:5
-msgid "A Subversion client for Windows"
-msgstr "Odjemalec za Subversion v operacijskem sistemu Windows"
+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)
#. (para)
#: ../source/TortoiseGit_en.xml:72
-msgid "This book is written for computer literate folk who want to use Subversion to manage their data, but are uncomfortable using the command line client to do so. Since 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 Subversion, vendar niso vešči dela preko ukazne vrstice. Ker je TortoiseGit razširitev Windowsove lupine, predpostavljamo, da uporabnik pozna Raziskovalca in ga zna uporabljati."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:95
-msgid "In <xref linkend=\"tsvn-basics\"/> we give a short introduction to the <emphasis>Subversion</emphasis> revision control system which underlies TortoiseGit. This is borrowed from the documentation for the Subversion project and explains the different approaches to version control, and how Subversion works."
-msgstr "Poglavje <xref linkend=\"tsvn-basics\"/> poda nekaj osnov o sistemu za nadzor različic <emphasis>Subversion</emphasis>, ki je podlaga za TortoiseGit. Ta del je izposojen iz dokumentacije Subversion in ponazori različne pristope k vodenju različic datotek in delovanje sistema Subversion."
+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 Subversion users will never have to set up a server themselves. The next chapter deals with how to set up such a server, and is useful for administrators."
-msgstr "Čeprav večini uporabnikov sistema Subversion ne bo nikoli potrebno postavljati strežnika, naslednje poglavje opiše, kako se to naredi. Primerno je za skrbnike sistema."
+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 Subversion 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 Subversion 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."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:134
-msgid "The <xref linkend=\"tsvn-cli\"/> give a correlation between TortoiseGit commands and their equivalents in the Subversion command line client <literal>svn.exe</literal>."
-msgstr "Poglavje <xref linkend=\"tsvn-cli\"/> poda seznam ukazov TortoiseGit in njihovih sorodnih ukazov v odjemalcu Subversion za ukazno vrstico (<literal>svn.exe</literal>)."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:169
-msgid "Both TortoiseGit and Subversion are developed by a community of people who are working on those projects. They come from different countries all over the world and joined together to create wonderful programs."
-msgstr "Projekta TortoiseGit in Subversion razvija skupnost ljudi, ki prihajajo iz vseh koncev sveta in ki so se združili, da bi ustvarjali čudovite programe."
+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
#. (term)
#: ../source/TortoiseGit_en.xml:216
-msgid "The Subversion Book"
-msgstr "The Subversion Book"
+msgid "The Git Book"
+msgstr "The Git Book"
#. (para)
#: ../source/TortoiseGit_en.xml:218
-msgid "for the great introduction to Subversion and its chapter 2 which we copied here"
-msgstr "za izvrsten uvod v sistem Subversion in poglavje številka dve, ki smo ga uporabili v tej knjigi"
+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
#. (para)
#: ../source/TortoiseGit_en.xml:340
-msgid "TortoiseGit is a free open-source client for the <firstterm>Subversion</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 Subversion 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>Subversion</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 Subversion in tudi ostale sisteme za nadzor različic kot neke vrste <quote>časovni stroj</quote>."
+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. Subversion, 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). Subversion ni tak sistem; je splošen sistem, ki omogoča urejanje <emphasis>katerokoli</emphasis> zbirke datotek, vključno z datotekami izvorne kode."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:369
-msgid "In 2002, Tim Kemp found that Subversion was a very good version control system, but it lacked a good GUI client. The idea for a Subversion client as a Windows shell integration was inspired by the similar client for CVS named TortoiseCVS."
-msgstr "Leta 2002 je Tim Kemp ugotovil, da je Subversion zelo dober sistem za nadzor različic, a brez grafičnega uporabniškega vmesnika. Idejo za odjemalca kot lupino sistema Windows je dobil iz podobnega odjemalca za sistem CVS - TortoiseCVS."
+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 Subversion 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 Subversion 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."
+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 Subversion became more stable it attracted more and more users who also started using TortoiseGit as their Subversion client. The user base grew quickly (and is still growing every day). That's when Lübbe Onken offered to help out with some nice icons and a logo for TortoiseGit. And he takes care of the website and manages the translation."
-msgstr "Sistem Subversion je postajal vse bolj stabilen in je pridobival vedno več uporabnikov, ki so uporabljali TortoiseGit kot odjemalca za Subversion. Število uporabnikov je hitro naraščalo (in raste še danes). Takrat je Lübbe Onken ponudil svojo pomoč in izdelal lepe ikone in logotip za TortoiseGit. Ureja tudi spletno stran in prevode."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:400
-msgid "What makes TortoiseGit such a good Subversion client? Here's a short list of features."
-msgstr "Zakaj je TortoiseGit tako dober odjemalec za Subversion? Tukaj je kratek seznam njegovih značilnosti."
+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
#. (term)
#: ../source/TortoiseGit_en.xml:445
-msgid "Easy access to Subversion commands"
-msgstr "Preprost dostop do ukazov sistema Subversion"
+msgid "Easy access to Git commands"
+msgstr "Preprost dostop do ukazov sistema Git"
#. (para)
#: ../source/TortoiseGit_en.xml:447
-msgid "All Subversion commands are available from the explorer context menu. TortoiseGit adds its own submenu there."
-msgstr "Vsi ukazi sistema Subversion so na razpolago v kontekstnem meniju Raziskovalca. TortoiseGit doda tja svoj lasten pomeni."
+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 Subversion client, we would also like to show you some of the features of Subversion itself:"
-msgstr "Ker je TortoiseGit odjemalec za Subversion, vam bomo prikazali tudi nekaj značilnosti samega sistema Subversion:"
+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
#. (para)
#: ../source/TortoiseGit_en.xml:462
-msgid "CVS only tracks the history of individual files, but Subversion 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, Subversion 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."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:499
-msgid "Subversion has an abstracted notion of repository access, making it easy for people to implement new network mechanisms. Subversion'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 Subversion a big advantage in stability and interoperability, and provides various key features for free: authentication, authorization, wire compression, and repository browsing, for example. A smaller, standalone Subversion server process is also available. This server speaks a custom protocol which can be easily tunneled over ssh."
-msgstr "Subversion je vpeljal abstrakten koncept dostopa do skladišča, kar uporabnikom omogoča, da izdelajo nove omrežne mehanizme. Subversionov <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 Subversion 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 Subversion. Strežnik se pogovarja po prilagojenem protokolu, ki se ga preprosto preusmeri preko ssh."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:518
-msgid "Subversion expresses file differences using a binary differencing algorithm, which works identically on both text (human-readable) and binary (human-unreadable) files. Both types of files are stored equally compressed in the repository, and differences are transmitted in both directions across the network."
-msgstr "Subversion zapisuje razlike med datotekami z dvojiškim algoritmom za razlikovanje, ki deluje tako na tekstovnih (uporabniku berljivih) kot na dvojiških (uporabniku neberljivih) datotekah. Datoteke obeh tipov so enako stisnjene in shranjene v skladišču, razlike pa se prenašajo v obeh smereh po mreži."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:531
-msgid "The cost of branching and tagging need not be proportional to the project size. Subversion creates branches and tags by simply copying the project, using a mechanism similar to a hard-link. Thus these operations take only a very small, constant amount of time, and very little space in the repository."
-msgstr "Cena vej in oznak ni nujno sorazmerna z velikostjo projekta. Subversion ustvari veje in oznake tako, da projekt skopira z uporabo mehanizma, podobnega simbolnim povezavam. Tako ti operaciji trajata zelo kratek (konstanten) čas in zavzameta zelo malo prostora v skladišču."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:544
-msgid "Subversion has no historical baggage; it is implemented as a collection of shared C libraries with well-defined APIs. This makes Subversion extremely maintainable and usable by other applications and languages."
-msgstr "Sistem Subversion nima zgodovine. Razvit je kot zbirka knjižnic v jeziku C z dobro definiranim programskim vmesnikom (API). Zato je Subversion zelo primeren za vzdrževanje in uporabo s strani ostalih aplikacij in jezikov."
+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
#. (primary)
#: ../source/TortoiseGit_en.xml:724
-msgid "Subversion book"
-msgstr "Subversion book"
+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
Subversion book. An online version of the Subversion 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
Subversion 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>."
+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 Subversion. If you're new to version control, this chapter is definitely for you. We begin with a discussion of general version control concepts, work our way into the specific ideas behind Subversion, and show some simple examples of Subversion in use."
-msgstr "To poglavje je kratek uvod v Subversion. Če se z nadzorom različic še niste srečali, potem je to poglavje za vas. Začnemo s splošnimi principi nadzora različic, pregledamo posebnosti sistema Subversion in na enostavnih primerih pogledamo, kako se Subversion uporablja."
+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 Subversion can manage any sort of file collection - it's not limited to helping computer programmers."
-msgstr "Čeprav primeri v tem poglavju prikazujejo, kako si uporabniki delijo programsko izvorno kodo, upoštevajte, da lahko Subversion upravlja katerekoli datoteke - ni omejen samo na pomoč računalniškim programerjem."
+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)
#. (para)
#: ../source/TortoiseGit_en.xml:755
-msgid "Subversion 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 "Subversion 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."
+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
#. (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 Subversion 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. Subversion 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."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:895
-msgid "Subversion, 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 "Subversion, 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."
+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
#. (title)
#: ../source/TortoiseGit_en.xml:976
-msgid "What does Subversion Do?"
-msgstr "Kaj naredi Subversion?"
+msgid "What does Git Do?"
+msgstr "Kaj naredi Git?"
#. (para)
#: ../source/TortoiseGit_en.xml:977
-msgid "Subversion uses the copy-modify-merge solution by default, and in many cases this is all you will ever need. However, as of Version 1.2, Subversion also supports file locking, so if you have unmergeable files, or if you are simply forced into a locking policy by management, Subversion will still provide the features you need."
-msgstr "Subversion po privzetih nastavitvah uporablja model kopiraj-spremeni-spoji in v veliko primerih je to vse, kar potrebujete. Od različice 1.2 naprej pa Subversion podpira tudi zaklepanje datotek. Če torej delate na datotekah, ki se jih ne da spajati ali če ste takšen model prisiljeni uporabljati zaradi pravil, ki veljajo v vašem podjetju, vam Subversion ponuja možnosti, ki jih potrebujete."
+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 "Subversion in Action"
-msgstr "Subversion v akciji"
+msgid "Git in Action"
+msgstr "Git v akciji"
#. (title)
#: ../source/TortoiseGit_en.xml:991
#. (para)
#: ../source/TortoiseGit_en.xml:995
-msgid "You've already read about working copies; now we'll demonstrate how the Subversion client creates and uses them."
-msgstr "O delovnih kopijah ste že brali. Sedaj bomo prikazali, kako jih odjemalec Subversion ustvari in uporablja."
+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 Subversion working copy is an ordinary directory tree on your local system, containing a collection of files. You can edit these files however you wish, and if they're source code files, you can compile your program from them in the usual way. Your working copy is your own private work area: Subversion will never incorporate other people's changes, nor make your own changes available to others, until you explicitly tell it to do so."
-msgstr "Delovna kopija sistema Subversion je običajna struktura map na vašem krajevnem sistemu, ki vsebuje datoteke. Datoteke lahko poljubno spreminjate. Če so to datoteke izvorne kode, lahko iz njih povsem običajno prevedete program. Vaša delovna kopija je vaše zasebno delovno območje: Subversion ne bo v vašo delovno kopijo nikoli vnašal sprememb, ki so jih naredili drugi uporabniki, prav tako vaših sprememb ne bo dal na voljo drugim, razen ko boste to izrecno zahtevali od njega."
+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, Subversion 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, Subversion provides you with commands to merge those changes into your working directory (by reading from the repository)."
-msgstr "Ko ste naredili določene spremembe v datotekah v delovni kopiji in jih preverili, uporabite ukaze sistema Subversion, da spremembe <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 Subversion omogoča, da te spremembe spojite v delovno kopijo (z branjem iz skladišča)."
+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 Subversion, 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 Subversion recognize which files contain unpublished changes, and which files are out-of-date with respect to others' work."
-msgstr "Delovna kopija vsebuje tudi nekaj posebnih datotek, ki jih ustvari in vzdržuje Subversion za pomoč pri izvajanju ukazov. Vsak mapa znotraj delovne kopije vsebuje podmapo <filename>.svn</filename>, ki ji rečemu <firstterm>skrbniška mapa</firstterm>. Datoteke znotraj te mape pomagajo sistemu Subversion prepoznati datoteke, ki vsebujejo neobjavljene spremembe, in datoteke, ki so jih spreminjali drugi uporabniki in so tako zastarele."
+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 Subversion repository often holds the files (or source code) for several projects; usually, each project is a subdirectory in the repository's filesystem tree. In this arrangement, a user's working copy will usually correspond to a particular subtree of the repository."
-msgstr "Tipično skladišče sistema Subversion pogosto vsebuje datoteke (ali izvorno kodo) za več projektov; običajno je vsak projekt podmapa v drevesni strukturi skladišča. Pri takšni ureditvi bo uporabnikova delovna kopija običajno ustrezala določenemu podrevesu skladišča."
+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
#. (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, Subversion can tell that you've changed the file. However, Subversion does not make your changes public until you explicitly tell it to. The act of publishing your changes is more commonly known as <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, Subversion ve, da ste datoteko sprememenili. Vendar pa Subversion ne objavi sprememb, dokler mu tega ne ukažete. Temu rečemo <firstterm>objava</firstterm> (ali <firstterm>vrnitev</firstterm>) sprememb v skladišče."
+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 Subversion's <command>commit</command> command."
+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)
#. (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; Subversion 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; Subversion spreminja delovne kopije le na zahtevo uporabnika."
+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 Subversion to <firstterm>update</firstterm> her working copy, by using the Subversion <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 Subversion 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."
+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; Subversion 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; Subversion uporabi informacije v mapi <filename>.svn</filename> in dodatne informacije iz skladišča, da se odloči, katere datoteke je potrebno posodobiti."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:1104
-msgid "Subversion repositories can be accessed through many different methods - on local disk, or through various network protocols. A repository location, however, is always a URL. The URL schema indicates the access method:"
-msgstr "Do skladišč Subversion lahko dostopate na več različnih načinov - na krajevnem disku ali preko različnih omrežnih protokolov. Lokacija skladišča pa je vedno navedena z naslovom URL. Shema naslova URL pove način dostopa:"
+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
#. (entry)
#: ../source/TortoiseGit_en.xml:1135
-msgid "Access via WebDAV protocol to Subversion-aware Apache server."
-msgstr "Dostop do strežnika Apache s sistemom Subversion preko protokola WebDAV."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:1168
-msgid "For the most part, Subversion's URLs use the standard syntax, allowing for server names and port numbers to be specified as part of the URL. The <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 Subversion za naslove URL uporablja standardna sintaksa, kar omogoča, da se ime strežnika in številka vrat pojavljata kot del naslova URL. Metoda dostopa <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>."
+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
#. (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. Subversion retains this atomicity in the face of program crashes, system crashes, network problems, and other users' actions."
-msgstr "V skladišču se vsaka objava opravi kot atomična transakcija: upoštevane so vse spremembe v objavi ali pa nobena. Subversion poskuša ohraniti atomičnost zaradi sesutja aplikacij, sistema, težav z omrežjem in ostalih uporabnikov posredovanj."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:1261
-msgid "Unlike those of many other version control systems, Subversion'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 Subversion 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 Subversion 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 Subversion 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."
+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
#. (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 Subversion 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 Subversion 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."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:1326
-msgid "For each file in a working directory, Subversion records two essential pieces of information in the <filename>.svn/</filename> administrative area:"
-msgstr "Za vsako datoteko v delovni kopiji Subversion shrani dve pomembni informaciji v skrbniško področje <filename>.svn/</filename>:"
+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
#. (para)
#: ../source/TortoiseGit_en.xml:1345
-msgid "Given this information, by talking to the repository, Subversion can tell which of the following four states a working file is in:"
-msgstr "S temi informacijami in komunikacijo s skladiščem lahko Subversion ugotovi, v katerem od štirih stanj se delovna datoteka nahaja:"
+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
#. (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 Subversion can't complete the merge in a plausible way automatically, it leaves it to the user to resolve the conflict."
-msgstr "Datoteka je bila spremenjena v delovni kopiji in v skladišču. Ukaz <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 Subversion ne more spojiti različic samodejno, reševanje spora prepusti uporabniku."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:1413
-msgid "We've covered a number of fundamental Subversion concepts in this chapter:"
-msgstr "V tem poglavju smo pregledali nekaj osnovnih principov sistema Subversion:"
+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
#. (para)
#: ../source/TortoiseGit_en.xml:1425
-msgid "We've seen some simple examples of how two collaborators can use Subversion to publish and receive changes from one another, using the 'copy-modify-merge' model."
-msgstr "Videli smo nekaj primerov, kako lahko dva sodelavca uporabljata Subversion in model 'kopiraj-spremeni-spoji' za objavljanje sprememb in sprejemanje sprememb drug od drugega."
+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 Subversion tracks and manages information in a working copy."
-msgstr "Govorili smo o tem, kako Subversion sledi in upravlja informacije v delovni kopiji."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:1447
-msgid "To use TortoiseGit (or any other Subversion client), you need a place where your repositories are located. You can either store your repositories locally and access them using the <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 Subversion) 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."
+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
Subversion server options, and how to choose the best architecture for your situation, can be found in the Subversion 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
Subversion in izbiri pravilne arhitekture za vaš primer najdete v knjigi The Subversion Book, poglavje <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.serverconfig.html\"><citetitle>Server Configuration</citetitle></ulink>."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:1486
-msgid "The most flexible of all possible server setups for Subversion is the Apache based one. Although a bit more complicated to set up, it offers benefits that other servers cannot:"
-msgstr "Najbolj prilagodljiv sistem za Subversion dobite pri uporabi strežnika Apache. Njegova namestitev je sicer nekoliko bolj zahtevna, vendar ima v primerjavi z ostalimi strežniki številne prednosti:"
+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)
#. (para)
#: ../source/TortoiseGit_en.xml:1498
-msgid "The Apache based Subversion server uses the WebDAV protocol which is supported by many other programs as well. You could e.g. mount such a repository as a <quote>Web folder</quote> in the Windows explorer and then access it like any other folder in the file system."
-msgstr "Strežniki Subversion, postavljeni na strežniku Apache, uporabljajo protokol WebDAV, ki ga podpirajo številni ostali programi. Ta omogoča, da naprimer priklopite skladišče kot <quote>internetno mapo</quote> v Windowsovem Raziskovalcu in do nje dostopate kot do katerekoli druge mape v datotečnem sistemu"
+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
#. (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 Subversion client installed. This gives access to your data to a much wider circle of users."
-msgstr "V spletni brskalnik lahko vpišete naslov URL skladišča in brskate po vsebini, ne da bi imeli nameščenega odjemalca za Subversion. To omogoča dostop do podatkov precej širšemu krogu uporabnikov."
+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)
#. (title)
#: ../source/TortoiseGit_en.xml:1628
-msgid "Installing Subversion"
-msgstr "Namestitev sistema Subversion"
+msgid "Installing Git"
+msgstr "Namestitev sistema Git"
#. (para)
#: ../source/TortoiseGit_en.xml:1632
-msgid "Download the latest version of the Subversion Win32 binaries for Apache. Be sure to get the right version to integrate with your version of Apache, otherwise you will get an obscure error message when you try to restart. If you have Apache 2.2.x go to <ulink url=\"http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100\"><citetitle>http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100</citetitle></ulink>."
-msgstr "Prenesite zadnjo različico Win32 dvojiških datotek Subversion za Apache. Prepričajte se, da ste prenesli pravilno različico, drugače boste ob ponovnem zagonu dobili čudna sporočila o napakah. Če uporabljate Apache 2.2.x, uporabite povezavo <ulink url=\"http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100\"><citetitle>http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=8100</citetitle></ulink>."
+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 Subversion installer and follow the instructions. If the Subversion installer recognized that you've installed Apache, then you're almost done. If it couldn't find an Apache server then you have to do some additional steps."
-msgstr "Poženite namestitveni program za Subversion in sledite navodilom. Če namestitveni program ugotovi, da imate nameščen strežnik Apache, ste že skoraj pri koncu. Če strežnika ne najde, potem vas čaka še nekaj korakov."
+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)
#. (para)
#: ../source/TortoiseGit_en.xml:1656
-msgid "Using the windows explorer, go to the installation directory of Subversion (usually <filename>c:\\program files\\Subversion</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 Subversion (običajno <filename>c:\\program files\\Subversion</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>)."
+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 Subversion 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 Subversion v podmapo bin strežnika Apache."
+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
" SVNParentPath D:\\SVN\n"
" #SVNIndexXSLT \"/svnindex.xsl\"\n"
" AuthType Basic\n"
-" AuthName \"Subversion repositories\"\n"
+" AuthName \"Git repositories\"\n"
" AuthUserFile passwd\n"
" #AuthzSVNAccessFile svnaccessfile\n"
" Require valid-user\n"
"</Location>\n"
-"</screen> This configures Apache so that all your Subversion 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."
+"</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"
"<Location /svn>\n"
" SVNParentPath D:\\SVN\n"
" #SVNIndexXSLT \"/svnindex.xsl\"\n"
" AuthType Basic\n"
-" AuthName \"Skladišča Subversion\"\n"
+" AuthName \"Skladišča Git\"\n"
" AuthUserFile passwd\n"
" #AuthzSVNAccessFile svnaccessfile\n"
" Require valid-user\n"
"</Location>\n"
-"</screen> S tem nastavite strežnik Apache tako, da so vsa skladišča sistema Subversion 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>."
+"</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
#. (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 Subversion repository you created before). If all went well you should be prompted for a username and password, then you can see the contents of your repository."
-msgstr "Usmerite spletni brskalnik na <systemitem class=\"url\">http://MojStrežnik/svn/MojeNovoSkladišče</systemitem> (kjer je <filename>MojeNovoSkladišče</filename> ime skladišča Subversion, ki je ste ga predhodno ustvarili). Če je šlo vse po načrtih, potem vas mora pričakati vnosno polje za uporabnišo ime in geslo. Po vpisu lahko vidite vsebino skladišča."
+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
Subversion, but Apache doesn't know how to handle Subversion clients like TortoiseGit yet. To get Apache to know which URL will be used for Subversion repositories you have to edit the Apache configuration file (usually located in <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
Subversion sta nameščena, vendar Apache še ne zna delati z odjemalci Subversion, kakršen je TortoiseGit. Da poveste strežniku Apache, kateri naslovi URL bodo uporabljeni kot skladišča Subversion, 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/>"
+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
#. (entry)
#: ../source/TortoiseGit_en.xml:1798
-msgid "means that the
Subversion repositories are available from the URL <placeholder-1/>"
-msgstr "pomeni, da so skladišča sistema
Subversion na voljo na naslovu URL <placeholder-1/>"
+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 Subversion module."
-msgstr "pove strežniku Apache, kateri modul bo odgovoren za strežbo naslova URL - v tem primeru modul Subversion."
+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
Subversion version 1.3 and higher, this directive enables listing all the available repositories under <placeholder-1/>."
-msgstr "V različicah sistema
Subversion 1.3 ali novejših ta ukaz omogoča izpis seznama vse razpoložljivih skladišč v mapi <placeholder-1/>."
+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
#. (entry)
#: ../source/TortoiseGit_en.xml:1820
-msgid "tells
Subversion to look for repositories below <placeholder-1/>"
-msgstr "pove sistemu
Subversion, naj skladišča išče v mapi <placeholder-1/>"
+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
#. (entry)
#: ../source/TortoiseGit_en.xml:1854
-msgid "Location of the Access file for paths inside a Subversion repository"
-msgstr "lokacija datoteke dostopov za poti v skladiščih Subversion"
+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 ""
"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 Subversion 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 Subversion's <literal>AuthzSVNAccessFile</literal> module so that it can enforce more granular access based upon rules listed in the Subversion access file. Note that paths are specified either as <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\"/>"
+"</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"
#. (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 Subversion repository. Simply create the new repository under the same location as the first repository and you're done! In my company I have direct access to that specific folder on the server via SMB (normal windows file access). So I just create a new folder there, run the TortoiseGit command <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Create repository here...</guimenuitem></menuchoice> and a new project has a home..."
+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 Subversion 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 Subversion 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."
+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
#. (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 Subversion 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 Subversion 1.3 naprej pa tudi pri uporabi svnserve."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:2094
msgid ""
-"To make the Subversion location use this type of authentication you have to change the line <screen>\n"
+"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"
"SSPIOfferBasic On\n"
"</screen> within the <literal><Location /svn></literal> block. If you don't have a domain controller, leave the name of the domain control as <literal><domaincontroller></literal>."
msgstr ""
-"Če želite, da Subversion uporablja ta tip avtentikacije, morate spremeniti vrstico <screen>\n"
+"Če želite, da Git uporablja ta tip avtentikacije, morate spremeniti vrstico <screen>\n"
"AuthType Basic\n"
"</screen> v <screen>\n"
"AuthType SSPI\n"
#. (para)
#: ../source/TortoiseGit_en.xml:2141
-msgid "Subversion <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 Subversion 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>)."
+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
#. (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 Subversion in the same case as the user types them in at the prompt. Internet Explorer often passes the username to Apache automatically using whatever case the account was created with."
-msgstr "Ta razlika pa vam lahko ponagaja pri uporabi avtentikacije SSPI. Sistem Subversion dobi domeno Windows in uporabniško ime v natančno takšni obliki, kot ju je uporabnik vpisal. Internet Explorer pogosto pošlje uporabniško ime strežniku Apache v obliki, ki je bila uporabljena pri ustvarjanju računa."
+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
#. (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 Subversion'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."
+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)
#. (para)
#: ../source/TortoiseGit_en.xml:2185
-msgid "It is also possible to have more than one authentication source for your Subversion repository. To do this, you need to make each authentication type non-authoritative, so that Apache will check multiple sources for a matching username/password."
-msgstr "Določiti je mogoče več virov za avtentikacijo skladišč Subversion. Da bi to delovalo, morate vsako avtentikacijo narediti neavtoritativno. S tem bo Apache pri več virih preveril, ali je sta uporabniško ime in geslo pravilna."
+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
" SVNListParentPath on\n"
" SVNParentPath D:\\SVN\n"
"\n"
-" AuthName \"Subversion repositories\"\n"
+" AuthName \"Git repositories\"\n"
" AuthzSVNAccessFile svnaccessfile.txt\n"
"\n"
"# NT Domain Logins.\n"
" SVNListParentPath on\n"
" SVNParentPath D:\\SVN\n"
"\n"
-" AuthName \"Skladišča Subversion\"\n"
+" AuthName \"Skladišča Git\"\n"
" AuthzSVNAccessFile svnaccessfile.txt\n"
"\n"
"# Logiranje preko domen NT.\n"
#. (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 Subversion client are still able to authenticate."
-msgstr "Če dostop do strežnika zavarujete s protokolom SSL in uporabite avtentikacijo z domeno Windows, boste ugotovili, da brskanje po skladiščih z Internet Explorerjem ne deluje več. Ne skrbite - samo Internet Explorer ni sposoben izvesti avtentikacije. Ostali brskalniki tega problema nimajo, TortoiseGit in ostali odjemalci za Subversion še vedno lahko izvajajo avtentikacijo."
+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><Location /path></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 Subversion won't be able to authenticate against that location."
-msgstr "v konfiguracijski datoteki Apache definirate ločen ukaz <literal><Location /path></literal> in dodate vrstico <literal>SSPIBasicPreferred On</literal>. To omogoči avtentikacijo preko Internet Explorerja, vendar pa ostali brskalniki in odjemalci za Subversion ne bodo mogli izvajati avtentikacije na tej lokaciji."
+msgid "define a separate <literal><Location /path></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><Location /path></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
#. (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 Subversion <literal><Location></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 Subversion blok <literal><Location></literal>: <literal>SSLRequireSSL</literal>."
+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><Location></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><Location></literal>: <literal>SSLRequireSSL</literal>."
#. (para)
#: ../source/TortoiseGit_en.xml:2403
" SVNParentPath D:\\SVN\n"
" SSLRequireSSL\n"
" AuthType Basic\n"
-" AuthName \"Subversion repositories\"\n"
+" AuthName \"Git repositories\"\n"
" AuthUserFile passwd\n"
" #AuthzSVNAccessFile svnaccessfile\n"
" Require valid-user\n"
" SVNParentPath D:\\SVN\n"
" SSLRequireSSL\n"
" AuthType Basic\n"
-" AuthName \"Skladišča Subversion\"\n"
+" AuthName \"Skladišča Git\"\n"
" AuthUserFile passwd\n"
" #AuthzSVNAccessFile svnaccessfile\n"
" Require valid-user\n"
#. (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 Subversion server."
-msgstr "V določenih primerih morate na enem strežniku ustvariti dva navidezna gostitelja SSL: prvega za javni dostop dostop preko interneta brez zahteve po certifikatu, drugega za varen dostop s certifikatom, ki poganja strežnik Subversion."
+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
#. (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 Subversion: <screen>\n"
+"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 Subversion: <screen>\n"
+"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."
" </Directory>\n"
"</VirtualHost>\n"
"\n"
-"### Virtual host configuration for SUBVERSION \n"
+"### Virtual host configuration for Git \n"
"### (requiring a client certificate)\n"
"<VirtualHost 127.0.0.1:443>\n"
-" <Directory \"subversion host root path\">\n"
+" <Directory \"Git host root path\">\n"
" SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n"
" </Directory>\n"
"\n"
" </Directory>\n"
"</VirtualHost>\n"
"\n"
-"### Navidezni gostitelj za SUBVERSION\n"
+"### Navidezni gostitelj za Git\n"
"### (zahteva certifikat)\n"
"<VirtualHost 127.0.0.1:443>\n"
-" <Directory \"korenska mapa za subversion\">\n"
+" <Directory \"korenska mapa za Git\">\n"
" SSLRequire %{SSL_CLIENT_VERIFY} eq \"SUCCESS\"\n"
" </Directory>\n"
"\n"
#. (para)
#: ../source/TortoiseGit_en.xml:2486
-msgid "There may be situations where it's not possible to use Apache as your server. Fortunately, Subversion includes Svnserve - a lightweight stand-alone server which uses a custom protocol over an ordinary TCP/IP connection."
-msgstr "Včasih strežnika Apache ne morete uporabiti. Na srečo Subversion vsebuje Svnserve - samostojen mini strežnik, ki uporablja protokol po meri preko običajne povezave TCP/IP."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:2503
-msgid "Get the latest version of Subversion from <ulink url=\"http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91\"><citetitle>http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91</citetitle></ulink>. Alternatively get a pre-packaged installer from CollabNet at <ulink url=\"http://www.collab.net/downloads/subversion\"><citetitle>http://www.collab.net/downloads/subversion</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 Subversion prenesite z naslova <ulink url=\"http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91\"><citetitle>http://subversion.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/subversion\"><citetitle>http://www.collab.net/downloads/subversion</citetitle></ulink>. Namestitveni program namesti svnserve kot storitev Windows, vsebuje pa tudi nekaj orodij, ki jih potrebujete za varno delovanje preko SASL."
+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 Subversion installed, and svnserve is running, you will need to stop it before continuing."
-msgstr "Če je Subversion že nameščen in svnserve trenutno teče, ga morate pred nadaljevanjem zaustaviti."
+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 Subversion installer. If you run the installer on your server (recommended) you can skip step 4."
-msgstr "Zaženite namestitvni program Subversion. Če nameščate Subversion na strežniku (priporočamo), lahko korak 4 preskočite."
+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 Subversion (usually <filename>C:\\Program Files\\Subversion</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 Subversion (običajno <filename>C:\\Program Files\\Subversion</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>"
+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
#. (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 Subversion 1.4, svnserve can be installed as a native windows service."
-msgstr "Poganjanje svnserve kot nek uporabnik običajno ni najboljša rešitev. To pomeni, da mora biti uporabnik stalno prijavljen na strežniku, prav tako se mora uporabnik prijaviti po ponovnem zagonu. Boljši način je poganjanje svnserve kot storitev (service) Windows. Od različice Subversion 1.4 se svnserve lahko namesti kot domorodna storitev (native windows service)."
+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= \"Subversion\" depend= tcpip \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\\Subversion\\bin\\svnserve.exe\\\"\n"
-" --service --root c:\\repos\" displayname= \"Subversion\" \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 \"Subversion server (svnserve)\"\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= \"Subversion\" depend= tcpip \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\\Subversion\\bin\\svnserve.exe\\\"\n"
-" --service --root c:\\repos\" displayname= \"Subversion\" \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 Subversion (svnserve)\"\n"
+"sc description svnserve \"Strežnik Git (svnserve)\"\n"
"</screen>"
#. (para)
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 Subversion and your repositories, as well as any applications which are used by hook scripts. The built-in group for this is called \"LOCAL SERVICE\"."
+"</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 Subversion in skladišča, prav tako pa tudi za vse aplikacije, ki jih kličejo ukazne datoteke akcij. Vgrajena skupina za to se imenuje \"LOCAL SERVICE\"."
+"</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
#. (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
Subversion 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
Subversion 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>"
+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
#. (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 Subversion 1.5 and later, both the svnserve server and TortoiseGit client know how to make use of this library."
+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
Subversion 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
Subversion 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."
+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
#. (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 subversion is installed."
-msgstr "Nato ustvarite datoteko <filename>svn.conf</filename> na primerni lokaciji - ponavadi je to v namestitveni mapi Subversion."
+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 Subversion 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 Subversion), 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."
+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
#. (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 Subversion</citetitle></ulink>."
-msgstr "Več informacij o svnserve lahko dobite na naslovu <ulink url=\"http://svnbook.red-bean.com\"><citetitle>Version Control with Subversion</citetitle></ulink>."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:2925
msgid ""
-"Starting with Subversion 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"
+"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 Subversion 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"
+"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 Subversion 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 (Subversion) ali preko grafičnega vmesnika (TortoiseGit)."
+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 Subversion repository yet, it's time to do that now."
-msgstr "Če še niste ustvarili skladišča Subversion, je sedaj čas, da to storite."
+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
#. (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 Subversion book for more information."
-msgstr "Skladišče lahko ustvarite s sistemom FSFS ali s starejšim, vendar stabilnim sistemom Berkeley Database (BDB). Sistem FSFS je hitrejši in sedaj brez težav deluje na mapah skupne rabe v omrežju in sistemu Windows 98. Sistem BDB smo včasih smatrali za stabilnejšega zaradi daljše uporabe, vendar ta argument ne drži več, saj se FSFS uporablja že več let. Za več informacij preberite <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 Subversion Book."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:3095
-msgid "To access your local repository you need the path to that folder. Just remember that Subversion expects all repository paths in the form <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 Subversion 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."
+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
#. (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 Subversion 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."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:3142
-msgid "Secondly not all network file sharing protocols support the locking that Subversion requires, so you may find your repository gets corrupted. It may not happen straight away, but one day two users will try to access the repository at the same time."
-msgstr "Druga težava je, da vsi omrežni protokoli ne omogočajo zaklepanja datotek, ki ga Subversion za svoje delovanje potrebuje. Zato se skladišče lahko pokvari. Mogoče se to ne bo zgodilo takoj, vendar bosta slej ko prej dva uporabnika dostopala do skladišča istočasno."
+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
#. (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 Subversion. 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:"
+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
#. (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 Subversion 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 Subversion 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."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:3333
-msgid "The <literal>svnadmin</literal> tool is installed automatically when you install the Subversion command line client. If you are installing the command line tools on a Windows PC, the best way is to download the Windows installer version. It is compressed more efficiently than the <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 Subversion command line client from <ulink url=\"http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91\"><citetitle>http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91</citetitle></ulink>."
-msgstr "Orodje <literal>svnadmin</literal> se namesti samodejno ob namestitvi odjemalca Subversion za ukazno vrstico. Če nameščate odjemalca za ukazno vrstico na operacijskem sistemu Windows, je najbolje, da si prenesete namestitveni program. Stisnjen je bolj učinkovito kot različica <filename>.zip</filename>, tako da je prenos hitrejši, poleg tega pa namesto vas opravi nastavitve. Najnovejša različica odjemalca Subversion za ukazno vrstico se nahaja na naslovu <ulink url=\"http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91\"><citetitle>http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=91</citetitle></ulink>."
+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
#. (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 Subversion Book for full details about the hooks which are implemented."
-msgstr "Ukazna datoteka akcije je program, ki ga sproži dogodek v skladišču, n. pr. nova revizija ali sprememba lastnosti brez različic. Vsaka akcija dobi dovolj informacij, da ve, za kateri dogodek gre, na katerih ciljih deluje in uporabniško ime osebe, ki je dogodek sprožila. Glede na rezultat akcije ali vrnjen status lahko skripta pusti, da se operacija nadaljuje, jo ustavi ali drugače prepreči njeno izvajanje. Preberite poglavje <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 Subversion Book, če želite izvedeti kaj več o akcijah, ki so na voljo."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:3412
-msgid "If you want to make your Subversion repository available to others you may want to include a link to it from your website. One way to make this more accessible is to include a <firstterm>checkout link</firstterm> for other TortoiseGit users."
-msgstr "Če želite ponuditi skladišče Subversion tudi ostalim uporabnikom, lahko povezavo vključite v svojo spletno stran. Da jo naredite bolj dostopno, lahko dodate <firstterm>prevzemno povezavo</firstterm> za uporabnike TortoiseGit."
+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
#. (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 Subversion (SVN). It is more like a place you may turn to when you know approximately what you want to do, but don't quite remember how to do it."
-msgstr "Ta dokument opisuje dnevno uporabo odjemalca TortoiseGit. To <emphasis>ni</emphasis> uvod v sisteme za nadzor različic, prav tako pa <emphasis>ni</emphasis> uvod v Subversion (SVN). To poglavje uporabite, ko veste, kaj želite narediti, vendar se ne spomnite natančno, kako se to naredi."
+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 Subversion, then we recommend you read the fantastic book: <ulink url=\"http://svnbook.red-bean.com/\"><citetitle>Version Control with Subversion</citetitle></ulink>."
-msgstr "Če potrebujete uvod v nadzor različic s sistemom Subversion, vam priporočamo odlično knjigo: <ulink url=\"http://svnbook.red-bean.com/\"><citetitle>Version Control with Subversion</citetitle></ulink>."
+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 Subversion are. If you find any mistakes, please report them to the mailing list so we can update the documentation. Some of the screenshots in the Daily Use Guide (DUG) might not reflect the current state of the software. Please forgive us. We're working on TortoiseGit in our free time."
-msgstr "Tako kot programa TortoiseGit in Subversion je tudi ta dokument \"v delu\". Če najdete kakšne napake, jih sporočite na dopisni seznam, da bomo lahko dokumentacijo dopolnili. Nekateri posnetki zaslonov v Dnevni uporabi so lahko drugačni, kot so trenutno v aplikaciji. Prosimo, oprostite. Aplikacijo TortoiseGit razvijamo v svojem prostem času."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:3488
-msgid "You should know the basics of Subversion."
-msgstr "morate poznati osnove sistema Subversion,"
+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 Subversion repository."
-msgstr "imeti morate nameščen strežnik in/ali dostop do skladišča Subversion."
+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
#. (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
Subversion's default directory: <filename>%APPDATA%\\Subversion\\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%\\
Subversion\\auth</filename> v tri podmape: <placeholder-2/>"
+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 Subversion <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\"/>."
+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)
#. (para)
#: ../source/TortoiseGit_en.xml:3730
-msgid "This section describes the
Subversion import command, which was designed for importing a directory hierarchy into the repository in one shot. Although it does the job, it has several shortcomings: <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 ..."
+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)
#. (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 Subversion property <literal>svn:ignore</literal> to include that filename. That way it won't show up as unversioned on every commit."
+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)
#. (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 Subversion 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"
+"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, Subversion 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."
+"</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 Subversion. 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"
+"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 Subversion 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."
+"</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
#. (para)
#: ../source/TortoiseGit_en.xml:4010
-msgid "To avoid such problems, Subversion clients version 1.5 and higher support relative external URLs. Four different methods of specifying a relative URL are supported. In the following examples, assume we have two repositories: one at <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 Subversion verzije 1.5 ali novejše podpirajo relativne zunanje naslove URL. Na voljo so štirje načini podajanja relativnega naslova URL. V naslednjih primerih predpostavljamo, da imamo dve skladišči: enega na naslovu <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)."
+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
#. (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 Subversion obravnava lastnosti, preberite <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
#. (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. Subversion 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. Subversion je ustvaril vmesne mapi brez prenašanja vsebine."
+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
#. (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 Subversion."
-msgstr "Potem ko ste prevzeli delovno kopijo do določene globine, lahko to globino povečate, da dobite dodatne vsebine. Globine pa ni mogoče zmanjšati in s tem brisati vsebino. Ta zmožnost bo mogoče dodana v prihodnjih različicah sistema Subversion."
+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
#. (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 Subversion configuration file. Read <xref linkend=\"tsvn-dug-settings-main\"/> for information on how to edit the Subversion configuration file."
-msgstr "Če imate nastavljene privzete nastavitve in naredite objavo sprememb, se vsi zaklepi v vaši lasti sprostijo takoj po uspešno izvedeni objavi. Če želite zaklepe ohraniti, potrdite polje <guilabel>Ohrani zaklepe</guilabel>. Privzeto stanje tega polja je definirano v konfiguracijski datoteki sistema Subversion z možnostjo <literal>no_unlock</literal>. Za več informacij o urejanju konfiguracijske datoteke Subversion si preberite <xref linkend=\"tsvn-dug-settings-main\"/>."
+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
#. (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 Subversion."
+msgstr "Datoteke brez različic lahko povlečete v pogovorno okno za objavo in bodo samodejno dodane v sistem Git."
#. (title)
#. (title)
#. (para)
#: ../source/TortoiseGit_en.xml:4517
#: ../source/TortoiseGit_en.xml:5318
-msgid "Sometimes files get renamed outside of Subversion, and they show up in the file list as a missing file and an unversioned file. To avoid losing the history you need to notify Subversion about the connection. Simply select both the old name (missing) and the new name (unversioned) and use <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 Subversion, zato se v seznamu sprememb pojavita manjkajoča datoteka in datoteka brez različic. Da bi preprečili izgubo zgodovine, morate sistemu Subversion povedati, da med datotekama obstaja povezava. Enostavno izberite tako staro ime (manjkajoče) kot novo ime (brez različic) in uporabite <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Popravi premik</guimenuitem></menuchoice> in s tem povežete datoteki v preimenovanje."
+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)
#. (para)
#: ../source/TortoiseGit_en.xml:4533
-msgid "The commit dialog supports Subversion's changelist feature to help with grouping related files together. Find out about this feature in <xref linkend=\"tsvn-dug-changelists\"/>."
+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)
#. (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 Subversion tries to checkout a newly versioned file, and finds that an unversioned file of the same name already exists in your working folder. Subversion will never overwrite an unversioned file - it might contain something you are working on, which coincidentally has the same filename as another developer has used for his newly committed file."
-msgstr "Včasih posodabljanje ni uspešno in dobite obvestilo, da v delovni kopiji že obstaja datoteka z enakim imenom. To se zgodi takrat, ko želi Subversion prevzeti iz skladišča novo dodano datoteko in ugotovi, da v delovni kopiji že obstaja datoteka z enakim imenom. Subversion nikoli ne prepiše datoteke, ki ni pod nadzorom - lahko vsebuje nekaj, na čemer delate in ima slučajno povsem enako ime, kot ga je nek drug uporabnik uporabil za novo dodano datoteko."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:4941
-msgid "This is the file that your Subversion client just received from the server when you updated your working copy. This file corresponds to the HEAD revision of the repository."
-msgstr "To je datoteka, ki jo je odjemalec Subversion pri posodabljanju delovne kopije prejel od strežnika. Ta datoteka ustreza reviziji HEAD v skladišču."
+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 Subversion knows nothing of your project, it leaves resolving the conflicts to the developers. Whenever a conflict is reported, you should open the file in question, and search for lines starting with the string <literal><<<<<<<</literal>. The conflicting area is marked like this: <screen>\n"
+"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><<<<<<<</literal>. The conflicting area is marked like this: <screen>\n"
"<<<<<<< filename\n"
" your changes\n"
"=======\n"
" code merged from repository\n"
">>>>>>> revision\n"
-"</screen> Also, for every conflicted file
Subversion places three additional files in your directory: <placeholder-1/>"
+"</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 Subversion o vašem projektu ne ve nič, prepusti reševanje sporov uporabnikom. Ko dobite sporočilo o sporu, morate sporno datoteko odpreti in poiskati vrstice, ki imajo na začetku niz <literal><<<<<<<</literal>. Sporno območje je označeno takole: <screen>\n"
+"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><<<<<<<</literal>. Sporno območje je označeno takole: <screen>\n"
"<<<<<<< ime datoteke\n"
" vaše spremembe\n"
"=======\n"
" koda, spojena iz skladišča\n"
">>>>>>> revizija\n"
-"</screen> Poleg tega
Subversion za vsako sporno datoteko doda v mapo tri dodatne datoteke: <placeholder-1/>"
+"</screen> Poleg tega
Git za vsako sporno datoteko doda v mapo tri dodatne datoteke: <placeholder-1/>"
#. (para)
#: ../source/TortoiseGit_en.xml:4951
#. (para)
#: ../source/TortoiseGit_en.xml:4975
-msgid "If you have conflicts with binary files, Subversion does not attempt to merge the files itself. The local file remains unchanged (exactly as you last changed it) and you have <filename>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, Subversion ne poskuša sam spajati datotek. Krajevna datoteka ostane nespremenjena (natančno takšna kot ob vaši zadnji spremembi), pojavijo pa se datoteke <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."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:5027
-msgid "Now that you have checked out a working copy from a Subversion repository you can see your files in the windows explorer with changed icons. This is one of the reasons why TortoiseGit is so popular. TortoiseGit adds a so called overlay icon to each file icon which overlaps the original file icon. Depending on the Subversion status of the file the overlay icon is different."
-msgstr "Ko prevzamete delovno kopijo iz skladišča Subversion, imajo datoteke v Raziskovalcu spremenjene ikone. To je razlog za veliko popularnost programa TortoiseGit. TortoiseGit doda datotekam prekrivno ikono, ki se prekriva z originalno ikono. Prekrivna ikona je odvisna od statusa datoteke."
+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/InSubVersionIcon.png\"/> A fresh checked out working copy has a green checkmark as overlay. That means the Subversion status is <emphasis>normal</emphasis>."
-msgstr "<graphic fileref=\"../images/InSubVersionIcon.png\"/> Sveže prevzeta delovna kopija ima zeleno prekrivno ikono. To pomeni, da je status datoteke/mape <emphasis>običajno</literal>."
+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
#. (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, Subversion makes that file read-only until you get a lock on that file. Such files have this overlay to indicate that you have to get a lock first before you can edit that file."
-msgstr "<graphic fileref=\"../images/ReadOnlyIcon.png\"/> Če ste datoteki nastavili lastnost <literal>svn:needs-lock</literal>, Subversion napravi to datoteko samo za branje, dokler za datoteko ne pridobite zaklepa. Datoteke, ki so namenjene samo za branje, imajo takšno ikono, da lahko hitro vidite, da morate pred urejanjem datoteke zanjo pridobiti zaklep."
+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 Subversion 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."
+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)
#. (para)
#: ../source/TortoiseGit_en.xml:5105
-msgid "For a description of how icon overlays correspond to Subversion status and other technical details, read <xref linkend=\"tsvn-app-internals-overlays\"/>."
-msgstr "Za opis, kakšnemu statusu v sistemu Subversion ustrezajo prekrivne ikone in ostale tehnične podrobnosti preberite <xref linkend=\"tsvn-app-internals-overlays\"/>."
+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
#. (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 Subversion (shown in the bottom pane). The search is not case sensitive."
-msgstr "Iščete po sporočilih dnevniških zapisov. Iskanje poteka po dnevniških zapisih, ki jih vnesete, in po povzetkih akcij, ki jih ustvari Subversion in so prikazani v spodnjem delu okna. Iskanje ni občutljivo na velike in male črke."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:5824
-msgid "View the Subversion properties for the selected item."
-msgstr "Pogledate lastnosti Subversion za izbran element."
+msgid "View the Git properties for the selected item."
+msgstr "Pogledate lastnosti Git za izbran element."
#. (para)
#: ../source/TortoiseGit_en.xml:5829
#. (para)
#: ../source/TortoiseGit_en.xml:5846
-msgid "Subversion uses revision numbers to mean 2 different things. A revision generally represents the state of the repository at a point in time, but it can also be used to represent the changeset which created that revision, eg. <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 Subversion 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."
+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 Subversion terms this is <literal>diff -r M:N</literal>."
+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 Subversion terms this is <literal>diff -r N-1:N</literal> or <literal>diff -c N</literal>."
+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)
#. (para)
#: ../source/TortoiseGit_en.xml:5916
-msgid "Note that Subversion currently implements renaming as a copy/delete pair, so renaming a file or folder will also cause the log display to stop if this option is checked."
-msgstr "Upoštevajte, da Subversion izvaja preimenovanje s parom kopirane in izbrisane datoteke, zato bo preimenovanje datoteke ali mape povzročilo, da se v tem primeru dnevniški zapis ustavi, če je ta možnost vklopljena."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:5950
-msgid "Subversion 1.5 and later keeps a record of merges using properties. This allows us to get a more detailed history of merged changes. For example, if you develop a new feature on a branch and then merge that branch back to trunk, the feature development will show up on the trunk log as a single commit for the merge, even though there may have been 1000 commits during branch development."
-msgstr "Subversion 1.5 uvaja sledenje spajanja z uporabo lastnosti. To nam omogoča pridobiti podrobnejšo zgodovino spojenih sprememb. Primer: če na posebni veji razvijate neko novo zmožnost programa in potem spremembe spojite na glavno vejo, boste na glavni veji to novo zmožnost videli kot eno objavo, čeprav ste pri razvoju te lastnosti na posebni veji naredili tisoč objav."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:5991
-msgid "Subversion lets you change both the log message and the author of revisions any time you want. But since such changes can't be undone (those changes are not versioned) this feature is disabled by default. To make this work, you must set up a pre-revprop-change hook. Please refer to the chapter on <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 Subversion 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 "Subversion vam omogoča kadarkoli po objavi spremeniti tako sporočilo dnevniškega zapisa kot tudi avtorja objave. Ker pa se teh sprememb ne na povrniti (niso pod nadzorom različic), s privzetimi nastavitvami ta možnost ni vključena. Nastaviti morate ukazno datoteko akcije pre-revprop-change. Poglejte v poglavje <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 Subversion 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."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:6010
-msgid "Because Subversion'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 Subversion 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."
+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
#. (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 Subversion 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 Subversion, 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."
+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
#. (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 Subversion."
-msgstr "Pogosto se zgodi, da nekatere datoteke že imate v skladišču v okviru drugega projekta in jih želite prekopirati. Lahko jih preprosto prekopirate in dodate v nadzor različic, kot je opisano v prejšnjem razdelku, vendar v tem primeru izgubite zgodovino datoteke. Če kasneje odkrijete in popravite napako v originalnih datotekah, lahko spremembe samodejno spojite le, če med originalnimi in novimi datotekami obstaja povezava v sistemu Subversion."
+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
#. (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> Subversion 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 Subversion, 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\"/>."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:6901
-msgid "Versioned files and folders can never be ignored - that's a feature of Subversion. If you versioned a file by mistake, read <xref linkend=\"tsvn-howto-unversion\"/> for instructions on how to <quote>unversion</quote> it."
+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)
#. (para)
#: ../source/TortoiseGit_en.xml:6916
-msgid "
Subversion's ignore patterns make use of filename globbing, a technique originally used in Unix to specify files using meta-characters as wildcards. The following characters have special meaning: <placeholder-1/>"
-msgstr "Iskanje vzorcev v sistemu
Subversion uporablja tehniko, ki izvira iz sistema Unix in se uporablja za določanje datotek z uporabo meta-znakov. Naslednji znaki imajo poseben pomen: <placeholder-1/>"
+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 "Subversion 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 "Subversion 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."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:6969
-msgid "Subversion uses this pattern matching against every path presented to it for action. These paths are generally relative to the directory being acted upon for import, add, commit, etc. The matching pattern therefore has to take account of the fact that there may or may not be path components before the filename."
-msgstr "Subversion uporablja iskanje vzorcev za vse poti, ki jih uporabimo pri ukazih. Te poti so v splošnem relativne na mapo, na kateri ukaz deluje (n. pr. pri uvažanju, dodajanju, objavi). Iskanje vzorcev mora zato upoštevati, da je pred imenom datoteke lahko naveden del poti."
+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 Subversion compares them with the ignore pattern."
+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)
#. (para)
#: ../source/TortoiseGit_en.xml:7011
-msgid "Unlike CVS,
Subversion allows renaming and moving of files and folders. So there are menu entries for delete and rename in the TortoiseGit submenu. <placeholder-1/>"
-msgstr "V nasprotju s sistemom CVS
Subversion dovoljuje preimenovanje in premikanje datotek in map. Zato se v podmeniju TortoiseGit nahajajo ukazi za brisanje in preimenovanje. <placeholder-1/>"
+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
#. (para)
#: ../source/TortoiseGit_en.xml:7028
-msgid "Use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Delete</guimenuitem></menuchoice> to remove files or folders from subversion."
-msgstr "Za brisanje datotek ali map iz sistema Subversion uporabite <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Izbriši</guimenuitem></menuchoice>."
+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
#. (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 Subversion, 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 Subversion, ne sistema TortoiseGit."
+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
#. (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, Subversion will spot the missing file and replace it with the latest version from the repository. If you need to delete a version-controlled file, always use <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Delete</guimenuitem></menuchoice> so that Subversion 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 Subversion manjkajočo krajevno datoteko nadomestil z zadnjo različico te datoteke v skladišču. Če želite izbrisati datoteko pod nadzorom različic, vedno uporabite ukaz <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Izbriši</guimenuitem></menuchoice>, da sistemu Subversion ne bo potrebno ugibati, kaj pravzaprav želite."
+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, Subversion 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 Subversion manjkajočo mapo nadomestil z najnovejšo različico mape iz skladišča. Potem jo lahko izbrišete na pravilen način z ukazom <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Izbriši</guimenuitem></menuchoice>."
+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
#. (title)
#: ../source/TortoiseGit_en.xml:7202
msgid "Do Not SVN Move Externals"
-msgstr "Zunanjih elementov ne premikajte z ukazi Subversion"
+msgstr "Zunanjih elementov ne premikajte z ukazi Git"
#. (para)
#: ../source/TortoiseGit_en.xml:7203
#. (para)
#: ../source/TortoiseGit_en.xml:7223
-msgid "Making case-only changes to a filename is tricky with Subversion on Windows, because for a short time during a rename, both filenames have to exist. As Windows has a case-insensitive file system, this does not work using the usual Rename command."
+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 subversion. Just renaming in the explorer will corrupt your working copy!"
-msgstr "Na srečo obstajata (vsaj) dve možni rešitvi, kako preimenovati datoteko brez izgube zgodovine. Pomembno je, da jo preimenujete v sistemu Subversion. Preimenovanje v Raziskovalcu pokvari delovno kopijo!"
+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
#. (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 Subversion supports case-sensitive filenames, Windows does not."
-msgstr "Če se v skladišču že nahajata dve datoteki, ki se razlikujeta samo v velikih in malih črkah (n. pr. <filename>TEST.TXT</filename> in <filename>test.txt</filename>), mape, kjer se ti dve datoteki nahajata, na sistemu Windows ne morete posodobiti ali prevzeti. Subversion namreč omogoča ločevanje imen, ki se razlikujejo samo v velikih in malih črkah, sistem Windows pa ne."
+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
#. (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 Subversion. If you try to commit your changes, Subversion will see the old filename as missing and the new one as an unversioned file. You could just check the new filename to get it added in, but you would then lose the history tracing, as Subversion does not know the files are related."
-msgstr "Včasih vaše prijazno razvojno orodje preimenuje datoteke kot del refaktoriranja in seveda tega ne pove sistemu Subversion. Če poskusite takšne spremembe objaviti, vidite staro datoteko kot manjkajočo in novo kot datoteko brez različic. Lahko bi enostavno dodali datoteko brez različic, vendar bi v tem primeru izgubili zgodovino, saj Subversion ne ve, da sta datoteki povezani."
+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 Subversion 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 Subversion 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."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:7340
-msgid "Usually you set your ignore list such that all generated files are ignored in Subversion. But what if you want to clear all those ignored items to produce a clean build? Usually you would set that in your makefile, but if you are debugging the makefile, or changing the build system it is useful to have a way of clearing the decks."
-msgstr "Običajno nastavite sezname prezrtih elementov v sistemu v Subversion tako, da se prezrejo vse generirane datoteke. Kaj pa, če želite počistiti vse prezrte datoteke, da bi naredili čisto gradnjo? Običajno naredite to v skripti makefile, če pa to skripto razhroščujete ali delate spremembe v sistemu gradnje, je koristno, če lahko delovno kopijo počistite."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:7442
-msgid "If a Subversion command cannot complete successfully, perhaps due to server problems, your working copy can be left in an inconsistent state. In that case you need to use <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 Subversion ne more izvesti uspešno, denimo zaradi težav s strežnikom, lahko vaša delovna kopija ostane v nekonsistentnem stanju. V tem primeru morate na mapi uporabiti ukaz <menuchoice><guimenu>TortoiseGit</guimenu><guimenuitem>Počisti</guimenuitem></menuchoice>. Najbolje, da to storite na vrhnji mapi delovne kopije."
+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, Subversion cannot tell whether it has really changed except by doing a byte-by-byte comparison with the pristine copy. If you have a lot of files in this state it makes acquiring status very slow, which will make many dialogs slow to respond. Executing a Cleanup on your working copy will repair these <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 Subversion ugotovi, ali gre za dejansko spremembo vsebine le s popolno primerjavo trenutne datoteke z začetno datoteko. Če imate v delovni kopiji veliko datotek s spremenjenim datumom, lahko pridobivanje dejanskega stanja datotek poteka zelo dolgo, kar upočasni odzivnost pogovornih oken. Če na delovni kopiji izvedete ukaz Počisti, bo le-ta popravil datoteke z nepravilnim časovnim žigom in s tem povečal hitrost pridobivanja stanja datotek."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:7465
-msgid "Some earlier releases of Subversion 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 Subversion 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."
+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
#. (title)
#: ../source/TortoiseGit_en.xml:7481
-msgid "Explorer property page, Subversion tab"
-msgstr "Stran Lastnosti v Raziskovalcu, zavihek Subversion"
+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 Subversion 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 Subversion 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 Subversion 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 Subversion, kjer dobite vse potrebne informacije o izbrani datoteki/mapi."
+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 "Subversion Properties"
-msgstr "Lastnosti Subversion"
+msgid "Git Properties"
+msgstr "Lastnosti Git"
#. (primary)
#: ../source/TortoiseGit_en.xml:7503
-msgid "Subversion properties"
-msgstr "lastnosti Subversion"
+msgid "Git properties"
+msgstr "lastnosti Git"
#. (title)
#: ../source/TortoiseGit_en.xml:7509
-msgid "Subversion property page"
-msgstr "Lastnosti v sistemu Subversion"
+msgid "Git property page"
+msgstr "Lastnosti v sistemu Git"
#. (para)
#: ../source/TortoiseGit_en.xml:7507
-msgid "<placeholder-1/> You can read and set the Subversion 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 Subversion 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>."
+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 Subversion. 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 Subversion 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\"/>."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:7538
-msgid "
Subversion supports CVS-like keyword expansion which can be used to embed filename and revision information within the file itself. Keywords currently supported are: <placeholder-1/>"
-msgstr "
Subversion omogoča (podobno kot sistem CVS) razširitev ključnih besed, ki se lahko uporabljajo za vstavljanje imena datoteke in številke revizije v vsebino datoteke. Trenutno so podprte naslednje ključne besede: <placeholder-1/>"
+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 Subversion book, which gives a full description of these keywords and how to enable and use them."
-msgstr "O uporabi teh ključnih besed si lahko več preberete v poglavju <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.advanced.props.special.keywords.html\"><citetitle>svn:keywords section</citetitle></ulink> knjige The Subversion Book. Tam dobite popoln opis ključnih besed in njihove uporabe."
+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
Subversion 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
Subversion dobite na naslovu <ulink url=\"http://svnbook.red-bean.com/en/1.4/svn.advanced.props.html\"><citetitle>Special Properties</citetitle></ulink>."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:7717
-msgid "You can configure Subversion 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 "Subversion 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."
+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 subversion 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 subversion'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 subversion feature and works with any subversion client. However it has to be defined on each client individually - there is no way to propagate these settings from the repository."
-msgstr "To zmožnost lahko vključite neposredno v konfiguracijski datoteki za Subversion. Na strani <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 Subversion. 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 Subversion, vendar jih je potrebno nastaviti na vsakem odjemalcu posebej - možnost, da jih nastavite v skladišču, od koder jih odjemalci preberejo, ne obstaja."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:7759
-msgid "Subversion properties are versioned. After you change or add a property you have to commit your changes."
-msgstr "Lastnosti v sistemu Subversion so pod nadzorom različic. Potem, ko spremenite ali dodate lastnosti, morate spremembe objaviti."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:7766
-msgid "If there's a conflict on committing the changes, because another user has changed the same property, Subversion 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, Subversion ustvari datoteko <filename>.prej</filename>. Ko rešite spor, to datoteko izbrišite."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:7831
-msgid "Subversion 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 subversion 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 subversion autoprops, e.g. <literal>*.sh = svn:eol-style=native;svn:executable</literal> sets two properties on files with the <literal>.sh</literal> extension."
-msgstr "Subversion 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 Subversion, n. pr: <literal>*.sh = svn:eol-style=native;svn:executable</literal> nastavi dve lastnosti na datotekah s končnico <literal>.sh</literal>."
+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
#. (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 Subversion 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 Subversion 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."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:8007
-msgid "Subversion 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 "Subversion 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."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:8194
-msgid "Although
Subversion itself makes no distinction between tags and branches, the way they are typically used differs a bit. <placeholder-1/>"
-msgstr "Čeprav
Subversion ne razlikuje med oznakami in vejami, se pri pri tipični uporabi ta dva ukaza nekoliko razlikujeta. <placeholder-1/>"
+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
#. (para)
#: ../source/TortoiseGit_en.xml:8248
-msgid "It is important to understand how branching and merging works in Subversion 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 Subversion 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 Subversion 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 Subversion Book, ki poda popoln opis in veliko primerov, kako ukaza uporabljati. "
+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
#. (para)
#: ../source/TortoiseGit_en.xml:8300
-msgid "What you are asking Subversion 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 Subversiona 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>"
+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)
#. (para)
#: ../source/TortoiseGit_en.xml:8311
-msgid "This method covers the case when you have made a feature branch as discussed in the Subversion 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 Subversion 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."
+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 Subversion 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."
+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)
#. (para)
#: ../source/TortoiseGit_en.xml:8340
-msgid "This is a more general case of the reintegrate method. What you are asking Subversion 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 Subversiona 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."
+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 Subversion 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 Subversion Book."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:8419
-msgid "If you are using the merge tracking features of Subversion, you do not need to remember which revisions have already been merged - Subversion 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 - Subversion 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\"/>."
+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
#. (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,
Subversion 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 Subversion use only path-based differences rather than history-based differences, check the <guilabel>Ignore ancestry</guilabel> box. Read more about this topic in the Subversion 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,
Subversion 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 Subversion upošteval razlike na osnovi poti in ne na osnovi zgodovine, potrdite polje <guilabel>Prezri dedovanje</guilabel>. Več o tem preberite v knjigi The Subversion 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>"
+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
#. (para)
#: ../source/TortoiseGit_en.xml:8590
-msgid "For Subversion 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 Subversion 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 Subversion book."
+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 Subversion 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 Subversion 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."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:8626
-msgid "Subversion 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 "Subversion 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."
+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
#. (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 Subversion pri naslednjih poskusil enostavno preskočil."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:8640
-msgid "
Subversion 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 "
Subversion 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/>"
+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
#. (para)
#: ../source/TortoiseGit_en.xml:8680
-msgid "Find out more about merge tracking from Subversion's <ulink url=\"http://subversion.tigris.org/merge-tracking/index.html\"><citetitle>Merge tracking documentation</citetitle></ulink>."
-msgstr "Več o sledenju spajanja preberite na strani <ulink url=\"http://subversion.tigris.org/merge-tracking/index.html\"><citetitle>Merge tracking documentation</citetitle></ulink>."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:8801
-msgid "
Subversion 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 "
Subversion 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/>"
+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 Subversion 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 Subversion 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."
+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 Subversion"
-msgstr "Zaklepanje v sistemu Subversion"
+msgid "How Locking Works in Git"
+msgstr "Zaklepanje v sistemu Git"
#. (para)
#: ../source/TortoiseGit_en.xml:8833
#. (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 Subversion 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."
+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)
#. (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? Subversion 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? Subversion 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."
+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
#. (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. Subversion 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. Subversion nikoli ne izgubi podatkov, izgubite pa lahko varnost dela v teamu, ki vam jo daje zaklepanje. "
+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
#. (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 Subversion'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."
+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)
#. (para)
#: ../source/TortoiseGit_en.xml:9002
-msgid "When you create a new repository with Subversion 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 Subversion 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."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:9848
-msgid "Because Subversion 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 Subversion 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."
+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
#. (title)
#: ../source/TortoiseGit_en.xml:9877
-msgid "Exporting a Subversion Working Copy"
-msgstr "Izvažanje delovne kopije sistema Subversion"
+msgid "Exporting a Git Working Copy"
+msgstr "Izvažanje delovne kopije sistema Git"
#. (primary)
#: ../source/TortoiseGit_en.xml:9879
#. (para)
#: ../source/TortoiseGit_en.xml:9952
-msgid "The export dialog does not allow exporting single files, even though Subversion can."
-msgstr "Pogovorno okno za izvažanje ne dovoli izvažanja posameznih datotek, čeprav je Subversion to zmožen narediti."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:10046
-msgid "You want to move to a different Subversion repository. In that case you should perform a clean checkout from the new repository location."
-msgstr "se želite premakniti v drugo skladišče Subversion. V tem primeru je najbolje narediti svež prevzem iz novega skladišča."
+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
#. (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 Subversion 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 Subversion 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."
+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
#. (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 Subversion. Č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:"
+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
#. (para)
#: ../source/TortoiseGit_en.xml:10391
-msgid "This issue tracker integration is not restricted to TortoiseGit; it can be used with any
Subversion 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
Subversion. Za več informacij preberite <ulink url=\"http://TortoiseGit.tigris.org/svn/TortoiseGit/trunk/doc/issuetrackers.txt\"><citetitle>Issue Tracker Integration Specification</citetitle></ulink>."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:10449
-msgid "There are several web-based repository viewers available for use with
Subversion 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
Subversion, 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."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:10562
-msgid "<placeholder-1/> This dialog allows you to specify your preferred language, and the Subversion-specific settings."
-msgstr "<placeholder-1/> To okno vam omogoča nastavitev jezika in nastavitev, specifičnih za Subversion."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:10644
-msgid "Note that the ignore patterns you specify here will also affect other Subversion 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 Subversion, ki so nameščeni na vašem računalniku, vključno z odjemalcem za ukazno vrstico."
+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 Subversion configuration file to set a <literal>global-ignores</literal> pattern, it will override the settings you make here. The Subversion configuration file is accessed using the <guibutton>Edit</guibutton> as described below."
-msgstr "Če uporabljate konfiguracijsko datoteko Subversion za nastavljanje <literal>splošnega vzorca prezrtih</literal>, bodo nastavitve, ki so nastavite tu, povožene. Do konfiguracijske datoteke Subversion dostopate z gumbom <guibutton>Uredi</guibutton>, kot je opisano spodaj."
+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
#. (term)
#: ../source/TortoiseGit_en.xml:10686
-msgid "Subversion configuration file"
-msgstr "Nastavitvena datoteka Subversion"
+msgid "Git configuration file"
+msgstr "Nastavitvena datoteka Git"
#. (para)
#: ../source/TortoiseGit_en.xml:10688
-msgid "Use <guibutton>Edit</guibutton> to edit the
Subversion configuration file directly. Some settings cannot be modified directly by TortoiseGit, and need to be set here instead. For more information about the Subversion <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 Subversion 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
Subversion 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 Subversion 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>."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:10715
-msgid "VS.NET when used with web projects can't handle the <literal>.svn</literal> folders that Subversion uses to store its internal information. This is not a bug in Subversion. 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 Subversion uporablja za shranjevanje notranjih informacij. To ni napaka v sistemu Subversion, 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\"/>."
+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 Subversion and TortoiseGit, you can use this checkbox to set the environment variable which controls this."
-msgstr "Če želite spremeniti obnašanje programov Subversion in TortoiseGit, lahko uporabite to potrditveno polje, da nastavite ustrezno okoljsko spremenljivko."
+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
#. (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 Subversion 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 Subversion ne more dokončati operacije. Primer: posodobitev je neuspešna, če strežnik ni dosegljiv, objava ni uspešna, če je delovna kopija zastarela."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:11259
-msgid "<filename>f:\\development\\SVN\\Subversion</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\\Subversion</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."
+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\\Subversion*</filename> will disable the overlays on <emphasis>all</emphasis> files and folders whose path starts with <filename>f:\\development\\SVN\\Subversion</filename>. That means you won't see overlays for any files and folders below that path."
-msgstr "Nastavitev <filename>f:\\development\\SVN\\Subversion*</filename> onemogoči prikaz prekrivnih ikon na <emphasis>vseh</emphasis> datotekah in mapah, katerih pot se začne z <filename>f:\\development\\SVN\\Subversion</filename>. To pomeni, da na datotekah in mapah pod to potjo ne boste videli prekrivnih ikon."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:11366
-msgid "If you need to set up per-repository proxy settings, you will need to use the
Subversion <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
Subversion. 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>."
+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
#. (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>Subversion/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>Subversion/TortoiseGit SSH How-To</citetitle></ulink>."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:11527
-msgid "You can also specify a different diff tool to use on Subversion 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 Subversion. Ker so lastnosti ponavadi enostavna kratka besedila, vam bo mogoče bolj ustrezal enostavnejši pregledovalnik."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:11760
-msgid "When you authenticate with a Subversion 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 Subversion, 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?"
+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
#. (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 Subversion 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 Subversion. V nasprotju s ukaznimi datotekami akcij, ki so razložene v <xref linkend=\"tsvn-repository-hooks\"/>, se te datoteke izvedejo krajevno na strani odjemalca."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:12072
-msgid "Called before the actual Subversion update begins."
+msgid "Called before the actual Git update begins."
msgstr "Pokliče se, preden se posodobitev začne."
#. (term)
#. (para)
#: ../source/TortoiseGit_en.xml:12244
-msgid "If you want the Subversion operation to hold off until the hook has completed, check <guilabel>Wait for the script to finish</guilabel>."
-msgstr "Če želite, da operacija Subversion čaka, dokler se ukazna datoteka akcije ne zaključi, potrdite polje <guilabel>Počakaj, da ukazna datoteka konča izvajanje</guilabel>."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:12337
-msgid "You can specify a different location for the Subversion configuration file using registry location <literal>HKCU\\Software\\TortoiseGit\\ConfigDir</literal>. This will affect all TortoiseGit operations."
-msgstr "Konfiguracijsko datoteko za Subversion lahko postavite na drugo lokacijo z uporabo naslednje lokacije v registru: <literal>HKCU\\Software\\TortoiseGit\\ConfigDir</literal>. Sprememba ima vpliv na vse operacije TortoiseGit."
+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
#. (title)
#: ../source/TortoiseGit_en.xml:12413
-msgid "Subversion Working Folders"
-msgstr "Delovne mape Subversion"
+msgid "Git Working Folders"
+msgstr "Delovne mape Git"
#. (primary)
#: ../source/TortoiseGit_en.xml:12415
#. (para)
#: ../source/TortoiseGit_en.xml:12420
-msgid "VS.NET 2003 when used with web projects can't handle the <literal>.svn</literal> folders that Subversion uses to store its internal information. This is not a bug in Subversion. 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 Subversion uporablja za shranjevanje notranjih informacij. To ni napaka sistema Subversion. To je napaka razvojnega okolja VS.NET 2003 in dodatkov za FrontPage, ki jih uporablja."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:12431
-msgid "As of Version 1.3.0 of Subversion and TortoiseGit, you can set the environment variable <literal>SVN_ASP_DOT_NET_HACK</literal>. If that variable is set, then Subversion 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 Subversion in TortoiseGit naprej lahko nastavite okoljsko spremenljivko <literal>SVN_ASP_DOT_NET_HACK</literal>. Če je le-ta nastavljena, bo Subversion 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\"/>."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:12492
-msgid "SubWCRev is Windows console program which can be used to read the status of a Subversion 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."
+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)
#. (para)
#: ../source/TortoiseGit_en.xml:12507
-msgid "SubWCRev reads the Subversion 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."
+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)
#. (para)
#: ../source/TortoiseGit_en.xml:12831
-msgid "If you need to access
Subversion 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/>"
+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)
#. (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>dev@TortoiseGit.tigris.org</email> and <email>users@TortoiseGit.tigris.org</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>dev@TortoiseGit.tigris.org</email> in <email>users@TortoiseGit.tigris.org</email>."
+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
#. (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>users@TortoiseGit.tigris.org</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>dev@TortoiseGit.tigris.org</email>."
-msgstr "Če odgovora na svoje vprašanje ne najdete nikjer drugje, uporabite naše dopisne sezname. Naslov <email>users@TortoiseGit.tigris.org</email> uporabite v primeru vprašanje glede uporabe programa TortoiseGit. Če želite sodelovati pri razvoju TortoiseGit, lahko sodelujete v debatah na naslovu <email>dev@TortoiseGit.tigris.org</email>."
+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
#. (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 Subversion 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 Subversion, vendar morate za nastavitev imeti neposreden dostop do strežnika."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:13080
-msgid "This method is the recommended way if your users also use other Subversion 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 Subversion. 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."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:13281
-msgid "The only way to remove data from the repository is to use the
Subversion 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
Subversion <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>."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:13375
-msgid "Commit the new folder. Now when you update, Subversion 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 Subversion 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."
+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
#. (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 Subversion"
-msgstr "Ustvarite novo mapo znotraj svojega projekta, ki naj vsebuje skupno kodo, vendar je ne dodajte v sistem Subversion."
+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
#. (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 Subversion 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 Subversion za ukazno vrstico."
+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)
#. (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 Subversion."
+msgstr "Odstrani datoteke v <placeholder-1/> iz sistema Git."
#. (entry)
#: ../source/TortoiseGit_en.xml:14195
#. (para)
#: ../source/TortoiseGit_en.xml:14504
-msgid "Sometimes this manual refers you to the main Subversion documentation, which describes Subversion 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 Subversion, ki opisuje sistem Subversion 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."
+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 Subversion 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 Subversion."
+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 Subversion 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 Subversion. S tem ločimo napake programa TortoiseGit od napak programa Subversion. Ta razpredelnica vam pove, katere ukaze poskusite."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:14577
-msgid "Updating multiple items is currently not an atomic operation in Subversion. 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 Subversion 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."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:14612
-msgid "In TortoiseGit, the commit dialog uses several Subversion 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 Subversion. 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."
+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)
#. (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 Subversion, 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 Subversion, ker se ukaz <literal>svn status</literal> ne ukvarja z datotekami brez različic."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:14637
-msgid "When you click on OK, the Subversion 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."
+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)
#. (para)
#: ../source/TortoiseGit_en.xml:14790
-msgid "When you click on OK, the Subversion 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."
+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)
#. (para)
#: ../source/TortoiseGit_en.xml:14892
-msgid "Exporting a working copy to a different location is done without using the Subversion library, so there's no matching command line equivalent."
-msgstr "Izvoz delovne kopije na drugo lokacijo se ne izvede s pomočjo knjižnice Subversion, zato ekvivalentnega ukaza ni."
+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
#. (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 Subversion."
-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 Subversion."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:15009
-msgid "Every file and folder has a Subversion status value as reported by the Subversion 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 Subversion stanje, ki ga sporoči knjižnica Subversion. 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."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:15051
-msgid "<graphic fileref=\"images/InSubVersionIcon.png\"/> The <emphasis>In Subversion</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/InSubVersionIcon.png\"/> Prekrivna ikona <emphasis>V sistemu Subversion</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."
+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 Subversion 1.4.0 and later, the <literal>svn:needs-lock</literal> status is cached locally by Subversion 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 Subversion 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 Subversion 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 Subversion samodejno nadgradi delovne kopije, ko jih posodobite. Predpomnenje lastnosti <literal>svn:needs-lock</literal> se morda ne bo zgodilo, dokler ne boste posodobili datoteke."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:15095
-msgid "If an item has subversion 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."
+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 Subversion status value. For example a file could be locally modified and it could be marked for deletion at the same time. Subversion returns a single status value - in this case <literal>deleted</literal>. Those priorities are defined within Subversion itself."
-msgstr "Element ima lahko le eno stanje sistema Subversion. Primer: datoteka je krajevno spremenjena in hkrati označena za brisanje. Subversion vrne eno samo stanje - v tem primeru <literal>izbrisano</literal>. Prioritete stanj definira Subversion."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:15172
-msgid "This section provides a step-by-step guide to setting up Subversion 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 Subversion book. If you are not using SSH but would like to do so to protect your Subversion installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every subversion user."
-msgstr "V tem razdelku so opisani koraki, ki jih je potrebno izvesti, če želite pri sistemu Subversion in TortoiseGit uporabljati protokol <literal>svn+ssh</literal>. Če za dostop do strežnika Subversion in avtentikacijo že uporabljate SSH, potem tega ne potrebujete; kaj več o tem si lahko preberete v knjigi The Subversion Book. Če še ne uporabljate SSH in želite svoj sistem Subversion zaščititi, vam ta razdelek ponuja enostaven način, kako to storite, ne da bi morali za vsakega uporabnika sistema Subversion ustvariti tudi račun SSH na strežniku."
+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 subversion users, and use different authentication keys to differentiate between the real Subversion users."
-msgstr "Pri tem načinu ustvarimo en račun SSH za vse uporabnike sistema Subversion in uporabimo različne ključe za avtentikacijo, da ločimo med posameznimi uporabniki sistema Subversion."
+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 subversion 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."
+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/subversion-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/subversion-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!"
+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
#. (para)
#: ../source/TortoiseGit_en.xml:15214
-msgid "One point to note is that if you build Subversion from source and do not provide any argument to <filename>./configure</filename>, Subversion 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 Subversion sami iz izvorne kode in ne podate parametra v <filename>./configure</filename>, Subversion 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>."
+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
"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 Subversion: <screen>\n"
+"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."
#. (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 subversion authors to use the same system account, <literal>svnuser</literal>. Note that every subversion 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 Subversion istočasno uporablja isti sistemski račun, <literal>svnuporabnik</literal>. Upoštevajte, da vsak uporabnik sistema Subversion uporablja iste podatke za prijavo, vendar ima drugačen avtentikacijski ključ, zato morate dodati za vsakega uporabnika eno vrstico."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:15413
msgid "<literal><Comment></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><Comment></literal> je lahko poljuben komentar, vendar je na tem mestu priporočljivo zapisati uporabniško ime v sistemu Subversion in pravo ime uporabnika."
+msgstr "<literal><Comment></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
#. (para)
#: ../source/TortoiseGit_en.xml:15523
-msgid "A Subversion 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 Subversion, ki se uporablja za dodajanje datoteke ali mape v delovno kopijo. Novi elementi so dodani v skladišče, ko naredite objavo."
+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
#. (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 Subversion 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 Subversion so veje izvedene kot <quote>poceni kopije</quote>."
+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 Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository."
+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 Subversion 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 Subversion 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."
+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 Subversion 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 Subversion se uporablja za pošiljanje sprememb v delovni kopiji nazaj na skladišče. S tem se tam ustvari nova revizija."
+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
#. (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 Subversion 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 Subversion 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."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:15628
-msgid "In a Subversion 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 Subversion 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."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:15671
-msgid "A proprietary Subversion 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 Subversion. Uporablja se lahko tudi v omrežnih datotekah v skupni rabi. Privzet sistem pri različicah 1.2 in novejših."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:15696
-msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision."
-msgstr "Ukaz sistema Subversion, ki omogoča uvoz celotne hierarhije map v skladišče v eni reviziji."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:15749
-msgid "If a working copy has changes to text files only, it is possible to use Subversion'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."
+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)
#. (para)
#: ../source/TortoiseGit_en.xml:15764
-msgid "In addition to versioning your directories and files, Subversion 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. Subversion 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 Subversion 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. Subversion 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."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:15819
-msgid "Subversion 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 "Subversion 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."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:15860
-msgid "A frequently-used abbreviation for Subversion."
-msgstr "Pogosto uporabljena okrajšava za Subversion."
+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 Subversion custom protocol used by the <quote>svnserve</quote> repository server."
-msgstr "Ime lastnega protokola sistema Subversion, ki ga uporablja strežnik skladišč <quote>svnserve</quote>."
+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
#. (para)
#: ../source/TortoiseGit_en.xml:15886
-msgid "This Subversion 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."
+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)
OSDN Git Service
