• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision15947 (tree)
Zeit2009-03-26 21:34:18
Autorluebbe.tortoisesvn

Log Message

Merge r15946 from trunk
- Slovenian GUI & DOC translation

Ändern Zusammenfassung

Diff

--- branches/1.6.x/Languages/Tortoise_ca_ES.po (revision 15946)
+++ branches/1.6.x/Languages/Tortoise_ca_ES.po (revision 15947)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_ca_ES.po:r15946
--- branches/1.6.x/Languages/Tortoise_da.po (revision 15946)
+++ branches/1.6.x/Languages/Tortoise_da.po (revision 15947)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_da.po:r15946
--- branches/1.6.x/Languages/Tortoise_nb.po (revision 15946)
+++ branches/1.6.x/Languages/Tortoise_nb.po (revision 15947)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_nb.po:r15946
--- branches/1.6.x/Languages/Tortoise_pt_PT.po (revision 15946)
+++ branches/1.6.x/Languages/Tortoise_pt_PT.po (revision 15947)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_pt_PT.po:r15946
--- branches/1.6.x/Languages/Tortoise_sl.po (revision 15946)
+++ branches/1.6.x/Languages/Tortoise_sl.po (revision 15947)
@@ -19,8 +19,8 @@
1919 "Project-Id-Version: TortoiseSVN\n"
2020 "Report-Msgid-Bugs-To: \n"
2121 "POT-Creation-Date: 1900-01-01 00:00+0000\n"
22-"PO-Revision-Date: 2009-03-21 12:07+0100\n"
23-"Last-Translator: Oto BREZINA <translator@e-posta.sk>\n"
22+"PO-Revision-Date: 2009-03-26 12:20+0100\n"
23+"Last-Translator: Miha Nahtigal <miha.nahtigal@gmail.com>\n"
2424 "Language-Team: TortoiseSVN translation team <dev@tortoisesvn.tigris.org>\n"
2525 "MIME-Version: 1.0\n"
2626 "Content-Type: text/plain; charset=UTF-8\n"
@@ -7424,9 +7424,8 @@
74247424 msgstr "Prikaži elemente med zunanjimi"
74257425
74267426 #. Resource IDs: (1037)
7427-#, fuzzy
74287427 msgid "Show l&og"
7429-msgstr "Pokaži &dnevnik"
7428+msgstr "P&okaži dnevnik"
74307429
74317430 #. Resource IDs: (1063)
74327431 msgid "Show linenumber&s"
--- branches/1.6.x/Languages/Tortoise_sv.po (revision 15946)
+++ branches/1.6.x/Languages/Tortoise_sv.po (revision 15947)
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /trunk/Languages/Tortoise_sv.po:r15946
--- branches/1.6.x/doc/po/TortoiseMerge_sl.po (revision 15946)
+++ branches/1.6.x/doc/po/TortoiseMerge_sl.po (revision 15947)
@@ -1,6 +1,6 @@
11 #
22 # Slovenian translation for TortoiseMerge
3-# Copyright (C) 2004-2008 the TortoiseSVN team
3+# Copyright (C) 2004-2009 the TortoiseSVN team
44 # This file is distributed under the same license as TortoiseSVN
55 #
66 # Last commit by:
@@ -9,14 +9,15 @@
99 # $Rev$
1010 #
1111 # Authors:
12-# Matjaz Cepon <matjaz.cepon@gmail.comY, 2007
12+# Matjaz Cepon <matjaz.cepon@gmail.com>, 2007
13+# Miha Nahtigal <miha.nahtigal@gmail.com>, 2009
1314 #
1415 msgid ""
1516 msgstr ""
1617 "Project-Id-Version: TortoiseMerge Documentation\n"
17-"POT-Creation-Date: 2008-07-11 23:46 +0000\n"
18-"PO-Revision-Date: 2008-09-19 22:16+0100\n"
19-"Last-Translator: Matjaz Cepon <matjaz.cepon@gmail.com>\n"
18+"POT-Creation-Date: 2009-03-03 10:39 +0000\n"
19+"PO-Revision-Date: 2009-03-26 12:11+0100\n"
20+"Last-Translator: Miha Nahtigal <miha.nahtigal@gmail.com>\n"
2021 "Language-Team: TortoiseSVN translation team <dev@tortoisesvn.tigris.org>\n"
2122 "MIME-Version: 1.0\n"
2223 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,315 +26,252 @@
2526 "X-Poedit-Country: SLOVENIA\n"
2627
2728 #. (title)
28-#: ../source/TortoiseMerge_en.xml:4
2929 msgid "TortoiseMerge"
3030 msgstr "TortoiseMerge"
3131
3232 #. (subtitle)
33-#: ../source/TortoiseMerge_en.xml:6
3433 msgid "A diff/merge tool for Windows"
3534 msgstr "Orodje za razlikovanje/spajanje v operacijskem sistemu Windows"
3635
3736 #. TRANSLATORS: "$MajorVersion$.$MinorVersion$.$MicroVersion$" is a literal value and should not be translated
3837 #. (subtitle)
39-#: ../source/TortoiseMerge_en.xml:7
4038 msgid "Version $MajorVersion$.$MinorVersion$.$MicroVersion$"
4139 msgstr "Version $MajorVersion$.$MinorVersion$.$MicroVersion$"
4240
4341 #. (edition)
44-#: ../source/TortoiseMerge_en.xml:9
4542 msgid "First"
4643 msgstr "Prvi"
4744
4845 #. (firstname)
49-#: ../source/TortoiseMerge_en.xml:12
5046 msgid "Stefan"
5147 msgstr "Stefan"
5248
5349 #. (surname)
54-#: ../source/TortoiseMerge_en.xml:13
5550 msgid "Küng"
5651 msgstr "Küng"
5752
5853 #. (firstname)
59-#: ../source/TortoiseMerge_en.xml:16
6054 msgid "Lübbe"
6155 msgstr "Lübbe"
6256
6357 #. (surname)
64-#: ../source/TortoiseMerge_en.xml:17
6558 msgid "Onken"
6659 msgstr "Onken"
6760
6861 #. (firstname)
69-#: ../source/TortoiseMerge_en.xml:20
7062 msgid "Simon"
7163 msgstr "Simon"
7264
7365 #. (surname)
74-#: ../source/TortoiseMerge_en.xml:21
7566 msgid "Large"
7667 msgstr "Large"
7768
7869 #. (title)
79-#: ../source/TortoiseMerge_en.xml:28
8070 msgid "Preface"
8171 msgstr "Predgovor"
8272
8373 #. (para)
84-#: ../source/TortoiseMerge_en.xml:33
8574 msgid "When working on a project, either an open-source project where several people review your code, or a commercial project where you sell a component with your source code, there will be people and customers who find bugs or want to improve your project. To do that they send you patches which you have to review and decide if you want to apply them."
8675 msgstr "Ko delate na projektu, pa naj bo to odprtokodni projekt ali komercialni projekt, kjer poleg komponente prodajate tudi izvorno kodo, uporabniki in stranke v vaši kodi najdejo napake oziroma želijo projekt izboljšati. To storijo tako, da vam pošljejo datoteko popravkov, ki jih morate pregledati in se odločiti, ali jih boste uporabili."
8776
8877 #. (para)
89-#: ../source/TortoiseMerge_en.xml:45
9078 msgid "Reviewing patches"
9179 msgstr "Pregledovanje popravkov"
9280
9381 #. (para)
94-#: ../source/TortoiseMerge_en.xml:50
9582 msgid "Applying the patches"
9683 msgstr "Uporaba popravkov"
9784
9885 #. (para)
99-#: ../source/TortoiseMerge_en.xml:41
10086 msgid "TortoiseMerge helps you with both those tasks: <placeholder-1/>"
10187 msgstr "TortoiseMerge vam pomaga pri obeh nalogah: <placeholder-1/>"
10288
10389 #. (para)
104-#: ../source/TortoiseMerge_en.xml:56
10590 msgid "TortoiseMerge also helps you to sort out conflicted files which can occur if you're working with a source control system and others are working on the same files as you."
10691 msgstr "TortoiseMerge vam poleg tega pomaga pri reševanju spornih datotek, ki se pojavijo pri delu z orodji za nadzor različic, ko ostali uporabniki spreminjajo iste datoteke kot vi."
10792
10893 #. (title)
109-#: ../source/TortoiseMerge_en.xml:66
11094 msgid "TortoiseMerge is free!"
11195 msgstr "TortoiseMerge je brezplačno orodje!"
11296
11397 #. (para)
114-#: ../source/TortoiseMerge_en.xml:67
11598 msgid "TortoiseMerge is free. You don't have to pay for it, you can use it any way you want. It is developed under the GP license (GPL)."
11699 msgstr "TortoiseMerge je brezplačen. Zanj vam ni treba plačati, lahko ga uporabljate, kakor želite. Razvit je pod licenco GPL."
117100
118101 #. (para)
119-#: ../source/TortoiseMerge_en.xml:71
120-msgid "TortoiseMerge is an Open Source project. That means you have full access to the source code of this program. You can browse it on this link <ulink url=\"http://tortoisesvn.tigris.org/svn/tortoisesvn/\"><citetitle>http://tortoisesvn.tigris.org/svn/tortoisesvn/</citetitle></ulink>. (Username:guest, for password hit enter) The most recent version (where we're currently working) is located under <filename>/trunk/</filename> the released versions are located under <filename>/tags/</filename>."
121-msgstr "TortoiseMerge je odprtokodni projekt. To pomeni, da imate dostop do njegove izvorne kode. Po njej lahko brskate z uporabo naslednje povezave: <ulink url=\"http://tortoisesvn.tigris.org/svn/tortoisesvn/\"><citetitle>http://tortoisesvn.tigris.org/svn/tortoisesvn/</citetitle></ulink>. (Uporabniško ime:guest, geslo pustite prazno) Najnovejša različica, na kateri delamo, se nahaja v mapi <filename>/trunk/</filename>, izdane različice pa se nahajajo v mapi <filename>/tags/</filename>."
102+msgid "TortoiseMerge is an Open Source project. That means you have full read access to the source code of this program. You can browse it on this link <ulink url=\"http://tortoisesvn.tigris.org/svn/tortoisesvn/\"><citetitle>http://tortoisesvn.tigris.org/svn/tortoisesvn/</citetitle></ulink>. You will be prompted to enter username and password. The username is <literal>guest</literal>, and the password must be left blank. The most recent version (where we're currently working) is located under <filename>/trunk/</filename>, and the released versions are located under <filename>/tags/</filename>."
103+msgstr "TortoiseMerge je odprtokodni projekt. To pomeni, da imate dostop do njegove izvorne kode. Po njej lahko brskate z uporabo naslednje povezave: <ulink url=\"http://tortoisesvn.tigris.org/svn/tortoisesvn/\"><citetitle>http://tortoisesvn.tigris.org/svn/tortoisesvn/</citetitle></ulink>. Za dostop potrebujete uporabniško ime in geslo. Uporabniško ime je <literal>guest</literal>, geslo pa pustite prazno. Najnovejša različica, na kateri delamo, se nahaja v mapi <filename>/trunk/</filename>, izdane različice pa se nahajajo v mapi <filename>/tags/</filename>."
122104
123105 #. (title)
124-#: ../source/TortoiseMerge_en.xml:90
125106 msgid "Donate!"
126107 msgstr "Darujte!"
127108
128109 #. (para)
129-#: ../source/TortoiseMerge_en.xml:91
130110 msgid "Even though TortoiseSVN and TortoiseMerge are free, you can support the developers by sending in patches and play an active role in the development. You can also help to cheer us up during the endless hours we spend in front of our computers."
131111 msgstr "Čeprav sta programa TortoiseSVN in TortoiseMerge brezplačna, lahko pomagate razvijalcem s pošiljanjem popravkov in igranjem aktivne vloge pri razvoju. Lahko nas tudi pomagate razvedriti med neštetimi urami, ki jih prebijemo pred računalnikom."
132112
133113 #. (para)
134-#: ../source/TortoiseMerge_en.xml:97
135114 msgid "While working on TortoiseSVN we love to listen to music. And since we spend many hours on the project we need a <emphasis>lot</emphasis> of music. Therefore we have set up some wish-lists with our favourite music CDs and DVDs: <ulink url=\"http://tortoisesvn.tigris.org/donate.html\"><citetitle>http://tortoisesvn.tigris.org/donate.html</citetitle></ulink> Please also have a look at the list of people who contributed to the project by sending in patches or translations."
136115 msgstr "Medtem ko delamo na projektu TortoiseSVN, radi poslušamo glasbo. In ker delamo na projektu veliko časa, potrebujemo <emphasis>veliko</emphasis> glasbe. Zato smo sestavili seznam želja z našimi priljubljenimi CDji in DVDji: <ulink url=\"http://tortoisesvn.tigris.org/donate.html\"><citetitle>http://tortoisesvn.tigris.org/donate.html</citetitle></ulink>. Prosimo, poglejte tudi seznam ljudi, ki so prispevali k projektu s popravki ali prevodi."
137116
138117 #. (title)
139-#: ../source/TortoiseMerge_en.xml:113
140118 msgid "Acknowledgments"
141119 msgstr "Zasluge"
142120
143121 #. (term)
144-#: ../source/TortoiseMerge_en.xml:117
145122 msgid "Stefan Küng"
146123 msgstr "Stefan Küng"
147124
148125 #. (para)
149-#: ../source/TortoiseMerge_en.xml:121
150126 msgid "for the hard work on TortoiseMerge"
151127 msgstr "za trdo delo na projektu TortoiseMerge"
152128
153129 #. (term)
154-#: ../source/TortoiseMerge_en.xml:127
155130 msgid "Lübbe Onken"
156131 msgstr "Lübbe Onken"
157132
158133 #. (para)
159-#: ../source/TortoiseMerge_en.xml:131
160134 msgid "for the beautiful icons, logo, bug hunting and taking care of the documentation"
161135 msgstr "za čudovite ikone, logotip, iskanje napak in urejanje dokumentacije"
162136
163137 #. (term)
164-#: ../source/TortoiseMerge_en.xml:138
165138 msgid "The Tigris Style project"
166139 msgstr "Projekt Tigris Style"
167140
168141 #. (para)
169-#: ../source/TortoiseMerge_en.xml:142
170142 msgid "for some of the styles which are reused in this documentation"
171143 msgstr "za nekatere stile, ki so uporabljeni v tej dokumentaciji"
172144
173145 #. (term)
174-#: ../source/TortoiseMerge_en.xml:149
175146 msgid "Our Contributors"
176147 msgstr "Zunanji sodelavci"
177148
178149 #. (para)
179-#: ../source/TortoiseMerge_en.xml:153
180150 msgid "for the patches, bug reports and new ideas, and for helping others by answering questions on our mailing list."
181151 msgstr "za popravke, poročila o napakah in nove ideje, za pomoč uporabnikom z odgovori na dopisnih seznamih"
182152
183153 #. (term)
184-#: ../source/TortoiseMerge_en.xml:160
185154 msgid "Our Donators"
186155 msgstr "Naši donatorji"
187156
188157 #. (para)
189-#: ../source/TortoiseMerge_en.xml:164
190158 msgid "for many hours of joy with the music they sent us"
191159 msgstr "za številne ure užitkov ob poslušanju glasbe, ki ste nam jo poslali"
192160
193161 #. (title)
194-#: ../source/TortoiseMerge_en.xml:175
195162 msgid "Introduction"
196163 msgstr "Uvod"
197164
198165 #. (title)
199-#: ../source/TortoiseMerge_en.xml:184
200166 msgid "Overview"
201167 msgstr "Pregled"
202168
203169 #. (para)
204-#: ../source/TortoiseMerge_en.xml:185
205170 msgid "TortoiseMerge is a free/open-source application. It lets you see differences in text files, merge those changes and even review and apply unified diff files, often called <firstterm>patches</firstterm>."
206171 msgstr "TortoiseMerge je brezplačen/odprtokodni program. Omogoča pregledovanje razlik v besedilnih datotekah, spajanje teh sprememb in celo pregled in uporabo datotek poenotene razlike, pogosto imenovane <firstterm>datoteke popravkov</firstterm>."
207172
208173 #. (para)
209-#: ../source/TortoiseMerge_en.xml:190
210174 msgid "While working on text files, e.g. source files in your favourite programming language, or html/xml files for your documentation or website, you will often have a situation where you need to compare different versions of those files. Sometimes you get a different version from someone else, sometimes you just want to see the changes you've made."
211175 msgstr "Pri delu z besedilnimi datotekami, n. pr. datotekami izvorne kode v priljubljenem programskem jeziku ali datotekami html/xml files za vašo dokumentacijo ali spletno stran se pogosto znajdete v situaciji, ko morate primerjati različne verzije teh datotek. Včasih dobite drugo različico datoteke od sodelavca, včasih pa želite videti, kakšne spremembe ste naredili sami."
212176
213177 #. (para)
214-#: ../source/TortoiseMerge_en.xml:198
215178 msgid "If you're working with a version control system (e.g. Subversion) then you sometimes get <emphasis>conflicts</emphasis> when you update your working copy. This happens if someone else changed the same parts of the file you're currently working on as you did. Then you have to resolve those conflicts manually. This is where TortoiseMerge can help you."
216179 msgstr "Če delate s sistemi za nadzor različic (n. pr. s sistemom Subversion), se včasih pri posodabljanju datotek pojavijo <emphasis>spori</emphasis>. To se zgodi, če nek drug uporabnik spremeni isti del datoteke kot vi. V takšnem primeru morate ročno rešiti spore. Tu vam pomaga TortoiseMerge."
217180
218181 #. (para)
219-#: ../source/TortoiseMerge_en.xml:206
220182 msgid "The following diagram shows you the relationships between the files involved in a conflict:"
221183 msgstr "Naslednji diagram prikazuje razmerja med datotekami, ki so udeležene v sporu:"
222184
223185 #. (title)
224186 #. (title)
225-#: ../source/TortoiseMerge_en.xml:211
226-#: ../source/TortoiseMerge_en.xml:347
227187 msgid "File Conflict"
228188 msgstr "Spori v datoteki"
229189
230190 #. (para)
231-#: ../source/TortoiseMerge_en.xml:214
232191 msgid "A conflict can also occur if you try to apply an outdated patch file. In such cases, without TortoiseMerge, you would either have to ask the person you got that patch file from for a current version or try to apply that patch file manually."
233192 msgstr "Spor se lahko pojavi tudi, če poskusite popravek namestiti na zastarelo datoteko. V takšnih primerih morate brez uporabe programa TortoiseMerge prositi avtorja popravka za popravek, ki se nanaša na najnovejšo različico datoteke ali namestiti popravek ročno."
234193
235194 #. (para)
236-#: ../source/TortoiseMerge_en.xml:220
237195 msgid "But now with TortoiseMerge this isn't necessary anymore - at least not if you're working with a version control system like Subversion. TortoiseMerge parses the patch file for the revision/version the patch was created for and automatically tries to fetch that specific version from your source-control. Then it applies the patch and lets you review both your changes to the file, and theirs. Then you can decide which changes you want to keep."
238196 msgstr "S programom TortoiseMerge vam tega ni potrebno več početi - vsaj v primeru uporabe sistema Subversion ne. TortoiseMerge razčleni datoteko popravkov za revizijo/verzijo, za katero je bil popravek ustvarjen in poskuša samodejno pridobiti določeno revizijo datoteke iz sistema za nadzor različic. Potem popravek namesti in vam omogoči pregled sprememb, ki ste jih naredili vi in avtor programa. Lahko se odločite, katere spremembe boste obdržali."
239197
240198 #. (title)
241-#: ../source/TortoiseMerge_en.xml:235
242199 msgid "TortoiseMerge's History"
243200 msgstr "Zgodovina TortoiseMerge"
244201
245202 #. (para)
246-#: ../source/TortoiseMerge_en.xml:236
247203 msgid "While working on <ulink url=\"http://tortoisesvn.tigris.org\"><citetitle>TortoiseSVN</citetitle></ulink> we found that whenever users sent in patches to enhance the project or just to fix bugs, we had a lot of work just applying those patches. And many times those patches were outdated and couldn't be applied with the command line patch tool <ulink url=\"http://unxutils.sourceforge.net/\"><citetitle>http://unxutils.sourceforge.net/</citetitle></ulink> because we were working on those files and had sometimes changed those files already."
248204 msgstr "Med delom na projektu <ulink url=\"http://tortoisesvn.tigris.org\"><citetitle>TortoiseSVN</citetitle></ulink> smo opazili, da imamo veliko dela z nameščanjem popravkov (izboljšave programa, odpravljene napake), ki nam jih pošljejo uporabniki. Ti popravki so bili pogosto zastareli, tako da nismo mogli uporabiti orodja ukazne vrstice <ulink url=\"http://unxutils.sourceforge.net/\"><citetitle>http://unxutils.sourceforge.net/</citetitle></ulink>. Datoteke smo namreč tudi sami spreminjali."
249205
250206 #. (para)
251-#: ../source/TortoiseMerge_en.xml:251
252207 msgid "This was also the main reason why TortoiseSVN did not originally have a <menuchoice><guimenu>TortoiseSVN</guimenu><guimenuitem>Create Patch</guimenuitem></menuchoice> implemented: we preferred users to send us the whole files because with those it was easier to apply patches."
253208 msgstr "To je tudi glavni vzrok, zakaj program TortoiseSVN na začetku ni ponujal ukaza <menuchoice><guimenu>TortoiseSVN</guimenu><guimenuitem>Ustvari popravek </guimenuitem></menuchoice>: raje smo videli, da so nam uporabniki pošiljali celotne datoteke, saj jih je bilo lažje uporabiti kot popravke."
254209
255210 #. (para)
256-#: ../source/TortoiseMerge_en.xml:261
257211 msgid "So we spent a lot of time, searching the Internet for a GUI tool which could apply patch files, but all we found was that such a tool didn't exist. So to cut a long story short: We decided that if no-one else could provide such a tool we would have to write our own. That's when TortoiseMerge was born."
258212 msgstr "Veliko časa smo zapravili za iskanje ustreznega grafičnega orodja na internetu, vendar smo lahko ugotovili le, da ne obstaja. Da skrajšamo celotno zgodbo: če nam nihče ne omogoča takšnega orodja, ga bomo morali napisati sami. Tako se je rodil program TortoiseMerge."
259213
260214 #. (para)
261-#: ../source/TortoiseMerge_en.xml:268
262215 msgid "Since TortoiseSVN already uses the Subversion library, which has a nice diffing engine built in, it was just natural to use this library instead of the GNU diff."
263216 msgstr "Ker TortoiseSVN že uporablja knjižnice sistema Subversion, ki imajo vgrajeno dobro orodje za razlikovanje, je bila odločitev za uporabo teh knjižnic namesto sistema GNU diff enostavna."
264217
265218 #. (title)
266-#: ../source/TortoiseMerge_en.xml:276
267219 msgid "Basic Concepts"
268220 msgstr "Osnovni principi"
269221
270222 #. (para)
271-#: ../source/TortoiseMerge_en.xml:282
272223 msgid "Viewing the difference between two files and merging changes into one of them, or removing unwanted changes."
273224 msgstr "Pregledovanje sprememb med dvema datotekama in spajanje sprememb v eno od datotek ali odstranjevanje neželjenih sprememb."
274225
275226 #. (para)
276-#: ../source/TortoiseMerge_en.xml:288
277227 msgid "Editing conflicts between local changes and changes in the Subversion repository following an update."
278228 msgstr "Urejanje sporov med krajevnimi spremembami in spremembami v skladišču Subversion po posodobitvi."
279229
280230 #. (para)
281-#: ../source/TortoiseMerge_en.xml:294
282231 msgid "Applying patch files. This is the reason TortoiseMerge was created :)"
283232 msgstr "Nameščanje popravkov. Za to je bil TortoiseMerge tudi ustvarjen :-)"
284233
285234 #. (para)
286-#: ../source/TortoiseMerge_en.xml:278
287235 msgid "TortoiseMerge has several different uses: <placeholder-1/>"
288236 msgstr "TortoiseMerge vam pomaga pri več nalogah: <placeholder-1/>"
289237
290238 #. (title)
291-#: ../source/TortoiseMerge_en.xml:303
292239 msgid "Viewing and Merging Differences"
293240 msgstr "Pregledovanje in spajanje sprememb"
294241
295242 #. (para)
296-#: ../source/TortoiseMerge_en.xml:304
297243 msgid "In this mode you are comparing two files. The file in the left pane is considered to be the original file (sometimes referred to as <emphasis>Theirs</emphasis>, and the file in the right pane is the modified file (sometimes referred to as <emphasis>Mine</emphasis>."
298244 msgstr "V tem načinu primerjate dve datoteki. Datoteka na levi strani se smatra za izvirno (včasih ji rečeno <emphasis>njihova</emphasis>), datoteka na desni pa je spremenjena datoteka (včasih ji rečemo <emphasis>moja</emphasis>)."
299245
300246 #. (para)
301-#: ../source/TortoiseMerge_en.xml:315
302247 msgid "Reverting changed lines back to the text shown in the left pane."
303248 msgstr "Povrnitev spremenjenih vrstic nazaj na stanje, kot je v levi datoteki."
304249
305250 #. (para)
306-#: ../source/TortoiseMerge_en.xml:320
307251 msgid "Using a combination of both blocks, either <emphasis>Theirs</emphasis> before <emphasis>Mine</emphasis> or <emphasis>Mine</emphasis> before <emphasis>Theirs</emphasis>."
308252 msgstr "S kombinacijo ukazov lahko izberete tudi <emphasis>njihove</emphasis> spremembe pred <emphasis>svojimi</emphasis> ali <emphasis>svoje</emphasis> pred <emphasis>njihovimi</emphasis>."
309253
310254 #. (para)
311-#: ../source/TortoiseMerge_en.xml:310
312255 msgid "You can make simple line-based changes to the file in the right pane which include: <placeholder-1/>"
313256 msgstr "Na desni datoteki lahko naredite enostavne vrstične spremembe, kar vključuje: <placeholder-1/>"
314257
315258 #. (para)
316-#: ../source/TortoiseMerge_en.xml:328
317259 msgid "You can also edit the file in the right pane just as you would in a text editor. Such lines are marked using a pencil icon. Please note that if you want to make any of the line/block-based changes described above, it is better to do those first since once you start editing the file yourself it becomes impossible for TortoiseMerge to keep track of the relationship to the original files."
318260 msgstr "V desnem podoknu lahko datoteko urejate prav tako kot v urejevalniku besedila. Spremenjene vrstice so označene s simbolom svinčnika. Če želite narediti kakšno spremembo na nivoju vrstice ali bloka besedila, je najbolje, da to storite najprej. Po ročnem urejanju namreč TortoiseMerge nima več povezave z izvornimi datotekami."
319261
320262 #. (title)
321-#: ../source/TortoiseMerge_en.xml:338
322263 msgid "Editing Conflicts"
323264 msgstr "Urejanje sporov"
324265
325266 #. (para)
326-#: ../source/TortoiseMerge_en.xml:339
327267 msgid "This is sometimes referred to as a three-way merge, and is shown in three panes. However there are actually four files involved. The file which is not shown is the common base file, the last common ancestor of the two files which are now in conflict. The relationships between the three files are explained in the diagram below:"
328268 msgstr "Temu včasih rečemo tristransko spajanje, zato se prikazuje v treh delih. V bistvu pa se ukvarjamo s štirimi datotekami. Datoteka, ki ni prikazana, je skupna osnovna datoteka, zadnja skupna prednica datotek, ki sta v sporu. Razmerja med vsemi tremi datotekami so prikazana na spodnjem diagramu:"
329269
330270 #. (para)
331-#: ../source/TortoiseMerge_en.xml:350
332271 msgid "The base file represents the oldest version of a file, from where <emphasis>You</emphasis> and <emphasis>They</emphasis> start making changes. <emphasis>Mine</emphasis> represents the base file with all the changes <emphasis>you</emphasis> made, and <emphasis>Theirs</emphasis> is the file with all the changes <emphasis>someone else</emphasis> made to the file. The left pane shows the changes in <emphasis>Theirs</emphasis> relative to the base file and the right pane shows the changes in <emphasis>Mine</emphasis> relative to the base file. The bottom pane is the output file which is where you are trying to resolve the conflicts."
333272 msgstr "Osnovna datoteka predstavlja najstarejšo različico datoteke, od kjer ste <emphasis>vi</emphasis> in <emphasis>oni</emphasis> začeli delati spremembe. <emphasis>Vaša</emphasis> datoteka predstavlja osnovno datoteko z vsemi spremembami, ki ste jih naredili <emphasis>vi</emphasis>, <emphasis>njihova</emphasis> pa je datoteka z vsemi spremembami, ki jih je na datoteki naredil <emphasis>nekdo drug</emphasis>. Leva stran prikazuje spremembe v <emphasis>njihovi</emphasis> datoteki, relativno na osnovno datoteko, desna stran pa prikazuje <emphasis>vašo</emphasis> datoteko, relativno na osnovno datoteko. Spodnji del je izhodna datoteka, kjer poskušate spore rešiti."
334273
335274 #. (para)
336-#: ../source/TortoiseMerge_en.xml:362
337275 msgid "In conflict resolution view, you can choose to use blocks from <emphasis>Mine</emphasis> or <emphasis>Theirs</emphasis> or both. But in this case, the changes are shown in the bottom pane."
338276 msgstr "V pogledu rešitve spora lahko izberete blok iz <emphasis>Moj</emphasis> ali <emphasis>Njihov</emphasis> ali obeh. V tem primeru so spremembe vidne v spodnjem delu."
339277
@@ -340,731 +278,583 @@
340278 #. (title)
341279 #. (title)
342280 #. (title)
343-#: ../source/TortoiseMerge_en.xml:369
344-#: ../source/TortoiseMerge_en.xml:478
345-#: ../source/TortoiseMerge_en.xml:866
346281 msgid "Applying Patches"
347282 msgstr "Namestitev popravkov"
348283
349284 #. (para)
350-#: ../source/TortoiseMerge_en.xml:370
351285 msgid "A patch file is a Subversion unified diff file, which contains the information required to apply changes to a set of files. The patch may have been supplied by another developer so that you can see changes he has made and possibly commit them to the repository. Or it may have been generated internally by TortoiseSVN when comparing two folders. This happens when you compare a repository revision with your working copy folder, or if you compare two different repository revisions, or if you compare two different repository paths."
352286 msgstr "Datoteka popravkov je datoteka poenotene razlike sistema Subversion, ki vsebuje informacije, potrebne za namestitev sprememb na množico datotek. Popravek je mogoče poslal drug razvijalec, da njegove spremembe pregledate in jih po možnosti objavite v skladišču. Ali pa ga je ustvaril program TortoiseSVN sam pri primerjanju map. To se zgodi pri primerjanju revizije iz skladišča z vašo delovno kopijo, pri primerjanju dveh revizij v skladišču ali pri primerjanju dveh poti v skladišču."
353287
354288 #. (para)
355-#: ../source/TortoiseMerge_en.xml:380
356289 msgid "In either case TortoiseMerge will show a small window listing the files included in the patch. By double clicking on one of these files you fetch the relevant file and apply the changes. The left pane shows the original file content and the right pane shows it after the patch is applied."
357290 msgstr "V vseh primerih vam TortoiseMerge pokaže majhno pogovorno okno s seznamom datotek, ki so vključene v popravek. Z dvoklikom na posamezno datoteko preberete ustrezno datoteko in namestite spremembe. Levi del prikazuje izvirno datoteko, desni pa datoteko po nameščenem popravku."
358291
359292 #. (para)
360-#: ../source/TortoiseMerge_en.xml:387
361293 msgid "You can edit the file in the right pane exactly as you would in compare/edit mode."
362294 msgstr "Datoteko lahko urejate na desni strani, tako kot bi jo v načinu primerjanja/urejanja."
363295
364296 #. (title)
365-#: ../source/TortoiseMerge_en.xml:394
366297 msgid "Using TortoiseMerge"
367298 msgstr "Uporaba TortoiseMerge"
368299
369300 #. (title)
370-#: ../source/TortoiseMerge_en.xml:402
371301 msgid "Viewing Modes"
372302 msgstr "Načini pregledovanja"
373303
374304 #. (para)
375-#: ../source/TortoiseMerge_en.xml:403
376305 msgid "TortoiseMerge has three main viewing modes: one-pane, two-pane and three-pane view. One/two-pane view is used to view changes and three-pane view is used to resolve conflicts."
377306 msgstr "TortoiseMerge ima tri različne glavne načine pregledovanja: enodelni, dvodelni in trodelni pogled. Eno- in dvodelni pogled se uporabljata za pregledovanje sprememb, trodelni pogled pa je namenjen reševanju sporov."
378307
379308 #. (title)
380309 #. (title)
381-#: ../source/TortoiseMerge_en.xml:409
382-#: ../source/TortoiseMerge_en.xml:843
383310 msgid "Viewing / Merging"
384311 msgstr "Pregledovanje / spajanje"
385312
386313 #. (title)
387-#: ../source/TortoiseMerge_en.xml:411
388314 msgid "One Pane View"
389315 msgstr "Enodelni pogled"
390316
391317 #. (title)
392-#: ../source/TortoiseMerge_en.xml:415
393318 msgid "Two Pane View"
394319 msgstr "Dvodelni pogled"
395320
396321 #. (para)
397-#: ../source/TortoiseMerge_en.xml:423
398322 msgid "Changes inside the modified lines are shown in different colors. Added string parts are shown with a lighter color, but you can of course configure the colors used here. Removed parts are indicated with a dark brown vertical line in the string. Check out the screenshot above to see how this works."
399323 msgstr "Spremembe v spremenjenih vrsticah so prikazane v drugačni barvi. Dodani nizi so prikazani s svetlejšo barvo, seveda pa lahko barve poljubno nastavite. Odstranjeni deli besedila so prikazani z rjavo vodoravno črto. Poglejte si posnetek okna, da vidite, kako stvar deluje."
400324
401325 #. (para)
402-#: ../source/TortoiseMerge_en.xml:433
403326 msgid "Code reorganization usually means a lot of changes in whitespaces (space, tab, newlines) but no actual code change. For example, you split up a very long line into several lines, or you sometimes compact several lines together into one."
404327 msgstr "Preurejanje kode ponavadi pomeni veliko sprememb presledkov (posamičnih presledkov, tabulatorjev, novih vrstic) in nobene dejanske spremembe kode. Primer: dolgo vrstico razdelite na več krajših ali pa več krajših združite v eno dolgo."
405328
406329 #. (para)
407-#: ../source/TortoiseMerge_en.xml:439
408330 msgid "Such changes are marked with a white circle symbol on the left side of the views. If you see such a white circle, you know immediately that no real code change is there and you don't have to check the changed block further."
409331 msgstr "Takšne spremembe so prikazane z belim krogcem na levi strani okna. Če vidite takšno oznako, takoj veste, da ne gre za pravo spremembo kode in vam je tako ni treba podrobneje pregledovati."
410332
411333 #. (para)
412-#: ../source/TortoiseMerge_en.xml:447
413334 msgid "Hand editing of the file in the right pane is possible in two-pane view. Such changes are marked with a pencil symbol."
414335 msgstr "Ročno urejanje datoteke v desnem podoknu je možno v dvodelnem pogledu. Takšne spremembe so označene s simbolom svinčnika."
415336
416337 #. (para)
417-#: ../source/TortoiseMerge_en.xml:418
418338 msgid "The two pane view has some features which are not available in the one pane view: <placeholder-1/>"
419339 msgstr "Dvodelni pogled ima v primerjavi z enodelnim nekaj dodatnih možnosti: <placeholder-1/>"
420340
421341 #. (para)
422-#: ../source/TortoiseMerge_en.xml:454
423342 msgid "If you want to compare/merge three files, TortoiseMerge will show you the differences in a three pane view. This view is also used if you need to resolve conflicted files."
424343 msgstr "Če želite primerjavi/spajati tri datoteke, vam TortoiseMerge prikaže razlike v tridelnem pogledu. Ta pogled se uporablja tudi pri reševanju sporov."
425344
426345 #. (title)
427-#: ../source/TortoiseMerge_en.xml:460
428346 msgid "Three Pane View"
429347 msgstr "Tridelni pogled"
430348
431349 #. (para)
432-#: ../source/TortoiseMerge_en.xml:463
433350 msgid "The left pane shows you the differences between <emphasis>Their</emphasis> file and the <emphasis>Base</emphasis> file, while the right pane shows you the differences between <emphasis>Mine</emphasis> file and the <emphasis>Base</emphasis> file. The bottom pane shows you the result of merging <emphasis>Base</emphasis>, <emphasis>Mine</emphasis> and <emphasis>Theirs</emphasis> with possible conflicts."
434351 msgstr "Leva stran prikazuje spremembe med <emphasis>njihovo</emphasis> datoteko in <emphasis>osnovno</emphasis> datoteko, desna pa spremembe med <emphasis>vašo</emphasis> datoteko in <emphasis>osnovno</emphasis> datoteko. Spodnji del prikazuje rezultat spajanja <emphasis>osnovne</emphasis>, <emphasis>vaše</emphasis> in <emphasis>njihove</emphasis> datoteke z možnimi spori."
435352
436353 #. (para)
437-#: ../source/TortoiseMerge_en.xml:472
438354 msgid "If you hover the mouse over the pane title, a tooltip will show the filenames used for the diff in each pane."
439355 msgstr "Če z miško nekoliko mirujete nad naslovom dela strani, vam namig prikaže imena datotek, ki so uporabljena za razlikovanje v posameznih delih."
440356
441357 #. (title)
442-#: ../source/TortoiseMerge_en.xml:484
443358 msgid "Patch File List"
444359 msgstr "Seznam datotek v popravku"
445360
446361 #. (para)
447-#: ../source/TortoiseMerge_en.xml:479
448362 msgid "After TortoiseMerge parses the patch file it will show you a small window with all the files which have changes according to the patch file. <placeholder-1/> If the filename is shown in black, then the patch can be applied without any problems. That means the file is not outdated according to the patch. However, if the filename is shown in red, then the patch can't get applied directly because you already changed that file."
449363 msgstr "Ko TortoiseMerge razčleni datoteko popravkov, prikaže majhno pogovorno okno s seznamom vseh datotek, v katerih so narejene spremembe. <placeholder-1/> Če je ime datoteke izpisano v črni barvi, se lahko popravek namesti brez težav. To pomeni, da datoteka v primerjavi s popravkom ni zastarela. Če pa je ime datoteke izpisano v rdeči barvi, popravka ne morete namestiti neposredno, saj ste datoteko že spreminjali."
450364
451365 #. (para)
452-#: ../source/TortoiseMerge_en.xml:493
453366 msgid "But don't worry. If you're working with Subversion you can retrieve an older version of the file and resolve the conflict. In fact, TortoiseMerge automatically tries to get that older version of the file and then shows you the diff between <emphasis>Base</emphasis> (the older version of the file), <emphasis>Mine</emphasis> (the file as it is currently in your working copy) and <emphasis>Theirs</emphasis> (the older version of the file with the patch already applied). Then you can resolve possible conflicts manually."
454367 msgstr "Brez skrbi. Če delate s sistemom Subversion, lahko pridobite starejško različico datoteke in rešite spor. V bistvu poskusi TortoiseMerge samodejno pridobiti starejšo različico datoteke in vam prikazati razlike med <emphasis>osnovno</emphasis> (staro različico datoteke), <emphasis>vašo</emphasis> (datoteke, kakršna je trenutno v vaši delovni kopiji) in <emphasis>njihovo</emphasis> (starejšo različico datoteke z že nameščenim popravkom). Sedaj lahko možne spore rešite ročno."
455368
456369 #. (para)
457-#: ../source/TortoiseMerge_en.xml:504
458370 msgid "The patch file window has a context menu which allows you to preview the effect of the patch on the current file (apply without saving), to apply and save the changes for the selected file, or to apply and save changes to <emphasis>all</emphasis> files in the list. The double-click action is to preview."
459371 msgstr "Okno popravka vsebuje kontekstni meni, ki vam omogoča predogled učinka popravka na trenutno datoteko (nameščanje popravka brez shranjevanja), nameščanje popravka in shranjevanje sprememb za izbrane datoteko ali nameščanje in shranjevanje sprememb <emphasis>vseh</emphasis> datotek na seznamu. Dvoklik vam prikaže predogled."
460372
461373 #. (para)
462-#: ../source/TortoiseMerge_en.xml:512
463374 msgid "Depending on whether TortoiseMerge can apply the patch directly or by fetching an older version of the file first, it shows you a two pane view (patch can be applied directly) or a three pane view (older version of file fetched)."
464375 msgstr "Odvisno od tega, ali lahko TortoiseMerge namesti popravek neposredno ali s pridobivanjem starejše različice datoteke, prikaže dvodelni pogled (neposredno nameščanje popravka) ali tridelni pogled (pridobljena starejša različica datoteke)."
465376
466377 #. (title)
467-#: ../source/TortoiseMerge_en.xml:521
468378 msgid "Buttons and Other Controls"
469379 msgstr "Gumbi in ostale kontrole"
470380
471381 #. (title)
472-#: ../source/TortoiseMerge_en.xml:524
473382 msgid "The Toolbar"
474383 msgstr "Orodna vrstica"
475384
476385 #. (para)
477-#: ../source/TortoiseMerge_en.xml:531
478386 msgid "<guibutton>Open</guibutton> accesses the file-open dialog. What else?"
479387 msgstr "<guibutton>Odpri</guibutton> prikaže okno za odpiranje datotek. Ste pričakovali kaj drugega?"
480388
481389 #. (para)
482-#: ../source/TortoiseMerge_en.xml:537
483390 msgid "<guibutton>Save</guibutton> saves any changes you have made."
484391 msgstr "Gumb <guibutton>Shrani</guibutton> shrani spremembe, ki ste jih naredili."
485392
486393 #. (para)
487-#: ../source/TortoiseMerge_en.xml:543
488394 msgid "<guibutton>Reload</guibutton> discards any changes you have made in TortoiseMerge and reloads the files from disk."
489395 msgstr "<guibutton>Ponovno naloži</guibutton> prekliče vse spremembe, ki ste jih naredili v programu TortoiseMerge, in ponovno naloži datoteke z diska."
490396
491397 #. (para)
492-#: ../source/TortoiseMerge_en.xml:550
493398 msgid "<guibutton>Undo</guibutton> implements a multi-level undo, allowing you to reverse any changes you have made within TortoiseMerge."
494399 msgstr "<guibutton>Prekliči</guibutton> omogoča večnivojski preklic, kar vam omogoča povrnitev katerekoli spremembe, ki ste jo naredili v programu TortoiseMerge."
495400
496401 #. (para)
497-#: ../source/TortoiseMerge_en.xml:557
498402 msgid "<guibutton>Prev/Next Difference</guibutton> jumps directly to the next point where the files differ. This saves scrolling through all the unchanged parts of the file."
499403 msgstr "Gumb <guibutton>Prejšnja/Naslednja sprememba</guibutton> omogoča skok na naslednjo točko, v kateri se datoteki razlikujeta. Tako vam ni potrebno brskati po nespremenjenih delih datoteke."
500404
501405 #. (para)
502-#: ../source/TortoiseMerge_en.xml:563
503406 msgid "When you do this in 2-pane diff mode, the detail bar at the bottom of the screen will show you the inline differences for the first line, regardless of where the mouse is hovering."
504407 msgstr "Če to naredite v dvodelnem pogledu, vam podrobni prikaz na dnu zaslona prikaže razlike med novimi in starimi vrsticami za prvo vrtico, ne glede na trenutni položaj miške."
505408
506409 #. (para)
507-#: ../source/TortoiseMerge_en.xml:570
508410 msgid "<guibutton>Prev/Next Conflict</guibutton> jumps directly to the next point where the file differences are in conflict and need to be resolved."
509411 msgstr "Gumb <guibutton>Prejšnji/naslednji spor</guibutton> omogoča skok na naslednjo točko, pri kateri se pojavi spor in ga je potrebno rešiti."
510412
511413 #. (para)
512-#: ../source/TortoiseMerge_en.xml:577
513414 msgid "<guibutton>Use Theirs/Use Mine</guibutton> selects whether to use a block from the left or the right pane. Refer to the next section for more information about editing changes and conflicts."
514415 msgstr "Z gumbom <guibutton>Uporabi njihovo/Uporabi mojo</guibutton> izberemo spremembe trenutnega bloka iz leve oziroma iz desne strani. Za več informacij o urejanju sprememb in sporov preberite naslednji razdelek."
515416
516417 #. (para)
517-#: ../source/TortoiseMerge_en.xml:586
518418 msgid "<guibutton>Theirs before Mine/Mine before Theirs</guibutton> is used when you want to combine changes in a conflicted file. Refer to the next section for more information about editing changes and conflicts."
519419 msgstr "Gumb <guibutton>Njihovo pred mojim/Moje pred njihovim</guibutton> se uporablja za izbiro kombinacije sprememb v sporni datoteki. Za več informacij o urejanju sprememb in sporov preberite naslednji razdelek."
520420
521421 #. (para)
522-#: ../source/TortoiseMerge_en.xml:594
523422 msgid "<guibutton>Mark as Resolved</guibutton> When you have resolved all the conflicts in a file and saved the changes, you can mark it as resolved from within TortoiseMerge, rather than going back to explorer and marking as resolved from there."
524423 msgstr "<guibutton>Označi kot rešeno</guibutton> Ko ste rešili vse spore v datoteki in spremembe shranili, lahko datoteko označite kot rešeno kar v programu TortoiseMerge, ne da bi vam bilo potrebno hoditi nazaj v Raziskovalca."
525424
526425 #. (para)
527-#: ../source/TortoiseMerge_en.xml:603
528426 msgid "<guibutton>Show Whitespaces</guibutton> toggles the option to display space and tab characters as symbols so you can distinguish white space changes."
529427 msgstr "<guibutton>Pokaži presledke</guibutton> preklaplja med možnostjo prikaza presledkov in tabulatorjev s posebnimi simboli in navadnim prikazom. Tako lahko lažje vidite število in vrsto presledkov."
530428
531429 #. (para)
532-#: ../source/TortoiseMerge_en.xml:610
533430 msgid "<guibutton>Inline Diff Word-wise</guibutton> toggles the method used to display inline diffs. In word-wise mode, when a character is changed, the whole word is highlighted. In char-wise mode, each individual changed character is highlighted."
534431 msgstr "Gumb <guibutton>Spremembe v vrstici</guibutton> preklaplja med način prikaza razlik v vrstici. V besednem načinu se pri spremembi znaka označi cela beseda. V znakovnem načinu je vedno označena le spremenjena črka."
535432
536433 #. (para)
537-#: ../source/TortoiseMerge_en.xml:617
538434 msgid "Word-wise is the default and in most cases it works better. For example if you change a variable name, the whole name is highlighted in word-wise mode, whereas in char-wise mode you tend to get a mess of added and deleted characters which doesn't make much sense. However, some content does not resolve neatly into words, for example a hex file, and in that case, char-wise display works better."
539435 msgstr "Besedni način je privzet in v večini primerov deluje bolje. Primer: če spremenite ime spremenljivke, se v besednem načinu označi ime cele spremenljivke. V znakovnem načinu vidite veliko dodanih in izbrisanih znakov, kar pa ni preveč smiselno. V nekaterih primerih pa se vsebina ne da lepo ločiti po besedah, n. pr. v šestnajstiških datotekah. Takrat je znakovna metoda boljša."
540436
541437 #. (para)
542-#: ../source/TortoiseMerge_en.xml:628
543438 msgid "<guibutton>Switch View</guibutton> selects between one-pane and two-pane view. Disabled in 3-pane view."
544439 msgstr "<guibutton>Preklopi pogled</guibutton> izbere enodelni ali dvodelni pogled. Gumb je onemogočen v primeru trodelnega pogleda."
545440
546441 #. (para)
547-#: ../source/TortoiseMerge_en.xml:635
548442 msgid "<guibutton>Switch Left and Right View</guibutton> In 2-pane view, swaps the left and right windows. When you are comparing a file in 2 different trees, as opposed to 2 revisions of the same file, TortoiseSVN does not know which one should go in the left pane as the <quote>original/base</quote> version. If it gets this wrong, you can change it to make viewing easier."
549443 msgstr "<guibutton>Preklopi levi in desni pogled</guibutton> V dvodelnem pogledu zamenja levi in desno del. Ko primerjate datoteki v dveh različnih drevesih (za razliko od primerjanja dveh revizij iste datoteke), TortoiseSVN ne ve, katera datoteka je <quote>izvirna/osnovna</quote>, ki naj se zato prikaže na levi strani. Če se zmoti, lahko sami zamenjate strani."
550444
551445 #. (para)
552-#: ../source/TortoiseMerge_en.xml:646
553446 msgid "<guibutton>Show/Hide Patch List</guibutton> When TortoiseMerge has a patch list, this button allows you to hide it (so you can see both windows), or show it (so you can review the file list)."
554447 msgstr "<guibutton>Pokaži/Skrij seznam popravkov</guibutton> Ko ima TortoiseMerge seznam popravkov, vam ta gumb omogoča, da seznam prikažete (tako da ga lahko pregledate) ali skrijete (in tako vidite oba dela strani)."
555448
556449 #. (para)
557-#: ../source/TortoiseMerge_en.xml:654
558450 msgid "<guibutton>Settings</guibutton> takes you to TortoiseMerge's settings dialog."
559451 msgstr "Gumb <guibutton>Nastavitve</guibutton> odpre pogovorno okno za nastavitve programa TortoiseMerge."
560452
561453 #. (para)
562-#: ../source/TortoiseMerge_en.xml:522
563454 msgid "<placeholder-1/> Below the menu bar lies the tool bar. This provides easy access to the most commonly used tools, which are <placeholder-2/>"
564455 msgstr "<placeholder-1/> Pod vrstico menijev se nahaja orodna vrstica, ki vam omogoča hiter dostop do najbolj uporabljenih orodij <placeholder-2/>"
565456
566457 #. (para)
567-#: ../source/TortoiseMerge_en.xml:661
568458 msgid "On the left side of the window is a locator bar. This provides a quick visual reference as to where the changes lie within the file. The bar has three columns. The left column refers to the left pane, the right column to the right pane, and the centre column to the bottom pane (if present). In one-pane view only the left column is used. The locator bar can also be used as a scroll bar to scroll all the windows simultaneously."
569459 msgstr "Na levi strani okna se nahaja lokacijski trak. Ta prikazuje, kje v datoteki se nahajajo spremenjene vrstice. Trak ima tri stolpce. Levi stolpec se nanaša na levo stran, desni na desno, sredinski pa na spodnji del (če obstaja). Pri enodenem prikazu se uporablja le levi stolpec. Lokacijski trak se lahko uporablja tudi kot drsni trak za premikanje obeh oken hkrati."
570460
571461 #. (para)
572-#: ../source/TortoiseMerge_en.xml:670
573462 msgid "Below the bottom window is the status bar. This shows the number of lines added and deleted in <literal>Theirs</literal> and <literal>Mine</literal>, and the number of unresolved conflicts remaining. You can also see which line-ending style is in use, what encoding (ASCII, UTF-8, etc) is assumed by TortoiseMerge, and whether there is a byte-order-mark (BOM) present in UTF-8 files. The left side of the status bar is used to display hints when you hover the mouse over a control."
574463 msgstr "Pod spodnjim oknom sem nahaja vrstica stanja. Ta prikazuje število dodanih in izbrisanih vrstic v datotekah <literal>njihova</literal> in <literal>moja</literal> in število še ne rešenih sporov. Vidite lahko tudi, kateri slog zaključevanja vrstic je v uporabi, vrsto kodiranja znakov (ASCII, UTF-8, etc), ki ga TortoiseMerge predpostavlja, in če se v datotekah UTF-8 uporablja byte-order-mark (BOM). Leva stran vrstice stanja se uporablja za prikaz namigov, ko z miško za hip mirujete na kontroli."
575464
576465 #. (title)
577-#: ../source/TortoiseMerge_en.xml:683
578466 msgid "Line Status Icons"
579467 msgstr "Ikone stanja vrstice"
580468
581469 #. (para)
582-#: ../source/TortoiseMerge_en.xml:684
583470 msgid "Changed lines are marked with an icon to indicate what type of change has occurred."
584471 msgstr "Spremenjene vrstice so označene z ikono, ki nakazuje, za kakšno spremembo gre."
585472
586473 #. (para)
587-#: ../source/TortoiseMerge_en.xml:688
588474 msgid "<graphic fileref=\"images/TMerge_lineadded.png\"/> A line has been added."
589475 msgstr "<graphic fileref=\"images/TMerge_lineadded.png\"/> Vrstica je bila dodana."
590476
591477 #. (para)
592-#: ../source/TortoiseMerge_en.xml:692
593478 msgid "<graphic fileref=\"images/TMerge_lineremoved.png\"/> A line has been removed."
594479 msgstr "<graphic fileref=\"images/TMerge_lineremoved.png\"/> Vrstica je bila odstranjena."
595480
596481 #. (para)
597-#: ../source/TortoiseMerge_en.xml:696
598482 msgid "<graphic fileref=\"images/TMerge_lineequal.png\"/> A change has been undone by reverting to the original content of the line."
599483 msgstr "<graphic fileref=\"images/TMerge_lineequal.png\"/> Sprememba je bila preklicana s povrnitvijo na izvirno vsebino vrstice."
600484
601485 #. (para)
602-#: ../source/TortoiseMerge_en.xml:700
603486 msgid "<graphic fileref=\"images/TMerge_linewhitespace.png\"/> This line contains only whitespace changes. Where several consecutive lines are marked, the paragraph may have been re-wrapped, causing words to shuffle onto adjacent lines."
604487 msgstr "<graphic fileref=\"images/TMerge_linewhitespace.png\"/> Vrstica vsebuje le spremembe v presledkih. Kjer je označenih več zaporednih vrstic, gre najbrž za preoblikovanje odstavka, tako da se določene besede lahko premaknejo v sosednjo vrstico."
605488
606489 #. (para)
607-#: ../source/TortoiseMerge_en.xml:706
608490 msgid "<graphic fileref=\"images/TMerge_lineedited.png\"/> A line has been edited by hand, using TortoiseMerge as a text editor."
609491 msgstr "<graphic fileref=\"images/TMerge_lineedited.png\"/> Vrstica je bila urejana ročno z uporabo TortoiseMerge kot urejevalnika besedil."
610492
611493 #. (para)
612-#: ../source/TortoiseMerge_en.xml:710
613494 msgid "<graphic fileref=\"images/TMerge_lineconflicted.png\"/> This line is in conflict."
614495 msgstr "<graphic fileref=\"images/TMerge_lineconflicted.png\"/> Vrstica je sporna."
615496
616497 #. (para)
617-#: ../source/TortoiseMerge_en.xml:714
618498 msgid "<graphic fileref=\"images/TMerge_lineconflictedignored.png\"/> This line is conflicted, but the effect is hidden by whitespace or line-ending settings."
619499 msgstr "<graphic fileref=\"images/TMerge_lineconflictedignored.png\"/> Vrstica je sporna, vendar se tega ne vidi zaradi nastavitev načina prikaza presledkov ali zaključkov vrstic."
620500
621501 #. (title)
622-#: ../source/TortoiseMerge_en.xml:721
623502 msgid "Merging / Editing Conflicts"
624503 msgstr "Spajanje / urejanje sporov"
625504
626505 #. (para)
627-#: ../source/TortoiseMerge_en.xml:722
628506 msgid "TortoiseMerge not only <emphasis>shows</emphasis> you the differences between files but also lets you resolve conflicts or apply changes."
629507 msgstr "TortoiseMerge vam ne le <emphasis>prikaže</emphasis> razlike med datotekami, ampak vam omogoča tudi reševanje sporov in namestitev sprememb."
630508
631509 #. (para)
632-#: ../source/TortoiseMerge_en.xml:726
633510 msgid "If you're in two pane view, then you can only edit the file in the right pane (<literal>Mine</literal>). To apply changes made in the left file (<literal>Theirs</literal>), <action>right-click</action> on the changed lines and select <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Use text block from <quote>theirs</quote></guimenuitem></menuchoice>. Then the changes from the left file are added to the right file."
634511 msgstr "Če se nahajate v dvodelnem pogledu, lahko urejate le datoteko na desni strani (<literal>moja</literal>). Za namestitev sprememb, narejenih na levi strani (<literal>njihova</literal>), <action>desno kliknite</action> na spremenjene vrstrice in izberite <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Uporabi del besedila iz <quote>njihovo</quote></guimenuitem></menuchoice>. S tem se spremembe z leve strani dodajo na desno datoteko."
635512
636513 #. (para)
637-#: ../source/TortoiseMerge_en.xml:738
638514 msgid "Sometimes you actually want both text blocks, and the context menu also offers you <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Use both text blocks (this one first)</guimenuitem></menuchoice> and <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Use both text blocks (this one last)</guimenuitem></menuchoice>."
639515 msgstr "Včasih želite uporabiti oba dela besedila, zato vam kontekstni meni ponudi tudi možnosti <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Uporabi oba dela besedila (tega najprej)</guimenuitem></menuchoice> in <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Uporabi oba dela besedila (tega zadnjega)</guimenuitem></menuchoice>."
640516
641517 #. (para)
642-#: ../source/TortoiseMerge_en.xml:751
643518 msgid "You can also edit the output file just as you would in a text editor. Such lines are marked using a pencil icon. Please note that if you want to make any of the line/block-based changes described above, it is better to do those first since once you start editing the file yourself it becomes impossible for TortoiseMerge to keep track of the relationship to the original files."
644519 msgstr "Izhodno datoteko lahko urejate prav tako kot v urejevalniku besedil. Spremenjene vrstice so označene s simbolom svinčnika. Če želite narediti kakšno spremembo na nivoju vrstice ali bloka besedila, je najbolje, da to storite najprej. Po ročnem urejanju namreč TortoiseMerge nima več povezave z izvornimi datotekami."
645520
646521 #. (para)
647-#: ../source/TortoiseMerge_en.xml:759
648522 msgid "If you're in three pane view (sometimes called <emphasis>merge view</emphasis>) you can only edit the file in the bottom view (<literal>Merged</literal>). As in two pane view, you can <action>right-click</action> on conflicted lines and either select <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Use text block from <quote>theirs</quote></guimenuitem></menuchoice> or <menuchoice><guimenu>Context Menu</guimenu><guimenuitem>Use text block from <quote>mine</quote></guimenuitem></menuchoice>. In addition, if you want <emphasis>both</emphasis> blocks, you can select <menuchoice><guimenu>Context Menu</guimenu><guimenuitem> Use text block from <quote>mine</quote> before <quote>theirs</quote></guimenuitem></menuchoice> or <menuchoice><guimenu>Context Menu</guimenu><guimenuitem> Use text block from <quote>theirs</quote> before <quote>mine</quote></guimenuitem></menuchoice>. According to the command you've selected, the changes are used in the resulting <literal>Merged</literal> file."
649523 msgstr "Če se nahajate v tridelnem pogledu (včasih mu rečemo tudi <emphasis>pogled za spajanje</emphasis>), lahko urejate le datoteko v spodnjem delu (<literal>spojeno</literal>). Kot v primeru dvodelnega pogleda lahko tudi tu <action>desno kliknete</action> na sporne vrstice in izberete <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Uporabi del besedila iz <quote>njihovega</quote></guimenuitem></menuchoice> ali <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem>Uporabi del besedila iz <quote>mojega</quote></guimenuitem></menuchoice>. Če želite uporabiti <emphasis>oba</emphasis> dela besedila, lahko izberete <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem> Uporabi del besedila iz <quote>mojega</quote> pred <quote>njihovim</quote></guimenuitem></menuchoice> ali <menuchoice><guimenu>Kontekstni meni</guimenu><guimenuitem> Uporabi del besedila iz <quote>njihovega</quote> pred <quote>mojim</quote></guimenuitem></menuchoice>. Glede na izbiro ukaza se spremembe prikažejo v <literal>spojeni</literal> datoteki."
650524
651525 #. (para)
652-#: ../source/TortoiseMerge_en.xml:796
653526 msgid "Sometimes a file will be marked as conflicted in Subversion, yet when you view it using TortoiseMerge there are no conflicts shown. This may be due to the whitespace handling you have chosen. If you choose to ignore line-endings or whitespace changes, those lines will be marked using the <emphasis>Conflict-Ignored</emphasis> icon. To resolve the conflict you still need to pick which version you want to use."
654527 msgstr "Včasih Subversion označi kakšno datoteko kot sporno, ko pa jo pogledate s programom TortoiseMerge, ne vidite nobenega spora. Razlog je lahko v načinu prikaza presledkov in tabulatorjev. Če spremembe presledkov ali končnic vrstic prezrete, so takšne vrstice označene z ikono <emphasis>Spor prezrt</emphasis>. Za rešitev spora morate še vedno izbrati željeno verzijo vrstice."
655528
656529 #. (para)
657-#: ../source/TortoiseMerge_en.xml:804
658530 msgid "Sometimes the conflict is too difficult to resolve by simply picking <literal>Theirs</literal> and <literal>Mine</literal> and it requires hand editing. TortoiseMerge allows you to do all the easy changes visually first and then save the file, leaving only the difficult changes to be resolved by hand-editing."
659531 msgstr "Včasih je spor preveč zahteven, da bi ga lahko rešili le z izbiro <literal>njihov</literal> in <literal>moj</literal>, zato je potrebno ročno urejanje. TortoiseMerge vam omogoča, da enostavne spremembe opravite vizuelno, shranite datoteko, nato pa zahtevnejše spremembe popravite ročno."
660532
661533 #. (para)
662-#: ../source/TortoiseMerge_en.xml:812
663534 msgid "Note that if you use TortoiseMerge on the same files again, any changes to your working copy, whether in TortoiseMerge, or by hand-editing, <emphasis>will be discarded</emphasis> and the file will appear as it did when conflict-editing first started."
664535 msgstr "Upoštevajte: če uporabite TortoiseMerge še enkrat na isti datoteki, bodo vse spremembe v delovni kopiji, narejene s TortoiseMerge ali ročno, <emphasis>preklicane</emphasis> in datoteka bo takšna, kot je bila pred začetkom reševanja sporov."
665536
666537 #. (title)
667-#: ../source/TortoiseMerge_en.xml:822
668538 msgid "Open Files"
669539 msgstr "Odpiranje datotek"
670540
671541 #. (para)
672-#: ../source/TortoiseMerge_en.xml:824
673542 msgid "When you start TortoiseMerge without any command line switches then you have to open the files manually, using <menuchoice><guimenu>File</guimenu><guimenuitem>Open</guimenuitem></menuchoice>."
674543 msgstr "Če TortoiseMerge zaženete brez parameterov ukazne vrstice, morate datoteke odpreti ročno z uporabo ukaza <menuchoice><guimenu>Datoteka</guimenu><guimenuitem>Odpri</guimenuitem></menuchoice>."
675544
676545 #. (title)
677-#: ../source/TortoiseMerge_en.xml:833
678546 msgid "The Open Dialog"
679547 msgstr "Pogovorno okno Odpri"
680548
681549 #. (para)
682-#: ../source/TortoiseMerge_en.xml:836
683550 msgid "The first thing you have to do is to decide whether you just want to compare/merge files, or whether you want to apply a patch file. Depending on what you choose, the corresponding edit boxes and browse buttons are activated."
684551 msgstr "Najprej se morate odločiti, ali želite samo primerjati/spajati datoteke, ali pa želite uporabiti datoteko popravkov. Vnosna polja in gumbi za brskanje se aktivirajo v skladu z vašo izbiro."
685552
686553 #. (para)
687-#: ../source/TortoiseMerge_en.xml:844
688554 msgid "If you want to compare / merge files you have to set at least two of the three possible paths for <literal>Base</literal>, <literal>Mine</literal> and <literal>Theirs</literal>. If you select only two files, then TortoiseMerge will show you the differences between those two files, either in a two pane view or in a one pane view."
689555 msgstr "Če želite primerjati/spajati datoteke, morate nastaviti vsaj dve od treh možnih poti za <literal>osnovno</literal>, <literal>vašo</literal> and <literal>njihovo</literal> datoteko. Če izberete le dve datoteki, vam TortoiseMerge pokaže razlike med datotekama - v enodelnem ali dvodelnem pogledu."
690556
691557 #. (para)
692-#: ../source/TortoiseMerge_en.xml:852
693558 msgid "If you want to merge three files, TortoiseMerge will show you the differences in a three pane view. This view is generally used if you need to resolve conflicted files. The output file is not named in this case and you will have to use the <menuchoice><guimenu>File</guimenu><guimenuitem>Save As...</guimenuitem></menuchoice>. to save the results."
694559 msgstr "Če želite spojiti tri datoteke, vam TortoiseMerge pokaže razlike v tridelnem pogledu. Ta pogled se v večini primerov uporablja za reševanje sporov. Izhodna datoteka je v tem primeru brez imena, tako da boste rezultat spajanja morali sami shraniti z ukazom <menuchoice><guimenu>Datoteka</guimenu><guimenuitem>Shrani kot...</guimenuitem></menuchoice>."
695560
696561 #. (para)
697-#: ../source/TortoiseMerge_en.xml:867
698562 msgid "If you want to apply a patch file you have to set both the path to the patch file itself and the path to the folder where the patch file should be applied."
699563 msgstr "Če želite namestiti popravek, morate navesti pot popravka in pot mape, kjer naj se popravek namesti."
700564
701565 #. (para)
702-#: ../source/TortoiseMerge_en.xml:873
703566 msgid "Currently, only patch files in <emphasis>Unified Diff Format</emphasis> are supported. And only files which were generated from a Subversion working copy. Other formats like patch files generated by CVS are currently not supported!"
704567 msgstr "Trenutno so podprte le datoteke popravkov oblike <emphasis>poenotene razlike (Unified Diff Format)</emphasis>, ki jih je ustvarilo orodje Subversion. Druge oblike, kot naprimer datoteka popravkov, ki jo ustvari orodje CVS, niso podprte!"
705568
706569 #. (title)
707-#: ../source/TortoiseMerge_en.xml:884
708570 msgid "Settings"
709571 msgstr "Nastavitve"
710572
711573 #. (title)
712-#: ../source/TortoiseMerge_en.xml:886
713574 msgid "Main Settings Page"
714575 msgstr "Glavna stran nastavitev"
715576
716577 #. (title)
717-#: ../source/TortoiseMerge_en.xml:889
718578 msgid "The Settings Main Page"
719579 msgstr "Glavna stran nastavitev"
720580
721581 #. (para)
722-#: ../source/TortoiseMerge_en.xml:892
723582 msgid "Most of the options here are self-explanatory, but a few points need clarifying."
724583 msgstr "Večina možnosti je očitnih, nekaj pa jih potrebuje razlago."
725584
726585 #. (para)
727-#: ../source/TortoiseMerge_en.xml:896
728586 msgid "<guilabel>Backup original file</guilabel> renames the original file in the WC to <literal>filename.bak</literal> before saving the modified version."
729587 msgstr "<guilabel>Naredi varnostno kopijo izvorne datoteke</guilabel> preimenuje originalno datoteko v delovni kopiji v <literal>imedatoteke.bak</literal>, preden se shrani spremenjena različica."
730588
731589 #. (para)
732-#: ../source/TortoiseMerge_en.xml:901
733590 msgid "<guilabel>Ignore line endings</guilabel> hides changes which are due solely to difference in line-end style."
734591 msgstr "<guilabel>Prezri zaključke vrstic</guilabel> skrije spremembe, ki so posledica zgolj zaradi razlik pri zaključkih vrstic."
735592
736593 #. (para)
737-#: ../source/TortoiseMerge_en.xml:905
738594 msgid "<guilabel>Ignore case changes</guilabel> hides changes which are due solely to case changes within the text. This can be useful with apps such as Visual Basic, which changes case in variables without warning."
739595 msgstr "<guilabel>Prezri spremembe velikih/malih črk</guilabel> skrije spremembe, ki so posledica menjave velikih in malih črk v besedilu. To je uporabno pri aplikacijah, kot je Visual Basic, ki spreminjajo velike in male črke brez opozorila."
740596
741597 #. (para)
742-#: ../source/TortoiseMerge_en.xml:911
743598 msgid "<guilabel>Colour code in-line changes</guilabel> uses the same scheme as the line diff bar to show the detailed in-line changes within the main display panes. Lines which have been heavily modified will not be shown using this method as the results are simply confusing. In this case the line will be shown as replaced (old line deleted, new line added)."
744599 msgstr "<guilabel>Obarvaj spremembe v vrstici</guilabel> uporablja isti način kot trak za prikaz razlik v vrstici, tako da prikaže podrobne spremembe znotraj vrstice v glavnih oknih. Vrstice, ki so bile močno spremenjene, ne bodo prikazane s to metodo, saj bi rezultati povzročili preprosto preveč zmede. V takšnem primeru se vrstica pokaže kot zamenjana (stara izbrisana, nova dodana)."
745600
746601 #. (para)
747-#: ../source/TortoiseMerge_en.xml:919
748602 msgid "<guilabel>Compare whitespaces</guilabel> shows all changes in indentation and inline whitespace as added/removed lines (which is how Subversion treats such changes)."
749603 msgstr "<guilabel>Primerjaj presledke</guilabel> prikaže vse spremembe zamikanja in presledkov kot dodane/odstranjene vrstice (tako takšne spremembe obravnava Subversion)."
750604
751605 #. (para)
752-#: ../source/TortoiseMerge_en.xml:924
753606 msgid "<guilabel>Ignore whitespace changes</guilabel> hides changes which are due solely to a change in the amount or type of whitespace, eg. changing the indentation or changing tabs to spaces. Adding whitespace where there was none before, or removing a whitespace completely is still shown as a change."
754607 msgstr "<guilabel>Prezri razlike presledkov</guilabel> skrije spremembe, ki so posledica spremembe števila presledkov, n. pr. pri zamikanju vrstic ali spremembi tabulatorjev v presledke. Dodajanje presledka na mesto, kjer ga prej ni bilo ali popolno odstranjevanje presledkov se še vedno prikaže kot sprememba."
755608
756609 #. (para)
757-#: ../source/TortoiseMerge_en.xml:932
758610 msgid "<guilabel>Ignore all whitespaces</guilabel> hides all whitespace-only changes."
759611 msgstr "<guilabel>Prezri vse presledke</guilabel> skrije vse spremembe, ki so posledica spremembe presledkov."
760612
761613 #. (title)
762-#: ../source/TortoiseMerge_en.xml:938
763614 msgid "Colour Settings Page"
764615 msgstr "Nastavitev barv"
765616
766617 #. (title)
767-#: ../source/TortoiseMerge_en.xml:941
768618 msgid "The Settings Color Page"
769619 msgstr "Nastavitev barv"
770620
771621 #. (para)
772-#: ../source/TortoiseMerge_en.xml:944
773622 msgid "This dialog allows you to select the background color coding used to highlight the different line changes."
774623 msgstr "To pogovorno okno omogoča izbiro barv ozadja za različno spremenjene vrstice."
775624
776625 #. (term)
777-#: ../source/TortoiseMerge_en.xml:950
778626 msgid "Normal"
779627 msgstr "Običajno"
780628
781629 #. (listitem)
782-#: ../source/TortoiseMerge_en.xml:951
783630 msgid "All lines which are unchanged, or where changes are hidden."
784631 msgstr "Vse vrstice, ki ne vsebujejo sprememb ali pa so spremembe skrite."
785632
786633 #. (term)
787-#: ../source/TortoiseMerge_en.xml:956
788634 msgid "Added"
789635 msgstr "Dodano"
790636
791637 #. (listitem)
792-#: ../source/TortoiseMerge_en.xml:957
793638 msgid "Lines which have been added."
794639 msgstr "Dodane vrstice"
795640
796641 #. (term)
797-#: ../source/TortoiseMerge_en.xml:962
798642 msgid "Removed"
799643 msgstr "Odstranjeno"
800644
801645 #. (listitem)
802-#: ../source/TortoiseMerge_en.xml:963
803646 msgid "Lines which have been deleted."
804647 msgstr "Izbrisane vrstice."
805648
806649 #. (term)
807-#: ../source/TortoiseMerge_en.xml:968
808650 msgid "Modified"
809651 msgstr "Spremenjeno"
810652
811653 #. (emphasis)
812-#: ../source/TortoiseMerge_en.xml:971
813654 msgid "unchanged"
814655 msgstr "nesprememnjeno"
815656
816657 #. (guilabel)
817-#: ../source/TortoiseMerge_en.xml:974
818658 msgid "Colour code in-line changes"
819659 msgstr "Barvno kodiranje sprememb v vrstici"
820660
821661 #. (listitem)
822-#: ../source/TortoiseMerge_en.xml:969
823662 msgid "Lines which have relatively small changes, and are shown using inline diff. This colour is used for the <placeholder-1/> portion of the line content. Changed portions will be shown using the inline added and deleted colours described below. If <placeholder-2/> is not enabled, this colour will not be used and changed lines will always be shown as replacements."
824663 msgstr "Vrstice, ki vsebujejo relativno majhne spremembe, so prikazane s spremembami v vrsticah. Ta barva se uporablja za del vrstice, ki ima status <placeholder-1/>. Spremenjeni deli se prikažejo z uporabo dodanih in izbrisanih barv, kot je to opisano spodaj. Če možnost <placeholder-2/> ni omogočena, barva ne bo uporabljena in spremenjene vrstice bodo vedno označene kot zamenjane."
825664
826665 #. (term)
827-#: ../source/TortoiseMerge_en.xml:980
828666 msgid "Conflicted"
829667 msgstr "Sporno"
830668
831669 #. (listitem)
832-#: ../source/TortoiseMerge_en.xml:981
833670 msgid "Where the same line has been changed in both files."
834671 msgstr "Kjer je bila ista vrstica spremenjena v obeh datotekah"
835672
836673 #. (term)
837-#: ../source/TortoiseMerge_en.xml:986
838674 msgid "Conflict resolved"
839675 msgstr "Spor rešen"
840676
841677 #. (listitem)
842-#: ../source/TortoiseMerge_en.xml:987
843678 msgid "Where the same line has been changed in both files, and you have now selected which version should be used."
844679 msgstr "Kjer je bila ista vrstica spremenjena v obeh datotekah in ste se odločili, katera različica bo sedaj uporabljena"
845680
846681 #. (term)
847-#: ../source/TortoiseMerge_en.xml:993
848682 msgid "Empty"
849683 msgstr "Prazno"
850684
851685 #. (listitem)
852-#: ../source/TortoiseMerge_en.xml:994
853686 msgid "Where lines have been added in the opposite pane, and no such line existed in this pane."
854687 msgstr "Kjer so bile vrstice dodane v nasprotnem predelu, v tem predelu pa ne obstajajo."
855688
856689 #. (term)
857-#: ../source/TortoiseMerge_en.xml:1000
858690 msgid "Inline added text"
859691 msgstr "Dodano besedilo v vrstici"
860692
861693 #. (listitem)
862-#: ../source/TortoiseMerge_en.xml:1001
863694 msgid "When inline diffs are shown, added text is shown in this colour."
864695 msgstr "Kadar so prikazane razlike v vrstici, je dodano besedilo prikazano v tej barvi."
865696
866697 #. (term)
867-#: ../source/TortoiseMerge_en.xml:1006
868698 msgid "Inline removed text"
869699 msgstr "Izbrisano besedilo v vrstici"
870700
871701 #. (listitem)
872-#: ../source/TortoiseMerge_en.xml:1007
873702 msgid "When inline diffs are shown, deleted text is shown in this colour."
874703 msgstr "Kadar so prikazane razlike v vrstici, je izbrisano besedilo prikazano v tej barvi."
875704
876705 #. (term)
877-#: ../source/TortoiseMerge_en.xml:1012
878706 msgid "Misc whitespaces"
879707 msgstr "Razno - presledki"
880708
881709 #. (listitem)
882-#: ../source/TortoiseMerge_en.xml:1013
883710 msgid "Characters used to indicate Whitespace are shown in a different colour from normal text."
884711 msgstr "Znaki, ki označujejo presledke, so prikazani v drugačni barvi kot običajno besedilo."
885712
886713 #. (title)
887-#: ../source/TortoiseMerge_en.xml:1023
888714 msgid "keyboard shortcuts"
889715 msgstr "bližnjice s tipkovnico"
890716
891717 #. (para)
892-#: ../source/TortoiseMerge_en.xml:1025
893718 msgid "List of keyboard shortcuts and commands."
894719 msgstr "Seznam bližnjic in ukazov."
895720
896721 #. (title)
897-#: ../source/TortoiseMerge_en.xml:1030
898722 msgid "Keyboard shortcuts"
899723 msgstr "Bližnjice s tipkovnico"
900724
901725 #. (term)
902-#: ../source/TortoiseMerge_en.xml:1033
903726 msgid "Ctrl-Q"
904727 msgstr "Ctrl-Q"
905728
906729 #. (para)
907-#: ../source/TortoiseMerge_en.xml:1035
908730 msgid "Quit the program"
909731 msgstr "Izhod iz aplikacije"
910732
911733 #. (term)
912-#: ../source/TortoiseMerge_en.xml:1041
913734 msgid "Ctrl-C"
914735 msgstr "Ctrl-C"
915736
916737 #. (para)
917-#: ../source/TortoiseMerge_en.xml:1043
918738 msgid "Copy the selected text to the clipboard"
919739 msgstr "Kopiraj izbrano besedilo na odložišče."
920740
921741 #. (term)
922-#: ../source/TortoiseMerge_en.xml:1049
923742 msgid "Ctrl-F"
924743 msgstr "Ctrl-F"
925744
926745 #. (para)
927-#: ../source/TortoiseMerge_en.xml:1051
928746 msgid "Open the Find dialog for text searches"
929747 msgstr "Odpri pogovorno okno za iskanje besedila"
930748
931749 #. (term)
932-#: ../source/TortoiseMerge_en.xml:1057
933750 msgid "Ctrl-O"
934751 msgstr "Ctrl-O"
935752
936753 #. (para)
937-#: ../source/TortoiseMerge_en.xml:1059
938754 msgid "Open files to diff/merge"
939755 msgstr "Odpri datoteke za razlikovanje/spajanje"
940756
941757 #. (term)
942-#: ../source/TortoiseMerge_en.xml:1065
943758 msgid "Ctrl-S"
944759 msgstr "Ctrl-S"
945760
946761 #. (para)
947-#: ../source/TortoiseMerge_en.xml:1067
948762 msgid "Save the changes"
949763 msgstr "Shrani spremembe"
950764
951765 #. (term)
952-#: ../source/TortoiseMerge_en.xml:1073
953766 msgid "Ctrl-Shift-S"
954767 msgstr "Ctrl-Shift-S"
955768
956769 #. (para)
957-#: ../source/TortoiseMerge_en.xml:1075
958770 msgid "Save as..."
959771 msgstr "Shrani kot..."
960772
961773 #. (term)
962-#: ../source/TortoiseMerge_en.xml:1081
963774 msgid "F7"
964775 msgstr "F7"
965776
966777 #. (para)
967-#: ../source/TortoiseMerge_en.xml:1083
968778 msgid "Go to next difference"
969779 msgstr "Na naslednjo razliko"
970780
971781 #. (term)
972-#: ../source/TortoiseMerge_en.xml:1089
973782 msgid "Shift-F7"
974783 msgstr "Shift-F7"
975784
976785 #. (para)
977-#: ../source/TortoiseMerge_en.xml:1091
978786 msgid "Go to previous difference"
979787 msgstr "Na prejšnjo razliko"
980788
981789 #. (term)
982-#: ../source/TortoiseMerge_en.xml:1097
983790 msgid "F8"
984791 msgstr "F8"
985792
986793 #. (para)
987-#: ../source/TortoiseMerge_en.xml:1099
988794 msgid "Go to next conflict"
989795 msgstr "Na naslednji spor"
990796
991797 #. (term)
992-#: ../source/TortoiseMerge_en.xml:1105
993798 msgid "Shift-F8"
994799 msgstr "Shift-F8"
995800
996801 #. (para)
997-#: ../source/TortoiseMerge_en.xml:1107
998802 msgid "Go to previous conflict"
999803 msgstr "Na prejšnji spor"
1000804
1001805 #. (term)
1002-#: ../source/TortoiseMerge_en.xml:1113
1003806 msgid "Ctrl-D"
1004807 msgstr "Ctrl-D"
1005808
1006809 #. (para)
1007-#: ../source/TortoiseMerge_en.xml:1115
1008810 msgid "Toggle between one-pane diff and two-pane diff"
1009811 msgstr "Preklaplja med enodelnim in dvodelnim pregledovalnikom razlik"
1010812
1011813 #. (term)
1012-#: ../source/TortoiseMerge_en.xml:1121
1013814 msgid "Ctrl-R"
1014815 msgstr "Ctrl-R"
1015816
1016817 #. (para)
1017-#: ../source/TortoiseMerge_en.xml:1123
1018818 msgid "Reload the files and revert all changes made"
1019819 msgstr "Ponovno naloži datoteke in povrne vse spremembe"
1020820
1021821 #. (term)
1022-#: ../source/TortoiseMerge_en.xml:1129
1023822 msgid "Ctrl-T"
1024823 msgstr "Ctrl-T"
1025824
1026825 #. (para)
1027-#: ../source/TortoiseMerge_en.xml:1131
1028826 msgid "Toggles between showing whitespaces or not"
1029827 msgstr "Preklaplja med prikazom in skrivanjem presledkov"
1030828
1031829 #. (term)
1032-#: ../source/TortoiseMerge_en.xml:1137
1033830 msgid "Ctrl-mousewheel"
1034831 msgstr "Ctrl-miškin kolešček"
1035832
1036833 #. (para)
1037-#: ../source/TortoiseMerge_en.xml:1139
1038834 msgid "Scroll the display left/right"
1039835 msgstr "Okno premika levo/desno"
1040836
1041837 #. (title)
1042-#: ../source/TortoiseMerge_en.xml:1148
1043838 msgid "Automating TortoiseMerge"
1044839 msgstr "Avtomatizacija TortoiseMerge"
1045840
1046841 #. (para)
1047-#: ../source/TortoiseMerge_en.xml:1150
1048842 msgid "TortoiseMerge can be started with command line parameters to avoid having to go through the <guilabel>Open</guilabel> dialog to select the files yourself. This is useful also if you want to use TortoiseMerge from another application."
1049843 msgstr "TortoiseMerge lahko poženemo s parametri ukazne vrstice. Tako nam po zagonu ni potrebno izbirati datotek z ukazom <guilabel>Odpri</guilabel>. Parametri so uporabni tudi, če želite TortoiseMerge uporabljati v okviru druge aplikacije."
1050844
1051845 #. (title)
1052-#: ../source/TortoiseMerge_en.xml:1161
1053846 msgid "TortoiseMerge Command Line Switches"
1054847 msgstr "Stikala ukazne vrstice TortoiseMerge"
1055848
1056849 #. (primary)
1057-#: ../source/TortoiseMerge_en.xml:1163
1058850 msgid "automation"
1059851 msgstr "avtomatizacija"
1060852
1061853 #. (primary)
1062-#: ../source/TortoiseMerge_en.xml:1166
1063854 msgid "command line"
1064855 msgstr "ukazna vrstica"
1065856
1066857 #. (para)
1067-#: ../source/TortoiseMerge_en.xml:1168
1068858 msgid ""
1069859 "Most switches require additional information like a path or some other string. In those cases, append an ':' to the switch and put the string/path after it. Example: <screen>\n"
1070860 "/base:\"c:\\folder\\my base file.txt\"\n"
@@ -1075,162 +865,130 @@
1075865 "</screen>"
1076866
1077867 #. (title)
1078-#: ../source/TortoiseMerge_en.xml:1188
1079868 msgid "List of available command line options"
1080869 msgstr "Seznam možnosti ukazne vrstice"
1081870
1082871 #. (entry)
1083-#: ../source/TortoiseMerge_en.xml:1194
1084872 msgid "Command"
1085873 msgstr "Ukaz"
1086874
1087875 #. (entry)
1088-#: ../source/TortoiseMerge_en.xml:1195
1089876 msgid "Description"
1090877 msgstr "Opis"
1091878
1092879 #. (entry)
1093-#: ../source/TortoiseMerge_en.xml:1201
1094880 msgid "Shows a dialog box with the most important command line switches."
1095881 msgstr "Prikaže pogovorno okno z najbolj pomembnimi stikali."
1096882
1097883 #. (option)
1098-#: ../source/TortoiseMerge_en.xml:1209
1099884 msgid "?"
1100885 msgstr "?"
1101886
1102887 #. (entry)
1103-#: ../source/TortoiseMerge_en.xml:1208
1104888 msgid "The same as <placeholder-1/>."
1105889 msgstr "Enako kot <placeholder-1/>."
1106890
1107891 #. (emphasis)
1108-#: ../source/TortoiseMerge_en.xml:1215
1109892 msgid "base"
1110893 msgstr "osnova"
1111894
1112895 #. (entry)
1113-#: ../source/TortoiseMerge_en.xml:1214
1114896 msgid "Specifies the <placeholder-1/> file used in three way diffs. This is the common ancestor of the files being diffed, although it is not shown in a separate window. For two way diffs, this is the left file."
1115897 msgstr "Datoteka <placeholder-1/> v tridelnem pogledu. To je skupni prednik obeh primerjanih datotek, čeprav se ne pokaže v posebnem oknu. Pri dvodelnem pogledu je to leva datoteka."
1116898
1117899 #. (entry)
1118-#: ../source/TortoiseMerge_en.xml:1224
1119900 msgid "The name of the base file. This is shown in the view title instead of the file path. For three way diffs it is shown in a tooltip for the view title."
1120901 msgstr "Ime osnovne datoteke. Prikaže se v naslovu pogleda namesto poti datoteke. V tridelnem pogledu se prikaže kot namig naslova pogleda."
1121902
1122903 #. (emphasis)
1123-#: ../source/TortoiseMerge_en.xml:1234
1124904 msgid "theirs"
1125905 msgstr "njihov"
1126906
1127907 #. (entry)
1128-#: ../source/TortoiseMerge_en.xml:1233
1129908 msgid "Specifies the <placeholder-1/> file used in three way diffs, displayed in the left pane."
1130909 msgstr "Določi <placeholder-1/> datoteko, ki se uporablja v trodelnem pogledu, in jo prikaže na levi strani."
1131910
1132911 #. (entry)
1133-#: ../source/TortoiseMerge_en.xml:1240
1134912 msgid "The name of the theirs file. This is shown in the view title instead of the file path."
1135913 msgstr "Ime njihove datoteke. Prikaže se v naslovu namesto poti datoteke."
1136914
1137915 #. (emphasis)
1138-#: ../source/TortoiseMerge_en.xml:1248
1139916 msgid "mine"
1140917 msgstr "moj"
1141918
1142919 #. (entry)
1143-#: ../source/TortoiseMerge_en.xml:1247
1144920 msgid "Specifies the <placeholder-1/> file used in three way diffs, displayed in the right pane. For two way diffs, this is the right file."
1145921 msgstr "Določi <placeholder-1/> datoteko, ki se uporablja v trodelnem pogledu, in jo prikaže na desni strani. Pri dvodelnem pogledu je to desna datoteka."
1146922
1147923 #. (entry)
1148-#: ../source/TortoiseMerge_en.xml:1255
1149924 msgid "The name of the mine file. This is shown in the view title instead of the file path."
1150925 msgstr "Ime naše datoteke. Prikaže se v naslovu namesto poti datoteke."
1151926
1152927 #. (emphasis)
1153-#: ../source/TortoiseMerge_en.xml:1263
1154928 msgid "merged"
1155929 msgstr "spojeno"
1156930
1157931 #. (entry)
1158-#: ../source/TortoiseMerge_en.xml:1262
1159-msgid "Specifies the resulting <placeholder-1/> file used in three way diffs. This is the filepath where the result of the merge/conflict resolving is saved. If this is not set, then TortoiseMerge will ask the user where to save the result."
1160-msgstr "Določi <placeholder-1/> datoteko, ki se uporablja v trodelnem pogledu. To je pot datoteke, v katero se shrani rezultat spajanja. Če vrednost ni nastavljena, bo TortoiseMerge o tem povprašal uporabnika."
932+msgid "Specifies the resulting <placeholder-1/> file used in three way diffs. This is the file path where the result of the merge/conflict resolving is saved. If this is not set, then TortoiseMerge will ask the user where to save the result."
933+msgstr "Določi <placeholder-1/> datoteko, ki se uporablja v trodelnem pogledu. To je pot datoteke, v katero se shrani rezultat spajanja. Če vrednost ni nastavljena, bo TortoiseMerge vprašal uporabnika, kam naj shrani rezultat."
1161934
1162935 #. (entry)
1163-#: ../source/TortoiseMerge_en.xml:1272
1164936 msgid "The name of the merged file. This is shown in the view title instead of the file path."
1165937 msgstr "Ime spojene datoteke. Prikaže se v naslovu namesto poti datoteke."
1166938
1167939 #. (emphasis)
1168-#: ../source/TortoiseMerge_en.xml:1283
1169940 msgid "very long"
1170941 msgstr "zelo dolgo"
1171942
1172943 #. (entry)
1173-#: ../source/TortoiseMerge_en.xml:1279
1174944 msgid "The path where a patch should be applied to. If you don't set this path, then TortoiseMerge will try to find the path itself to match the paths in the patch file, but that can take <placeholder-1/>."
1175945 msgstr "Pot, kamor se namesti popravek. Če poti ne nastavite, jo bo TortoiseMerge poskušal poiskati sam, vendar lahko to traja <placeholder-1/>."
1176946
1177947 #. (entry)
1178-#: ../source/TortoiseMerge_en.xml:1288
1179948 msgid "The name of the original file to patch. Used for the view title."
1180949 msgstr "Ime izvirne datoteke, na katero se namešča popravek. Pokaže se kot naslov."
1181950
1182951 #. (entry)
1183-#: ../source/TortoiseMerge_en.xml:1295
1184952 msgid "The name of the resulting patched file. Used for the view title."
1185953 msgstr "Ime datoteke, na katero je nameščen popravek. Pokaže se kot naslov."
1186954
1187955 #. (entry)
1188-#: ../source/TortoiseMerge_en.xml:1302
1189956 msgid "The path to the patch/diff file to apply to a directory."
1190957 msgstr "Pot do datoteke popravkov/sprememb, ki naj se namesti na mapo."
1191958
1192959 #. (entry)
1193-#: ../source/TortoiseMerge_en.xml:1308
1194960 msgid "Forces TortoiseMerge to start with the one-way view instead of the view the user specified in the settings."
1195961 msgstr "Prisili TortoiseMerge, da se zažene v enodelnem pogledu namesto v pogledu, ki ga je uporabnik nastavil v nastavitvah."
1196962
1197963 #. (entry)
1198-#: ../source/TortoiseMerge_en.xml:1315
1199964 msgid "Switches the left and right view of the specified two files to diff."
1200965 msgstr "Zamenja levo in desno stran izbranih datotek za razlikovanje."
1201966
1202967 #. (literal)
1203-#: ../source/TortoiseMerge_en.xml:1325
1204968 msgid "/origfile:\"path_to_original_file\""
1205969 msgstr "/origfile:\"pot_do_originalne_datoteke\""
1206970
1207971 #. (literal)
1208-#: ../source/TortoiseMerge_en.xml:1326
1209972 msgid "/modifiedfile:\"path_to_modified_file\""
1210973 msgstr "/modifiedfile:\"pot_do_spremenjene_datoteke\""
1211974
1212975 #. (literal)
1213-#: ../source/TortoiseMerge_en.xml:1328
1214976 msgid "/outfile:\"path_to_resulting_patchfile\""
1215977 msgstr "/outfile:\"pot_do_ustvarjenega_popravka\""
1216978
1217979 #. (literal)
1218-#: ../source/TortoiseMerge_en.xml:1329
1219980 msgid "/outfile"
1220981 msgstr "/outfile"
1221982
1222983 #. (literal)
1223-#: ../source/TortoiseMerge_en.xml:1332
1224984 msgid "/createunifieddiff"
1225985 msgstr "/createunifieddiff"
1226986
1227987 #. (entry)
1228-#: ../source/TortoiseMerge_en.xml:1322
1229988 msgid "Creates a unified diff file (patch file) of two files specified with <placeholder-1/> and <placeholder-2/>. The target path is set with <placeholder-3/>. If <placeholder-4/> is not set, a file save dialog is shown so the user can choose the location to save the patch file. Note: If <placeholder-5/> is set, all other parameters are ignored."
1230989 msgstr "Ustvari datoteko poenotene razlike datotek, nastavljenih z <placeholder-1/> in <placeholder-2/>. Ciljna pot je nastavljena z <placeholder-3/>. Če <placeholder-4/> ni nastavljen, se uporabniku prikaže pogovorno okno za shranjevanje datoteke, tako da lahko izbere lokacijo datoteke popravkov. Opomba: Če je nastavljen <placeholder-5/>, se ostali parametri ne upoštevajo."
1231990
1232991 #. (para)
1233-#: ../source/TortoiseMerge_en.xml:1340
1234992 msgid ""
1235993 "You can also supply simple filenames on the command line for compatibility with other diff programs. In this simplified form the command line is <screen>\n"
1236994 "TortoiseMerge BaseFilePath MyFilePath [ TheirFilePath ]\n"
@@ -1241,369 +999,296 @@
1241999 "</screen> Če sta podani dve datoteki, ju program primerja med sabo. Če so podane tri datoteke, je prva datoteke OSNOVNA, ostali dve pa se primerjata z njo v trodelnem pogledu."
12421000
12431001 #. (title)
1244-#: ../source/TortoiseMerge_en.xml:1356
12451002 msgid "Glossary"
12461003 msgstr "Slovar"
12471004
12481005 #. (glossterm)
1249-#: ../source/TortoiseMerge_en.xml:1358
12501006 msgid "Add"
12511007 msgstr "Dodaj"
12521008
12531009 #. (para)
1254-#: ../source/TortoiseMerge_en.xml:1360
12551010 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."
12561011 msgstr "Ukaz sistema Subversion, ki se uporablja za dodajanje datoteke ali mapo v delovno kopijo. Novi elementi se v skladišče dodajo ob objavi."
12571012
12581013 #. (glossterm)
1259-#: ../source/TortoiseMerge_en.xml:1368
12601014 msgid "BASE revision"
12611015 msgstr "revizija BASE"
12621016
12631017 #. (para)
1264-#: ../source/TortoiseMerge_en.xml:1370
12651018 msgid "The current base revision of a file or folder in your <emphasis>working copy</emphasis>. This is the revision the file or folder was in, when the last checkout, update or commit was run. The BASE revision is normally not equal to the HEAD revision."
12661019 msgstr "Trenutna osnovna revizija datoteke ali mape v vaši <emphasis>delovni kopiji</emphasis>. To je revizija datoteke ali mapi pri zadnjem prevzemu, posodobitvi ali objavi. Revizija BASE v splošnem ni enaka reviziji HEAD."
12671020
12681021 #. (glossterm)
1269-#: ../source/TortoiseMerge_en.xml:1379
12701022 msgid "Blame"
12711023 msgstr "Okrivi"
12721024
12731025 #. (para)
1274-#: ../source/TortoiseMerge_en.xml:1381
12751026 msgid "This command is for text files only, and it annotates every line to show the repository revision in which it was last changed, and the author who made that change. Our GUI implementation is called TortoiseBlame and it also shows the commit date/time and the log message when you hover the mouse of the revision number."
12761027 msgstr "Ta ukaz se uporablja le za besedilne datoteke, v katerih ob vsaki vrstici izpiše revizijo zadnje spremembe in avtorja te spremembe. Uporabniški vmesnik se imenuje TortoiseBlame in ob mirovanju miške na številki revizije pokaže tudi datum/čas objave in sporočilo dnevniškega zapisa."
12771028
12781029 #. (glossterm)
1279-#: ../source/TortoiseMerge_en.xml:1391
12801030 msgid "BDB"
12811031 msgstr "BDB"
12821032
12831033 #. (para)
1284-#: ../source/TortoiseMerge_en.xml:1393
12851034 msgid "Berkeley DB. A well tested database backend for repositories, that cannot be used on network shares. Default for pre 1.2 repositories."
12861035 msgstr "Berkeley DB. Dobro preizkušena baza za skladišča, ki se ne more uporabljati v mapah v skupni rabi. Privzeta oblika za skladišča pred različico 1.2."
12871036
12881037 #. (glossterm)
1289-#: ../source/TortoiseMerge_en.xml:1400
12901038 msgid "Branch"
12911039 msgstr "Veja"
12921040
12931041 #. (para)
1294-#: ../source/TortoiseMerge_en.xml:1402
12951042 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>."
12961043 msgstr "Izraz, ki se pogosto uporablja v sistemih za nadzor različic, in opisuje dve različni poti razvoja, ki se razcepita v določeni točki. Vejo lahko ustvarite na glavni veji, da razvijate novo lastnost ločeno, ne da bi glavno vejo naredili nestabilno. Lahko pa naredite vejo stabilne izdaje, na kateri le popravljate napake, nadaljni razvoj aplikacije pa se izvaja na nestabilni glavni veji. V sistemu Subversion je veja narejena kot <quote>poceni kopija</quote>."
12971044
12981045 #. (glossterm)
1299-#: ../source/TortoiseMerge_en.xml:1415
13001046 msgid "Checkout"
13011047 msgstr "Prevzemi"
13021048
13031049 #. (para)
1304-#: ../source/TortoiseMerge_en.xml:1417
13051050 msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository."
13061051 msgstr "Ukaz sistema Subversion, ki iz skladišča prenese elemente pod nadzorom in tako ustvari krajevno delovno kopijo v prazni mapi."
13071052
13081053 #. (glossterm)
1309-#: ../source/TortoiseMerge_en.xml:1424
13101054 msgid "Cleanup"
13111055 msgstr "Počisti"
13121056
13131057 #. (para)
1314-#: ../source/TortoiseMerge_en.xml:1426
13151058 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."
13161059 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."
13171060
13181061 #. (glossterm)
1319-#: ../source/TortoiseMerge_en.xml:1441
13201062 msgid "Commit"
13211063 msgstr "Objavi"
13221064
13231065 #. (para)
1324-#: ../source/TortoiseMerge_en.xml:1443
13251066 msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision."
13261067 msgstr "Ta ukaz omogoča prenos krajevnih sprememb v skladišče. S tem se v skladišču ustvari nova revizije."
13271068
13281069 #. (glossterm)
1329-#: ../source/TortoiseMerge_en.xml:1451
13301070 msgid "Conflict"
13311071 msgstr "Spor"
13321072
13331073 #. (para)
1334-#: ../source/TortoiseMerge_en.xml:1453
13351074 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."
13361075 msgstr "Ob spajanju sprememb iz skladišča s krajevnimi spremembami se včasih zgodi, da se spremembe zgodijo v isti vrstici. V takšnem primeru se Subversion ne more sam odločiti, katera različica vrstice je pravilna. Rečemo, da je datoteka sporna. Pred objavo morate spremembe morate ročno popraviti in tako rešiti spore."
13371076
13381077 #. (glossterm)
1339-#: ../source/TortoiseMerge_en.xml:1463
13401078 msgid "Copy"
13411079 msgstr "Kopiraj"
13421080
13431081 #. (para)
1344-#: ../source/TortoiseMerge_en.xml:1465
13451082 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."
13461083 msgstr "V skladišču In Subversion lahko ustvarjate kopije posameznih datotek ali celotnih dreves. Te kopije so <quote>poceni kopije</quote>, ki delujejo kot povezava na izvirno datoteko ali mapo in ne zavzemajo skoraj nič prostora. Usvarjanje kopije ohrani zgodovino kopiranega elementa, tako da lahko pregledujete spremembe tudi pred izdelavo kopije."
13471084
13481085 #. (glossterm)
1349-#: ../source/TortoiseMerge_en.xml:1475
13501086 msgid "Delete"
13511087 msgstr "Izbriši"
13521088
13531089 #. (para)
1354-#: ../source/TortoiseMerge_en.xml:1477
13551090 msgid "When you delete a versioned item (and commit the change) the item no longer exists in the repository after the committed revision. But of course it still exists in earlier repository revisions, so you can still access it. If necessary, you can copy a deleted item and <quote>resurrect</quote> it complete with history."
13561091 msgstr "Ko izbrišete datoteko pod nadzorom (in objavite spremembo), tega elementa ni več v skladišču od objavljene revizije naprej. Seveda pa še vedno obstaja v prejšnjih revizijah skladišča in tako lahko še vedno dostopate do njega. Če je potrebno, lahko skopirate izbrisan element in ga pripeljete nazaj med žive s celotno zgodovino."
13571092
13581093 #. (glossterm)
1359-#: ../source/TortoiseMerge_en.xml:1487
13601094 msgid "Diff"
13611095 msgstr "Razlikuj"
13621096
13631097 #. (para)
1364-#: ../source/TortoiseMerge_en.xml:1489
13651098 msgid "Shorthand for <quote>Show Differences</quote>. Very useful when you want to see exactly what changes have been made."
13661099 msgstr "Bližnjica za <quote>Pokaži razlike</quote>. Zelo uporabno, kadar želite videti, kakšne spremembe natančno ste naredili."
13671100
13681101 #. (glossterm)
1369-#: ../source/TortoiseMerge_en.xml:1496
13701102 msgid "Export"
13711103 msgstr "Izvozi"
13721104
13731105 #. (para)
1374-#: ../source/TortoiseMerge_en.xml:1498
13751106 msgid "This command produces a copy of a versioned folder, just like a working copy, but without the local <literal>.svn</literal> folders."
13761107 msgstr "Ta ukaz ustvari kopijo mape pod nadzorom različic, prav takšno, kot je delovna kopija, vendar brez map <literal>.svn</literal>."
13771108
13781109 #. (glossterm)
1379-#: ../source/TortoiseMerge_en.xml:1506
13801110 msgid "FSFS"
13811111 msgstr "FSFS"
13821112
13831113 #. (para)
1384-#: ../source/TortoiseMerge_en.xml:1508
13851114 msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories."
13861115 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."
13871116
13881117 #. (glossterm)
1389-#: ../source/TortoiseMerge_en.xml:1515
13901118 msgid "GPO"
13911119 msgstr "GPO"
13921120
13931121 #. (para)
1394-#: ../source/TortoiseMerge_en.xml:1517
13951122 msgid "Group policy object"
13961123 msgstr "Group policy object"
13971124
13981125 #. (glossterm)
1399-#: ../source/TortoiseMerge_en.xml:1523
14001126 msgid "HEAD revision"
14011127 msgstr "Revizija HEAD"
14021128
14031129 #. (para)
1404-#: ../source/TortoiseMerge_en.xml:1525
14051130 msgid "The latest revision of a file or folder in the <emphasis>repository</emphasis>."
14061131 msgstr "Najnovejša revizija datoteke ali mape v <emphasis>skladišču</emphasis>."
14071132
14081133 #. (glossterm)
1409-#: ../source/TortoiseMerge_en.xml:1531
14101134 msgid "Import"
14111135 msgstr "Uvozi"
14121136
14131137 #. (para)
1414-#: ../source/TortoiseMerge_en.xml:1533
14151138 msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision."
14161139 msgstr "Ukaz sistema Subversion za uvoz celotne hierarhije map v skladišče v eni sami reviziji."
14171140
14181141 #. (glossterm)
1419-#: ../source/TortoiseMerge_en.xml:1540
14201142 msgid "Lock"
14211143 msgstr "Zakleni"
14221144
14231145 #. (para)
1424-#: ../source/TortoiseMerge_en.xml:1542
14251146 msgid "When you take out a lock on a versioned item, you mark it in the repository as non-committable, except from the working copy where the lock was taken out."
14261147 msgstr "Ko element pod nadzorom zaklenete, ga s tem označite v skladišču in preprečite objave, razen iz delovne kopije, ki je zaklep zahtevala."
14271148
14281149 #. (glossterm)
1429-#: ../source/TortoiseMerge_en.xml:1550
14301150 msgid "Log"
14311151 msgstr "Dnevniški zapis"
14321152
14331153 #. (para)
1434-#: ../source/TortoiseMerge_en.xml:1552
14351154 msgid "Show the revision history of a file or folder. Also known as <quote>History</quote>."
14361155 msgstr "Prikaže zgodovino revizij datoteke ali mape. Uporablja se tudi termin <quote>Zgodovina</quote>."
14371156
14381157 #. (glossterm)
1439-#: ../source/TortoiseMerge_en.xml:1559
14401158 msgid "History"
14411159 msgstr "Zgodovina"
14421160
14431161 #. (para)
1444-#: ../source/TortoiseMerge_en.xml:1561
14451162 msgid "Show the revision history of a file or folder. Also known as <quote>Log</quote>."
14461163 msgstr "Prikaže zgodovino revizij datoteke ali mape. Uporablja se tudi termin <quote>Dnevnik</quote>."
14471164
14481165 #. (glossterm)
1449-#: ../source/TortoiseMerge_en.xml:1568
14501166 msgid "Merge"
14511167 msgstr "Spoji"
14521168
14531169 #. (para)
1454-#: ../source/TortoiseMerge_en.xml:1570
14551170 msgid "The process by which changes from the repository are added to your working copy without disrupting any changes you have already made locally. Sometimes these changes cannot be reconciled automatically and the working copy is said to be in conflict."
14561171 msgstr "Proces dodajanja sprememb iz skladišča v vašo delovno kopijo, ne da ob tem povozite krajevne spremembe. Včasih sprememb ni možno samodejno spojiti in takrat je delovno kopija sporna."
14571172
14581173 #. (para)
1459-#: ../source/TortoiseMerge_en.xml:1576
14601174 msgid "Merging happens automatically when you update your working copy. You can also merge specific changes from another branch using TortoiseSVN's Merge command."
14611175 msgstr "Spajanje se zgodi samodejno, ko posodabljate delovno kopijo. Lahko pa opravljate spajanje specifičnih sprememb iz druge veje z uporabo ukaza Spoji."
14621176
14631177 #. (glossterm)
1464-#: ../source/TortoiseMerge_en.xml:1584
14651178 msgid "Patch"
14661179 msgstr "Popravek"
14671180
14681181 #. (para)
1469-#: ../source/TortoiseMerge_en.xml:1586
14701182 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."
14711183 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 različice (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 pravice 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."
14721184
14731185 #. (glossterm)
1474-#: ../source/TortoiseMerge_en.xml:1599
14751186 msgid "Property"
14761187 msgstr "Lastnost"
14771188
14781189 #. (para)
1479-#: ../source/TortoiseMerge_en.xml:1601
14801190 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>. TortoiseSVN has some too, such as <literal>tsvn:logminsize</literal>. You can add your own properties with any name and value you choose."
14811191 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 TortoiseSVN uporablja nekaj internih lastnosti, n. pr. <literal>tsvn:logminsize</literal>. Lahko pa dodate svoje lastnosti s poljubnim imenom in vrednostjo."
14821192
14831193 #. (glossterm)
1484-#: ../source/TortoiseMerge_en.xml:1614
14851194 msgid "Relocate"
14861195 msgstr "Premesti"
14871196
14881197 #. (para)
1489-#: ../source/TortoiseMerge_en.xml:1616
14901198 msgid "If your repository moves, perhaps because you have moved it to a different directory on your server, or the server domain name has changed, you need to <quote>relocate</quote> your working copy so that its repository URLs point to the new location."
14911199 msgstr "Če se skladišče premakne (ker ste ga premaknili v drugo mapo na strežniku ali pa se je spremenilo domensko ime), morate narediti <quote>premik</quote> delovne kopije, da bodo poti URL do skladišča kazale na novo lokacijo."
14921200
14931201 #. (para)
1494-#: ../source/TortoiseMerge_en.xml:1622
14951202 msgid "Note: you should only use this command if your working copy is referring to the same location in the same repository, but the repository itself has moved. In any other circumstance you probably need the <quote>Switch</quote> command instead."
14961203 msgstr "Opomba: ta ukaz uporabljajte le, če delovna kopija kaže na isto lokacijo znotraj istega skladišča, skladišče pa je bilo premaknjeno na drugo lokacijo. V vseh ostalih primerih uporabite ukaz <quote>Preklopi</quote>."
14971204
14981205 #. (glossterm)
1499-#: ../source/TortoiseMerge_en.xml:1631
15001206 msgid "Repository"
15011207 msgstr "Skladišče"
15021208
15031209 #. (para)
1504-#: ../source/TortoiseMerge_en.xml:1633
15051210 msgid "A repository is a central place where data is stored and maintained. A repository can be a place where multiple databases or files are located for distribution over a network, or a repository can be a location that is directly accessible to the user without having to travel across a network."
15061211 msgstr "Skladišče je središčna lokacija, kjer se podatki shranjujejo in vzdržujejo. Skladišče je lahko lokacija, kjer so shranjene številne baze podatkov ali datoteke za distibucijo preko omrežja, lahko pa je tudi lokacija, ki je neposredno dostopna uporabniku, ne da bi uporabljal omrežje."
15071212
15081213 #. (glossterm)
1509-#: ../source/TortoiseMerge_en.xml:1642
15101214 msgid "Resolve"
15111215 msgstr "Reši"
15121216
15131217 #. (para)
1514-#: ../source/TortoiseMerge_en.xml:1644
15151218 msgid "When files in a working copy are left in a conflicted state following a merge, those conflicts must be sorted out by a human using an editor (or perhaps TortoiseMerge). This process is referred to as <quote>Resolving Conflicts</quote>. When this is complete you can mark the conflicted files as being resolved, which allows them to be committed."
15161219 msgstr "Ko so datoteke v delovni kopiji sporne (zaradi spajanja), mora uporabnik te spore rešiti z uporabo urejevalnika (ali pa programa TortoiseMerge). Procesu rečemo <quote>reševanje sporov</quote>. Ko ste spore rešili, označite datoteko kot rešeno, kar vam omogoča njeno objavo."
15171220
15181221 #. (glossterm)
1519-#: ../source/TortoiseMerge_en.xml:1654
15201222 msgid "Revert"
15211223 msgstr "Povrni"
15221224
15231225 #. (para)
1524-#: ../source/TortoiseMerge_en.xml:1656
15251226 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."
15261227 msgstr "Subversion hrani krajevno <quote>originalno</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 originalno datoteko."
15271228
15281229 #. (glossterm)
1529-#: ../source/TortoiseMerge_en.xml:1665
15301230 msgid "Revision"
15311231 msgstr "Revizija"
15321232
15331233 #. (para)
1534-#: ../source/TortoiseMerge_en.xml:1667
15351234 msgid "Every time you commit a set of changes, you create one new <quote>revision</quote> in the repository. Each revision represents the state of the repository tree at a certain point in its history. If you want to go back in time you can examine the repository as it was at revision N."
15361235 msgstr "Vsakič ko objavite spremembe, naredite novo <quote>revizijo</quote> v skladišču. Vsaka revizija predstavlja stanje skladišča ob določeni točki v njegovi zgodovini. Če želite, si lahko ogledate skladišče, kakršno je bilo ob reviziji številka N."
15371236
15381237 #. (para)
1539-#: ../source/TortoiseMerge_en.xml:1674
15401238 msgid "In another sense, a revision can refer to the set of changes that were made when that revision was created."
15411239 msgstr "Drug pogled: revizija je množica sprememb, ki so bile narejene, ko je bila revizija ustvarjena."
15421240
15431241 #. (glossterm)
1544-#: ../source/TortoiseMerge_en.xml:1681
15451242 msgid "Revision Property (revprop)"
15461243 msgstr "Lastnost revizije (revprop)"
15471244
15481245 #. (para)
1549-#: ../source/TortoiseMerge_en.xml:1683
15501246 msgid "Just as files can have properties, so can each revision in the repository. Some special revprops are added automatically when the revision is created, namely: <literal>svn:date svn:author svn:log</literal> which represent the commit date/time, the committer and the log message respectively. These properties can be edited, but they are not versioned, so any change is permanent and cannot be undone."
15511247 msgstr "Prav tako, kot imajo lastnosti datoteke, jih imajo tudi revizije v skladišču. Nekatere posebne se dodajo samodejno, ko se revizija ustvari: <literal>svn:date svn:author svn:log</literal>, ki predstavljajo datum/čas objave, avtorja in sporočilo dnevniškega zapisa. Vrednosti teh lastnosti lahko urejate, vendar upoštevajte, da niso pod nadzorom različic, tako da so spremembe trajne in se jih ne da povrniti."
15521248
15531249 #. (glossterm)
1554-#: ../source/TortoiseMerge_en.xml:1695
15551250 msgid "SVN"
15561251 msgstr "SVN"
15571252
15581253 #. (para)
1559-#: ../source/TortoiseMerge_en.xml:1697
15601254 msgid "A frequently-used abbreviation for Subversion."
15611255 msgstr "Pogosto uporabljena okrajšava za Subversion"
15621256
15631257 #. (para)
1564-#: ../source/TortoiseMerge_en.xml:1700
15651258 msgid "The name of the Subversion custom protocol used by the <quote>svnserve</quote> repository server."
15661259 msgstr "Ime lastnega protokola sistema Subversion, ki ga uporablja strežnik skladišč <quote>svnserve</quote>."
15671260
15681261 #. (glossterm)
1569-#: ../source/TortoiseMerge_en.xml:1707
15701262 msgid "Switch"
15711263 msgstr "Preklop"
15721264
15731265 #. (para)
1574-#: ../source/TortoiseMerge_en.xml:1709
15751266 msgid "Just as <quote>Update-to-revision</quote> changes the time window of a working copy to look at a different point in history, so <quote>Switch</quote> changes the space window of a working copy so that it points to a different part of the repository. It is particularly useful when working on trunk and branches where only a few files differ. You can switch your working copy between the two and only the changed files will be transferred."
15761267 msgstr "Prav tako kot ukaz <quote>posodobi-na-revizijo</quote> spremeni časovno okno delovne kopije, da izgleda tako, kot v neki določeni točki v zgodovini, ukaz <quote>Preklopi</quote> spremeni prostorsko okno delovne kopije, da kaže na drugo mesto v skladišču. To je uporabno predvsem takrat, kot delate na glavni veji in na stranskih vejah, na katerih je spremenjenih le nekaj datotek. Delovno kopijo lahko preklapljate, prenesejo pa se le spremenjene datoteke."
15771268
15781269 #. (glossterm)
1579-#: ../source/TortoiseMerge_en.xml:1721
15801270 msgid "Update"
15811271 msgstr "Posodobitev"
15821272
15831273 #. (para)
1584-#: ../source/TortoiseMerge_en.xml:1723
15851274 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."
15861275 msgstr "Ta ukaz Subversion prenese iz skladišča v delovno kopijo zadnje spremembe, pri tem spremembe spoji s krajevnimi spremembami, narejenimi v delovni kopiji."
15871276
15881277 #. (glossterm)
1589-#: ../source/TortoiseMerge_en.xml:1731
15901278 msgid "Working Copy"
15911279 msgstr "Delovna kopija"
15921280
15931281 #. (para)
1594-#: ../source/TortoiseMerge_en.xml:1733
15951282 msgid "This is your local <quote>sandbox</quote>, the area where you work on the versioned files, and it normally resides on your local hard disk. You create a working copy by doing a <quote>Checkout</quote> from a repository, and you feed your changes back into the repository using <quote>Commit</quote>."
15961283 msgstr "To je vaše zasebno <quote>igrišče</quote>, območje, kjer delate z datotekami pod nadzorom, in se obilčajno nahaja na krajevnem trdem disku. Delovno kopijo naredite s <quote>prevzemom</quote> iz skladišča, spremembe pa v skladišče prenesete z ukazom <quote>Objavi</quote>."
15971284
15981285 #. Put one translator per line, in the form of NAME <EMAIL>.
15991286 #. (None)
1600-#: ../source/TortoiseMerge_en.xml:0
16011287 msgid "translator-credits"
16021288 msgstr "Matjaž Čepon <matjaz.cepon@gmail.com>"
16031289
16041290 #. Place the translation of 'translation' here.
16051291 #. (None)
1606-#: ../source/TortoiseMerge_en.xml:0
16071292 msgid "translator-translation"
16081293 msgstr "Prevod"
16091294
Show on old repository browser