[meld] Updated Slovenian translation
- From: Matej Urbančič <mateju src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Updated Slovenian translation
- Date: Fri, 22 Oct 2010 18:02:32 +0000 (UTC)
commit 4974aaeaac205a8c60fabd63f545d62702fc3e33
Author: Matej UrbanÄ?iÄ? <mateju svn gnome org>
Date: Fri Oct 22 20:02:28 2010 +0200
Updated Slovenian translation
po/sl.po | 378 ++++++++++++++++++++++++++++++++------------------------------
1 files changed, 193 insertions(+), 185 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 8300d83..bd93921 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: meld master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&component=general\n"
-"POT-Creation-Date: 2010-10-10 21:16+0000\n"
-"PO-Revision-Date: 2010-10-12 19:49+0100\n"
+"POT-Creation-Date: 2010-10-20 07:02+0000\n"
+"PO-Revision-Date: 2010-10-22 20:00+0100\n"
"Last-Translator: Matej UrbanÄ?iÄ? <mateju svn gnome org>\n"
"Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
"Language: \n"
@@ -21,11 +21,11 @@ msgstr ""
"X-Poedit-Country: SLOVENIA\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: ../bin/meld:95
+#: ../bin/meld:96
msgid "Cannot import: "
msgstr "Ni mogoÄ?e uvoziti:"
-#: ../bin/meld:98
+#: ../bin/meld:99
#, c-format
msgid "Meld requires %s or higher."
msgstr "Program Meld zahteva najmanj razliÄ?ico %s."
@@ -39,7 +39,7 @@ msgid "Diff Viewer"
msgstr "Pregledovalnik sprememb"
#: ../data/meld.desktop.in.h:3
-#: ../data/ui/meldapp.ui.h:4
+#: ../data/ui/meldapp.ui.h:5
msgid "Meld"
msgstr "Meld"
@@ -96,7 +96,7 @@ msgid "_Previous"
msgstr "_Predhodni"
#: ../data/ui/findbar.ui.h:8
-#: ../meld/meldapp.py:153
+#: ../meld/meldapp.py:154
msgid "_Replace"
msgstr "_Zamenjaj"
@@ -109,45 +109,53 @@ msgid "Choose Files"
msgstr "Izbor datotek"
#: ../data/ui/meldapp.ui.h:2
-msgid "Copyright © 2002-2009 Stephen Kennedy"
-msgstr "Avtorske pravice © 2002-2009 Stephen Kennedy"
+msgid ""
+"Copyright © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2010 Kai Willadsen"
+msgstr ""
+"Avtorske pravice © 2002-2009 Stephen Kennedy\n"
+"Avtorske pravice © 2009-2010 Kai Willadsen"
-#: ../data/ui/meldapp.ui.h:3
+#: ../data/ui/meldapp.ui.h:4
msgid "Directory"
msgstr "Mapa"
-#: ../data/ui/meldapp.ui.h:5
+#: ../data/ui/meldapp.ui.h:6
msgid "Mine"
msgstr "Lastno"
-#: ../data/ui/meldapp.ui.h:6
+#: ../data/ui/meldapp.ui.h:7
msgid "Original"
msgstr "Izvorno"
-#: ../data/ui/meldapp.ui.h:7
+#: ../data/ui/meldapp.ui.h:8
msgid "Other"
msgstr "Drugo"
-#: ../data/ui/meldapp.ui.h:8
+#: ../data/ui/meldapp.ui.h:9
msgid "Select VC Directory"
msgstr "Izbor VC mape"
-#: ../data/ui/meldapp.ui.h:9
+#: ../data/ui/meldapp.ui.h:10
msgid "_Directory Comparison"
msgstr "_Primerjava vsebine map"
-#: ../data/ui/meldapp.ui.h:10
+#: ../data/ui/meldapp.ui.h:11
msgid "_File Comparison"
msgstr "_Primerjava datotek"
-#: ../data/ui/meldapp.ui.h:11
+#: ../data/ui/meldapp.ui.h:12
msgid "_Three Way Compare"
msgstr "_Trojna primerjava"
-#: ../data/ui/meldapp.ui.h:12
+#: ../data/ui/meldapp.ui.h:13
msgid "_Version Control Browser"
msgstr "_Brskalnik po nadzoru razliÄ?ic"
+#: ../data/ui/meldapp.ui.h:14
+msgid "translator-credits"
+msgstr "Matej UrbanÄ?iÄ? <mateju svn gnome org>"
+
#: ../data/ui/preferences.ui.h:1
msgid "Display"
msgstr "Prikaz"
@@ -273,7 +281,7 @@ msgid "Previous Logs"
msgstr "Predhodni dnevniki"
#: ../data/ui/vcview.ui.h:8
-#: ../meld/vcview.py:183
+#: ../meld/vcview.py:189
msgid "Tag"
msgstr "Oznaka"
@@ -281,117 +289,117 @@ msgstr "Oznaka"
msgid "VC Log"
msgstr "VC dnevnik"
-#: ../meld/dirdiff.py:184
-#: ../meld/vcview.py:125
+#: ../meld/dirdiff.py:142
+#: ../meld/vcview.py:128
msgid "_Compare"
msgstr "_Primerjava"
-#: ../meld/dirdiff.py:184
-#: ../meld/vcview.py:125
+#: ../meld/dirdiff.py:142
+#: ../meld/vcview.py:128
msgid "Compare selected"
msgstr "Primerjaj izbrano"
-#: ../meld/dirdiff.py:185
+#: ../meld/dirdiff.py:143
msgid "Left"
msgstr "Levo"
-#: ../meld/dirdiff.py:185
+#: ../meld/dirdiff.py:143
msgid "Copy To Left"
msgstr "Kopiraj na levo"
-#: ../meld/dirdiff.py:186
+#: ../meld/dirdiff.py:144
msgid "Right"
msgstr "Desno"
-#: ../meld/dirdiff.py:186
+#: ../meld/dirdiff.py:144
msgid "Copy To Right"
msgstr "Kopiraj na desno"
-#: ../meld/dirdiff.py:187
+#: ../meld/dirdiff.py:145
msgid "Delete selected"
msgstr "Izbriši izbor"
-#: ../meld/dirdiff.py:188
-#: ../meld/filediff.py:908
+#: ../meld/dirdiff.py:146
+#: ../meld/filediff.py:913
msgid "Hide"
msgstr "Skrij"
-#: ../meld/dirdiff.py:188
+#: ../meld/dirdiff.py:146
msgid "Hide selected"
msgstr "Skrij izbrano"
-#: ../meld/dirdiff.py:190
+#: ../meld/dirdiff.py:148
#: ../meld/filediff.py:226
-#: ../meld/vcview.py:126
+#: ../meld/vcview.py:129
msgid "Open selected"
msgstr "Odpri izbrano"
-#: ../meld/dirdiff.py:194
+#: ../meld/dirdiff.py:152
msgid "Case"
msgstr "Ä?rke"
-#: ../meld/dirdiff.py:194
+#: ../meld/dirdiff.py:152
msgid "Ignore case of entries"
msgstr "Prezri velikosti Ä?rk"
-#: ../meld/dirdiff.py:195
+#: ../meld/dirdiff.py:153
msgid "Same"
msgstr "Enako"
-#: ../meld/dirdiff.py:195
+#: ../meld/dirdiff.py:153
msgid "Show identical"
msgstr "Pokaži enako"
-#: ../meld/dirdiff.py:196
+#: ../meld/dirdiff.py:154
msgid "New"
msgstr "Novo"
-#: ../meld/dirdiff.py:196
+#: ../meld/dirdiff.py:154
msgid "Show new"
msgstr "Pokaži novejše"
-#: ../meld/dirdiff.py:197
+#: ../meld/dirdiff.py:155
msgid "Modified"
msgstr "Spremenjeno"
-#: ../meld/dirdiff.py:197
-#: ../meld/vcview.py:139
+#: ../meld/dirdiff.py:155
+#: ../meld/vcview.py:142
msgid "Show modified"
msgstr "Pokaži spremenjeno"
-#: ../meld/dirdiff.py:199
+#: ../meld/dirdiff.py:157
msgid "Filters"
msgstr "Filtri"
-#: ../meld/dirdiff.py:199
+#: ../meld/dirdiff.py:157
msgid "Set active filters"
msgstr "DoloÄ?i dejavne filtre"
-#: ../meld/dirdiff.py:252
-#: ../meld/dirdiff.py:298
+#: ../meld/dirdiff.py:213
+#: ../meld/dirdiff.py:259
#, python-format
msgid "Error converting pattern '%s' to regular expression"
msgstr "Napaka med pretvarjanjem vzorca '%s' v logiÄ?ni izraz"
-#: ../meld/dirdiff.py:309
+#: ../meld/dirdiff.py:270
#, python-format
msgid "Hide %s"
msgstr "Skrij %s"
-#: ../meld/dirdiff.py:394
-#: ../meld/dirdiff.py:404
-#: ../meld/vcview.py:301
-#: ../meld/vcview.py:329
+#: ../meld/dirdiff.py:355
+#: ../meld/dirdiff.py:365
+#: ../meld/vcview.py:307
+#: ../meld/vcview.py:335
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] Preiskovanje %s"
-#: ../meld/dirdiff.py:433
+#: ../meld/dirdiff.py:394
#, python-format
msgid "'%s' hidden by '%s'"
msgstr "'%s' je skrit; '%s'"
-#: ../meld/dirdiff.py:439
+#: ../meld/dirdiff.py:400
#, python-format
msgid ""
"You are running a case insensitive comparison on a case sensitive filesystem. Some files are not visible:\n"
@@ -400,12 +408,12 @@ msgstr ""
"Zagnan je naÄ?in primerjave brez upoÅ¡tevanja velikosti Ä?rk na sistemu, ki razlike velikosti upoÅ¡teva. Nekatere datoteke niso vidne:\n"
"%s"
-#: ../meld/dirdiff.py:516
+#: ../meld/dirdiff.py:477
#, python-format
msgid "[%s] Done"
msgstr "[%s] konÄ?ano"
-#: ../meld/dirdiff.py:562
+#: ../meld/dirdiff.py:523
#, python-format
msgid ""
"'%s' exists.\n"
@@ -414,7 +422,7 @@ msgstr ""
"'%s' že obstaja.\n"
"Ali naj bo prepisana?"
-#: ../meld/dirdiff.py:569
+#: ../meld/dirdiff.py:530
#, python-format
msgid ""
"Error copying '%s' to '%s'\n"
@@ -425,8 +433,8 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:587
-#: ../meld/vcview.py:488
+#: ../meld/dirdiff.py:548
+#: ../meld/vcview.py:494
#, python-format
msgid ""
"'%s' is a directory.\n"
@@ -435,8 +443,8 @@ msgstr ""
"'%s' je mapa.\n"
"Ali naj bo odstranjena vsa vsebina?"
-#: ../meld/dirdiff.py:594
-#: ../meld/vcview.py:493
+#: ../meld/dirdiff.py:555
+#: ../meld/vcview.py:499
#, python-format
msgid ""
"Error removing %s\n"
@@ -447,7 +455,7 @@ msgstr ""
"\n"
"%s."
-#: ../meld/dirdiff.py:606
+#: ../meld/dirdiff.py:567
#, python-format
msgid "%i second"
msgid_plural "%i seconds"
@@ -456,7 +464,7 @@ msgstr[1] "%i sekunda"
msgstr[2] "%i sekundi"
msgstr[3] "%i sekunde"
-#: ../meld/dirdiff.py:607
+#: ../meld/dirdiff.py:568
#, python-format
msgid "%i minute"
msgid_plural "%i minutes"
@@ -465,7 +473,7 @@ msgstr[1] "%i minuta"
msgstr[2] "%i minuti"
msgstr[3] "%i minute"
-#: ../meld/dirdiff.py:608
+#: ../meld/dirdiff.py:569
#, python-format
msgid "%i hour"
msgid_plural "%i hours"
@@ -474,7 +482,7 @@ msgstr[1] "%i ura"
msgstr[2] "%i uri"
msgstr[3] "%i ure"
-#: ../meld/dirdiff.py:609
+#: ../meld/dirdiff.py:570
#, python-format
msgid "%i day"
msgid_plural "%i days"
@@ -483,7 +491,7 @@ msgstr[1] "%i dan"
msgstr[2] "%i dni"
msgstr[3] "%i dni"
-#: ../meld/dirdiff.py:610
+#: ../meld/dirdiff.py:571
#, python-format
msgid "%i week"
msgid_plural "%i weeks"
@@ -492,7 +500,7 @@ msgstr[1] "%i teden"
msgstr[2] "%i tedna"
msgstr[3] "%i tedni"
-#: ../meld/dirdiff.py:611
+#: ../meld/dirdiff.py:572
#, python-format
msgid "%i month"
msgid_plural "%i months"
@@ -501,7 +509,7 @@ msgstr[1] "%i mesec"
msgstr[2] "%i meseca"
msgstr[3] "%i meseci"
-#: ../meld/dirdiff.py:612
+#: ../meld/dirdiff.py:573
#, python-format
msgid "%i year"
msgid_plural "%i years"
@@ -620,58 +628,58 @@ msgid "Regular expression '%s' changed the number of lines in the file. Comparis
msgstr "Po dejanju logiÄ?nega izraza '%s' se je spremenilo Å¡tevilo vrstic v datoteki, zato primerjava ne bo natanÄ?na. Za veÄ? podrobnosti si oglejte priroÄ?nik."
#. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:590
+#: ../meld/filediff.py:595
msgid "<unnamed>"
msgstr "<neimenovano>"
-#: ../meld/filediff.py:766
+#: ../meld/filediff.py:771
#, python-format
msgid "[%s] Set num panes"
msgstr "[%s] DoloÄ?i okna"
-#: ../meld/filediff.py:772
+#: ../meld/filediff.py:777
#, python-format
msgid "[%s] Opening files"
msgstr "[%s] Odpiranje datotek"
-#: ../meld/filediff.py:778
-#: ../meld/filediff.py:912
+#: ../meld/filediff.py:783
+#: ../meld/filediff.py:917
msgid "Hi_de"
msgstr "S_krij"
-#: ../meld/filediff.py:800
-#: ../meld/filediff.py:811
-#: ../meld/filediff.py:824
-#: ../meld/filediff.py:830
+#: ../meld/filediff.py:805
+#: ../meld/filediff.py:816
+#: ../meld/filediff.py:829
+#: ../meld/filediff.py:835
msgid "Could not read file"
msgstr "Ni mogoÄ?e prebrati datoteke"
-#: ../meld/filediff.py:803
+#: ../meld/filediff.py:808
#, python-format
msgid "[%s] Reading files"
msgstr "[%s] Branje datotek"
-#: ../meld/filediff.py:812
+#: ../meld/filediff.py:817
#, python-format
msgid "%s appears to be a binary file."
msgstr "%s je videti kot dvojiška datoteka."
-#: ../meld/filediff.py:825
+#: ../meld/filediff.py:830
#, python-format
msgid "%s is not in encodings: %s"
msgstr "%s ni zapisan v naboru: %s"
-#: ../meld/filediff.py:857
+#: ../meld/filediff.py:862
#: ../meld/filemerge.py:70
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] RaÄ?unanje razlik"
-#: ../meld/filediff.py:906
+#: ../meld/filediff.py:911
msgid "Files are identical"
msgstr "Datoteki sta enaki"
-#: ../meld/filediff.py:1041
+#: ../meld/filediff.py:1046
#, python-format
msgid ""
"\"%s\" exists!\n"
@@ -680,7 +688,7 @@ msgstr ""
"\"%s\" že obstaja!\n"
"Ali naj bo datoteka prepisana?"
-#: ../meld/filediff.py:1054
+#: ../meld/filediff.py:1059
#, python-format
msgid ""
"Error writing to %s\n"
@@ -691,12 +699,12 @@ msgstr ""
"\n"
"%s."
-#: ../meld/filediff.py:1063
+#: ../meld/filediff.py:1068
#, python-format
msgid "Choose a name for buffer %i."
msgstr "Izbor imena za medpomnilnik %i."
-#: ../meld/filediff.py:1077
+#: ../meld/filediff.py:1082
#, python-format
msgid ""
"This file '%s' contains a mixture of line endings.\n"
@@ -707,7 +715,7 @@ msgstr ""
"\n"
"Kateri zapis želite uporabiti?"
-#: ../meld/filediff.py:1093
+#: ../meld/filediff.py:1098
#, python-format
msgid ""
"'%s' contains characters not encodable with '%s'\n"
@@ -716,7 +724,7 @@ msgstr ""
"'%s' vsebuje znake, ki jih ni mogoÄ?e kodirati v naboru '%s'\n"
"Ali naj se datoteka shrani v naboru UTF-8?"
-#: ../meld/filediff.py:1150
+#: ../meld/filediff.py:1155
#, python-format
msgid ""
"Reloading will discard changes in:\n"
@@ -734,236 +742,236 @@ msgstr ""
msgid "[%s] Merging files"
msgstr "[%s] Združevanje datotek"
-#: ../meld/meldapp.py:138
+#: ../meld/meldapp.py:139
msgid "_File"
msgstr "_Datoteka"
-#: ../meld/meldapp.py:139
+#: ../meld/meldapp.py:140
msgid "_New..."
msgstr "_Novo ..."
-#: ../meld/meldapp.py:139
+#: ../meld/meldapp.py:140
msgid "Start a new comparison"
msgstr "Nova primerjava"
-#: ../meld/meldapp.py:140
+#: ../meld/meldapp.py:141
msgid "Save the current file"
msgstr "Shrani trenutno datoteko"
-#: ../meld/meldapp.py:142
+#: ../meld/meldapp.py:143
msgid "Close the current file"
msgstr "Zapri trenutno datoteko"
-#: ../meld/meldapp.py:143
+#: ../meld/meldapp.py:144
msgid "Quit the program"
msgstr "KonÄ?aj program"
-#: ../meld/meldapp.py:145
+#: ../meld/meldapp.py:146
msgid "_Edit"
msgstr "_Uredi"
-#: ../meld/meldapp.py:146
+#: ../meld/meldapp.py:147
msgid "Undo the last action"
msgstr "Razveljavi zadnje dejanje"
-#: ../meld/meldapp.py:147
+#: ../meld/meldapp.py:148
msgid "Redo the last undone action"
msgstr "Obnovi zadnje razveljavljeno dejanje"
-#: ../meld/meldapp.py:148
+#: ../meld/meldapp.py:149
msgid "Cut the selection"
msgstr "Izreži izbrano"
-#: ../meld/meldapp.py:149
+#: ../meld/meldapp.py:150
msgid "Copy the selection"
msgstr "Kopiraj izbrano"
-#: ../meld/meldapp.py:150
+#: ../meld/meldapp.py:151
msgid "Paste the clipboard"
msgstr "Prilepi iz odložiÅ¡Ä?a"
-#: ../meld/meldapp.py:151
+#: ../meld/meldapp.py:152
msgid "Search for text"
msgstr "PoiÅ¡Ä?i besedilo"
-#: ../meld/meldapp.py:152
+#: ../meld/meldapp.py:153
msgid "Find Ne_xt"
msgstr "Najdi _naslednje"
-#: ../meld/meldapp.py:152
+#: ../meld/meldapp.py:153
msgid "Search forwards for the same text"
msgstr "PoiÅ¡Ä?i niz naprej po besedilu"
-#: ../meld/meldapp.py:153
+#: ../meld/meldapp.py:154
msgid "Find and replace text"
msgstr "PoiÅ¡Ä?i in zamenjaj besedilo"
-#: ../meld/meldapp.py:154
+#: ../meld/meldapp.py:155
msgid "Prefere_nces"
msgstr "_Lastnosti"
-#: ../meld/meldapp.py:154
+#: ../meld/meldapp.py:155
msgid "Configure the application"
msgstr "Spremeni nastavitve programa"
-#: ../meld/meldapp.py:156
+#: ../meld/meldapp.py:157
msgid "_Changes"
msgstr "_Spremembe"
-#: ../meld/meldapp.py:157
+#: ../meld/meldapp.py:158
msgid "Next change"
msgstr "Naslednja sprememba"
-#: ../meld/meldapp.py:157
+#: ../meld/meldapp.py:158
msgid "Go to the next change"
msgstr "SkoÄ?i na naslednjo spremembo"
-#: ../meld/meldapp.py:158
+#: ../meld/meldapp.py:159
msgid "Previous change"
msgstr "Predhodna sprememba"
-#: ../meld/meldapp.py:158
+#: ../meld/meldapp.py:159
msgid "Go to the previous change"
msgstr "SkoÄ?i na predhodno spremembo"
-#: ../meld/meldapp.py:160
+#: ../meld/meldapp.py:161
msgid "_View"
msgstr "_Pogled"
-#: ../meld/meldapp.py:161
+#: ../meld/meldapp.py:162
msgid "File status"
msgstr "Stanje datoteke"
-#: ../meld/meldapp.py:162
+#: ../meld/meldapp.py:163
msgid "Version status"
msgstr "Stanje razliÄ?ice"
-#: ../meld/meldapp.py:163
+#: ../meld/meldapp.py:164
msgid "File filters"
msgstr "Filtri datotek"
-#: ../meld/meldapp.py:164
+#: ../meld/meldapp.py:165
msgid "Stop the current action"
msgstr "Ustavi trenutno dejanje"
-#: ../meld/meldapp.py:165
+#: ../meld/meldapp.py:166
msgid "Refresh the view"
msgstr "Osveži pogled"
-#: ../meld/meldapp.py:166
+#: ../meld/meldapp.py:167
msgid "Reload"
msgstr "Ponovno naloži"
-#: ../meld/meldapp.py:166
+#: ../meld/meldapp.py:167
msgid "Reload the comparison"
msgstr "Ponovno naloži primerjavo"
-#: ../meld/meldapp.py:168
+#: ../meld/meldapp.py:169
msgid "_Help"
msgstr "Pomo_Ä?"
-#: ../meld/meldapp.py:169
+#: ../meld/meldapp.py:170
msgid "_Contents"
msgstr "_Vsebina"
-#: ../meld/meldapp.py:169
+#: ../meld/meldapp.py:170
msgid "Open the Meld manual"
msgstr "Odpri priroÄ?nik Meld"
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:171
msgid "Report _Bug"
msgstr "PoÅ¡lji poroÄ?ilo o _hroÅ¡Ä?u"
-#: ../meld/meldapp.py:170
+#: ../meld/meldapp.py:171
msgid "Report a bug in Meld"
msgstr "PoroÄ?ilo o hroÅ¡Ä?u programa Meld"
-#: ../meld/meldapp.py:171
+#: ../meld/meldapp.py:172
msgid "About this program"
msgstr "O programu"
-#: ../meld/meldapp.py:174
+#: ../meld/meldapp.py:175
msgid "Full Screen"
msgstr "Celozaslonski naÄ?in"
-#: ../meld/meldapp.py:174
+#: ../meld/meldapp.py:175
msgid "View the comparison in full screen"
msgstr "Ogled primerjave v celozaslonskem naÄ?inu"
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:176
msgid "_Toolbar"
msgstr "_Orodna vrstica"
-#: ../meld/meldapp.py:175
+#: ../meld/meldapp.py:176
msgid "Show or hide the toolbar"
msgstr "Pokaži ali skrij orodno vrstico"
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:177
msgid "_Statusbar"
msgstr "_Vrstica stanja"
-#: ../meld/meldapp.py:176
+#: ../meld/meldapp.py:177
msgid "Show or hide the statusbar"
msgstr "Pokaži ali skrij vrstico stanja"
#. exit at first non found directory + file
-#: ../meld/meldapp.py:542
+#: ../meld/meldapp.py:543
msgid "Cannot compare a mixture of files and directories.\n"
msgstr "Ni mogoÄ?e primerjati meÅ¡anice datotek in map.\n"
-#: ../meld/meldapp.py:596
+#: ../meld/meldapp.py:598
msgid "wrong number of arguments supplied to --diff"
msgstr "Neveljavno Å¡tevilo argumentov pri ukazu --diff."
-#: ../meld/meldapp.py:600
+#: ../meld/meldapp.py:602
msgid "Start with an empty window"
msgstr "Zagon brez odprtih oken"
-#: ../meld/meldapp.py:601
-#: ../meld/meldapp.py:602
+#: ../meld/meldapp.py:603
#: ../meld/meldapp.py:604
+#: ../meld/meldapp.py:606
msgid "file"
msgstr "datoteka"
-#: ../meld/meldapp.py:601
#: ../meld/meldapp.py:603
-#: ../meld/meldapp.py:604
+#: ../meld/meldapp.py:605
+#: ../meld/meldapp.py:606
msgid "dir"
msgstr "mapa"
-#: ../meld/meldapp.py:601
+#: ../meld/meldapp.py:603
msgid "Start a version control comparison"
msgstr "Zagon primerjave nadzora razliÄ?ic"
-#: ../meld/meldapp.py:602
+#: ../meld/meldapp.py:604
msgid "Start a 2- or 3-way file comparison"
msgstr "Zagon z dvojno ali trojno primerjavo datotek"
-#: ../meld/meldapp.py:603
+#: ../meld/meldapp.py:605
msgid "Start a 2- or 3-way directory comparison"
msgstr "Zagon z dvojno ali trojno primerjavo map"
-#: ../meld/meldapp.py:604
+#: ../meld/meldapp.py:606
msgid "Start a comparison between file and dir/file"
msgstr "Zagon primerjave med datoteko in mapo/datoteko"
-#: ../meld/meldapp.py:610
+#: ../meld/meldapp.py:612
msgid "Meld is a file and directory comparison tool."
msgstr "Meld je orodje za primerjavo vsebine datotek in map."
-#: ../meld/meldapp.py:613
+#: ../meld/meldapp.py:615
msgid "Set label to use instead of file name"
msgstr "DoloÄ?i naslov namesto imena datoteke"
-#: ../meld/meldapp.py:615
+#: ../meld/meldapp.py:617
msgid "Automatically compare all differing files on startup"
msgstr "Ob zagonu samodejno primerjaj vse razliÄ?ne datoteke."
-#: ../meld/meldapp.py:618
+#: ../meld/meldapp.py:620
msgid "Creates a diff tab for up to 3 supplied files or directories."
msgstr "Ustvari zavihke primerjav za do tri datoteke ali mape."
-#: ../meld/meldapp.py:621
+#: ../meld/meldapp.py:623
#, python-format
msgid "too many arguments (wanted 0-4, got %d)"
msgstr "preveÄ? argumentov (zahtevanih 0-4, prejetih %d)"
@@ -973,7 +981,7 @@ msgid "untitled"
msgstr "neimenovano"
#. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:181
+#: ../meld/misc.py:192
msgid "[None]"
msgstr "[noben]"
@@ -997,7 +1005,7 @@ msgstr "Na voljo le, Ä?e je nameÅ¡Ä?en paket gnome-python-desktop"
#. text filters
#: ../meld/preferences.py:165
#: ../meld/preferences.py:170
-#: ../meld/vcview.py:163
+#: ../meld/vcview.py:166
msgid "Name"
msgstr "Ime"
@@ -1069,168 +1077,168 @@ msgstr "ZaÄ?etni presledni znaki\t0\t^[ \\t\\r\\f\\v]*\n"
msgid "Script comment\t0\t#.*"
msgstr "Opomba skripta\t0\t#.*"
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:130
msgid "_Commit"
msgstr "_Uveljavi"
-#: ../meld/vcview.py:127
+#: ../meld/vcview.py:130
msgid "Commit"
msgstr "Uveljavi"
#. FIXME: popup used to use gtk.STOCK_GO_BACK
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:131
msgid "_Update"
msgstr "_Posodobi"
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:131
msgid "Update"
msgstr "Posodobi"
#. FIXME: popup used to use gtk.STOCK_GO_FORWARD
-#: ../meld/vcview.py:129
+#: ../meld/vcview.py:132
msgid "_Add"
msgstr "_Dodaj"
-#: ../meld/vcview.py:129
+#: ../meld/vcview.py:132
msgid "Add to VC"
msgstr "Dodaj v VC"
#. FIXME: popup used to use gtk.STOCK_ADD
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:133
msgid "Add _Binary"
msgstr "Dodaj _dvojiško"
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:133
msgid "Add binary to VC"
msgstr "Dodaj dvojiško datoteko v VC"
#. FIXME: stock is inconsistent with other VC actions
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:134
msgid "_Remove"
msgstr "_Odstrani"
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:134
msgid "Remove from VC"
msgstr "Odstrani iz VC"
#. FIXME: popup used to use gtk.STOCK_REMOVE
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:135
msgid "_Resolved"
msgstr "_Razrešeno"
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:135
msgid "Mark as resolved for VC"
msgstr "OznaÄ?i kot razreÅ¡eno v VC"
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:136
msgid "Revert to original"
msgstr "_Povrni na izvirne vrednosti"
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:137
msgid "Delete locally"
msgstr "Izbriši krajevno"
-#: ../meld/vcview.py:138
+#: ../meld/vcview.py:141
msgid "_Flatten"
msgstr "_Razpni"
-#: ../meld/vcview.py:138
+#: ../meld/vcview.py:141
msgid "Flatten directories"
msgstr "_Razpni mape"
-#: ../meld/vcview.py:139
+#: ../meld/vcview.py:142
msgid "_Modified"
msgstr "_Spremenjeno"
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:143
msgid "_Normal"
msgstr "_ObiÄ?ajno"
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:143
msgid "Show normal"
msgstr "Pokaži obiÄ?ajno"
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:144
msgid "Non _VC"
msgstr "Ni _VC"
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:144
msgid "Show unversioned files"
msgstr "Pokaži datoteke z nedoloÄ?enimi razliÄ?icami"
-#: ../meld/vcview.py:142
+#: ../meld/vcview.py:145
msgid "Ignored"
msgstr "Prezrto"
-#: ../meld/vcview.py:142
+#: ../meld/vcview.py:145
msgid "Show ignored files"
msgstr "Pokaži prezrte datoteke"
-#: ../meld/vcview.py:180
+#: ../meld/vcview.py:186
msgid "Location"
msgstr "Mesto"
-#: ../meld/vcview.py:181
+#: ../meld/vcview.py:187
msgid "Status"
msgstr "Stanje"
-#: ../meld/vcview.py:182
+#: ../meld/vcview.py:188
msgid "Rev"
msgstr "Rev"
-#: ../meld/vcview.py:184
+#: ../meld/vcview.py:190
msgid "Options"
msgstr "Možnosti"
-#: ../meld/vcview.py:231
+#: ../meld/vcview.py:237
msgid "Choose one Version Control"
msgstr "Izbor nadzora razliÄ?ic"
-#: ../meld/vcview.py:232
+#: ../meld/vcview.py:238
msgid "Only one Version Control in this directory"
msgstr "V tej mapi je le en nadzornik razliÄ?ic"
#. TRANSLATORS: this is an error message when a version control
#. application isn't installed or can't be found
-#: ../meld/vcview.py:245
+#: ../meld/vcview.py:251
#, python-format
msgid "%s Not Installed"
msgstr "%s paket ni nameÅ¡Ä?en"
#. TRANSLATORS: this is an error message when a version
#. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:249
+#: ../meld/vcview.py:255
msgid "Invalid Repository"
msgstr "Neveljavno skladiÅ¡Ä?e"
-#: ../meld/vcview.py:258
+#: ../meld/vcview.py:264
#, python-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../meld/vcview.py:345
+#: ../meld/vcview.py:351
msgid "(Empty)"
msgstr "(Prazno)"
-#: ../meld/vcview.py:378
+#: ../meld/vcview.py:384
#, python-format
msgid "[%s] Fetching differences"
msgstr "[%s] Iskanje razlik"
-#: ../meld/vcview.py:385
+#: ../meld/vcview.py:391
#, python-format
msgid "[%s] Applying patch"
msgstr "[%s] Pripenjanje popravka"
-#: ../meld/vcview.py:389
+#: ../meld/vcview.py:395
msgid "No differences found."
msgstr "Ni razlik."
-#: ../meld/vcview.py:463
+#: ../meld/vcview.py:469
msgid "Select some files first."
msgstr "Najprej je treba izbrati datoteke."
-#: ../meld/vcview.py:529
+#: ../meld/vcview.py:535
#, python-format
msgid ""
"\n"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]