• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision14238 (tree)
Zeit2008-10-09 19:25:15
Autormatjaz

Log Message

Slovenian doc update.

Ändern Zusammenfassung

Diff

--- branches/1.5.x/doc/po/TortoiseSVN_sl.po (revision 14237)
+++ branches/1.5.x/doc/po/TortoiseSVN_sl.po (revision 14238)
@@ -14,8 +14,8 @@
1414 msgid ""
1515 msgstr ""
1616 "Project-Id-Version: TortoiseSVN Documentation\n"
17-"POT-Creation-Date: 2008-07-20 22:35 +0000\n"
18-"PO-Revision-Date: 2008-09-19 21:45+0100\n"
17+"POT-Creation-Date: 2008-09-22 15:28 +0000\n"
18+"PO-Revision-Date: 2008-10-02 19:23+0100\n"
1919 "Last-Translator: Matjaz Cepon <matjaz.cepon@gmail.com>\n"
2020 "Language-Team: TortoiseSVN translation team <dev@tortoisesvn.tigris.org>\n"
2121 "MIME-Version: 1.0\n"
@@ -3182,7 +3182,7 @@
31823182 #. (title)
31833183 #: ../source/TortoiseSVN_en.xml:3506
31843184 #: ../source/TortoiseSVN_en.xml:5014
3185-#: ../source/TortoiseSVN_en.xml:14944
3185+#: ../source/TortoiseSVN_en.xml:14939
31863186 msgid "Icon Overlays"
31873187 msgstr "Prekrivne ikone"
31883188
@@ -3403,8 +3403,8 @@
34033403 #. (glossterm)
34043404 #: ../source/TortoiseSVN_en.xml:3718
34053405 #: ../source/TortoiseSVN_en.xml:13715
3406-#: ../source/TortoiseSVN_en.xml:14875
3407-#: ../source/TortoiseSVN_en.xml:15636
3406+#: ../source/TortoiseSVN_en.xml:14870
3407+#: ../source/TortoiseSVN_en.xml:15631
34083408 msgid "Import"
34093409 msgstr "Uvoz"
34103410
@@ -3794,7 +3794,7 @@
37943794 #. (listitem)
37953795 #: ../source/TortoiseSVN_en.xml:4200
37963796 #: ../source/TortoiseSVN_en.xml:8079
3797-#: ../source/TortoiseSVN_en.xml:14792
3797+#: ../source/TortoiseSVN_en.xml:14787
37983798 msgid "Working copy"
37993799 msgstr "Delovna kopija"
38003800
@@ -4434,7 +4434,7 @@
44344434 #. (primary)
44354435 #. (primary)
44364436 #: ../source/TortoiseSVN_en.xml:5016
4437-#: ../source/TortoiseSVN_en.xml:14949
4437+#: ../source/TortoiseSVN_en.xml:14944
44384438 msgid "overlays"
44394439 msgstr "prekrivki"
44404440
@@ -4551,7 +4551,7 @@
45514551 #. (title)
45524552 #. (title)
45534553 #: ../source/TortoiseSVN_en.xml:5156
4554-#: ../source/TortoiseSVN_en.xml:14639
4554+#: ../source/TortoiseSVN_en.xml:14634
45554555 msgid "Check for Modifications"
45564556 msgstr "Preveri posodobitve"
45574557
@@ -6347,8 +6347,8 @@
63476347 #. (glossterm)
63486348 #: ../source/TortoiseSVN_en.xml:7438
63496349 #: ../source/TortoiseSVN_en.xml:13703
6350-#: ../source/TortoiseSVN_en.xml:14744
6351-#: ../source/TortoiseSVN_en.xml:15529
6350+#: ../source/TortoiseSVN_en.xml:14739
6351+#: ../source/TortoiseSVN_en.xml:15524
63526352 msgid "Cleanup"
63536353 msgstr "Čiščenje"
63546354
@@ -6814,7 +6814,7 @@
68146814 #. (term)
68156815 #. (listitem)
68166816 #: ../source/TortoiseSVN_en.xml:8053
6817-#: ../source/TortoiseSVN_en.xml:14790
6817+#: ../source/TortoiseSVN_en.xml:14785
68186818 msgid "HEAD revision in the repository"
68196819 msgstr "Revizija HEAD v skladišču"
68206820
@@ -10311,8 +10311,8 @@
1031110311 #. (glossterm)
1031210312 #: ../source/TortoiseSVN_en.xml:12496
1031310313 #: ../source/TortoiseSVN_en.xml:13711
10314-#: ../source/TortoiseSVN_en.xml:14802
10315-#: ../source/TortoiseSVN_en.xml:15812
10314+#: ../source/TortoiseSVN_en.xml:14797
10315+#: ../source/TortoiseSVN_en.xml:15807
1031610316 msgid "Switch"
1031710317 msgstr "Preklop"
1031810318
@@ -10325,7 +10325,7 @@
1032510325 #: ../source/TortoiseSVN_en.xml:12582
1032610326 #: ../source/TortoiseSVN_en.xml:12790
1032710327 #: ../source/TortoiseSVN_en.xml:13967
10328-#: ../source/TortoiseSVN_en.xml:14372
10328+#: ../source/TortoiseSVN_en.xml:14367
1032910329 msgid "Description"
1033010330 msgstr "Opis"
1033110331
@@ -11373,7 +11373,7 @@
1137311373 #. (primary)
1137411374 #. (glossterm)
1137511375 #: ../source/TortoiseSVN_en.xml:13524
11376-#: ../source/TortoiseSVN_en.xml:15620
11376+#: ../source/TortoiseSVN_en.xml:15615
1137711377 msgid "GPO"
1137811378 msgstr "GPO"
1137911379
@@ -11542,8 +11542,8 @@
1154211542 #. (title)
1154311543 #. (glossterm)
1154411544 #: ../source/TortoiseSVN_en.xml:13683
11545-#: ../source/TortoiseSVN_en.xml:14496
11546-#: ../source/TortoiseSVN_en.xml:15520
11545+#: ../source/TortoiseSVN_en.xml:14491
11546+#: ../source/TortoiseSVN_en.xml:15515
1154711547 msgid "Checkout"
1154811548 msgstr "Prevzemi"
1154911549
@@ -11551,8 +11551,8 @@
1155111551 #. (title)
1155211552 #. (glossterm)
1155311553 #: ../source/TortoiseSVN_en.xml:13687
11554-#: ../source/TortoiseSVN_en.xml:14514
11555-#: ../source/TortoiseSVN_en.xml:15826
11554+#: ../source/TortoiseSVN_en.xml:14509
11555+#: ../source/TortoiseSVN_en.xml:15821
1155611556 msgid "Update"
1155711557 msgstr "Posodobi"
1155811558
@@ -11560,8 +11560,8 @@
1156011560 #. (title)
1156111561 #. (glossterm)
1156211562 #: ../source/TortoiseSVN_en.xml:13691
11563-#: ../source/TortoiseSVN_en.xml:14553
11564-#: ../source/TortoiseSVN_en.xml:15546
11563+#: ../source/TortoiseSVN_en.xml:14548
11564+#: ../source/TortoiseSVN_en.xml:15541
1156511565 msgid "Commit"
1156611566 msgstr "Objavi"
1156711567
@@ -11569,8 +11569,8 @@
1156911569 #. (title)
1157011570 #. (glossterm)
1157111571 #: ../source/TortoiseSVN_en.xml:13695
11572-#: ../source/TortoiseSVN_en.xml:14865
11573-#: ../source/TortoiseSVN_en.xml:15463
11572+#: ../source/TortoiseSVN_en.xml:14860
11573+#: ../source/TortoiseSVN_en.xml:15458
1157411574 msgid "Add"
1157511575 msgstr "Dodaj"
1157611576
@@ -11578,8 +11578,8 @@
1157811578 #. (title)
1157911579 #. (glossterm)
1158011580 #: ../source/TortoiseSVN_en.xml:13699
11581-#: ../source/TortoiseSVN_en.xml:14722
11582-#: ../source/TortoiseSVN_en.xml:15759
11581+#: ../source/TortoiseSVN_en.xml:14717
11582+#: ../source/TortoiseSVN_en.xml:15754
1158311583 msgid "Revert"
1158411584 msgstr "Povrni"
1158511585
@@ -11586,7 +11586,7 @@
1158611586 #. (entry)
1158711587 #. (glossterm)
1158811588 #: ../source/TortoiseSVN_en.xml:13707
11589-#: ../source/TortoiseSVN_en.xml:15747
11589+#: ../source/TortoiseSVN_en.xml:15742
1159011590 msgid "Resolve"
1159111591 msgstr "Reši"
1159211592
@@ -11594,8 +11594,8 @@
1159411594 #. (title)
1159511595 #. (glossterm)
1159611596 #: ../source/TortoiseSVN_en.xml:13719
11597-#: ../source/TortoiseSVN_en.xml:14826
11598-#: ../source/TortoiseSVN_en.xml:15601
11597+#: ../source/TortoiseSVN_en.xml:14821
11598+#: ../source/TortoiseSVN_en.xml:15596
1159911599 msgid "Export"
1160011600 msgstr "Izvozi"
1160111601
@@ -11607,7 +11607,7 @@
1160711607 #. (entry)
1160811608 #. (title)
1160911609 #: ../source/TortoiseSVN_en.xml:13727
11610-#: ../source/TortoiseSVN_en.xml:14778
11610+#: ../source/TortoiseSVN_en.xml:14773
1161111611 msgid "Branch/Tag"
1161211612 msgstr "Veja/Oznaka"
1161311613
@@ -11615,8 +11615,8 @@
1161511615 #. (title)
1161611616 #. (glossterm)
1161711617 #: ../source/TortoiseSVN_en.xml:13731
11618-#: ../source/TortoiseSVN_en.xml:14809
11619-#: ../source/TortoiseSVN_en.xml:15673
11618+#: ../source/TortoiseSVN_en.xml:14804
11619+#: ../source/TortoiseSVN_en.xml:15668
1162011620 msgid "Merge"
1162111621 msgstr "Spoji"
1162211622
@@ -11624,8 +11624,8 @@
1162411624 #. (title)
1162511625 #. (glossterm)
1162611626 #: ../source/TortoiseSVN_en.xml:13735
11627-#: ../source/TortoiseSVN_en.xml:14716
11628-#: ../source/TortoiseSVN_en.xml:15580
11627+#: ../source/TortoiseSVN_en.xml:14711
11628+#: ../source/TortoiseSVN_en.xml:15575
1162911629 msgid "Delete"
1163011630 msgstr "Izbriši"
1163111631
@@ -11632,7 +11632,7 @@
1163211632 #. (entry)
1163311633 #. (title)
1163411634 #: ../source/TortoiseSVN_en.xml:13739
11635-#: ../source/TortoiseSVN_en.xml:14710
11635+#: ../source/TortoiseSVN_en.xml:14705
1163611636 msgid "Rename"
1163711637 msgstr "Preimenuj"
1163811638
@@ -11645,8 +11645,8 @@
1164511645 #. (title)
1164611646 #. (glossterm)
1164711647 #: ../source/TortoiseSVN_en.xml:13747
11648-#: ../source/TortoiseSVN_en.xml:14600
11649-#: ../source/TortoiseSVN_en.xml:15592
11648+#: ../source/TortoiseSVN_en.xml:14595
11649+#: ../source/TortoiseSVN_en.xml:15587
1165011650 msgid "Diff"
1165111651 msgstr "Razlikuj"
1165211652
@@ -11653,7 +11653,7 @@
1165311653 #. (entry)
1165411654 #. (title)
1165511655 #: ../source/TortoiseSVN_en.xml:13751
11656-#: ../source/TortoiseSVN_en.xml:14621
11656+#: ../source/TortoiseSVN_en.xml:14616
1165711657 msgid "Show Log"
1165811658 msgstr "Pokaži dnevnik"
1165911659
@@ -11660,7 +11660,7 @@
1166011660 #. (entry)
1166111661 #. (title)
1166211662 #: ../source/TortoiseSVN_en.xml:13755
11663-#: ../source/TortoiseSVN_en.xml:14696
11663+#: ../source/TortoiseSVN_en.xml:14691
1166411664 msgid "Edit Conflicts"
1166511665 msgstr "Uredi spore"
1166611666
@@ -11668,8 +11668,8 @@
1166811668 #. (title)
1166911669 #. (glossterm)
1167011670 #: ../source/TortoiseSVN_en.xml:13759
11671-#: ../source/TortoiseSVN_en.xml:14851
11672-#: ../source/TortoiseSVN_en.xml:15719
11671+#: ../source/TortoiseSVN_en.xml:14846
11672+#: ../source/TortoiseSVN_en.xml:15714
1167311673 msgid "Relocate"
1167411674 msgstr "Premakni"
1167511675
@@ -11692,8 +11692,8 @@
1169211692 #. (title)
1169311693 #. (glossterm)
1169411694 #: ../source/TortoiseSVN_en.xml:13775
11695-#: ../source/TortoiseSVN_en.xml:14885
11696-#: ../source/TortoiseSVN_en.xml:15484
11695+#: ../source/TortoiseSVN_en.xml:14880
11696+#: ../source/TortoiseSVN_en.xml:15479
1169711697 msgid "Blame"
1169811698 msgstr "Okrivi"
1169911699
@@ -11700,7 +11700,7 @@
1170011700 #. (entry)
1170111701 #. (title)
1170211702 #: ../source/TortoiseSVN_en.xml:13779
11703-#: ../source/TortoiseSVN_en.xml:14911
11703+#: ../source/TortoiseSVN_en.xml:14906
1170411704 msgid "Create Patch"
1170511705 msgstr "Ustvari popravek"
1170611706
@@ -11707,7 +11707,7 @@
1170711707 #. (entry)
1170811708 #. (title)
1170911709 #: ../source/TortoiseSVN_en.xml:13783
11710-#: ../source/TortoiseSVN_en.xml:14921
11710+#: ../source/TortoiseSVN_en.xml:14916
1171111711 msgid "Apply Patch"
1171211712 msgstr "Namesti popravek"
1171311713
@@ -11719,7 +11719,7 @@
1171911719 #. (entry)
1172011720 #. (glossterm)
1172111721 #: ../source/TortoiseSVN_en.xml:13791
11722-#: ../source/TortoiseSVN_en.xml:15645
11722+#: ../source/TortoiseSVN_en.xml:15640
1172311723 msgid "Lock"
1172411724 msgstr "Zaklep"
1172511725
@@ -11798,7 +11798,7 @@
1179811798 #. (title)
1179911799 #. (title)
1180011800 #: ../source/TortoiseSVN_en.xml:13868
11801-#: ../source/TortoiseSVN_en.xml:14494
11801+#: ../source/TortoiseSVN_en.xml:14489
1180211802 msgid "TortoiseSVN Commands"
1180311803 msgstr "Ukazi TortoiseSVN"
1180411804
@@ -11805,7 +11805,7 @@
1180511805 #. (primary)
1180611806 #. (primary)
1180711807 #: ../source/TortoiseSVN_en.xml:13870
11808-#: ../source/TortoiseSVN_en.xml:14339
11808+#: ../source/TortoiseSVN_en.xml:14334
1180911809 msgid "automation"
1181011810 msgstr "avtomatizacija"
1181111811
@@ -11812,7 +11812,7 @@
1181211812 #. (primary)
1181311813 #. (primary)
1181411814 #: ../source/TortoiseSVN_en.xml:13873
11815-#: ../source/TortoiseSVN_en.xml:14342
11815+#: ../source/TortoiseSVN_en.xml:14337
1181611816 msgid "command line"
1181711817 msgstr "ukazna vrstica"
1181811818
@@ -11940,24 +11940,24 @@
1194011940 #: ../source/TortoiseSVN_en.xml:14082
1194111941 #: ../source/TortoiseSVN_en.xml:14084
1194211942 #: ../source/TortoiseSVN_en.xml:14090
11943-#: ../source/TortoiseSVN_en.xml:14102
11944-#: ../source/TortoiseSVN_en.xml:14110
11945-#: ../source/TortoiseSVN_en.xml:14131
11946-#: ../source/TortoiseSVN_en.xml:14138
11947-#: ../source/TortoiseSVN_en.xml:14148
11948-#: ../source/TortoiseSVN_en.xml:14154
11949-#: ../source/TortoiseSVN_en.xml:14187
11950-#: ../source/TortoiseSVN_en.xml:14193
11951-#: ../source/TortoiseSVN_en.xml:14206
11952-#: ../source/TortoiseSVN_en.xml:14215
11953-#: ../source/TortoiseSVN_en.xml:14221
11954-#: ../source/TortoiseSVN_en.xml:14229
11955-#: ../source/TortoiseSVN_en.xml:14264
11956-#: ../source/TortoiseSVN_en.xml:14274
11957-#: ../source/TortoiseSVN_en.xml:14281
11958-#: ../source/TortoiseSVN_en.xml:14288
11959-#: ../source/TortoiseSVN_en.xml:14297
11960-#: ../source/TortoiseSVN_en.xml:14314
11943+#: ../source/TortoiseSVN_en.xml:14097
11944+#: ../source/TortoiseSVN_en.xml:14105
11945+#: ../source/TortoiseSVN_en.xml:14126
11946+#: ../source/TortoiseSVN_en.xml:14133
11947+#: ../source/TortoiseSVN_en.xml:14143
11948+#: ../source/TortoiseSVN_en.xml:14149
11949+#: ../source/TortoiseSVN_en.xml:14182
11950+#: ../source/TortoiseSVN_en.xml:14188
11951+#: ../source/TortoiseSVN_en.xml:14201
11952+#: ../source/TortoiseSVN_en.xml:14210
11953+#: ../source/TortoiseSVN_en.xml:14216
11954+#: ../source/TortoiseSVN_en.xml:14224
11955+#: ../source/TortoiseSVN_en.xml:14259
11956+#: ../source/TortoiseSVN_en.xml:14269
11957+#: ../source/TortoiseSVN_en.xml:14276
11958+#: ../source/TortoiseSVN_en.xml:14283
11959+#: ../source/TortoiseSVN_en.xml:14292
11960+#: ../source/TortoiseSVN_en.xml:14309
1196111961 msgid "/path"
1196211962 msgstr "/path"
1196311963
@@ -11964,7 +11964,7 @@
1196411964 #. (option)
1196511965 #. (option)
1196611966 #: ../source/TortoiseSVN_en.xml:13984
11967-#: ../source/TortoiseSVN_en.xml:14156
11967+#: ../source/TortoiseSVN_en.xml:14151
1196811968 msgid "/startrev:xxx"
1196911969 msgstr "/startrev:xxx"
1197011970
@@ -11971,7 +11971,7 @@
1197111971 #. (option)
1197211972 #. (option)
1197311973 #: ../source/TortoiseSVN_en.xml:13985
11974-#: ../source/TortoiseSVN_en.xml:14157
11974+#: ../source/TortoiseSVN_en.xml:14152
1197511975 msgid "/endrev:xxx"
1197611976 msgstr "/endrev:xxx"
1197711977
@@ -11988,7 +11988,7 @@
1198811988 #. (option)
1198911989 #. (option)
1199011990 #: ../source/TortoiseSVN_en.xml:13993
11991-#: ../source/TortoiseSVN_en.xml:14112
11991+#: ../source/TortoiseSVN_en.xml:14107
1199211992 msgid "/url"
1199311993 msgstr "/url"
1199411994
@@ -12030,7 +12030,7 @@
1203012030 #. (option)
1203112031 #. (option)
1203212032 #: ../source/TortoiseSVN_en.xml:14021
12033-#: ../source/TortoiseSVN_en.xml:14114
12033+#: ../source/TortoiseSVN_en.xml:14109
1203412034 msgid "/logmsg"
1203512035 msgstr "/logmsg"
1203612036
@@ -12037,7 +12037,7 @@
1203712037 #. (option)
1203812038 #. (option)
1203912039 #: ../source/TortoiseSVN_en.xml:14024
12040-#: ../source/TortoiseSVN_en.xml:14117
12040+#: ../source/TortoiseSVN_en.xml:14112
1204112041 msgid "/logmsgfile:path"
1204212042 msgstr "/logmsgfile:pot"
1204312043
@@ -12044,7 +12044,7 @@
1204412044 #. (option)
1204512045 #. (option)
1204612046 #: ../source/TortoiseSVN_en.xml:14025
12047-#: ../source/TortoiseSVN_en.xml:14118
12047+#: ../source/TortoiseSVN_en.xml:14113
1204812048 msgid "path"
1204912049 msgstr "pot"
1205012050
@@ -12077,8 +12077,8 @@
1207712077 #. (option)
1207812078 #. (option)
1207912079 #: ../source/TortoiseSVN_en.xml:14060
12080-#: ../source/TortoiseSVN_en.xml:14141
12081-#: ../source/TortoiseSVN_en.xml:14307
12080+#: ../source/TortoiseSVN_en.xml:14136
12081+#: ../source/TortoiseSVN_en.xml:14302
1208212082 msgid "/noquestion"
1208312083 msgstr "/noquestion"
1208412084
@@ -12102,48 +12102,33 @@
1210212102 msgid "Exports the working copy in <placeholder-1/> to another directory. If the <placeholder-2/> points to an unversioned directory, a dialog will ask for an URL to export to the directory in <placeholder-3/>."
1210312103 msgstr "Izvozi delovno kopijo v <placeholder-1/> v drugo mapo. Če <placeholder-2/> kaže na mapo brez različic, se pojavi pogovorno okno, ki uporabnika vpraša po naslovu, ki naj se izvozi v <placeholder-3/>."
1210412104
12105-#. (option)
12106-#: ../source/TortoiseSVN_en.xml:14093
12107-msgid "/mergefrom:xxx"
12108-msgstr "/mergefrom:xxx"
12109-
12110-#. (option)
12111-#: ../source/TortoiseSVN_en.xml:14094
12112-msgid "/mergeto:xxx"
12113-msgstr "/mergeto:xxx"
12114-
12115-#. (option)
12116-#: ../source/TortoiseSVN_en.xml:14095
12117-msgid "/fromurl:URL"
12118-msgstr "/fromurl:URL"
12119-
1212012105 #. (entry)
1212112106 #: ../source/TortoiseSVN_en.xml:14089
12122-msgid "Opens the merge dialog. The <placeholder-1/> specifies the target directory. Three additional options can be set: <placeholder-2/>, <placeholder-3/> and <placeholder-4/>. These pre-fill the relevant fields in the merge dialog."
12123-msgstr "Odpre okno za spajanje. <placeholder-1/> določa ciljno mapo. Nastavimo pa lahko še tri parametre: <placeholder-2/>, <placeholder-3/> in <placeholder-4/>. Z njimi nastavimo ostala pomembna polja v oknu za spajanje."
12107+msgid "Opens the merge dialog. The <placeholder-1/> specifies the target directory."
12108+msgstr "Odpre okno za spajanje. <placeholder-1/> določa ciljno mapo."
1212412109
1212512110 #. (entry)
12126-#: ../source/TortoiseSVN_en.xml:14101
12111+#: ../source/TortoiseSVN_en.xml:14096
1212712112 msgid "Opens the merge all dialog. The <placeholder-1/> specifies the target directory."
1212812113 msgstr "Odpre okno za spajanje. <placeholder-1/> določa ciljno mapo."
1212912114
1213012115 #. (entry)
12131-#: ../source/TortoiseSVN_en.xml:14108
12116+#: ../source/TortoiseSVN_en.xml:14103
1213212117 msgid "Brings up the branch/tag dialog. The <placeholder-1/> is the working copy to branch/tag from. And the <placeholder-2/> is the target URL. You can also specify the <placeholder-3/> switch to pass a predefined log message to the branch/tag dialog. Or, if you don't want to pass the log message on the command line, use <placeholder-4/>, where <placeholder-5/> points to a file containing the log message."
1213312118 msgstr "Prikaže okno za ustvarjanje vej/oznak. <placeholder-1/> je delovna kopija, iz katere želite ustvariti vejo/oznako. <placeholder-2/> je ciljni naslov URL. Nastavite pa lahko tudi stikalo <placeholder-3/>, s katerim določite sporočilo dnevniškega zapisa. Če pa sporočila dnevniškega zapisa ne želite podati v kazni vrstici, uporabite <placeholder-4/>, kjer <placeholder-5/> kaže na datoteko s sporočilom dnevniškega zapisa."
1213412119
1213512120 #. (entry)
12136-#: ../source/TortoiseSVN_en.xml:14124
12121+#: ../source/TortoiseSVN_en.xml:14119
1213712122 msgid "Opens the settings dialog."
1213812123 msgstr "Odpre okno za nastavitve"
1213912124
1214012125 #. (entry)
12141-#: ../source/TortoiseSVN_en.xml:14130
12126+#: ../source/TortoiseSVN_en.xml:14125
1214212127 msgid "Removes the file(s) in <placeholder-1/> from version control."
1214312128 msgstr "Odstrani datoteke v <placeholder-1/> iz sistema Subversion."
1214412129
1214512130 #. (entry)
12146-#: ../source/TortoiseSVN_en.xml:14137
12131+#: ../source/TortoiseSVN_en.xml:14132
1214712132 msgid "Renames the file in <placeholder-1/>. The new name for the file is asked with a dialog. To avoid the question about renaming similar files in one step, pass <placeholder-2/>."
1214812133 msgstr "Preimenuje datoteko v <placeholder-1/>. Novo ime vpišete v pogovornem oknu. Če se želite izgoniti vprašanju o preimenovanju podobnih datotek v enem koraku, podajte <placeholder-2/>."
1214912134
@@ -12150,146 +12135,146 @@
1215012135 #. (option)
1215112136 #. (option)
1215212137 #. (option)
12153-#: ../source/TortoiseSVN_en.xml:14150
12154-#: ../source/TortoiseSVN_en.xml:14152
12155-#: ../source/TortoiseSVN_en.xml:14158
12138+#: ../source/TortoiseSVN_en.xml:14145
12139+#: ../source/TortoiseSVN_en.xml:14147
12140+#: ../source/TortoiseSVN_en.xml:14153
1215612141 msgid "/path2"
1215712142 msgstr "/path2"
1215812143
1215912144 #. (option)
12160-#: ../source/TortoiseSVN_en.xml:14158
12145+#: ../source/TortoiseSVN_en.xml:14153
1216112146 msgid "/blame"
1216212147 msgstr "/blame"
1216312148
1216412149 #. (entry)
12165-#: ../source/TortoiseSVN_en.xml:14146
12150+#: ../source/TortoiseSVN_en.xml:14141
1216612151 msgid "Starts the external diff program specified in the TortoiseSVN settings. The <placeholder-1/> specifies the first file. If the option <placeholder-2/> is set, then the diff program is started with those two files. If <placeholder-3/> is omitted, then the diff is done between the file in <placeholder-4/> and its BASE. To explicitly set the revision numbers use <placeholder-5/> and <placeholder-6/>. If <placeholder-7/> is set and <placeholder-8/> is not set, then the diff is done by first blaming the files with the given revisions."
1216712152 msgstr "Požene zunanje orodje za razlikovanje, ki je navedeno v nastavitvah TortoiseSVN. <placeholder-1/> določa prvo datoteko. Če je možnost <placeholder-2/> nastavljena, se program zažene z navedenima datotekama. Če je možnost <placeholder-3/> izpuščena, potem se razlikovanje opravi med datoteko <placeholder-4/> in njeno osnovo (BASE). Za določitev številk revizij uporabite <placeholder-5/> in <placeholder-6/>. Če je nastavljena možnost <placeholder-7/> in možnost <placeholder-8/> ni nastavljena, potem se razlikovanje naredi tako, da se naprej okrivi obe datoteki glede na podani reviziji."
1216812153
1216912154 #. (para)
12170-#: ../source/TortoiseSVN_en.xml:14166
12155+#: ../source/TortoiseSVN_en.xml:14161
1217112156 msgid "Depending on the URLs and revisions to compare, this either shows a unified diff (if the option <option>unified</option> is set), a dialog with a list of files that have changed or if the URLs point to files starts the diff viewer for those two files."
1217212157 msgstr "Odvisno od naslovov URL in revizij, ki jih želite primerjati, se prikaže poenotena razlika (če je nastavljena možnost <option>unified</option>), seznam spremenjenih datotek ali (v primeru, da naslov URL kaže na datoteko) pregledovalnik sprememb za ti dve datoteki."
1217312158
1217412159 #. (para)
12175-#: ../source/TortoiseSVN_en.xml:14173
12160+#: ../source/TortoiseSVN_en.xml:14168
1217612161 msgid "The options <option>url1</option>, <option>url2</option>, <option>revision1</option> and <option>revision2</option> must be specified. The options <option>pegrevision</option>, <option>ignoreancestry</option>, <option>blame</option> and <option>unified</option> are optional."
1217712162 msgstr "Možnosti <option>url1</option>, <option>url2</option>, <option>revision1</option> in <option>revision2</option> so obvezne, možnosti <option>pegrevision</option>, <option>ignoreancestry</option>, <option>blame</option> in <option>unified</option> pa opcijske."
1217812163
1217912164 #. (entry)
12180-#: ../source/TortoiseSVN_en.xml:14184
12165+#: ../source/TortoiseSVN_en.xml:14179
1218112166 msgid "Starts the conflict editor specified in the TortoiseSVN settings with the correct files for the conflicted file in <placeholder-1/>."
1218212167 msgstr "Zažene urejevalnik sporov, ki je naveden v nastavitvah TortoiseSVN, s pravilnimi datotekami za sporno datoteko <placeholder-1/>."
1218312168
1218412169 #. (entry)
12185-#: ../source/TortoiseSVN_en.xml:14192
12170+#: ../source/TortoiseSVN_en.xml:14187
1218612171 msgid "Opens the relocate dialog. The <placeholder-1/> specifies the working copy path to relocate."
1218712172 msgstr "Odpre pogovorno okno za premestitev. <placeholder-1/> določa pot delovne kopije za premestitev."
1218812173
1218912174 #. (entry)
12190-#: ../source/TortoiseSVN_en.xml:14199
12175+#: ../source/TortoiseSVN_en.xml:14194
1219112176 msgid "Opens the help file."
1219212177 msgstr "Odpre datoteko pomoči."
1219312178
1219412179 #. (entry)
12195-#: ../source/TortoiseSVN_en.xml:14205
12180+#: ../source/TortoiseSVN_en.xml:14200
1219612181 msgid "Opens the check-for-modifications dialog. The <placeholder-1/> specifies the working copy directory."
1219712182 msgstr "Odpre pogovorno okno za preverjanje sprememb. <placeholder-1/> določa mapo delovne kopije."
1219812183
1219912184 #. (option)
1220012185 #. (option)
12201-#: ../source/TortoiseSVN_en.xml:14217
12202-#: ../source/TortoiseSVN_en.xml:14219
12186+#: ../source/TortoiseSVN_en.xml:14212
12187+#: ../source/TortoiseSVN_en.xml:14214
1220312188 msgid "/rev:xxx"
1220412189 msgstr "/rev:xxx"
1220512190
1220612191 #. (option)
12207-#: ../source/TortoiseSVN_en.xml:14222
12192+#: ../source/TortoiseSVN_en.xml:14217
1220812193 msgid "/projectpropertiespath:path/to/wc"
1220912194 msgstr "/projectpropertiespath:pot/do/delovne/kopije"
1221012195
1221112196 #. (entry)
12212-#: ../source/TortoiseSVN_en.xml:14212
12197+#: ../source/TortoiseSVN_en.xml:14207
1221312198 msgid "Starts the repository browser dialog, pointing to the URL of the working copy given in <placeholder-1/> or <placeholder-2/> points directly to an URL. An additional option <placeholder-3/> can be used to specify the revision which the repository browser should show. If the <placeholder-4/> is omitted, it defaults to HEAD. If <placeholder-5/> points to an URL, the <placeholder-6/> specifies the path from where to read and use the project properties."
1221412199 msgstr "Zažene skladiščni brskalnik, ki kaže na naslov URL delovne kopije, podane v <placeholder-1/> ali <placeholder-2/> kaže neposredno na naslov URL. Dodatna možnost <placeholder-3/> omogoča nastavitev revizije, ki naj jo skladiščni brskalnik prikaže. Če možnost <placeholder-4/> ni uporabljena, je privzeta nastavitev HEAD. Če <placeholder-5/> kaže na naslov URL, <placeholder-6/> določa pot, iz katere preberemo in uporabimo projektne lastnosti."
1221512200
1221612201 #. (literal)
12217-#: ../source/TortoiseSVN_en.xml:14230
12202+#: ../source/TortoiseSVN_en.xml:14225
1221812203 msgid "svn:ignore"
1221912204 msgstr "svn:ignore"
1222012205
1222112206 #. (entry)
12222-#: ../source/TortoiseSVN_en.xml:14228
12207+#: ../source/TortoiseSVN_en.xml:14223
1222312208 msgid "Adds all targets in <placeholder-1/> to the ignore list, i.e. adds the <placeholder-2/> property to those files."
1222412209 msgstr "Doda vse cilje v <placeholder-1/> na seznam prezrtih elementov, to pomeni, da datotekam doda lastnost <placeholder-2/>."
1222512210
1222612211 #. (para)
12227-#: ../source/TortoiseSVN_en.xml:14237
12212+#: ../source/TortoiseSVN_en.xml:14232
1222812213 msgid "Opens the blame dialog for the file specified in <option>/path</option>."
1222912214 msgstr "Odpre pogovorno okno Okrivi za datoteko, podano z opcijo <option>/path</option>."
1223012215
1223112216 #. (para)
12232-#: ../source/TortoiseSVN_en.xml:14241
12217+#: ../source/TortoiseSVN_en.xml:14236
1223312218 msgid "If the options <option>/startrev</option> and <option>/endrev</option> are set, then the dialog asking for the blame range is not shown but the revision values of those options are used instead."
1223412219 msgstr "Če sta nastavljevni možnosti <option>/startrev</option> in <option>/endrev</option>, se ne pojavi pogovorno okno za vnos območja revizij, ampak se uporabita navedeni vrednosti."
1223512220
1223612221 #. (para)
12237-#: ../source/TortoiseSVN_en.xml:14248
12222+#: ../source/TortoiseSVN_en.xml:14243
1223812223 msgid "If the option <option>/line:nnn</option> is set, TortoiseBlame will open with the specified line number showing."
1223912224 msgstr "Če je nastavljena opcija <option>/line:nnn</option>, se ob zagonu TortoiseBlame prikaže navedena vrstica."
1224012225
1224112226 #. (para)
12242-#: ../source/TortoiseSVN_en.xml:14253
12227+#: ../source/TortoiseSVN_en.xml:14248
1224312228 msgid "The options <option>/ignoreeol</option>, <option>/ignorespaces</option> and <option>/ignoreallspaces</option> are also supported."
1224412229 msgstr "Podprte so tudi možnosti <option>/ignoreeol</option>, <option>/ignorespaces</option> in <option>/ignoreallspaces</option>."
1224512230
1224612231 #. (option)
12247-#: ../source/TortoiseSVN_en.xml:14265
12232+#: ../source/TortoiseSVN_en.xml:14260
1224812233 msgid "/savepath:path"
1224912234 msgstr "/savepath:pot"
1225012235
1225112236 #. (option)
12252-#: ../source/TortoiseSVN_en.xml:14266
12237+#: ../source/TortoiseSVN_en.xml:14261
1225312238 msgid "/revision:xxx"
1225412239 msgstr "/revision:xxx"
1225512240
1225612241 #. (entry)
12257-#: ../source/TortoiseSVN_en.xml:14262
12242+#: ../source/TortoiseSVN_en.xml:14257
1225812243 msgid "Saves a file from an URL or working copy path given in <placeholder-1/> to the location given in <placeholder-2/>. The revision is given in <placeholder-3/>. This can be used to get a file with a specific revision."
1225912244 msgstr "Shrani datoteko z naslova URL ali delovne kopije, navedene v <placeholder-1/>, na lokacijo <placeholder-2/>. <placeholder-3/> predstavlja številko revizije. S tem lahko prevzamemo datoteko v določeni reviziji."
1226012245
1226112246 #. (entry)
12262-#: ../source/TortoiseSVN_en.xml:14272
12247+#: ../source/TortoiseSVN_en.xml:14267
1226312248 msgid "Creates a patch file for the path given in <placeholder-1/>."
1226412249 msgstr "Ustvari popravek za pot <placeholder-1/>."
1226512250
1226612251 #. (entry)
12267-#: ../source/TortoiseSVN_en.xml:14279
12252+#: ../source/TortoiseSVN_en.xml:14274
1226812253 msgid "Shows the revision graph for the path given in <placeholder-1/>."
1226912254 msgstr "Prikaže graf revizij za pot, podano v <placeholder-1/>."
1227012255
1227112256 #. (entry)
12272-#: ../source/TortoiseSVN_en.xml:14286
12257+#: ../source/TortoiseSVN_en.xml:14281
1227312258 msgid "Locks a file or all files in a directory given in <placeholder-1/>. The 'lock' dialog is shown so the user can enter a comment for the lock."
1227412259 msgstr "Zaklene datoteko ali vse datoteke v mapi, podani v <placeholder-1/>. Pogovorno okno za zaklepanje se pojavi, da lahko uporabnik vnese sporočilo zaklepanja."
1227512260
1227612261 #. (entry)
12277-#: ../source/TortoiseSVN_en.xml:14295
12262+#: ../source/TortoiseSVN_en.xml:14290
1227812263 msgid "Unlocks a file or all files in a directory given in <placeholder-1/>."
1227912264 msgstr "Odklene datoteko ali vse datoteke v mapi, podani v <placeholder-1/>."
1228012265
1228112266 #. (entry)
12282-#: ../source/TortoiseSVN_en.xml:14302
12267+#: ../source/TortoiseSVN_en.xml:14297
1228312268 msgid "Rebuilds the windows icon cache. Only use this in case the windows icons are corrupted. A side effect of this (which can't be avoided) is that the icons on the desktop get rearranged. To suppress the message box, pass <placeholder-1/>."
1228412269 msgstr "Ponovno zgradi predpomnilnik ikon sistema. Ta ukaz uporabite le v primeru, če se ikone na nek način poškodujejo. Neizogiben stranski učinek tega postopka je, da se ikone na namizju prerazporedijo po svoje. Če sporočila ne želite videti, podajte <placeholder-1/>."
1228512270
1228612271 #. (entry)
12287-#: ../source/TortoiseSVN_en.xml:14312
12272+#: ../source/TortoiseSVN_en.xml:14307
1228812273 msgid "Shows the properties dialog for the path given in <placeholder-1/>."
1228912274 msgstr "Za pot, podano v <placeholder-1/>, prikaže okno z lastnostmi."
1229012275
1229112276 #. (para)
12292-#: ../source/TortoiseSVN_en.xml:14321
12277+#: ../source/TortoiseSVN_en.xml:14316
1229312278 msgid ""
1229412279 "Examples (which should be entered on one line): <screen>\n"
1229512280 "TortoiseProc.exe /command:commit\n"
@@ -12314,64 +12299,64 @@
1231412299 "</screen>"
1231512300
1231612301 #. (title)
12317-#: ../source/TortoiseSVN_en.xml:14337
12302+#: ../source/TortoiseSVN_en.xml:14332
1231812303 msgid "TortoiseIDiff Commands"
1231912304 msgstr "Ukazi TortoiseIDiff"
1232012305
1232112306 #. (para)
12322-#: ../source/TortoiseSVN_en.xml:14344
12307+#: ../source/TortoiseSVN_en.xml:14339
1232312308 msgid "The image diff tool has a few command line options which you can use to control how the tool is started. The program is called <literal>TortoiseIDiff.exe</literal>."
1232412309 msgstr "Orodje za razlikovanje slik omogoča nekaj možnosti ukazne vrstice, s katerimi lahko določite, kako se orodje zažene. Program se imenuje <literal>TortoiseIDiff.exe</literal>."
1232512310
1232612311 #. (para)
12327-#: ../source/TortoiseSVN_en.xml:14349
12312+#: ../source/TortoiseSVN_en.xml:14344
1232812313 msgid "The table below lists all the options which can be passed to the image diff tool on the command line."
1232912314 msgstr "Spodnja tabela vsebuje seznam vseh možnosti, ki jih lahko v ukazni vrstici podate orodju za razlikovanje slik."
1233012315
1233112316 #. (title)
12332-#: ../source/TortoiseSVN_en.xml:14365
12317+#: ../source/TortoiseSVN_en.xml:14360
1233312318 msgid "List of available options"
1233412319 msgstr "Seznam možnosti"
1233512320
1233612321 #. (entry)
12337-#: ../source/TortoiseSVN_en.xml:14371
12322+#: ../source/TortoiseSVN_en.xml:14366
1233812323 msgid "Option"
1233912324 msgstr "Možnost"
1234012325
1234112326 #. (entry)
12342-#: ../source/TortoiseSVN_en.xml:14378
12327+#: ../source/TortoiseSVN_en.xml:14373
1234312328 msgid "Path to the file shown on the left."
1234412329 msgstr "Pot do datoteke, prikazane na levi."
1234512330
1234612331 #. (entry)
1234712332 #. (entry)
12348-#: ../source/TortoiseSVN_en.xml:14384
12349-#: ../source/TortoiseSVN_en.xml:14397
12333+#: ../source/TortoiseSVN_en.xml:14379
12334+#: ../source/TortoiseSVN_en.xml:14392
1235012335 msgid "A title string. This string is used in the image view title instead of the full path to the image file."
1235112336 msgstr "Naslov. Uporablja se pri prikazu slike namesto polne poti datoteke."
1235212337
1235312338 #. (entry)
12354-#: ../source/TortoiseSVN_en.xml:14391
12339+#: ../source/TortoiseSVN_en.xml:14386
1235512340 msgid "Path to the file shown on the right."
1235612341 msgstr "Pot do datoteke, prikazane na desni."
1235712342
1235812343 #. (entry)
12359-#: ../source/TortoiseSVN_en.xml:14404
12344+#: ../source/TortoiseSVN_en.xml:14399
1236012345 msgid "If specified, the image diff tool switches to the overlay mode (alpha blend)."
1236112346 msgstr "Če je parameter podan, orodje za razlikovanje slik uporablja prekrivni način (alpha blend)."
1236212347
1236312348 #. (entry)
12364-#: ../source/TortoiseSVN_en.xml:14411
12349+#: ../source/TortoiseSVN_en.xml:14406
1236512350 msgid "If specified, the image diff tool fits both images together."
1236612351 msgstr "Če je parameter podan, orodje za razlikovanje slik stlači sliki v okno."
1236712352
1236812353 #. (entry)
12369-#: ../source/TortoiseSVN_en.xml:14418
12354+#: ../source/TortoiseSVN_en.xml:14413
1237012355 msgid "Shows the image info box."
1237112356 msgstr "Pokaže okno z informacijami o sliki."
1237212357
1237312358 #. (para)
12374-#: ../source/TortoiseSVN_en.xml:14426
12359+#: ../source/TortoiseSVN_en.xml:14421
1237512360 msgid ""
1237612361 "Example (which should be entered on one line): <screen>\n"
1237712362 "TortoiseIDiff.exe /left:\"c:\\images\\img1.jpg\" /lefttitle:\"image 1\"\n"
@@ -12386,57 +12371,57 @@
1238612371 "</screen>"
1238712372
1238812373 #. (title)
12389-#: ../source/TortoiseSVN_en.xml:14438
12374+#: ../source/TortoiseSVN_en.xml:14433
1239012375 msgid "Command Line Interface Cross Reference"
1239112376 msgstr "Ustrezni ukazi v odjemalcu za ukazno vrstico"
1239212377
1239312378 #. (primary)
12394-#: ../source/TortoiseSVN_en.xml:14440
12379+#: ../source/TortoiseSVN_en.xml:14435
1239512380 msgid "command line client"
1239612381 msgstr "odjemalec za ukazno vrstico"
1239712382
1239812383 #. (primary)
12399-#: ../source/TortoiseSVN_en.xml:14443
12384+#: ../source/TortoiseSVN_en.xml:14438
1240012385 msgid "CLI"
1240112386 msgstr "CLI"
1240212387
1240312388 #. (para)
12404-#: ../source/TortoiseSVN_en.xml:14446
12389+#: ../source/TortoiseSVN_en.xml:14441
1240512390 msgid "Sometimes this manual refers you to the main Subversion documentation, which describes Subversion in terms of the Command Line Interface (CLI). To help you understand what TortoiseSVN is doing behind the scenes, we have compiled a list showing the equivalent CLI commands for each of TortoiseSVN's GUI operations."
1240612391 msgstr "Ta priročnik vas včasih pozove, da pogledate dokumentacijo sistema Subversion, ki opisuje sistem Subversion z vidika uporabe preko ukazne vrstice (Command Line Interface - CLI). Da bi lažje razumeli, kaj se dogaja v ozadju, je tu seznam ukazov TortoiseSVN in ekvivalentnih ukazov odjemalca za ukazno vrstico."
1240712392
1240812393 #. (para)
12409-#: ../source/TortoiseSVN_en.xml:14455
12394+#: ../source/TortoiseSVN_en.xml:14450
1241012395 msgid "Even though there are CLI equivalents to what TortoiseSVN does, remember that TortoiseSVN does <emphasis>not</emphasis> call the CLI but uses the Subversion library directly."
1241112396 msgstr "Čeprav za ukaze TortoiseSVN obstajajo ekvivalentni ukazi v ukazni vrstici, ne pozabite, da TortoiseSVN ukazne vrstice <emphasis>ne</emphasis> uporablja, ampak neposredno uporablja knjižnice sistema Subversion."
1241212397
1241312398 #. (para)
12414-#: ../source/TortoiseSVN_en.xml:14461
12399+#: ../source/TortoiseSVN_en.xml:14456
1241512400 msgid "If you think you have found a bug in TortoiseSVN, we may ask you to try to reproduce it using the CLI, so that we can distinguish TortoiseSVN issues from Subversion issues. This reference tells you which command to try."
1241612401 msgstr "Če mislite, da ste našli napako v programu TortoiseSVN, vas bomo mogoče prosili, da jo poskusite ponoviti z uporabo odjemalca ukazne vrstice za Subversion. S tem ločimo napake programa TortoiseSVN od napak programa Subversion. Ta razpredelnica vam pove, katere ukaze poskusite."
1241712402
1241812403 #. (title)
12419-#: ../source/TortoiseSVN_en.xml:14469
12404+#: ../source/TortoiseSVN_en.xml:14464
1242012405 msgid "Conventions and Basic Rules"
1242112406 msgstr "Konvencije in osnovna pravila"
1242212407
1242312408 #. (para)
12424-#: ../source/TortoiseSVN_en.xml:14470
12409+#: ../source/TortoiseSVN_en.xml:14465
1242512410 msgid "In the descriptions which follow, the URL for a repository location is shown simply as <literal>URL</literal>, and an example might be <systemitem class=\"url\">http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk</systemitem>. The working copy path is shown simply as <literal>PATH</literal>, and an example might be <filename>C:\\TortoiseSVN\\trunk</filename>."
1242612411 msgstr "V naslednjih opisih je naslov URL za lokacijo skladišča prikazan kot <literal>URL</literal>, n. pr. <systemitem class=\"url\">http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk</systemitem>. Delovno kopijo prikazujemo kot <literal>PATH</literal>, n. pr. <literal>C:\\TortoiseSVN\\trunk</literal>."
1242712412
1242812413 #. (para)
12429-#: ../source/TortoiseSVN_en.xml:14480
12414+#: ../source/TortoiseSVN_en.xml:14475
1243012415 msgid "Because TortoiseSVN is a Windows Shell Extension, it is not able to use the notion of a current working directory. All working copy paths must be given using the absolute path, not a relative path."
1243112416 msgstr "Ker je TortoiseSVN razširitev lupine Windows, ne more uporabljati trenutne mape. Vse poti delovne kopije morajo biti podane z absolutno in ne z relativno potjo."
1243212417
1243312418 #. (para)
12434-#: ../source/TortoiseSVN_en.xml:14487
12419+#: ../source/TortoiseSVN_en.xml:14482
1243512420 msgid "Certain items are optional, and these are often controlled by checkboxes or radio buttons in TortoiseSVN. These options are shown in [square brackets] in the command line definitions."
1243612421 msgstr "Določeni elementi so opcijski in se ponavadi v TortoiseSVN nastavijo preko potrditvenih polj ali radijskih gumbov. Te opcije so v definicijah ukazne vrstice prikazane v [oglatih oklepajih]."
1243712422
1243812423 #. (screen)
12439-#: ../source/TortoiseSVN_en.xml:14497
12424+#: ../source/TortoiseSVN_en.xml:14492
1244012425 #, no-wrap
1244112426 msgid ""
1244212427 "\n"
@@ -12446,24 +12431,24 @@
1244612431 "svn checkout [-N] [--ignore-externals] [-r rev] URL POT\n"
1244712432
1244812433 #. (para)
12449-#: ../source/TortoiseSVN_en.xml:14500
12434+#: ../source/TortoiseSVN_en.xml:14495
1245012435 msgid "If <guilabel>Only checkout the top folder</guilabel> is checked, use the <literal>-N</literal> switch."
1245112436 msgstr "Če je potrjena opcija <guilabel>Prevzemi vrhnjo mapo</guilabel>, uporabi stikalo <literal>-N</literal>."
1245212437
1245312438 #. (para)
1245412439 #. (para)
12455-#: ../source/TortoiseSVN_en.xml:14504
12456-#: ../source/TortoiseSVN_en.xml:14547
12440+#: ../source/TortoiseSVN_en.xml:14499
12441+#: ../source/TortoiseSVN_en.xml:14542
1245712442 msgid "If <guilabel>Omit externals</guilabel> is checked, use the <literal>--ignore-externals</literal> switch."
1245812443 msgstr "Če je potrjeno polje <guilabel>Izpusti zunanje</guilabel>, uporabi stikalo <literal>--ignore-externals</literal>."
1245912444
1246012445 #. (para)
12461-#: ../source/TortoiseSVN_en.xml:14508
12446+#: ../source/TortoiseSVN_en.xml:14503
1246212447 msgid "If you are checking out a specific revision, specify that after the URL using <literal>-r</literal> switch."
1246312448 msgstr "Če prevzemate določeno revizijo, pove to po navedbi naslova URL s stikalom <literal>-r</literal>."
1246412449
1246512450 #. (screen)
12466-#: ../source/TortoiseSVN_en.xml:14515
12451+#: ../source/TortoiseSVN_en.xml:14510
1246712452 #, no-wrap
1246812453 msgid ""
1246912454 "\n"
@@ -12475,27 +12460,27 @@
1247512460 "svn update [-r rev] POT\n"
1247612461
1247712462 #. (para)
12478-#: ../source/TortoiseSVN_en.xml:14519
12463+#: ../source/TortoiseSVN_en.xml:14514
1247912464 msgid "Updating multiple items is currently not an atomic operation in Subversion. So TortoiseSVN first finds the HEAD revision of the repository, and then updates all items to that particular revision number to avoid creating a mixed revision working copy."
1248012465 msgstr "Posodabljanje večjega števila elementov v sistemu Subversion ni atomična operacija. TortoiseSVN najprej najde revizijo HEAD v skladišču in potem posodobi vse elemente na to določeno številko revizije, da se izogne ustarjanju mešane delovne kopije."
1248112466
1248212467 #. (para)
12483-#: ../source/TortoiseSVN_en.xml:14526
12468+#: ../source/TortoiseSVN_en.xml:14521
1248412469 msgid "If only one item is selected for updating or the selected items are not all from the same repository, TortoiseSVN just updates to HEAD."
1248512470 msgstr "Če je za posodobitev izbran le en element ali če niso vsi izbrani elementi iz istega skladišča, TortoiseSVN posodobi na revizijo HEAD."
1248612471
1248712472 #. (para)
12488-#: ../source/TortoiseSVN_en.xml:14531
12473+#: ../source/TortoiseSVN_en.xml:14526
1248912474 msgid "No command line options are used here. <guilabel>Update to revision</guilabel> also implements the update command, but offers more options."
1249012475 msgstr "Tu se ne uporabljajo možnosti ukazne vrstice. <guilabel>Posodobi na revizijo</guilabel> prav tako izvede posodabljanje, a ponudi več možnosti."
1249112476
1249212477 #. (title)
12493-#: ../source/TortoiseSVN_en.xml:14538
12478+#: ../source/TortoiseSVN_en.xml:14533
1249412479 msgid "Update to Revision"
1249512480 msgstr "Posodobi na revizijo"
1249612481
1249712482 #. (screen)
12498-#: ../source/TortoiseSVN_en.xml:14539
12483+#: ../source/TortoiseSVN_en.xml:14534
1249912484 #, no-wrap
1250012485 msgid ""
1250112486 "\n"
@@ -12507,12 +12492,12 @@
1250712492 "svn update [-r rev] [-N] [--ignore-externals] POT\n"
1250812493
1250912494 #. (para)
12510-#: ../source/TortoiseSVN_en.xml:14543
12495+#: ../source/TortoiseSVN_en.xml:14538
1251112496 msgid "If <guilabel>Only update the top folder</guilabel> is checked, use the <literal>-N</literal> switch."
1251212497 msgstr "Če je potrjeno polje <guilabel>Posodobi le vrhnjo mapo</guilabel>, uporabi stikalo <literal>-N</literal>."
1251312498
1251412499 #. (para)
12515-#: ../source/TortoiseSVN_en.xml:14554
12500+#: ../source/TortoiseSVN_en.xml:14549
1251612501 msgid "In TortoiseSVN, the commit dialog uses several Subversion commands. The first stage is a status check which determines the items in your working copy which can potentially be committed. You can review the list, diff files against BASE and select the items you want to be included in the commit."
1251712502 msgstr "V programu TortoiseSVN pogovorno okno za objavo uporablja več ukazov sistema Subversion. Prvi ukaz je preverjanje stanja, ki v delovni kopiji najde elemente, ki so kandidati za objavo. Seznam lahko pregledate, pogledate spremembe datotek glede na revizijo BASE in izberete elemente, ki jih želite objaviti."
1251812503
@@ -12519,9 +12504,9 @@
1251912504 #. (screen)
1252012505 #. (screen)
1252112506 #. (screen)
12522-#: ../source/TortoiseSVN_en.xml:14561
12523-#: ../source/TortoiseSVN_en.xml:14723
12524-#: ../source/TortoiseSVN_en.xml:14751
12507+#: ../source/TortoiseSVN_en.xml:14556
12508+#: ../source/TortoiseSVN_en.xml:14718
12509+#: ../source/TortoiseSVN_en.xml:14746
1252512510 #, no-wrap
1252612511 msgid ""
1252712512 "\n"
@@ -12532,20 +12517,20 @@
1253212517
1253312518 #. (para)
1253412519 #. (para)
12535-#: ../source/TortoiseSVN_en.xml:14564
12536-#: ../source/TortoiseSVN_en.xml:14652
12520+#: ../source/TortoiseSVN_en.xml:14559
12521+#: ../source/TortoiseSVN_en.xml:14647
1253712522 msgid "If <guilabel>Show unversioned files</guilabel> is checked, TortoiseSVN will also show all unversioned files and folders in the working copy hierarchy, taking account of the ignore rules. This particular feature has no direct equivalent in Subversion, as the <literal>svn status</literal> command does not descend into unversioned folders."
1253812523 msgstr "Če je potrjena možnost <guilabel>Prikaži datoteke brez različic</guilabel>, bo TortoiseSVN prikazal vse datoteke in mape brez različic v hierarhiji delovne kopije, pri tem pa upošteval pravila za prezrte elemente. Ta zmožnost nima neposrednega ekvivalentnega ukaza v sistemu Subversion, ker se ukaz <literal>svn status</literal> ne ukvarja z datotekami brez različic."
1253912524
1254012525 #. (para)
12541-#: ../source/TortoiseSVN_en.xml:14572
12526+#: ../source/TortoiseSVN_en.xml:14567
1254212527 msgid "If you check any unversioned files and folders, those items will first be added to your working copy."
1254312528 msgstr "Če potrdite datoteke in mape brez različic, se le-te najprej dodajo v delovno kopijo."
1254412529
1254512530 #. (screen)
1254612531 #. (screen)
12547-#: ../source/TortoiseSVN_en.xml:14576
12548-#: ../source/TortoiseSVN_en.xml:14866
12532+#: ../source/TortoiseSVN_en.xml:14571
12533+#: ../source/TortoiseSVN_en.xml:14861
1254912534 #, no-wrap
1255012535 msgid ""
1255112536 "\n"
@@ -12555,12 +12540,12 @@
1255512540 "svn add POT...\n"
1255612541
1255712542 #. (para)
12558-#: ../source/TortoiseSVN_en.xml:14579
12543+#: ../source/TortoiseSVN_en.xml:14574
1255912544 msgid "When you click on OK, the Subversion commit takes place. If you have left all the file selection checkboxes in their default state, TortoiseSVN uses a single recursive commit of the working copy. If you deselect some files, then a non-recursive commit (<literal>-N</literal>) must be used, and every path must be specified individually on the commit command line."
1256012545 msgstr "Ko kliknete na gumb V redu, se spremembe objavijo. Če ste pustili vsa potrditvena polja za izbiro datotek v privzetem stanju, TortoiseSVN uporabi enojno rekurzivno objavo delovne kopije. Če nekatere datoteke izločite, mora uporabiti nerekurzivno objavo (<literal>-N</literal>). Vsaka pot mora biti posamično navedena v ukazni vrstici ob objavi."
1256112546
1256212547 #. (screen)
12563-#: ../source/TortoiseSVN_en.xml:14587
12548+#: ../source/TortoiseSVN_en.xml:14582
1256412549 #, no-wrap
1256512550 msgid ""
1256612551 "\n"
@@ -12572,19 +12557,19 @@
1257212557 #. (para)
1257312558 #. (para)
1257412559 #. (para)
12575-#: ../source/TortoiseSVN_en.xml:14590
12576-#: ../source/TortoiseSVN_en.xml:14796
12577-#: ../source/TortoiseSVN_en.xml:14879
12560+#: ../source/TortoiseSVN_en.xml:14585
12561+#: ../source/TortoiseSVN_en.xml:14791
12562+#: ../source/TortoiseSVN_en.xml:14874
1257812563 msgid "<literal>LogMessage</literal> here represents the contents of the log message edit box. This can be empty."
1257912564 msgstr "<literal>Sporočilo</literal> predstavlja vsebino vnosnega polja sporočila dnevniškega zapisa. Lahko je prazno."
1258012565
1258112566 #. (para)
12582-#: ../source/TortoiseSVN_en.xml:14594
12567+#: ../source/TortoiseSVN_en.xml:14589
1258312568 msgid "If <guilabel>Keep locks</guilabel> is checked, use the <literal>--no-unlock</literal> switch."
1258412569 msgstr "Če je potrjena možnost <guilabel>Ohrani zaklepe</guilabel>, uporabi stikalo <literal>--no-unlock</literal>."
1258512570
1258612571 #. (screen)
12587-#: ../source/TortoiseSVN_en.xml:14601
12572+#: ../source/TortoiseSVN_en.xml:14596
1258812573 #, no-wrap
1258912574 msgid ""
1259012575 "\n"
@@ -12594,17 +12579,17 @@
1259412579 "svn diff POT\n"
1259512580
1259612581 #. (para)
12597-#: ../source/TortoiseSVN_en.xml:14604
12582+#: ../source/TortoiseSVN_en.xml:14599
1259812583 msgid "If you use Diff from the main context menu, you are diffing a modified file against its BASE revision. The output from the CLI command above also does this and produces output in unified-diff format. However, this is not what TortoiseSVN is using. TortoiseSVN uses TortoiseMerge (or a diff program of your choosing) to display differences visually between full-text files, so there is no direct CLI equivalent."
1259912584 msgstr "Če uporabljate ukaz Razlikuj iz glavnega kontekstnega menija, gledate spremembe v primerjavi z revizijo BASE. To se zgodi tudi pri uporabi ukazne vrstice, izhod pa je podan v obliki poenotene razlike. Vendar za prikaz razlik med dvema datotekama TortoiseSVN ne uporablja te možnosti, ampak TortoiseMerge (ali kak drug program za razlikovanje, ki ste ga izbrali), torej ekvivalentnega ukaza za ukazno vrstico ni."
1260012585
1260112586 #. (para)
12602-#: ../source/TortoiseSVN_en.xml:14613
12587+#: ../source/TortoiseSVN_en.xml:14608
1260312588 msgid "You can also diff any 2 files using TortoiseSVN, whether or not they are version controlled. TortoiseSVN just feeds the two files into the chosen diff program and lets it work out where the differences lie."
1260412589 msgstr "S TortoiseSVN lahko razlikujete katerikoli dve datoteki, ne glede na to, ali sta pod nadzorom različic ali ne. TortoiseSVN enostavno pošlje datoteki v izbrani program za razlikovanje in mu prepusti, da vam pokaže razlike v datotekah."
1260512590
1260612591 #. (screen)
12607-#: ../source/TortoiseSVN_en.xml:14622
12592+#: ../source/TortoiseSVN_en.xml:14617
1260812593 #, no-wrap
1260912594 msgid ""
1261012595 "\n"
@@ -12618,17 +12603,17 @@
1261812603 "svn log -v -r M:N [--stop-on-copy] POT\n"
1261912604
1262012605 #. (para)
12621-#: ../source/TortoiseSVN_en.xml:14627
12606+#: ../source/TortoiseSVN_en.xml:14622
1262212607 msgid "By default, TortoiseSVN tries to fetch 100 log messages using the --limit method. If the settings instruct it to use old APIs, then the second form is used to fetch the log messages for 100 repository revisions."
1262312608 msgstr "Po privezetih nastavitvah TortoiseSVN poskuša pridobiti 100 dnevniških zapisov z uporabo parametra --limit. Če nastavitve zahtevajo uporabo starega aplikacijskega vmesnika, potem se za pridobivanje 100 revizij dnevniških zapisov iz skladišča uporablja druga oblika."
1262412609
1262512610 #. (para)
12626-#: ../source/TortoiseSVN_en.xml:14633
12611+#: ../source/TortoiseSVN_en.xml:14628
1262712612 msgid "If <guilabel>Stop on copy/rename</guilabel> is checked, use the <literal>--stop-on-copy</literal> switch."
1262812613 msgstr "Če je potrjeno polje <guilabel>Ustavi ob kopiranju/preimenovanju</guilabel>, uporabi stikalo <literal>--stop-on-copy</literal>."
1262912614
1263012615 #. (screen)
12631-#: ../source/TortoiseSVN_en.xml:14640
12616+#: ../source/TortoiseSVN_en.xml:14635
1263212617 #, no-wrap
1263312618 msgid ""
1263412619 "\n"
@@ -12642,22 +12627,22 @@
1264212627 "svn status -u -v POT\n"
1264312628
1264412629 #. (para)
12645-#: ../source/TortoiseSVN_en.xml:14645
12630+#: ../source/TortoiseSVN_en.xml:14640
1264612631 msgid "The initial status check looks only at your working copy. If you click on <guibutton>Check repository</guibutton> then the repository is also checked to see which files would be changed by an update, which requires the <literal>-u</literal> switch."
1264712632 msgstr "Najprej se stanje preveri le v delovni kopiji. Če pa kliknete na <guibutton>Preveri skladišče</guibutton>, potem se preveri tudi stanje v skladišču, da se izve, katere datoteke bi se spremenile v primeru posodobitve. To zahteva stikalo <literal>-u</literal>."
1264812633
1264912634 #. (title)
12650-#: ../source/TortoiseSVN_en.xml:14662
12635+#: ../source/TortoiseSVN_en.xml:14657
1265112636 msgid "Revision Graph"
1265212637 msgstr "Graf revizij"
1265312638
1265412639 #. (para)
12655-#: ../source/TortoiseSVN_en.xml:14663
12640+#: ../source/TortoiseSVN_en.xml:14658
1265612641 msgid "The revision graph is a feature of TortoiseSVN only. There's no equivalent in the command line client."
1265712642 msgstr "Graf revizij je zmožnost aplikacije TortoiseSVN. Ekvivalenten ukaz v ukazni vrstici ne obstaja."
1265812643
1265912644 #. (para)
12660-#: ../source/TortoiseSVN_en.xml:14667
12645+#: ../source/TortoiseSVN_en.xml:14662
1266112646 msgid ""
1266212647 "What TortoiseSVN does is an <screen>\n"
1266312648 "svn info URL_of_WC\n"
@@ -12670,12 +12655,12 @@
1267012655 "</screen>kjer je URL korenska pot skladišča, in potem analizira vrnjene podatke."
1267112656
1267212657 #. (title)
12673-#: ../source/TortoiseSVN_en.xml:14678
12658+#: ../source/TortoiseSVN_en.xml:14673
1267412659 msgid "Repo Browser"
1267512660 msgstr "Brskalnik po skladišču"
1267612661
1267712662 #. (screen)
12678-#: ../source/TortoiseSVN_en.xml:14679
12663+#: ../source/TortoiseSVN_en.xml:14674
1267912664 #, no-wrap
1268012665 msgid ""
1268112666 "\n"
@@ -12687,27 +12672,27 @@
1268712672 "svn list [-r rev] -v URL\n"
1268812673
1268912674 #. (para)
12690-#: ../source/TortoiseSVN_en.xml:14683
12675+#: ../source/TortoiseSVN_en.xml:14678
1269112676 msgid "You can use <literal>svn info</literal> to determine the repository root, which is the top level shown in the repository browser. You cannot navigate <literal>Up</literal> above this level. Also, this command returns all the locking information shown in the repository browser."
1269212677 msgstr "Da najdete korensko mapo skladišča, lahko uporabite ukaz <literal>svn info</literal>. Ta mapa se prikaže kot vrhnja mapa v brskalniku po skladišču. <literal>Višje</literal> od te mape ne morete. Ta ukaz vrne tudi vse informacije o zaklepih, ki se prav tako prikažejo v brskalniku po skladišču."
1269312678
1269412679 #. (para)
12695-#: ../source/TortoiseSVN_en.xml:14690
12680+#: ../source/TortoiseSVN_en.xml:14685
1269612681 msgid "The <literal>svn list</literal> call will list the contents of a directory, given a URL and revision."
1269712682 msgstr "Ukaz <literal>svn list</literal> s parametrom URL in številko revizije vrne vsebino mape."
1269812683
1269912684 #. (para)
12700-#: ../source/TortoiseSVN_en.xml:14697
12685+#: ../source/TortoiseSVN_en.xml:14692
1270112686 msgid "This command has no CLI equivalent. It invokes TortoiseMerge or an external 3-way diff/merge tool to look at the files involved in the conflict and sort out which lines to use."
1270212687 msgstr "Ekvivalenten ukaz za ukazno vrstico ne obstaja. Uporabi se orodje TortoiseMerge ali kakšen drug tristranski program za razlikovanje/spajanje, s pomočjo katerega se odločimo, kako bomo spore rešili."
1270312688
1270412689 #. (title)
12705-#: ../source/TortoiseSVN_en.xml:14704
12690+#: ../source/TortoiseSVN_en.xml:14699
1270612691 msgid "Resolved"
1270712692 msgstr "Rešeno"
1270812693
1270912694 #. (screen)
12710-#: ../source/TortoiseSVN_en.xml:14705
12695+#: ../source/TortoiseSVN_en.xml:14700
1271112696 #, no-wrap
1271212697 msgid ""
1271312698 "\n"
@@ -12717,7 +12702,7 @@
1271712702 "svn resolved POT\n"
1271812703
1271912704 #. (screen)
12720-#: ../source/TortoiseSVN_en.xml:14711
12705+#: ../source/TortoiseSVN_en.xml:14706
1272112706 #, no-wrap
1272212707 msgid ""
1272312708 "\n"
@@ -12727,7 +12712,7 @@
1272712712 "svn rename TRENUTNA_POT NOVA_POT\n"
1272812713
1272912714 #. (screen)
12730-#: ../source/TortoiseSVN_en.xml:14717
12715+#: ../source/TortoiseSVN_en.xml:14712
1273112716 #, no-wrap
1273212717 msgid ""
1273312718 "\n"
@@ -12737,17 +12722,17 @@
1273712722 "svn delete POT\n"
1273812723
1273912724 #. (para)
12740-#: ../source/TortoiseSVN_en.xml:14726
12725+#: ../source/TortoiseSVN_en.xml:14721
1274112726 msgid "The first stage is a status check which determines the items in your working copy which can potentially be reverted. You can review the list, diff files against BASE and select the items you want to be included in the revert."
1274212727 msgstr "Prva faza predstavlja preverjanje stanja, s čemer ugotovimo, katere elemente v delovni kopiji je mogoče povrniti. Seznam lahko pregledate, pogledate razlike v primerjavi z revizijo BASE in izberete elemente, ki jih želite povrniti."
1274312728
1274412729 #. (para)
12745-#: ../source/TortoiseSVN_en.xml:14732
12730+#: ../source/TortoiseSVN_en.xml:14727
1274612731 msgid "When you click on OK, the Subversion revert takes place. If you have left all the file selection checkboxes in their default state, TortoiseSVN uses a single recursive (<literal>-R</literal>) revert of the working copy. If you deselect some files, then every path must be specified individually on the revert command line."
1274712732 msgstr "Ko kliknete na gumb V redu, se zgodi povrnitev. Če izbire niste spreminjali, uporabi TortoiseSVN eno samo rekurzivno (<literal>-R</literal>) povrnitev delovne kopije. Če ste izklopili nekatere datoteke, potem mora pri uporabi ukaza v ukazni vrstici podati vsako pot posebej. "
1274812733
1274912734 #. (screen)
12750-#: ../source/TortoiseSVN_en.xml:14739
12735+#: ../source/TortoiseSVN_en.xml:14734
1275112736 #, no-wrap
1275212737 msgid ""
1275312738 "\n"
@@ -12757,7 +12742,7 @@
1275712742 "svn revert [-R] POT...\n"
1275812743
1275912744 #. (screen)
12760-#: ../source/TortoiseSVN_en.xml:14745
12745+#: ../source/TortoiseSVN_en.xml:14740
1276112746 #, no-wrap
1276212747 msgid ""
1276312748 "\n"
@@ -12767,17 +12752,17 @@
1276712752 "svn cleanup POT\n"
1276812753
1276912754 #. (title)
12770-#: ../source/TortoiseSVN_en.xml:14750
12755+#: ../source/TortoiseSVN_en.xml:14745
1277112756 msgid "Get Lock"
1277212757 msgstr "Dobi zaklep"
1277312758
1277412759 #. (para)
12775-#: ../source/TortoiseSVN_en.xml:14754
12760+#: ../source/TortoiseSVN_en.xml:14749
1277612761 msgid "The first stage is a status check which determines the files in your working copy which can potentially be locked. You can select the items you want to be locked."
1277712762 msgstr "Prva faza je preverjanje stanja, ki ugotovi, katere datoteke v delovni kopiji lahko zaklenete. Nato izberete datoteke, ki jih želite zakleniti."
1277812763
1277912764 #. (screen)
12780-#: ../source/TortoiseSVN_en.xml:14759
12765+#: ../source/TortoiseSVN_en.xml:14754
1278112766 #, no-wrap
1278212767 msgid ""
1278312768 "\n"
@@ -12787,22 +12772,22 @@
1278712772 "svn lock -m \"Sporočilo\" [--force] POT...\n"
1278812773
1278912774 #. (para)
12790-#: ../source/TortoiseSVN_en.xml:14762
12775+#: ../source/TortoiseSVN_en.xml:14757
1279112776 msgid "<literal>LockMessage</literal> here represents the contents of the lock message edit box. This can be empty."
1279212777 msgstr "<literal>Sporočilo</literal> predstavlja vsebina sporočila zaklepa. Lahko je prazno."
1279312778
1279412779 #. (para)
12795-#: ../source/TortoiseSVN_en.xml:14766
12780+#: ../source/TortoiseSVN_en.xml:14761
1279612781 msgid "If <guilabel>Steal the locks</guilabel> is checked, use the <literal>--force</literal> switch."
1279712782 msgstr "Če je potrjeno polje <guilabel>Ukradi zaklep</guilabel>, uporabi stikalo <literal>--force</literal>."
1279812783
1279912784 #. (title)
12800-#: ../source/TortoiseSVN_en.xml:14772
12785+#: ../source/TortoiseSVN_en.xml:14767
1280112786 msgid "Release Lock"
1280212787 msgstr "Odstrani zaklep"
1280312788
1280412789 #. (screen)
12805-#: ../source/TortoiseSVN_en.xml:14773
12790+#: ../source/TortoiseSVN_en.xml:14768
1280612791 #, no-wrap
1280712792 msgid ""
1280812793 "\n"
@@ -12812,7 +12797,7 @@
1281212797 "svn unlock POT\n"
1281312798
1281412799 #. (screen)
12815-#: ../source/TortoiseSVN_en.xml:14779
12800+#: ../source/TortoiseSVN_en.xml:14774
1281612801 #, no-wrap
1281712802 msgid ""
1281812803 "\n"
@@ -12830,17 +12815,17 @@
1283012815 "svn copy -m \"Sporočilo\" POT URL\n"
1283112816
1283212817 #. (listitem)
12833-#: ../source/TortoiseSVN_en.xml:14791
12818+#: ../source/TortoiseSVN_en.xml:14786
1283412819 msgid "Specific revision in repository"
1283512820 msgstr "Določena revizija v skladišču"
1283612821
1283712822 #. (para)
12838-#: ../source/TortoiseSVN_en.xml:14786
12823+#: ../source/TortoiseSVN_en.xml:14781
1283912824 msgid "The Branch/Tag dialog performs a copy to the repository. There are 3 radio button options: <placeholder-1/> which correspond to the 3 command line variants above."
1284012825 msgstr "Okno Veja/Oznaka izdela kopijo skladišča. Na voljo so trije radijski gumbi: <placeholder-1/> Ti ustrezajo trem opisanim variacijam ukazne vrstice. "
1284112826
1284212827 #. (screen)
12843-#: ../source/TortoiseSVN_en.xml:14803
12828+#: ../source/TortoiseSVN_en.xml:14798
1284412829 #, no-wrap
1284512830 msgid ""
1284612831 "\n"
@@ -12852,7 +12837,7 @@
1285212837 "svn switch [-r rev] URL POT\n"
1285312838
1285412839 #. (screen)
12855-#: ../source/TortoiseSVN_en.xml:14810
12840+#: ../source/TortoiseSVN_en.xml:14805
1285612841 #, no-wrap
1285712842 msgid ""
1285812843 "\n"
@@ -12862,12 +12847,12 @@
1286212847 "svn merge [--dry-run] --force Iz_URL@revN V_URL@revM POT\n"
1286312848
1286412849 #. (para)
12865-#: ../source/TortoiseSVN_en.xml:14813
12850+#: ../source/TortoiseSVN_en.xml:14808
1286612851 msgid "The <guibutton>Dry run</guibutton> performs the same merge with the <literal>--dry-run</literal> switch."
1286712852 msgstr "<guibutton>Izvedi poskusno</guibutton> izvede enako spajanje z uporabo stikala <literal>--dry-run</literal>."
1286812853
1286912854 #. (screen)
12870-#: ../source/TortoiseSVN_en.xml:14817
12855+#: ../source/TortoiseSVN_en.xml:14812
1287112856 #, no-wrap
1287212857 msgid ""
1287312858 "\n"
@@ -12877,12 +12862,12 @@
1287712862 "svn diff Iz_URL@revN V_URL@revM\n"
1287812863
1287912864 #. (para)
12880-#: ../source/TortoiseSVN_en.xml:14820
12865+#: ../source/TortoiseSVN_en.xml:14815
1288112866 msgid "The <guibutton>Unified diff</guibutton> shows the diff operation which will be used to do the merge."
1288212867 msgstr "Gumb <guibutton>Poenotena različica</guibutton> pokaže operacijo razlikovanja, ki bo uporabljena za spajanje."
1288312868
1288412869 #. (screen)
12885-#: ../source/TortoiseSVN_en.xml:14827
12870+#: ../source/TortoiseSVN_en.xml:14822
1288612871 #, no-wrap
1288712872 msgid ""
1288812873 "\n"
@@ -12892,27 +12877,27 @@
1289212877 "svn export [-r rev] [--ignore-externals] URL POT_za_izboz\n"
1289312878
1289412879 #. (para)
12895-#: ../source/TortoiseSVN_en.xml:14830
12880+#: ../source/TortoiseSVN_en.xml:14825
1289612881 msgid "This form is used when accessed from an unversioned folder, and the folder is used as the destination."
1289712882 msgstr "Ta oblika se uporablja v mapi brez različic, kadar je ta mapa tudi ciljna mapa."
1289812883
1289912884 #. (para)
12900-#: ../source/TortoiseSVN_en.xml:14834
12885+#: ../source/TortoiseSVN_en.xml:14829
1290112886 msgid "Exporting a working copy to a different location is done without using the Subversion library, so there's no matching command line equivalent."
1290212887 msgstr "Izvoz delovne kopije na drugo lokacijo se ne izvede s pomočjo knjižnice Subversion, zato ekvivalentnega ukaza ni."
1290312888
1290412889 #. (para)
12905-#: ../source/TortoiseSVN_en.xml:14839
12890+#: ../source/TortoiseSVN_en.xml:14834
1290612891 msgid "What TortoiseSVN does is to copy all files to the new location while showing you the progress of the operation. Unversioned files/folders can optionally be exported too."
1290712892 msgstr "TortoiseSVN prekopira vse datoteke na novo lokacijo, hkrati pa prikazuje napredek operacije. Nastavite lahko, da se izvozijo tudi datoteke/mape brez različic."
1290812893
1290912894 #. (para)
12910-#: ../source/TortoiseSVN_en.xml:14844
12895+#: ../source/TortoiseSVN_en.xml:14839
1291112896 msgid "In both cases, if <guilabel>Omit externals</guilabel> is checked, use the <literal>--ignore-externals</literal> switch."
1291212897 msgstr "Če je potrjeno potrditveno polje <guilabel>Izpusti zunanje</guilabel>, v obeh primerih uporabi stikalo <literal>--ignore-externals</literal>."
1291312898
1291412899 #. (screen)
12915-#: ../source/TortoiseSVN_en.xml:14852
12900+#: ../source/TortoiseSVN_en.xml:14847
1291612901 #, no-wrap
1291712902 msgid ""
1291812903 "\n"
@@ -12922,12 +12907,12 @@
1292212907 "svn switch --relocate Iz_URL V_URL\n"
1292312908
1292412909 #. (title)
12925-#: ../source/TortoiseSVN_en.xml:14857
12910+#: ../source/TortoiseSVN_en.xml:14852
1292612911 msgid "Create Repository Here"
1292712912 msgstr "Tu ustvari skladišče"
1292812913
1292912914 #. (screen)
12930-#: ../source/TortoiseSVN_en.xml:14858
12915+#: ../source/TortoiseSVN_en.xml:14853
1293112916 #, no-wrap
1293212917 msgid ""
1293312918 "\n"
@@ -12941,12 +12926,12 @@
1294112926 "svnadmin create --fs-type bdb POT\n"
1294212927
1294312928 #. (para)
12944-#: ../source/TortoiseSVN_en.xml:14869
12929+#: ../source/TortoiseSVN_en.xml:14864
1294512930 msgid "If you selected a folder, TortoiseSVN first scans it recursively for items which can be added."
1294612931 msgstr "Če izberete mapo, jo TortoiseSVN najprej rekurzivno pregleda, da najde elemente, ki jih je možno dodati."
1294712932
1294812933 #. (screen)
12949-#: ../source/TortoiseSVN_en.xml:14876
12934+#: ../source/TortoiseSVN_en.xml:14871
1295012935 #, no-wrap
1295112936 msgid ""
1295212937 "\n"
@@ -12956,7 +12941,7 @@
1295612941 "svn import -m Sporočilo POT URL\n"
1295712942
1295812943 #. (screen)
12959-#: ../source/TortoiseSVN_en.xml:14886
12944+#: ../source/TortoiseSVN_en.xml:14881
1296012945 #, no-wrap
1296112946 msgid ""
1296212947 "\n"
@@ -12968,17 +12953,17 @@
1296812953 "svn log -r N:M POT\n"
1296912954
1297012955 #. (para)
12971-#: ../source/TortoiseSVN_en.xml:14890
12956+#: ../source/TortoiseSVN_en.xml:14885
1297212957 msgid "If you use TortoiseBlame to view the blame info, the file log is also required to show log messages in a tooltip. If you view blame as a text file, this information is not required."
1297312958 msgstr "Če za pregled krivdnih informacij uporabljate TortoiseBlame, potem potrebujete tudi informacije o dnevniških zapisih datoteke, ki se prikažejo kot namig. Če krivdne informacije pregledujete v obliki besedilne datoteke, to ni potrebno."
1297412959
1297512960 #. (title)
12976-#: ../source/TortoiseSVN_en.xml:14898
12961+#: ../source/TortoiseSVN_en.xml:14893
1297712962 msgid "Add to Ignore List"
1297812963 msgstr "Dodaj na seznam prezrtih"
1297912964
1298012965 #. (screen)
12981-#: ../source/TortoiseSVN_en.xml:14899
12966+#: ../source/TortoiseSVN_en.xml:14894
1298212967 #, no-wrap
1298312968 msgid ""
1298412969 "\n"
@@ -12992,12 +12977,12 @@
1299212977 "svn propset svn:ignore -F začasnadatoteka POT\n"
1299312978
1299412979 #. (para)
12995-#: ../source/TortoiseSVN_en.xml:14904
12980+#: ../source/TortoiseSVN_en.xml:14899
1299612981 msgid "Because the <literal>svn:ignore</literal> property is often a multi-line value, it is shown here as being changed via a text file rather than directly on the command line."
1299712982 msgstr "Ker lastnost <literal>svn:ignore</literal> pogosto obsega več vrstic, tukaj prikazujemo, kako jo spreminjamo preko besedilne datoteke namesto neposredno v ukazni vrstici."
1299812983
1299912984 #. (screen)
13000-#: ../source/TortoiseSVN_en.xml:14912
12985+#: ../source/TortoiseSVN_en.xml:14907
1300112986 #, no-wrap
1300212987 msgid ""
1300312988 "\n"
@@ -13007,157 +12992,157 @@
1300712992 "svn diff POT &gt; datotekapopravkov\n"
1300812993
1300912994 #. (para)
13010-#: ../source/TortoiseSVN_en.xml:14915
12995+#: ../source/TortoiseSVN_en.xml:14910
1301112996 msgid "TortoiseSVN creates a patch file in unified diff format by comparing the working copy with its BASE version."
1301212997 msgstr "TortoiseSVN ustvari datoteko popravkov v obliki poenotene razlike s primerjanjem delovne kopije in verzije BASE."
1301312998
1301412999 #. (para)
13015-#: ../source/TortoiseSVN_en.xml:14922
13000+#: ../source/TortoiseSVN_en.xml:14917
1301613001 msgid "Applying patches is a tricky business unless the patch and working copy are at the same revision. Luckily for you, you can use TortoiseMerge, which has no direct equivalent in Subversion."
1301713002 msgstr "Nameščanje datotek popravkov je zahtevno opravilo, razen če imata datoteka popravkov in delovna kopija isto številko revizije. Na srečo lahko uporabite orodje TortoiseMerge, ki nima ekvivalentnega orodja v sistemu Subversion."
1301813003
1301913004 #. (title)
13020-#: ../source/TortoiseSVN_en.xml:14936
13005+#: ../source/TortoiseSVN_en.xml:14931
1302113006 msgid "Implementation Details"
1302213007 msgstr "Podrobnosti o izvedbi"
1302313008
1302413009 #. (para)
13025-#: ../source/TortoiseSVN_en.xml:14938
13010+#: ../source/TortoiseSVN_en.xml:14933
1302613011 msgid "This appendix contains a more detailed discussion of the implementation of some of TortoiseSVN's features."
1302713012 msgstr "Ta dodatek vsebuje podrobno razlago izvedbe nekaterih zmožnosti programa TortoiseSVN."
1302813013
1302913014 #. (primary)
13030-#: ../source/TortoiseSVN_en.xml:14946
13015+#: ../source/TortoiseSVN_en.xml:14941
1303113016 msgid "overlay priority"
1303213017 msgstr "prioriteta prekrivnih ikon"
1303313018
1303413019 #. (para)
13035-#: ../source/TortoiseSVN_en.xml:14951
13020+#: ../source/TortoiseSVN_en.xml:14946
1303613021 msgid "Every file and folder has a Subversion status value as reported by the Subversion library. In the command line client, these are represented by single letter codes, but in TortoiseSVN they are shown graphically using the icon overlays. Because the number of overlays is very limited, each overlay may represent one of several status values."
1303713022 msgstr "Vsaka datoteka in mapa pod nadzorom ima v sistemu Subversion stanje, ki ga sporoči knjižnica Subversion. V odjemalcu za ukazno vrstico je status prikazan z črko, v programu TortoiseSVN pa je prikazan grafično s prekrivnimi ikonami. Ker je število prekrivnih ikon zelo omejeno, lahko vsaka ikona predstavlja več vrednosti stanja."
1303813023
1303913024 #. (para)
13040-#: ../source/TortoiseSVN_en.xml:14959
13025+#: ../source/TortoiseSVN_en.xml:14954
1304113026 msgid "<graphic fileref=\"images/ConflictIcon.png\"/> The <emphasis>Conflicted</emphasis> overlay is used to represent the <literal>conflicted</literal> state, where an update or switch results in conflicts between local changes and changes downloaded from the repository. It is also used to indicate the <literal>obstructed</literal> state, which can occur when an operation is unable to complete."
1304213027 msgstr "<graphic fileref=\"images/ConflictIcon.png\"/> Prekrivna ikona za <emphasis>spor</emphasis> se uporablja za prikaz <literal>spornega stanja</literal>. Pri posodobitvi ali preklopu se pri spajanju krajevnih sprememb in sprememb iz skladišča pojavijo spori. Uporablja se tudi za prikaz <literal>oviranega</literal> stanja, ki se pojavi, ko operacije ni mogoče zaključiti."
1304313028
1304413029 #. (para)
13045-#: ../source/TortoiseSVN_en.xml:14968
13030+#: ../source/TortoiseSVN_en.xml:14963
1304613031 msgid "<graphic fileref=\"images/ModifiedIcon.png\"/> The <emphasis>Modified</emphasis> overlay represents the <literal>modified</literal> state, where you have made local modifications, the <literal>merged</literal> state, where changes from the repository have been merged with local changes, and the <literal>replaced</literal> state, where a file has been deleted and replaced by another different file with the same name."
1304713032 msgstr "<graphic fileref=\"images/ModifiedIcon.png\"/> Prekrivna ikona <emphasis>spremenjeno</emphasis> predstavlja <literal>spremenjeno</literal> stanje pri krajevnih spremembah, <literal>spojeno</literal> stanje, ko so bile spremembe iz skladišča spojene s krajevnimi spremembami in <literal>zamenjano</literal> stanje, ko je bila datoteka izbrisana in nadomeščena z drugo datoteko z istim imenom."
1304813033
1304913034 #. (para)
13050-#: ../source/TortoiseSVN_en.xml:14978
13035+#: ../source/TortoiseSVN_en.xml:14973
1305113036 msgid "<graphic fileref=\"images/DeletedIcon.png\"/> The <emphasis>Deleted</emphasis> overlay represents the <literal>deleted</literal> state, where an item is scheduled for deletion, or the <literal>missing</literal> state, where an item is not present. Naturally an item which is missing cannot have an overlay itself, but the parent folder can be marked if one of its child items is missing."
1305213037 msgstr "<graphic fileref=\"images/DeletedIcon.png\"/> Prekrivna ikona <emphasis>izbrisano</emphasis> predstavlja <literal>izbrisano</literal> stanje, kjer je element označen za brisanje ali stanje <literal>manjkajoče</literal>, ko elementa ni v delovni kopiji. Seveda element, ki ne obstaja, ne more imeti prekrivne ikone, zato je ikona za manjkajoč element pripeta na nadrejeno mapo."
1305313038
1305413039 #. (para)
13055-#: ../source/TortoiseSVN_en.xml:14987
13040+#: ../source/TortoiseSVN_en.xml:14982
1305613041 msgid "<graphic fileref=\"images/AddedIcon.png\"/> The <emphasis>Added</emphasis> overlay is simply used to represent the <literal>added</literal> status when an item has been added to version control."
1305713042 msgstr "<graphic fileref=\"images/AddedIcon.png\"/> Prekrivna ikona <emphasis>dodano</emphasis> predstavlja <literal>dodano</literal> stanje, ko je element dodan sistemu za nadzor različic."
1305813043
1305913044 #. (para)
13060-#: ../source/TortoiseSVN_en.xml:14993
13045+#: ../source/TortoiseSVN_en.xml:14988
1306113046 msgid "<graphic fileref=\"images/InSubVersionIcon.png\"/> The <emphasis>In Subversion</emphasis> overlay is used to represent an item which is in the <literal>normal</literal> state, or a versioned item whose state is not yet known. Because TortoiseSVN uses a background caching process to gather status, it may take a few seconds before the overlay updates."
1306213047 msgstr "<graphic fileref=\"images/InSubVersionIcon.png\"/> Prekrivna ikona <emphasis>V sistemu Subversion</emphasis> predstavlja <literal>običajno</literal> stanje ali element pod nadzorom, katerega stanje še ni znano. Ker TortoiseSVN uporablja poseben proces za predpomnenje stanja, lahko traja nekaj sekund, preden se prekrivna ikona posodobi."
1306313048
1306413049 #. (para)
13065-#: ../source/TortoiseSVN_en.xml:15002
13050+#: ../source/TortoiseSVN_en.xml:14997
1306613051 msgid "<graphic fileref=\"images/ReadOnlyIcon.png\"/> The <emphasis>Needs Lock</emphasis> overlay is used to indicate when a file has the <literal>svn:needs-lock</literal> property set. For working copies which were created using Subversion 1.4.0 and later, the <literal>svn:needs-lock</literal> status is cached locally by Subversion and this is used to determine when to show this overlay. For working copies which are in pre-1.4.x format, TortoiseSVN shows this overlay when the file has read-only status. Note that Subversion automatically upgrades working copies when you update them, although the caching of the <literal>svn:needs-lock</literal> property may not happen until the file itself is updated."
1306713052 msgstr "<graphic fileref=\"images/ReadOnlyIcon.png\"/> Prekrivna ikona <emphasis>Potrebuje zaklep</emphasis> se uporablja za datoteke, ki imajo nastavljeno lastnost <literal>svn:needs-lock</literal>. Za delovne kopije, ustvarjene z različico Subversion 1.4.0 ali novejšo, je stanje <literal>svn:needs-lock</literal> predpomnjeno krajevno in se uporablja tudi za prikaz prekrivne ikone. Za delovne kopije, ustvarjene z različico 1.4.x ali starejšo TortoiseSVN prikaže to ikono v primeru datoteke, ki je namenjena samo za branje. Upoštevajte, da Subversion samodejno nadgradi delovne kopije, ko jih posodobite. Predpomnenje lastnosti <literal>svn:needs-lock</literal> se morda ne bo zgodilo, dokler ne boste posodobili datoteke."
1306813053
1306913054 #. (para)
13070-#: ../source/TortoiseSVN_en.xml:15016
13055+#: ../source/TortoiseSVN_en.xml:15011
1307113056 msgid "<graphic fileref=\"images/LockedIcon.png\"/> The <emphasis>Locked</emphasis> overlay is used when the local working copy holds a lock for that file."
1307213057 msgstr "<graphic fileref=\"images/LockedIcon.png\"/> Prekrivna ikona <emphasis>zaklenjeno</emphasis> se uporablja, kadar je delovna kopija lastnica zaklepa za datoteko."
1307313058
1307413059 #. (para)
13075-#: ../source/TortoiseSVN_en.xml:15021
13060+#: ../source/TortoiseSVN_en.xml:15016
1307613061 msgid "<graphic fileref=\"images/IgnoredIcon.png\"/> The <emphasis>Ignored</emphasis> overlay is used to represent an item which is in the <literal>ignored</literal> state, either due to a global ignore pattern, or the <literal>svn:ignore</literal> property of the parent folder. This overlay is optional."
1307713062 msgstr "<graphic fileref=\"images/IgnoredIcon.png\"/> Ikona za <emphasis>prezrte</emphasis> elemente se uporablja za elemente, ki so <literal>prezrti</literal> zaradi splošnega vzorca prezrtih elementov ali zaradi nastavljene lastnosti <literal>svn:ignore</literal> na nadrejeni mapi. Prikaz je možno izključiti."
1307813063
1307913064 #. (para)
13080-#: ../source/TortoiseSVN_en.xml:15029
13065+#: ../source/TortoiseSVN_en.xml:15024
1308113066 msgid "<graphic fileref=\"images/UnversionedIcon.png\"/> The <emphasis>Unversioned</emphasis> overlay is used to represent an item which is in the <literal>unversioned</literal> state. This is an item in a versioned folder, but which is not under version control itself. This overlay is optional."
1308213067 msgstr "<graphic fileref=\"images/UnversionedIcon.png\"/> Ta ikona se uporablja za elemente <literal>brez različic</literal>. To so elementi, ki se nahajajo znotraj mape pod nadzorom, sami pa niso pod nadzorom. Prikaz te ikone je možno izključiti."
1308313068
1308413069 #. (para)
13085-#: ../source/TortoiseSVN_en.xml:15037
13070+#: ../source/TortoiseSVN_en.xml:15032
1308613071 msgid "If an item has subversion status <literal>none</literal> (the item is not within a working copy) then no overlay is shown. If you have chosen to disable the <emphasis>Ignored</emphasis> and <emphasis>Unversioned</emphasis> overlays then no overlay will be shown for those files either."
1308713072 msgstr "Če je stanje elementa <literal>brez stanja</literal> (element se ne nahaja v delovni kopiji), prekrivna ikona ni prikazana. Če ste izključili prikaz prekrivnih ikon za <emphasis>prezrte</emphasis> elemente in elemente <emphasis>brez različic</emphasis>, potem prekrivne ikone ne bodo prikazane tudi za te elemente."
1308813073
1308913074 #. (para)
13090-#: ../source/TortoiseSVN_en.xml:15044
13075+#: ../source/TortoiseSVN_en.xml:15039
1309113076 msgid "An item can only have one Subversion status value. For example a file could be locally modified and it could be marked for deletion at the same time. Subversion returns a single status value - in this case <literal>deleted</literal>. Those priorities are defined within Subversion itself."
1309213077 msgstr "Element ima lahko le eno stanje sistema Subversion. Primer: datoteka je krajevno spremenjena in hkrati označena za brisanje. Subversion vrne eno samo stanje - v tem primeru <literal>izbrisano</literal>. Prioritete stanj definira Subversion."
1309313078
1309413079 #. (para)
13095-#: ../source/TortoiseSVN_en.xml:15051
13080+#: ../source/TortoiseSVN_en.xml:15046
1309613081 msgid "When TortoiseSVN displays the status recursively (the default setting), each folder displays an overlay reflecting its own status and the status of all its children. In order to display a single <emphasis>summary</emphasis> overlay, we use the priority order shown above to determine which overlay to use, with the <emphasis>Conflicted</emphasis> overlay taking highest priority."
1309713082 msgstr "Kadar TortoiseSVN prikazuje stanje rekurzivno (privzeta nastavitev), vsaka mapa prikazuje svoje stanje in stanje vseh svojih elementov. Da prikažemo le eno vrednost stanja - prekrivno ikono za <emphasis>povzetek</emphasis> - uporabljamo prioritetni red, ki je prikazan zgoraj. Najvišo prioriteto ima stanje <emphasis>sporno</emphasis>."
1309813083
1309913084 #. (para)
13100-#: ../source/TortoiseSVN_en.xml:15060
13085+#: ../source/TortoiseSVN_en.xml:15055
1310113086 msgid "In fact, you may find that not all of these icons are used on your system. This is because the number of overlays allowed by Windows is limited to 15. Windows uses 4 of those, and the remaining 11 can be used by other applications. If there are not enough overlay slots available, TortoiseSVN tries to be a <quote>Good Citizen (TM)</quote> and limits its use of overlays to give other apps a chance."
1310213087 msgstr "Lahko pa ugotovite, da omenjene ikone niso vse na voljo na vašem sistemu. Razlog je v omejitvi sistema Windows, ki omogoča le petnajst prekrivnih ikon. Štiri uporablja operacijski sistem sam, enajst pa jih je na razpolago ostalim aplikacijam. Če na sistemu ni na voljo dovolj prostih mest, poskuša biti TortoiseSVN<quote>pošten državljan (TM)</quote> in ne uporablja veliko prekrivnih ikon, da ostane prostor tudi za ostale aplikacije."
1310313088
1310413089 #. (para)
13105-#: ../source/TortoiseSVN_en.xml:15071
13090+#: ../source/TortoiseSVN_en.xml:15066
1310613091 msgid "<emphasis>Normal</emphasis>, <emphasis>Modified</emphasis> and <emphasis>Conflicted</emphasis> are always loaded and visible."
1310713092 msgstr "Ikone <emphasis>Navadno</emphasis>, <emphasis>Spremenjeno</emphasis> in <emphasis>Sporno</emphasis> se vedno naložijo in so vidne."
1310813093
1310913094 #. (para)
13110-#: ../source/TortoiseSVN_en.xml:15079
13095+#: ../source/TortoiseSVN_en.xml:15074
1311113096 msgid "<emphasis>Deleted</emphasis> is loaded if possible, but falls back to <emphasis>Modified</emphasis> if there are not enough slots."
1311213097 msgstr "Ikona <emphasis>Izbrisano</emphasis> se naloži, če je to mogoče, če pa prostih mest ni dovolj, se prikaže ikona <emphasis>Spremenjeno</emphasis>."
1311313098
1311413099 #. (para)
13115-#: ../source/TortoiseSVN_en.xml:15086
13100+#: ../source/TortoiseSVN_en.xml:15081
1311613101 msgid "<emphasis>Read-Only</emphasis> is loaded if possible, but falls back to <emphasis>Normal</emphasis> if there are not enough slots."
1311713102 msgstr "Ikona <emphasis>Samo za branje</emphasis> se naloži, če je to mogoče, če pa prostih mest ni dovolj, se prikaže ikona <emphasis>Običajno</emphasis>."
1311813103
1311913104 #. (para)
13120-#: ../source/TortoiseSVN_en.xml:15093
13105+#: ../source/TortoiseSVN_en.xml:15088
1312113106 msgid "<emphasis>Locked</emphasis> is only loaded if there are fewer than 13 overlays already loaded. It falls back to <emphasis>Normal</emphasis> if there are not enough slots."
1312213107 msgstr "Ikona <emphasis>Zaklenjeno</emphasis> se naloži, če je naloženih manj kot trinajst ikon, v nasprotnem primeru pa se prikaže ikona <emphasis>Običajno</emphasis>."
1312313108
1312413109 #. (para)
13125-#: ../source/TortoiseSVN_en.xml:15101
13110+#: ../source/TortoiseSVN_en.xml:15096
1312613111 msgid "<emphasis>Added</emphasis> is only loaded if there are fewer than 14 overlays already loaded. It falls back to <emphasis>Modified</emphasis> if there are not enough slots."
1312713112 msgstr "Ikona <emphasis>Dodano</emphasis> se naloži, če je naloženih manj kot štirinajst ikon, v nasprotnem primeru pa se prikaže ikona <emphasis>Spremenjeno</emphasis>."
1312813113
1312913114 #. (title)
13130-#: ../source/TortoiseSVN_en.xml:15112
13115+#: ../source/TortoiseSVN_en.xml:15107
1313113116 msgid "Securing Svnserve using SSH"
1313213117 msgstr "Zavarovanje strežnika Svnserve z SSL"
1313313118
1313413119 #. (para)
13135-#: ../source/TortoiseSVN_en.xml:15114
13120+#: ../source/TortoiseSVN_en.xml:15109
1313613121 msgid "This section provides a step-by-step guide to setting up Subversion and TortoiseSVN to use the <literal>svn+ssh</literal> protocol. If you already use authenticated SSH connections to login to your server, then you are already there and you can find more detail in the Subversion book. If you are not using SSH but would like to do so to protect your Subversion installation, this guide gives a simple method which does not involve creating a separate SSH user account on the server for every subversion user."
1313713122 msgstr "V tem razdelku so opisani koraki, ki jih je potrebno izvesti, če želite pri sistemu Subversion in TortoiseSVN uporabljati protokol <literal>svn+ssh</literal>. Če za dostop do strežnika Subversion in avtentikacijo že uporabljate SSH, potem tega ne potrebujete; kaj več o tem si lahko preberete v knjigi The Subversion Book. Če še ne uporabljate SSH in želite svoj sistem Subversion zaščititi, vam ta razdelek ponuja enostaven način, kako to storite, ne da bi morali za vsakega uporabnika sistema Subversion ustvariti tudi račun SSH na strežniku."
1313813123
1313913124 #. (para)
13140-#: ../source/TortoiseSVN_en.xml:15124
13125+#: ../source/TortoiseSVN_en.xml:15119
1314113126 msgid "In this implementation we create a single SSH user account for all subversion users, and use different authentication keys to differentiate between the real Subversion users."
1314213127 msgstr "Pri tem načinu ustvarimo en račun SSH za vse uporabnike sistema Subversion in uporabimo različne ključe za avtentikacijo, da ločimo med posameznimi uporabniki sistema Subversion."
1314313128
1314413129 #. (para)
13145-#: ../source/TortoiseSVN_en.xml:15129
13130+#: ../source/TortoiseSVN_en.xml:15124
1314613131 msgid "In this appendix we assume that you already have the subversion tools installed, and that you have created a repository as detailed elsewhere in this manual. Note that you should <emphasis>not</emphasis> start svnserve as a service or daemon when used with SSH."
1314713132 msgstr "V tem dodatku predpostavljamo, da imate nameščena vsa potrebna orodja in ustvarjeno skladišče, kot je opisano v predhodnjih poglavjih. Pri uporabi SSH strežnika svnserve <emphasis>ne</emphasis> smete poganjati kot storitev ali prikriti process."
1314813133
1314913134 #. (para)
13150-#: ../source/TortoiseSVN_en.xml:15135
13135+#: ../source/TortoiseSVN_en.xml:15130
1315113136 msgid "Much of the information here comes from a tutorial provided by Marc Logemann, which can be found at <ulink url=\"http://www.logemann.org/2007/03/13/subversion-tortoisesvn-ssh-howto/\"><citetitle>www.logemann.org</citetitle></ulink> Additional information on setting up a Windows server was provided by Thorsten Müller. Thanks guys!"
1315213137 msgstr "Veliko informacij smo povzeli po učbeniku Marca Logemanna, ki ga najdete na povezavi <ulink url=\"http://www.logemann.org/2007/03/13/subversion-tortoisesvn-ssh-howto/\"><citetitle>www.logemann.org</citetitle></ulink> Dodatne informacije v zvezi s postavitvijo strežnika v sistemu Windows je podal Thorsten Müller. Hvala obema!"
1315313138
1315413139 #. (title)
13155-#: ../source/TortoiseSVN_en.xml:15146
13140+#: ../source/TortoiseSVN_en.xml:15141
1315613141 msgid "Setting Up a Linux Server"
1315713142 msgstr "Nameščanje strežnika na operacijskem sistemu Linux"
1315813143
1315913144 #. (para)
13160-#: ../source/TortoiseSVN_en.xml:15147
13145+#: ../source/TortoiseSVN_en.xml:15142
1316113146 msgid ""
1316213147 "You need to have SSH enabled on the server, and here we assume that you will be using OpenSSH. On most distributions this will already be installed. To find out, type: <screen>\n"
1316313148 "ps xa | grep sshd\n"
@@ -13168,12 +13153,12 @@
1316813153 "</screen> in prikaže se vam seznam opravil SSH."
1316913154
1317013155 #. (para)
13171-#: ../source/TortoiseSVN_en.xml:15156
13156+#: ../source/TortoiseSVN_en.xml:15151
1317213157 msgid "One point to note is that if you build Subversion from source and do not provide any argument to <filename>./configure</filename>, Subversion creates a <filename>bin</filename> directory under <filename>/usr/local</filename> and places its binaries there. If you want to use tunneling mode with SSH, you have to be aware that the user logging in via SSH needs to execute the svnserve program and some other binaries. For this reason, either place <filename>/usr/local/bin</filename> into the <literal>PATH</literal> variable or create symbolic links of your binaries to the <filename>/usr/sbin</filename> directory, or to any other directory which is commonly in the <literal>PATH</literal>."
1317313158 msgstr "Če zgradite Subversion sami iz izvorne kode in ne podate parametra v <filename>./configure</filename>, Subversion ustvari podmapo <filename>bin</filename> v mapi <filename>/usr/local</filename> in tja shrani binarne datoteke. Če želite uporabiti tunelski način s SSH, se morate zavedati, da prijava uporabnika preko SSH zahteva izvržbo programa svnserve in še nekaterih knjižnic. Zato dodajte mapo <filename>/usr/local/bin</filename> v okoljsko spremenljivko <literal>PATH</literal> ali ustvarite simbolično povezavo binarnih datotek v mapo <filename>/usr/sbin</filename> ali katerokoli mapo, ki se nahaja v okoljski spremenljivki <literal>PATH</literal>."
1317413159
1317513160 #. (para)
13176-#: ../source/TortoiseSVN_en.xml:15169
13161+#: ../source/TortoiseSVN_en.xml:15164
1317713162 msgid ""
1317813163 "To check that everything is OK, login in as the target user with SSH and type: <screen>\n"
1317913164 "which svnserve\n"
@@ -13184,7 +13169,7 @@
1318413169 "</screen> Ta ukaz vam pove, če je strežnik svnserve dosegljiv."
1318513170
1318613171 #. (para)
13187-#: ../source/TortoiseSVN_en.xml:15177
13172+#: ../source/TortoiseSVN_en.xml:15172
1318813173 msgid ""
1318913174 "Create a new user which we will use to access the svn repository: <screen>\n"
1319013175 "useradd -m svnuser\n"
@@ -13195,22 +13180,22 @@
1319513180 "</screen> Uporabniku dajte popoln dostop do skladišča."
1319613181
1319713182 #. (title)
13198-#: ../source/TortoiseSVN_en.xml:15186
13183+#: ../source/TortoiseSVN_en.xml:15181
1319913184 msgid "Setting Up a Windows Server"
1320013185 msgstr "Nameščanje strežnika na operacijskem sistemu Windows"
1320113186
1320213187 #. (para)
13203-#: ../source/TortoiseSVN_en.xml:15187
13188+#: ../source/TortoiseSVN_en.xml:15182
1320413189 msgid "Install Cygwin SSH daemon as described here: <ulink url=\"http://pigtail.net/LRP/printsrv/cygwin-sshd.html\"><citetitle>http://pigtail.net/LRP/printsrv/cygwin-sshd.html</citetitle></ulink>"
1320513190 msgstr "Namestite Cygwin SSH daemon, kot je opisano na naslednjem naslovu: <ulink url=\"http://pigtail.net/LRP/printsrv/cygwin-sshd.html\"><citetitle>http://pigtail.net/LRP/printsrv/cygwin-sshd.html</citetitle></ulink>"
1320613191
1320713192 #. (para)
13208-#: ../source/TortoiseSVN_en.xml:15193
13193+#: ../source/TortoiseSVN_en.xml:15188
1320913194 msgid "Create a new Windows user account <literal>svnuser</literal> which we will use to access the repository. Be sure to give this user full access rights to the repository."
1321013195 msgstr "Ustvarite nov račun v sistemu Windows in ga poimenujte <literal>svnuporabnik</literal>. S tem računom bomo dostopali do skladišča. Temu računu dajte popoln dostop do skladišča."
1321113196
1321213197 #. (para)
13213-#: ../source/TortoiseSVN_en.xml:15198
13198+#: ../source/TortoiseSVN_en.xml:15193
1321413199 msgid ""
1321513200 "If there is no password file yet then create one from the Cygwin console using: <screen>\n"
1321613201 "mkpasswd -l &gt; /etc/passwd\n"
@@ -13221,32 +13206,32 @@
1322113206 "</screen>"
1322213207
1322313208 #. (title)
13224-#: ../source/TortoiseSVN_en.xml:15206
13209+#: ../source/TortoiseSVN_en.xml:15201
1322513210 msgid "SSH Client Tools for use with TortoiseSVN"
1322613211 msgstr "Odjemalci SSH za uporabo s TortoiseSVN"
1322713212
1322813213 #. (para)
13229-#: ../source/TortoiseSVN_en.xml:15207
13214+#: ../source/TortoiseSVN_en.xml:15202
1323013215 msgid "Grab the tools we need for using SSH on the windows client from this site: <ulink url=\"http://www.chiark.greenend.org.uk/~sgtatham/putty/\"><citetitle>http://www.chiark.greenend.org.uk/~sgtatham/putty/</citetitle></ulink> Just go to the download section and get <filename>Putty</filename>, <filename>Plink</filename>, <filename>Pageant</filename> and <filename>Puttygen</filename>."
1323113216 msgstr "Orodja, ki jih potrebujemo za delo s SSH na sistemu Windows, dobite na naslednjem naslovu: <ulink url=\"http://www.chiark.greenend.org.uk/~sgtatham/putty/\"><citetitle>http://www.chiark.greenend.org.uk/~sgtatham/putty/</citetitle></ulink> Pojdi na odsek Download in prenesite aplikacije <filename>Putty</filename>, <filename>Plink</filename>, <filename>Pageant</filename> in <filename>Puttygen</filename>."
1323213217
1323313218 #. (title)
13234-#: ../source/TortoiseSVN_en.xml:15220
13219+#: ../source/TortoiseSVN_en.xml:15215
1323513220 msgid "Creating OpenSSH Certificates"
1323613221 msgstr "Ustvarjanje certifikatov OpenSSH"
1323713222
1323813223 #. (para)
13239-#: ../source/TortoiseSVN_en.xml:15221
13224+#: ../source/TortoiseSVN_en.xml:15216
1324013225 msgid "The next step is to create a key pair for authentication. There are two possible ways to create keys. The first is to create the keys with PuTTYgen on the client, upload the public key to your server and use the private key with PuTTY. The other is to create the key pair with the OpenSSH tool ssh-keygen, download the private key to your client and convert the private key to a PuTTY-style private key."
1324113226 msgstr "V naslednjem koraku izdelamo par ključev za avtentikacijo. Za izdelavo ključev obstajata dva načina. Prvi način: ključa ustvarimo s programom PuTTYgen na strani odjemalca, javni ključ naložimo na strežnik, zasebni ključ pa uporabljamo s programom PuTTY. Drugi način: par ključev ustvarimo s programom ssh-keygen, ki je del OpenSSH, prenesemo zasebni ključ v odjemalca in ga pretvorimo v obliko PuTTY."
1324213227
1324313228 #. (title)
13244-#: ../source/TortoiseSVN_en.xml:15231
13229+#: ../source/TortoiseSVN_en.xml:15226
1324513230 msgid "Create Keys using ssh-keygen"
1324613231 msgstr "Ustvarjanje ključev s ssh-keygen"
1324713232
1324813233 #. (para)
13249-#: ../source/TortoiseSVN_en.xml:15232
13234+#: ../source/TortoiseSVN_en.xml:15227
1325013235 msgid ""
1325113236 "Login to the server as <literal>root</literal> or <literal>svnuser</literal> and type: <screen>\n"
1325213237 "ssh-keygen -b 1024 -t dsa -N passphrase -f keyfile\n"
@@ -13261,7 +13246,7 @@
1326113246 "</screen>vidite dve datoteki, <filename>datotekaključev</filename> in <filename>datotekaključev.pub</filename>. Datoteka <filename>.pub</filename> je javni ključ, datoteka brez končnice pa zasebni."
1326213247
1326313248 #. (para)
13264-#: ../source/TortoiseSVN_en.xml:15249
13249+#: ../source/TortoiseSVN_en.xml:15244
1326513250 msgid ""
1326613251 "Append the public key to those in the <filename>.ssh</filename> folder within the <literal>svnuser</literal> home directory: <screen>\n"
1326713252 "cat keyfile.pub &gt;&gt; /home/svnuser/.ssh/authorized_keys\n"
@@ -13272,17 +13257,17 @@
1327213257 "</screen>"
1327313258
1327413259 #. (para)
13275-#: ../source/TortoiseSVN_en.xml:15256
13260+#: ../source/TortoiseSVN_en.xml:15251
1327613261 msgid "In order to use the private key we generated, we have to convert it to a putty format. This is because the private key file format is not specified by a standards body. After you download the private key file to your client PC, start PuTTYgen and use <menuchoice><guimenu>Conversions</guimenu><guimenuitem>Import key</guimenuitem></menuchoice>. Browse to your file <filename>keyfile</filename> which you got from the server the passphrase you used when creating the key. Finally click on <guibutton>Save private key</guibutton> and save the file as <filename>keyfile.PPK</filename>."
1327713262 msgstr "Da zasebni ključ, ki smo ga ustvarili, lahko uporabimo, ga moramo pretvoriti v obliko PuTTY. Oblika privatnega ključa namreč ni standardizirana. Ko ste zasebni ključ prenesli na odjemalca, zaženite orodje PuTTYgen in izberite <menuchoice><guimenu>Conversions</guimenu><guimenuitem>Import key</guimenuitem></menuchoice>. Poiščite svojo <filename>datotekoključev</filename>, ki ste jo dobili s strežnika, in uporabite širfrirno frazo, ki ste jo uporabili pri ustvarjanju ključa. Nazadnje kliknite na gumb <guibutton>Save private key</guibutton> in shranite datoteko z kot <filename>datotekaključev.PPK</filename>."
1327813263
1327913264 #. (title)
13280-#: ../source/TortoiseSVN_en.xml:15273
13265+#: ../source/TortoiseSVN_en.xml:15268
1328113266 msgid "Create Keys using PuTTYgen"
1328213267 msgstr "Ustvarjanje ključev s programom PuTTYgen"
1328313268
1328413269 #. (para)
13285-#: ../source/TortoiseSVN_en.xml:15274
13270+#: ../source/TortoiseSVN_en.xml:15269
1328613271 msgid ""
1328713272 "Use PuTTYgen to generate a public-key/private-key pair and save it. Copy the public key to the server and append it to those in the <filename>.ssh</filename> folder within the <literal>svnuser</literal> home directory: <screen>\n"
1328813273 "cat keyfile.pub &gt;&gt; /home/svnuser/.ssh/authorized_keys\n"
@@ -13293,22 +13278,22 @@
1329313278 "</screen>"
1329413279
1329513280 #. (title)
13296-#: ../source/TortoiseSVN_en.xml:15286
13281+#: ../source/TortoiseSVN_en.xml:15281
1329713282 msgid "Test using PuTTY"
1329813283 msgstr "Preiskušanje s programom PuTTY"
1329913284
1330013285 #. (para)
13301-#: ../source/TortoiseSVN_en.xml:15287
13286+#: ../source/TortoiseSVN_en.xml:15282
1330213287 msgid "To test the connection we will use PuTTY. Start the program and on the <guilabel>Session</guilabel> tab set the hostname to the name or IP address of your server, the protocol to SSH and save the session as <literal>SvnConnection</literal> or whatever name you prefer. On the <guilabel>SSH</guilabel> tab set the preferred SSH protocol version to 2 and from <guilabel>Auth</guilabel> set the full path to the <literal>.PPK</literal> private key file you converted earlier. Go back to the <guilabel>Sessions</guilabel> tab and hit the <guilabel>Save</guilabel> button. You will now see <literal>SvnConnection</literal> in the list of saved sessions."
1330313288 msgstr "Za preizkus povezave uporabimo PuTTY. Zaženite program in v zavihku <guilabel>Session</guilabel> nastavite ime gostitelja ali naslov IP vašega strežnika, nastavite protokol SSH in shranite sejo s poljubnim imenom, npr <literal>SvnPovezava</literal>. Na zavihku <guilabel>SSH</guilabel> nastavite verzijo protokola na 2 in v zavihku <guilabel>Auth</guilabel> nastavite polno pot do datoteke zasebnega ključa <literal>.PKK</literal>, ki ste ga pred tem pretvorili. Vrnite se na zavihek <guilabel>Sessions</guilabel> in kliknite na gumb <guilabel>Save</guilabel>. Seja <literal>SvnPovezava</literal> bo sedaj navedena med shranjenimi sejami."
1330413289
1330513290 #. (para)
13306-#: ../source/TortoiseSVN_en.xml:15300
13291+#: ../source/TortoiseSVN_en.xml:15295
1330713292 msgid "Click on <guilabel>Open</guilabel> and you should see a telnet style login prompt. Use <literal>svnuser</literal> as the user name and if all is well you should connect directly without being prompted for a password."
1330813293 msgstr "Kliknite <guilabel>Open</guilabel> in prikazalo sem vam bo okno za prijavo, podobno kot v programu telnet. Za uporabniško ime uporabite <literal>svnuporabnik</literal> in če ste vse naredili pravilno, se boste povezali na strežnik brez vnosa gesla."
1330913294
1331013295 #. (para)
13311-#: ../source/TortoiseSVN_en.xml:15306
13296+#: ../source/TortoiseSVN_en.xml:15301
1331213297 msgid ""
1331313298 "You may need to edit <filename>/etc/sshd_config</filename> on the server. Edit lines as follows and restart the SSH service afterwards. <screen>\n"
1331413299 "PubkeyAuthentication yes\n"
@@ -13325,17 +13310,17 @@
1332513310 "</screen>"
1332613311
1332713312 #. (title)
13328-#: ../source/TortoiseSVN_en.xml:15318
13313+#: ../source/TortoiseSVN_en.xml:15313
1332913314 msgid "Testing SSH with TortoiseSVN"
1333013315 msgstr "Preizkušanje SSH s TortoiseSVN"
1333113316
1333213317 #. (para)
13333-#: ../source/TortoiseSVN_en.xml:15319
13318+#: ../source/TortoiseSVN_en.xml:15314
1333413319 msgid "So far we have only tested that you can login using SSH. Now we need to make sure that the SSH connection can actually run svnserve. On the server modify <filename>/home/svnuser/.ssh/authorized_keys</filename> as follows to allow many subversion authors to use the same system account, <literal>svnuser</literal>. Note that every subversion author uses the same login but a different authentication key, thus you have to add one line for every author."
1333513320 msgstr "Preverili smo le, če se lahko prijavite preko SSH. Sedaj moramo zagotoviti, da ta povezava lahko poganja svnserve. Na strežniku spremenite datoteko <filename>/home/svnuser/.ssh/authorized_keys</filename>, kot je navedeno spodaj. S tem omogočite, da več uporabnikov sistema Subversion istočasno uporablja isti sistemski račun, <literal>svnuporabnik</literal>. Upoštevajte, da vsak uporabnik sistema Subversion uporablja iste podatke za prijavo, vendar ima drugačen avtentikacijski ključ, zato morate dodati za vsakega uporabnika eno vrstico."
1333613321
1333713322 #. (para)
13338-#: ../source/TortoiseSVN_en.xml:15328
13323+#: ../source/TortoiseSVN_en.xml:15323
1333913324 msgid ""
1334013325 "Note: This is all on one very long line. <screen>\n"
1334113326 "command=\"svnserve -t -r &lt;ReposRootPath&gt; --tunnel-user=&lt;author&gt;\",\n"
@@ -13350,27 +13335,27 @@
1335013335 "</screen> Vrednosti morate nastaviti tako, da ustrezajo vašemu sistemu."
1335113336
1335213337 #. (para)
13353-#: ../source/TortoiseSVN_en.xml:15337
13338+#: ../source/TortoiseSVN_en.xml:15332
1335413339 msgid "<literal>&lt;ReposRootPath&gt;</literal> should be replaced with the path to the directory containing your repositories. This avoids the need to specify full server paths within URLs. Note that you must use forward slashes even on a Windows server, e.g. <filename>c:/svn/reposroot</filename>. In the examples below we assume that you have a repository folder within the repository root called <filename>repos</filename>."
1335513340 msgstr "<literal>&lt;ReposRootPath&gt;</literal> je potrebno zamenjati s potjo do mape, ki vsebuje vaša skladišča. Na ta način nam ni potrebno navajati polnih poti pri navajanju naslovov URL. Upoštevajte, da je potrebno tudi v primeru uporabe operacijskega sistema Windows uporabiti poševnice, n. pr. <filename>c:/svn/reposroot</filename>. V naslednjih primerih predpostavljamo, da se skladiščna mapa nahaja v mapi <filename>sklad</filename> v korenski mapi skladišča."
1335613341
1335713342 #. (para)
13358-#: ../source/TortoiseSVN_en.xml:15346
13343+#: ../source/TortoiseSVN_en.xml:15341
1335913344 msgid "<literal>&lt;author&gt;</literal> should be replaced with the svn author that you want to be stored on commit. This also allows svnserve to use its own access rights within <filename>svnserve.conf</filename>."
1336013345 msgstr "Niz <literal>&lt;author&gt;</literal> je potrebno zamenjati z uporabniškim imenom avtorja, ki naj se uporabi pri objavi. Prav tako s tem omogočimo procesu svnserve uporabo lastne avtorizacije z datoteko <filename>svnserve.conf</filename>."
1336113346
1336213347 #. (para)
13363-#: ../source/TortoiseSVN_en.xml:15351
13348+#: ../source/TortoiseSVN_en.xml:15346
1336413349 msgid "<literal>&lt;PublicKey&gt;</literal> should be replaced with the public key that you generated earlier."
1336513350 msgstr "<literal>&lt;PublicKey&gt;</literal> je potrebno nadomestiti z javnim ključem, ki ste ga pred tem ustvarili."
1336613351
1336713352 #. (para)
13368-#: ../source/TortoiseSVN_en.xml:15355
13353+#: ../source/TortoiseSVN_en.xml:15350
1336913354 msgid "<literal>&lt;Comment&gt;</literal> can be any comment you like, but it is useful for mapping an svn author name to the person's real name."
1337013355 msgstr "<literal>&lt;Comment&gt;</literal> je lahko poljuben komentar, vendar je na tem mestu priporočljivo zapisati uporabniško ime v sistemu Subversion in pravo ime uporabnika."
1337113356
1337213357 #. (para)
13373-#: ../source/TortoiseSVN_en.xml:15359
13358+#: ../source/TortoiseSVN_en.xml:15354
1337413359 msgid ""
1337513360 "Right click on any folder in Windows Explorer and select <menuchoice><guimenu>TortoiseSVN</guimenu><guimenuitem>Repo-Browser</guimenuitem></menuchoice>. You will be prompted to enter a URL, so enter one in this form: <screen>\n"
1337613361 "svn+ssh://svnuser@SvnConnection/repos\n"
@@ -13381,22 +13366,22 @@
1338113366 "</screen> Kaj ta naslov pomeni? Ime sheme je <literal>svn+ssh</literal>. To programu TortoiseSVN pove, kako obravnavati zahteve do strežnika. Za dvojno poševnico sledi ime uporabnika, ki se priklaplja na strežnik, v našem primeru je to <literal>svnuporabnik</literal>. Po znaku <literal>@</literal> sledi ime seje v programu PuTTY. Seja vsebuje podatke o zasebnem ključu, IP naslovu strežnika, DNS strežniku. Nazadnje podamo še pot do skladišča in sicer relativno na korensko mapo skladišč na strežniku, kot je podano v datoteki <filename>authorized_keys</filename>."
1338213367
1338313368 #. (para)
13384-#: ../source/TortoiseSVN_en.xml:15379
13369+#: ../source/TortoiseSVN_en.xml:15374
1338513370 msgid "Click on <guibutton>OK</guibutton> and you should be able to browse the repository content. If so you now have a running SSH tunnel in conjunction with TortoiseSVN."
1338613371 msgstr "Kliknite na gumb <guibutton>V redu</guibutton> in sedaj naj bi imeli možnost brskanja po vsebini skladišča. Če je res tako, imate delujoč tunel SSH v povezavi s TortoiseSVN."
1338713372
1338813373 #. (para)
13389-#: ../source/TortoiseSVN_en.xml:15384
13374+#: ../source/TortoiseSVN_en.xml:15379
1339013375 msgid "Note that by default TortoiseSVN uses its own version of Plink to connect. This avoids a console window popping up for every authentication attempt, but it also means that there is nowhere for error messages to appear. If you receive the error <quote>Unable to write to standard output</quote>, you can try specifying Plink as the client in TortoiseSVN's network settings. This will allow you to see the real error message generated by Plink."
1339113376 msgstr "Upoštevajte, da po privzetih nastavitvah TortoiseSVN za povezavo uporablja lastno različico aplikacije Plink. S tem se izgognemo pojavljanju konzolnih oken ob vsakem poskusu avtentikacije, hkrati pa to pomeni, da sporočil o napakah ni možno prikazati. Če se pojavi napaka <quote>Unable to write to standard output</quote>, lahko poskusite nastaviti Plink za odjemalca v mrežnih nastavitvah TortoiseSVN. Tako boste lahko videli dejansko obvestilo o napaki, ki ga vrne Plink."
1339213377
1339313378 #. (title)
13394-#: ../source/TortoiseSVN_en.xml:15394
13379+#: ../source/TortoiseSVN_en.xml:15389
1339513380 msgid "SSH Configuration Variants"
1339613381 msgstr "Variacije konfiguracije SSH"
1339713382
1339813383 #. (para)
13399-#: ../source/TortoiseSVN_en.xml:15395
13384+#: ../source/TortoiseSVN_en.xml:15390
1340013385 msgid ""
1340113386 "One way to simplify the URL in TortoiseSVN is to set the user inside the PuTTY session. For this you have to load your already defined session <literal>SvnConnection</literal> in PuTTY and in the <guilabel>Connection</guilabel> tab set <guilabel>Auto login user</guilabel> to the user name, e.g. <literal>svnuser</literal>. Save your PuTTY session as before and try the following URL inside TortoiseSVN: <screen>\n"
1340213387 "svn+ssh://SvnConnection/repos\n"
@@ -13407,27 +13392,27 @@
1340713392 "</screen> V tem primeru odjemalcu SSH, ki ga uporablja TortoiseSVN (TortoisePlink.exe), podamo le ime seje. Odjemalec bo podatke pridobil iz navedene seje."
1340813393
1340913394 #. (para)
13410-#: ../source/TortoiseSVN_en.xml:15410
13395+#: ../source/TortoiseSVN_en.xml:15405
1341113396 msgid "At the time of writing PuTTY does not check all saved configurations, so if you have multiple configurations with the same server name, it will pick the first one which matches. Also, if you edit the default configuration and save it, the auto login user name is <emphasis>not</emphasis> saved."
1341213397 msgstr "V trenutni različici orodja PuTTY le-ta ne preverja vseh shranjenih konfiguracij. Če imate več konfiguracij, ki se nanašajo na isti strežnik, PuTTY uporabi privega ustreznega. Poleg tega se lahko zgodi, da se pri urejanju privzete konfiguracije in njenem shranjevanu <emphasis>ne</emphasis> shrani uporabniško ime, ki se uporablja za samodejno prijavo."
1341313398
1341413399 #. (para)
13415-#: ../source/TortoiseSVN_en.xml:15417
13400+#: ../source/TortoiseSVN_en.xml:15412
1341613401 msgid "Many people like to use Pageant for storing all their keys. Because a PuTTY session is capable of storing a key, you don't always need Pageant. But imagine you want to store keys for several different servers; in that case you would have to edit the PuTTY session over and over again, depending on the server you are trying to connect with. In this situation Pageant makes perfect sense, because when PuTTY, Plink, TortoisePlink or any other PuTTY-based tool is trying to connect to an SSH server, it checks all private keys that Pageant holds to initiate the connection."
1341713402 msgstr "Veliko ljudi uporablja Pageant za shranjevanje ključev. Ker je seja PuTTY sposobna shranjevati ključe, programa Pageant ne potrebujete vedno. Predstavljajte pa si, da želite shraniti ključe za različne strežnike; v tem primeru bi morali sejo PuTTY urejevati znova in znova, odvisno od strežnika, s katerim bi se želeli povezati. V tem primeru je uporaba programa Pageant zelo smiselna. Ko PuTTY, Plink, TortoisePlink ali katerikoli program, ki temelji na programu PuTTY, poskuša narediti povezavo do strežnika SSH, le-ta preveri vse ključe, ki jih ima shranjene Pageant, da ustvari povezavo."
1341813403
1341913404 #. (para)
13420-#: ../source/TortoiseSVN_en.xml:15428
13405+#: ../source/TortoiseSVN_en.xml:15423
1342113406 msgid "For this task, simply run Pageant and add the private key. It should be the same private key you defined in the PuTTY session above. If you use Pageant for private key storage, you can delete the reference to the private key file in your saved PuTTY session. You can add more keys for other servers, or other users of course."
1342213407 msgstr "Poženite Pageant in dodajte zasebni ključ. Uporabiti morate istega kot v seji programa PuTTY zgoraj. Če uporabljate program Pageant za shranjevanje zasebnih ključev, lahko zbrišete referenco na zasebni ključ, ki ste ga shranili v seji PuTTY. Seveda lahko dodate tudi ključe za druge strežnike ali uporabnike."
1342313408
1342413409 #. (para)
13425-#: ../source/TortoiseSVN_en.xml:15435
13410+#: ../source/TortoiseSVN_en.xml:15430
1342613411 msgid "If you don't want to repeat this procedure after every reboot of your client, you should place Pageant in the auto-start group of your Windows installation. You can append the keys with complete paths as command line arguments to Pageant.exe"
1342713412 msgstr "Če tega postopka ne želite ponavljati ob vsakem zagonu računalnika, dodajte Pageant v mapo za samodejni zagon (Startup). Ključe vključno s potmi lahko dodate kot parametre ukazne vrstice programa Pageant.exe"
1342813413
1342913414 #. (para)
13430-#: ../source/TortoiseSVN_en.xml:15441
13415+#: ../source/TortoiseSVN_en.xml:15436
1343113416 msgid ""
1343213417 "The last way to connect to an SSH server is simply by using this URL inside TortoiseSVN: <screen>\n"
1343313418 "svn+ssh://svnuser@100.101.102.103/repos\n"
@@ -13440,272 +13425,272 @@
1344013425 "</screen> Kot vidite, ne uporabljamo shranjene seje programa PuTTY, ampak naslov IP (ali domeno) kot cilj priklopa. Dodamo tudi uporabnika. Verjetno se vprašate, kako najdemo zasebni ključ. Ker je TortoisePlink.exe le predelana verzija standardnega programa Plink iz svežnja programov PuTTY, TortoiseSVN poskusi uporabiti vse ključe, ki so shranjeni v Pageantu."
1344113426
1344213427 #. (title)
13443-#: ../source/TortoiseSVN_en.xml:15461
13428+#: ../source/TortoiseSVN_en.xml:15456
1344413429 msgid "Glossary"
1344513430 msgstr "Slovar"
1344613431
1344713432 #. (para)
13448-#: ../source/TortoiseSVN_en.xml:15465
13433+#: ../source/TortoiseSVN_en.xml:15460
1344913434 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."
1345013435 msgstr "Ukaz Subversion, ki se uporablja za dodajanje datoteke ali mape v delovno kopijo. Novi elementi so dodani v skladišče, ko naredite objavo."
1345113436
1345213437 #. (glossterm)
13453-#: ../source/TortoiseSVN_en.xml:15473
13438+#: ../source/TortoiseSVN_en.xml:15468
1345413439 msgid "BASE revision"
1345513440 msgstr "Revizija BASE"
1345613441
1345713442 #. (para)
13458-#: ../source/TortoiseSVN_en.xml:15475
13443+#: ../source/TortoiseSVN_en.xml:15470
1345913444 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."
1346013445 msgstr "Trenutna osnovna revizija datoteke v vaši <emphasis>delovni kopiji</emphasis>. To je različica datoteke, kakršna je bila pri zadnjem prevzemu, posodobitvi ali objavi. Revizija BASE običajno ni ista kot revizija HEAD."
1346113446
1346213447 #. (para)
13463-#: ../source/TortoiseSVN_en.xml:15486
13448+#: ../source/TortoiseSVN_en.xml:15481
1346413449 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."
1346513450 msgstr "Ta ukaz se uporablja samo pri besedilnih datotekah. Vsako vrstico datoteke označi z informacijo, v kateri reviziji je bila nazadnje spremenjena in kdo je spremembo naredil. Grafični ekvivalent temu ukazu je TortoiseBlame, ki vam pokaže tudi datum in dnevniški zapis, če greste z miško na številko revizije."
1346613451
1346713452 #. (glossterm)
13468-#: ../source/TortoiseSVN_en.xml:15496
13453+#: ../source/TortoiseSVN_en.xml:15491
1346913454 msgid "BDB"
1347013455 msgstr "BDB"
1347113456
1347213457 #. (para)
13473-#: ../source/TortoiseSVN_en.xml:15498
13458+#: ../source/TortoiseSVN_en.xml:15493
1347413459 msgid "Berkeley DB. A well tested database backend for repositories, that cannot be used on network shares. Default for pre 1.2 repositories."
1347513460 msgstr "Berkeley DB. Dobro preizkušena baza podatkov za skladišča, ki se ne more uporabljati v mapah v skupni rabi v omrežju. To je privzeta baza za skladišča pred različico 1.2."
1347613461
1347713462 #. (glossterm)
13478-#: ../source/TortoiseSVN_en.xml:15505
13463+#: ../source/TortoiseSVN_en.xml:15500
1347913464 msgid "Branch"
1348013465 msgstr "Veja"
1348113466
1348213467 #. (para)
13483-#: ../source/TortoiseSVN_en.xml:15507
13468+#: ../source/TortoiseSVN_en.xml:15502
1348413469 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>."
1348513470 msgstr "Ta izraz, ki se pri nadzoru različic pogosto uporablja, opisuje, kaj se zgodi, ko se razvoj prelomi v določeni točki in se nadaljuje v dveh smereh. Iz glavne veje lahko ustvarite vejo, da razvijate novo zmožnost programa, ne da bi naredili glavno vejo nestabilno. Lahko pa naredite vejo iz stabilne verzije programa, da naredite popravke, razvoj pa se nadaljuje na nestabilni veji. V sistemu Subversion so veje izvedene kot <quote>poceni kopije</quote>."
1348613471
1348713472 #. (para)
13488-#: ../source/TortoiseSVN_en.xml:15522
13473+#: ../source/TortoiseSVN_en.xml:15517
1348913474 msgid "A Subversion command which creates a local working copy in an empty directory by downloading versioned files from the repository."
1349013475 msgstr "Ukaz, ki ustvari krajevno delovno kopijo v prazni mapi in prenese datoteke pod nadzorom iz skladišča."
1349113476
1349213477 #. (para)
13493-#: ../source/TortoiseSVN_en.xml:15531
13478+#: ../source/TortoiseSVN_en.xml:15526
1349413479 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."
1349513480 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."
1349613481
1349713482 #. (para)
13498-#: ../source/TortoiseSVN_en.xml:15548
13483+#: ../source/TortoiseSVN_en.xml:15543
1349913484 msgid "This Subversion command is used to pass the changes in your local working copy back into the repository, creating a new repository revision."
1350013485 msgstr "Ta ukaz sistema Subversion se uporablja za pošiljanje sprememb v delovni kopiji nazaj na skladišče. S tem se tam ustvari nova revizija."
1350113486
1350213487 #. (glossterm)
13503-#: ../source/TortoiseSVN_en.xml:15556
13488+#: ../source/TortoiseSVN_en.xml:15551
1350413489 msgid "Conflict"
1350513490 msgstr "Spor"
1350613491
1350713492 #. (para)
13508-#: ../source/TortoiseSVN_en.xml:15558
13493+#: ../source/TortoiseSVN_en.xml:15553
1350913494 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."
1351013495 msgstr "Ko spremembe iz skladišča spojimo s krajevnimi spremembami, se včasih spremembe zgodijo na isti vrstici. V takšnem primeru se Subversion ne more sam odločiti, katero različico naj uporabi in datoteka je v spornem stanju. Pred objavo morate datoteko ročno urediti in rešiti spor."
1351113496
1351213497 #. (glossterm)
13513-#: ../source/TortoiseSVN_en.xml:15568
13498+#: ../source/TortoiseSVN_en.xml:15563
1351413499 msgid "Copy"
1351513500 msgstr "Kopiraj"
1351613501
1351713502 #. (para)
13518-#: ../source/TortoiseSVN_en.xml:15570
13503+#: ../source/TortoiseSVN_en.xml:15565
1351913504 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."
1352013505 msgstr "V skladišču Subversion lahko naredite kopijo datoteke ali celotnega drevesa. Kopije so izvedene kot <quote>poceni kopije</quote>, kar je nekaj podobnega kot povezava na originalen element in ne zavzema skoraj nič prostora. Kopija ohrani zgodovino originala, tako da lahko vedno pogledate spremembe, ki so bile narejene preden se je element prekopiral."
1352113506
1352213507 #. (para)
13523-#: ../source/TortoiseSVN_en.xml:15582
13508+#: ../source/TortoiseSVN_en.xml:15577
1352413509 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."
1352513510 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."
1352613511
1352713512 #. (para)
13528-#: ../source/TortoiseSVN_en.xml:15594
13513+#: ../source/TortoiseSVN_en.xml:15589
1352913514 msgid "Shorthand for <quote>Show Differences</quote>. Very useful when you want to see exactly what changes have been made."
1353013515 msgstr "Bližnica za <quote>Prikaži razlike</quote>. Zelo uporabno, ko želite vedeti, kaj točno se je spremenilo."
1353113516
1353213517 #. (para)
13533-#: ../source/TortoiseSVN_en.xml:15603
13518+#: ../source/TortoiseSVN_en.xml:15598
1353413519 msgid "This command produces a copy of a versioned folder, just like a working copy, but without the local <literal>.svn</literal> folders."
1353513520 msgstr "Ta ukaz ustvari kopijo mape pod nadzorom, prav takšno, kot je delovna kopija, vendar brez krajevnih map <literal>.svn</literal>."
1353613521
1353713522 #. (glossterm)
13538-#: ../source/TortoiseSVN_en.xml:15611
13523+#: ../source/TortoiseSVN_en.xml:15606
1353913524 msgid "FSFS"
1354013525 msgstr "FSFS"
1354113526
1354213527 #. (para)
13543-#: ../source/TortoiseSVN_en.xml:15613
13528+#: ../source/TortoiseSVN_en.xml:15608
1354413529 msgid "A proprietary Subversion filesystem backend for repositories. Can be used on network shares. Default for 1.2 and newer repositories."
1354513530 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."
1354613531
1354713532 #. (para)
13548-#: ../source/TortoiseSVN_en.xml:15622
13533+#: ../source/TortoiseSVN_en.xml:15617
1354913534 msgid "Group policy object"
1355013535 msgstr "Group policy object"
1355113536
1355213537 #. (glossterm)
13553-#: ../source/TortoiseSVN_en.xml:15628
13538+#: ../source/TortoiseSVN_en.xml:15623
1355413539 msgid "HEAD revision"
1355513540 msgstr "Revizija HEAD"
1355613541
1355713542 #. (para)
13558-#: ../source/TortoiseSVN_en.xml:15630
13543+#: ../source/TortoiseSVN_en.xml:15625
1355913544 msgid "The latest revision of a file or folder in the <emphasis>repository</emphasis>."
1356013545 msgstr "Najnovejša revizija datoteke ali mape v <emphasis>skladišču</emphasis>."
1356113546
1356213547 #. (para)
13563-#: ../source/TortoiseSVN_en.xml:15638
13548+#: ../source/TortoiseSVN_en.xml:15633
1356413549 msgid "Subversion command to import an entire folder hierarchy into the repository in a single revision."
1356513550 msgstr "Ukaz sistema Subversion, ki omogoča uvoz celotne hierarhije map v skladišče v eni reviziji."
1356613551
1356713552 #. (para)
13568-#: ../source/TortoiseSVN_en.xml:15647
13553+#: ../source/TortoiseSVN_en.xml:15642
1356913554 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."
1357013555 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."
1357113556
1357213557 #. (glossterm)
13573-#: ../source/TortoiseSVN_en.xml:15655
13558+#: ../source/TortoiseSVN_en.xml:15650
1357413559 msgid "Log"
1357513560 msgstr "Dnevnik"
1357613561
1357713562 #. (para)
13578-#: ../source/TortoiseSVN_en.xml:15657
13563+#: ../source/TortoiseSVN_en.xml:15652
1357913564 msgid "Show the revision history of a file or folder. Also known as <quote>History</quote>."
1358013565 msgstr "Prikaže zgodovino revizij datoteke ali mape. Uporablja se tudi termin <quote>Zgodovina</quote>."
1358113566
1358213567 #. (glossterm)
13583-#: ../source/TortoiseSVN_en.xml:15664
13568+#: ../source/TortoiseSVN_en.xml:15659
1358413569 msgid "History"
1358513570 msgstr "Zgodovina"
1358613571
1358713572 #. (para)
13588-#: ../source/TortoiseSVN_en.xml:15666
13573+#: ../source/TortoiseSVN_en.xml:15661
1358913574 msgid "Show the revision history of a file or folder. Also known as <quote>Log</quote>."
1359013575 msgstr "Prikaže zgodovino revizij datoteke ali mape. Uporablja se tudi termin <quote>Dnevnik</quote>."
1359113576
1359213577 #. (para)
13593-#: ../source/TortoiseSVN_en.xml:15675
13578+#: ../source/TortoiseSVN_en.xml:15670
1359413579 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."
1359513580 msgstr "Proces dodajanja sprememb iz skladišča v vašo delovno kopijo, ne da ob tem povozite krajevne spremembe. Včasih sprememb ni možno samodejno spojiti in takrat je delovna kopija sporna."
1359613581
1359713582 #. (para)
13598-#: ../source/TortoiseSVN_en.xml:15681
13583+#: ../source/TortoiseSVN_en.xml:15676
1359913584 msgid "Merging happens automatically when you update your working copy. You can also merge specific changes from another branch using TortoiseSVN's Merge command."
1360013585 msgstr "Spajanje se zgodi samodejno, ko posodabljate delovno kopijo. Lahko pa opravljate spajanje specifičnih sprememb iz druge veje z uporabo ukaza Spoji."
1360113586
1360213587 #. (glossterm)
13603-#: ../source/TortoiseSVN_en.xml:15689
13588+#: ../source/TortoiseSVN_en.xml:15684
1360413589 msgid "Patch"
1360513590 msgstr "Popravek"
1360613591
1360713592 #. (para)
13608-#: ../source/TortoiseSVN_en.xml:15691
13593+#: ../source/TortoiseSVN_en.xml:15686
1360913594 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."
1361013595 msgstr "Če so se v delovni kopiji spremenile le besedilne datoteke, je možno z ukazom Razlikuj ustvariti datoteko s povzetkom sprememb v obliki poenotene razlike (unified diff). Datoteka takšnega tipa se pogosto imenuje <quote>popravek</quote> in se lahko uporablja za pošiljanje sprememb po elektronski pošti vašemu sodelavcu ali dopisnemu seznamu. Ta datoteka se potem uporabi na neki drugi delovni kopiji. Nekdo, ki nima pravic pisanja po skladišču, lahko naredi spremembe in ustvari popravek, ki ga objavi nek drug uporabnik, ki ustrezne pravice ima. Ali pa če niste prepričani, da so vaše spremembe dobre, lahko na ta način drugim uporabnikom pošljete spremembe v pregled."
1361113596
1361213597 #. (glossterm)
13613-#: ../source/TortoiseSVN_en.xml:15704
13598+#: ../source/TortoiseSVN_en.xml:15699
1361413599 msgid "Property"
1361513600 msgstr "Lastnost"
1361613601
1361713602 #. (para)
13618-#: ../source/TortoiseSVN_en.xml:15706
13603+#: ../source/TortoiseSVN_en.xml:15701
1361913604 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."
1362013605 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."
1362113606
1362213607 #. (para)
13623-#: ../source/TortoiseSVN_en.xml:15721
13608+#: ../source/TortoiseSVN_en.xml:15716
1362413609 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."
1362513610 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."
1362613611
1362713612 #. (para)
13628-#: ../source/TortoiseSVN_en.xml:15727
13613+#: ../source/TortoiseSVN_en.xml:15722
1362913614 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."
1363013615 msgstr "Opomba: ta ukaz uporabljajte le, če delovna kopija kaže na isto lokacijo znotraj istega skladišča, skladišče pa se je premaknilo na drugo lokacijo. V vseh ostalih primerih uporabite ukaz <quote>Preklopi</quote>."
1363113616
1363213617 #. (glossterm)
13633-#: ../source/TortoiseSVN_en.xml:15736
13618+#: ../source/TortoiseSVN_en.xml:15731
1363413619 msgid "Repository"
1363513620 msgstr "Skladišče"
1363613621
1363713622 #. (para)
13638-#: ../source/TortoiseSVN_en.xml:15738
13623+#: ../source/TortoiseSVN_en.xml:15733
1363913624 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."
1364013625 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."
1364113626
1364213627 #. (para)
13643-#: ../source/TortoiseSVN_en.xml:15749
13628+#: ../source/TortoiseSVN_en.xml:15744
1364413629 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."
1364513630 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."
1364613631
1364713632 #. (para)
13648-#: ../source/TortoiseSVN_en.xml:15761
13633+#: ../source/TortoiseSVN_en.xml:15756
1364913634 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."
1365013635 msgstr "Subversion hrani krajevno <quote>izvirno</quote> kopijo vsake datoteke, kakršna je bila ob zadnji posodobitvi. Če ste na datoteki naredili spremembe in jih želite povrniti, uporabite ukaz <quote>povrni</quote>, da dobite nazaj izvirno datoteko."
1365113636
1365213637 #. (glossterm)
13653-#: ../source/TortoiseSVN_en.xml:15770
13638+#: ../source/TortoiseSVN_en.xml:15765
1365413639 msgid "Revision"
1365513640 msgstr "Revizija"
1365613641
1365713642 #. (para)
13658-#: ../source/TortoiseSVN_en.xml:15772
13643+#: ../source/TortoiseSVN_en.xml:15767
1365913644 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."
1366013645 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."
1366113646
1366213647 #. (para)
13663-#: ../source/TortoiseSVN_en.xml:15779
13648+#: ../source/TortoiseSVN_en.xml:15774
1366413649 msgid "In another sense, a revision can refer to the set of changes that were made when that revision was created."
1366513650 msgstr "Drug pogled: revizija je množica sprememb, ki so bile narejene, ko je bila revizija ustvarjena."
1366613651
1366713652 #. (glossterm)
13668-#: ../source/TortoiseSVN_en.xml:15786
13653+#: ../source/TortoiseSVN_en.xml:15781
1366913654 msgid "Revision Property (revprop)"
1367013655 msgstr "Lastnost revizije (revprop)"
1367113656
1367213657 #. (para)
13673-#: ../source/TortoiseSVN_en.xml:15788
13658+#: ../source/TortoiseSVN_en.xml:15783
1367413659 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."
1367513660 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."
1367613661
1367713662 #. (glossterm)
13678-#: ../source/TortoiseSVN_en.xml:15800
13663+#: ../source/TortoiseSVN_en.xml:15795
1367913664 msgid "SVN"
1368013665 msgstr "SVN"
1368113666
1368213667 #. (para)
13683-#: ../source/TortoiseSVN_en.xml:15802
13668+#: ../source/TortoiseSVN_en.xml:15797
1368413669 msgid "A frequently-used abbreviation for Subversion."
1368513670 msgstr "Pogosto uporabljena okrajšava za Subversion."
1368613671
1368713672 #. (para)
13688-#: ../source/TortoiseSVN_en.xml:15805
13673+#: ../source/TortoiseSVN_en.xml:15800
1368913674 msgid "The name of the Subversion custom protocol used by the <quote>svnserve</quote> repository server."
1369013675 msgstr "Ime lastnega protokola sistema Subversion, ki ga uporablja strežnik skladišč <quote>svnserve</quote>."
1369113676
1369213677 #. (para)
13693-#: ../source/TortoiseSVN_en.xml:15814
13678+#: ../source/TortoiseSVN_en.xml:15809
1369413679 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."
1369513680 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."
1369613681
1369713682 #. (para)
13698-#: ../source/TortoiseSVN_en.xml:15828
13683+#: ../source/TortoiseSVN_en.xml:15823
1369913684 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."
1370013685 msgstr "Ta ukaz prenese vse zadnje spremembe iz skladišča v delovno kopijo, pri tem pa spoji spremebe, ki so jih naredili ostali uporabniki, z vašimi spremembami v delovni kopiji."
1370113686
1370213687 #. (glossterm)
13703-#: ../source/TortoiseSVN_en.xml:15836
13688+#: ../source/TortoiseSVN_en.xml:15831
1370413689 msgid "Working Copy"
1370513690 msgstr "Delovna kopija"
1370613691
1370713692 #. (para)
13708-#: ../source/TortoiseSVN_en.xml:15838
13693+#: ../source/TortoiseSVN_en.xml:15833
1370913694 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>."
1371013695 msgstr "To je vaš krajeni <quote>peskovnik</quote>, področje, kjer lahko delate z datotekami pod nadzorom in se običajno nahaja na vašem trdem disku. Z uporabno ukaza <quote>Prevzemi</quote> naredite delovno kopijo iz skladišča, spremembe, ki jih naredite, pa shranite v skladišče z ukazom <quote>Objavi</quote>."
1371113696
@@ -13721,6 +13706,22 @@
1372113706 msgid "translator-translation"
1372213707 msgstr "Prevod"
1372313708
13709+#~ msgid "/mergefrom:xxx"
13710+#~ msgstr "/mergefrom:xxx"
13711+#~ msgid "/mergeto:xxx"
13712+#~ msgstr "/mergeto:xxx"
13713+#~ msgid "/fromurl:URL"
13714+#~ msgstr "/fromurl:URL"
13715+#~ msgid ""
13716+#~ "Opens the merge dialog. The <placeholder-1/> specifies the target "
13717+#~ "directory. Three additional options can be set: <placeholder-2/>, "
13718+#~ "<placeholder-3/> and <placeholder-4/>. These pre-fill the relevant fields "
13719+#~ "in the merge dialog."
13720+#~ msgstr ""
13721+#~ "Odpre okno za spajanje. <placeholder-1/> določa ciljno mapo. Nastavimo pa "
13722+#~ "lahko še tri parametre: <placeholder-2/>, <placeholder-3/> in "
13723+#~ "<placeholder-4/>. Z njimi nastavimo ostala pomembna polja v oknu za "
13724+#~ "spajanje."
1372413725 #~ msgid "Merge All Changes"
1372513726 #~ msgstr "Spoji vse spremembe"
1372613727 #~ msgid "merge all"
Show on old repository browser