[meld] Updated Slovenian translation



commit 3ad2bd36486a54f938980a84534963d5ebebaf0d
Author: Matej UrbanÄ?iÄ? <mateju svn gnome org>
Date:   Sun Jan 16 14:29:32 2011 +0100

    Updated Slovenian translation

 po/sl.po |  251 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 125 insertions(+), 126 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 8e82095..73e38b1 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-12-11 17:28+0000\n"
-"PO-Revision-Date: 2010-12-11 20:08+0100\n"
+"POT-Creation-Date: 2011-01-16 12:13+0000\n"
+"PO-Revision-Date: 2011-01-16 14:27+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"
@@ -335,19 +335,19 @@ msgid "Compare selected"
 msgstr "Primerjaj izbrano"
 
 #: ../meld/dirdiff.py:143
-msgid "Left"
-msgstr "Levo"
+msgid "Copy _Left"
+msgstr "Kopiraj _levo"
 
 #: ../meld/dirdiff.py:143
-msgid "Copy To Left"
+msgid "Copy to left"
 msgstr "Kopiraj na levo"
 
 #: ../meld/dirdiff.py:144
-msgid "Right"
-msgstr "Desno"
+msgid "Copy _Right"
+msgstr "Kopiraj _desno"
 
 #: ../meld/dirdiff.py:144
-msgid "Copy To Right"
+msgid "Copy to right"
 msgstr "Kopiraj na desno"
 
 #: ../meld/dirdiff.py:145
@@ -355,7 +355,7 @@ msgid "Delete selected"
 msgstr "Izbriši izbor"
 
 #: ../meld/dirdiff.py:146
-#: ../meld/filediff.py:962
+#: ../meld/filediff.py:974
 msgid "Hide"
 msgstr "Skrij"
 
@@ -364,7 +364,7 @@ msgid "Hide selected"
 msgstr "Skrij izbrano"
 
 #: ../meld/dirdiff.py:148
-#: ../meld/filediff.py:246
+#: ../meld/filediff.py:249
 #: ../meld/vcview.py:119
 msgid "Open selected"
 msgstr "Odpri izbrano"
@@ -411,30 +411,30 @@ msgid "Set active filters"
 msgstr "DoloÄ?i dejavne filtre"
 
 #: ../meld/dirdiff.py:213
-#: ../meld/dirdiff.py:259
+#: ../meld/dirdiff.py:261
 #, python-format
 msgid "Error converting pattern '%s' to regular expression"
 msgstr "Napaka med pretvarjanjem vzorca '%s' v logiÄ?ni izraz"
 
-#: ../meld/dirdiff.py:270
+#: ../meld/dirdiff.py:272
 #, python-format
 msgid "Hide %s"
 msgstr "Skrij %s"
 
-#: ../meld/dirdiff.py:355
-#: ../meld/dirdiff.py:365
-#: ../meld/vcview.py:299
-#: ../meld/vcview.py:327
+#: ../meld/dirdiff.py:357
+#: ../meld/dirdiff.py:367
+#: ../meld/vcview.py:304
+#: ../meld/vcview.py:332
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Preiskovanje %s"
 
-#: ../meld/dirdiff.py:394
+#: ../meld/dirdiff.py:396
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' je skrit; '%s'"
 
-#: ../meld/dirdiff.py:400
+#: ../meld/dirdiff.py:402
 #, python-format
 msgid ""
 "You are running a case insensitive comparison on a case sensitive filesystem. Some files are not visible:\n"
@@ -443,12 +443,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:477
+#: ../meld/dirdiff.py:479
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] konÄ?ano"
 
-#: ../meld/dirdiff.py:523
+#: ../meld/dirdiff.py:525
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -457,7 +457,7 @@ msgstr ""
 "'%s' že obstaja.\n"
 "Ali naj bo prepisana?"
 
-#: ../meld/dirdiff.py:530
+#: ../meld/dirdiff.py:532
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -468,8 +468,8 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:548
-#: ../meld/vcview.py:486
+#: ../meld/dirdiff.py:550
+#: ../meld/vcview.py:504
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -478,8 +478,8 @@ msgstr ""
 "'%s' je mapa.\n"
 "Ali naj bo odstranjena vsa vsebina?"
 
-#: ../meld/dirdiff.py:555
-#: ../meld/vcview.py:491
+#: ../meld/dirdiff.py:557
+#: ../meld/vcview.py:509
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -490,7 +490,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:567
+#: ../meld/dirdiff.py:569
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -499,7 +499,7 @@ msgstr[1] "%i sekunda"
 msgstr[2] "%i sekundi"
 msgstr[3] "%i sekunde"
 
-#: ../meld/dirdiff.py:568
+#: ../meld/dirdiff.py:570
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -508,7 +508,7 @@ msgstr[1] "%i minuta"
 msgstr[2] "%i minuti"
 msgstr[3] "%i minute"
 
-#: ../meld/dirdiff.py:569
+#: ../meld/dirdiff.py:571
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -517,7 +517,7 @@ msgstr[1] "%i ura"
 msgstr[2] "%i uri"
 msgstr[3] "%i ure"
 
-#: ../meld/dirdiff.py:570
+#: ../meld/dirdiff.py:572
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -526,7 +526,7 @@ msgstr[1] "%i dan"
 msgstr[2] "%i dni"
 msgstr[3] "%i dni"
 
-#: ../meld/dirdiff.py:571
+#: ../meld/dirdiff.py:573
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -535,7 +535,7 @@ msgstr[1] "%i teden"
 msgstr[2] "%i tedna"
 msgstr[3] "%i tedni"
 
-#: ../meld/dirdiff.py:572
+#: ../meld/dirdiff.py:574
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -544,7 +544,7 @@ msgstr[1] "%i mesec"
 msgstr[2] "%i meseca"
 msgstr[3] "%i meseci"
 
-#: ../meld/dirdiff.py:573
+#: ../meld/dirdiff.py:575
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -553,200 +553,200 @@ msgstr[1] "%i leto"
 msgstr[2] "%i leti"
 msgstr[3] "%i leta"
 
-#: ../meld/filediff.py:247
+#: ../meld/filediff.py:250
 msgid "Format as patch..."
 msgstr "Oblikuj kot popravek ..."
 
-#: ../meld/filediff.py:247
+#: ../meld/filediff.py:250
 msgid "Create a patch using differences between files"
 msgstr "Ustvari popravek z razlikovanjem med datotekami"
 
-#: ../meld/filediff.py:248
+#: ../meld/filediff.py:251
 msgid "Previous conflict"
 msgstr "Predhodni spor"
 
-#: ../meld/filediff.py:248
+#: ../meld/filediff.py:251
 msgid "Go to the previous conflict"
 msgstr "SkoÄ?i na predhodni niz v sporu"
 
-#: ../meld/filediff.py:249
+#: ../meld/filediff.py:252
 msgid "Next conflict"
 msgstr "Naslednji spor"
 
-#: ../meld/filediff.py:249
+#: ../meld/filediff.py:252
 msgid "Go to the next conflict"
 msgstr "SkoÄ?i na naslednji niz v sporu"
 
-#: ../meld/filediff.py:250
+#: ../meld/filediff.py:253
 msgid "Push to left"
 msgstr "Potisni levo"
 
-#: ../meld/filediff.py:250
+#: ../meld/filediff.py:253
 msgid "Push current change to the left"
 msgstr "Potisni trenutne spremembe na levo"
 
-#: ../meld/filediff.py:251
+#: ../meld/filediff.py:254
 msgid "Push to right"
 msgstr "Potisni desno"
 
-#: ../meld/filediff.py:251
+#: ../meld/filediff.py:254
 msgid "Push current change to the right"
 msgstr "Potisni trenutne spremembe na desno"
 
 #. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:253
+#: ../meld/filediff.py:256
 msgid "Pull from left"
 msgstr "Potegni z leve"
 
-#: ../meld/filediff.py:253
+#: ../meld/filediff.py:256
 msgid "Pull change from the left"
 msgstr "Potegni spremembe z leve"
 
-#: ../meld/filediff.py:254
+#: ../meld/filediff.py:257
 msgid "Pull from right"
 msgstr "Potegni z desne"
 
-#: ../meld/filediff.py:254
+#: ../meld/filediff.py:257
 msgid "Pull change from the right"
 msgstr "Potegni spremembe z desne"
 
-#: ../meld/filediff.py:255
+#: ../meld/filediff.py:258
 msgid "Copy above left"
 msgstr "Kopiraj nad levo"
 
-#: ../meld/filediff.py:255
+#: ../meld/filediff.py:258
 msgid "Copy change above the left chunk"
 msgstr "Kopiraj spremembe nad levi del"
 
-#: ../meld/filediff.py:256
+#: ../meld/filediff.py:259
 msgid "Copy below left"
 msgstr "Kopiraj pod levo"
 
-#: ../meld/filediff.py:256
+#: ../meld/filediff.py:259
 msgid "Copy change below the left chunk"
 msgstr "Kopiraj spremembe pod levi del"
 
-#: ../meld/filediff.py:257
+#: ../meld/filediff.py:260
 msgid "Copy above right"
 msgstr "Kopiraj nad desno"
 
-#: ../meld/filediff.py:257
+#: ../meld/filediff.py:260
 msgid "Copy change above the right chunk"
 msgstr "Kopiraj spremembe nad desni del"
 
-#: ../meld/filediff.py:258
+#: ../meld/filediff.py:261
 msgid "Copy below right"
 msgstr "Kopiraj pod desno"
 
-#: ../meld/filediff.py:258
+#: ../meld/filediff.py:261
 msgid "Copy change below the right chunk"
 msgstr "Kopiraj spremembe pod desni del"
 
-#: ../meld/filediff.py:259
+#: ../meld/filediff.py:262
 msgid "Delete"
 msgstr "Izbriši"
 
-#: ../meld/filediff.py:259
+#: ../meld/filediff.py:262
 msgid "Delete change"
 msgstr "Izbriši spremembo"
 
-#: ../meld/filediff.py:260
+#: ../meld/filediff.py:263
 msgid "Merge all changes from left"
 msgstr "Združi vse spremembe z leve"
 
-#: ../meld/filediff.py:260
+#: ../meld/filediff.py:263
 msgid "Merge all non-conflicting changes from the left"
 msgstr "Združi vse spremembe brez sporov z leve"
 
-#: ../meld/filediff.py:261
+#: ../meld/filediff.py:264
 msgid "Merge all changes from right"
 msgstr "Združi vse spremembe z desne"
 
-#: ../meld/filediff.py:261
+#: ../meld/filediff.py:264
 msgid "Merge all non-conflicting changes from the right"
 msgstr "Združi vse spremembe brez sporov z desne"
 
-#: ../meld/filediff.py:262
+#: ../meld/filediff.py:265
 msgid "Merge all non-conflicting"
 msgstr "Združi vse spremembe brez sporov"
 
-#: ../meld/filediff.py:262
+#: ../meld/filediff.py:265
 msgid "Merge all non-conflicting changes from left and right panes"
 msgstr "Združi vse spremembe brez sporov z leve in z desne"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:333
+#: ../meld/filediff.py:337
 msgid "INS"
 msgstr "VST"
 
-#: ../meld/filediff.py:333
+#: ../meld/filediff.py:337
 msgid "OVR"
 msgstr "PRE"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:335
+#: ../meld/filediff.py:339
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Vr. %i, St. %i"
 
-#: ../meld/filediff.py:537
+#: ../meld/filediff.py:541
 #, python-format
 msgid "Regular expression '%s' changed the number of lines in the file. Comparison will be incorrect. See the user manual for more details."
 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:645
+#: ../meld/filediff.py:649
 msgid "<unnamed>"
 msgstr "<neimenovano>"
 
-#: ../meld/filediff.py:828
+#: ../meld/filediff.py:839
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] DoloÄ?i okna"
 
-#: ../meld/filediff.py:834
+#: ../meld/filediff.py:845
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Odpiranje datotek"
 
-#: ../meld/filediff.py:840
-#: ../meld/filediff.py:966
+#: ../meld/filediff.py:851
+#: ../meld/filediff.py:978
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: ../meld/filediff.py:861
-#: ../meld/filediff.py:870
-#: ../meld/filediff.py:882
-#: ../meld/filediff.py:888
+#: ../meld/filediff.py:872
+#: ../meld/filediff.py:881
+#: ../meld/filediff.py:893
+#: ../meld/filediff.py:899
 msgid "Could not read file"
 msgstr "Ni mogoÄ?e prebrati datoteke"
 
-#: ../meld/filediff.py:862
+#: ../meld/filediff.py:873
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Branje datotek"
 
-#: ../meld/filediff.py:871
+#: ../meld/filediff.py:882
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s je videti kot dvojiška datoteka."
 
-#: ../meld/filediff.py:883
+#: ../meld/filediff.py:894
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ni zapisan v naboru: %s"
 
-#: ../meld/filediff.py:913
+#: ../meld/filediff.py:924
 #: ../meld/filemerge.py:69
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] RaÄ?unanje razlik"
 
-#: ../meld/filediff.py:960
+#: ../meld/filediff.py:972
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: ../meld/filediff.py:1095
+#: ../meld/filediff.py:1115
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -755,7 +755,7 @@ msgstr ""
 "\"%s\" že obstaja!\n"
 "Ali naj bo datoteka prepisana?"
 
-#: ../meld/filediff.py:1108
+#: ../meld/filediff.py:1128
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -766,12 +766,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1117
+#: ../meld/filediff.py:1137
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Izbor imena za medpomnilnik %i."
 
-#: ../meld/filediff.py:1132
+#: ../meld/filediff.py:1152
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -782,7 +782,7 @@ msgstr ""
 "\n"
 "Kateri zapis želite uporabiti?"
 
-#: ../meld/filediff.py:1148
+#: ../meld/filediff.py:1168
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -791,7 +791,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:1207
+#: ../meld/filediff.py:1227
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -982,67 +982,67 @@ 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:544
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Ni mogoÄ?e primerjati meÅ¡anice datotek in map.\n"
 
-#: ../meld/meldapp.py:597
+#: ../meld/meldapp.py:599
 msgid "wrong number of arguments supplied to --diff"
 msgstr "Neveljavno Å¡tevilo argumentov pri ukazu --diff."
 
-#: ../meld/meldapp.py:601
+#: ../meld/meldapp.py:603
 msgid "Start with an empty window"
 msgstr "Zagon brez odprtih oken"
 
-#: ../meld/meldapp.py:602
-#: ../meld/meldapp.py:603
+#: ../meld/meldapp.py:604
 #: ../meld/meldapp.py:605
+#: ../meld/meldapp.py:607
 msgid "file"
 msgstr "datoteka"
 
-#: ../meld/meldapp.py:602
 #: ../meld/meldapp.py:604
-#: ../meld/meldapp.py:605
+#: ../meld/meldapp.py:606
+#: ../meld/meldapp.py:607
 msgid "dir"
 msgstr "mapa"
 
-#: ../meld/meldapp.py:602
+#: ../meld/meldapp.py:604
 msgid "Start a version control comparison"
 msgstr "Zagon primerjave nadzora razliÄ?ic"
 
-#: ../meld/meldapp.py:603
+#: ../meld/meldapp.py:605
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo datotek"
 
-#: ../meld/meldapp.py:604
+#: ../meld/meldapp.py:606
 msgid "Start a 2- or 3-way directory comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo map"
 
-#: ../meld/meldapp.py:605
+#: ../meld/meldapp.py:607
 msgid "Start a comparison between file and dir/file"
 msgstr "Zagon primerjave med datoteko in mapo/datoteko"
 
-#: ../meld/meldapp.py:611
+#: ../meld/meldapp.py:613
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld je orodje za primerjavo vsebine datotek in map."
 
-#: ../meld/meldapp.py:614
+#: ../meld/meldapp.py:616
 msgid "Set label to use instead of file name"
 msgstr "DoloÄ?i naslov namesto imena datoteke"
 
-#: ../meld/meldapp.py:616
+#: ../meld/meldapp.py:618
 msgid "Automatically compare all differing files on startup"
 msgstr "Ob zagonu samodejno primerjaj vse razliÄ?ne datoteke."
 
-#: ../meld/meldapp.py:619
+#: ../meld/meldapp.py:621
 msgid "Set the target file for saving a merge result"
 msgstr "DoloÄ?itev ciljne datoteke za shranjevanje rezultatov združevanja."
 
-#: ../meld/meldapp.py:622
+#: ../meld/meldapp.py:624
 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:625
+#: ../meld/meldapp.py:627
 #, python-format
 msgid "too many arguments (wanted 0-4, got %d)"
 msgstr "preveÄ? argumentov (zahtevanih 0-4, prejetih %d)"
@@ -1150,14 +1150,13 @@ msgid "Script comment\t0\t#.*"
 msgstr "Opomba skripta\t0\t#.*"
 
 #: ../meld/vcview.py:120
-msgid "_Commit"
+msgid "Co_mmit"
 msgstr "_Uveljavi"
 
 #: ../meld/vcview.py:120
 msgid "Commit"
 msgstr "Uveljavi"
 
-#. FIXME: popup used to use gtk.STOCK_GO_BACK
 #: ../meld/vcview.py:121
 msgid "_Update"
 msgstr "_Posodobi"
@@ -1166,7 +1165,6 @@ msgstr "_Posodobi"
 msgid "Update"
 msgstr "Posodobi"
 
-#. FIXME: popup used to use gtk.STOCK_GO_FORWARD
 #: ../meld/vcview.py:122
 msgid "_Add"
 msgstr "_Dodaj"
@@ -1175,7 +1173,6 @@ msgstr "_Dodaj"
 msgid "Add to VC"
 msgstr "Dodaj v VC"
 
-#. FIXME: popup used to use gtk.STOCK_ADD
 #: ../meld/vcview.py:123
 msgid "Add _Binary"
 msgstr "Dodaj _dvojiško"
@@ -1184,7 +1181,6 @@ msgstr "Dodaj _dvojiško"
 msgid "Add binary to VC"
 msgstr "Dodaj dvojiško datoteko v VC"
 
-#. FIXME: stock is inconsistent with other VC actions
 #: ../meld/vcview.py:124
 msgid "_Remove"
 msgstr "_Odstrani"
@@ -1193,7 +1189,6 @@ msgstr "_Odstrani"
 msgid "Remove from VC"
 msgstr "Odstrani iz VC"
 
-#. FIXME: popup used to use gtk.STOCK_REMOVE
 #: ../meld/vcview.py:125
 msgid "_Resolved"
 msgstr "_Razrešeno"
@@ -1247,7 +1242,7 @@ msgid "Show ignored files"
 msgstr "Pokaži prezrte datoteke"
 
 #: ../meld/vcview.py:176
-#: ../meld/vcview.py:295
+#: ../meld/vcview.py:300
 msgid "Location"
 msgstr "Mesto"
 
@@ -1263,61 +1258,57 @@ msgstr "Rev"
 msgid "Options"
 msgstr "Možnosti"
 
-#: ../meld/vcview.py:227
+#: ../meld/vcview.py:232
 msgid "Choose one Version Control"
 msgstr "Izbor nadzora razliÄ?ic"
 
-#: ../meld/vcview.py:228
+#: ../meld/vcview.py:233
 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:241
+#: ../meld/vcview.py:246
 #, 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:245
+#: ../meld/vcview.py:250
 msgid "Invalid Repository"
 msgstr "Neveljavno odložiÅ¡Ä?e"
 
-#: ../meld/vcview.py:254
+#: ../meld/vcview.py:259
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:295
+#: ../meld/vcview.py:300
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:343
+#: ../meld/vcview.py:348
 msgid "(Empty)"
 msgstr "(Prazno)"
 
-#: ../meld/vcview.py:376
+#: ../meld/vcview.py:386
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] Iskanje razlik"
 
-#: ../meld/vcview.py:383
+#: ../meld/vcview.py:394
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] Pripenjanje popravka"
 
-#: ../meld/vcview.py:387
-msgid "No differences found."
-msgstr "Ni razlik."
-
-#: ../meld/vcview.py:461
+#: ../meld/vcview.py:479
 msgid "Select some files first."
 msgstr "Najprej je treba izbrati datoteke."
 
-#: ../meld/vcview.py:527
+#: ../meld/vcview.py:552
 #, python-format
 msgid ""
 "\n"
@@ -1408,7 +1399,7 @@ msgstr "Zapri zavihek"
 msgid "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing"
 msgstr "Prezrto:NedoloÄ?eno:::Napaka::Novo dodano:Spremenjeno:V sporu:Odstranjeno:ManjkajoÄ?e"
 
-#: ../meld/vc/cvs.py:156
+#: ../meld/vc/cvs.py:163
 #, python-format
 msgid ""
 "Error converting to a regular expression\n"
@@ -1419,6 +1410,14 @@ msgstr ""
 "DoloÄ?en je bil vzorec '%s'\n"
 "Javljena napaka je '%s'"
 
+#~ msgid "Left"
+#~ msgstr "Levo"
+#~ msgid "Right"
+#~ msgstr "Desno"
+#~ msgid "_Commit"
+#~ msgstr "_Uveljavi"
+#~ msgid "No differences found."
+#~ msgstr "Ni razlik."
 #~ msgid "Three way directory"
 #~ msgstr "Trojni pogled map"
 #~ msgid "Three way file"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]