[meld] Updated Slovenian translation

From: Matej Urbančič <mateju src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] Updated Slovenian translation
Date: Thu, 27 Jan 2011 19:51:32 +0000 (UTC)
commit f2fb22d8481d7f2d4d111ef9b4772d40804fadc2
Author: Matej UrbanÄ?iÄ? <mateju svn gnome org>
Date:   Thu Jan 27 20:51:26 2011 +0100

    Updated Slovenian translation

 po/sl.po |  136 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 72 insertions(+), 64 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 73e38b1..c1fc847 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: 2011-01-16 12:13+0000\n"
-"PO-Revision-Date: 2011-01-16 14:27+0100\n"
+"POT-Creation-Date: 2011-01-26 20:50+0000\n"
+"PO-Revision-Date: 2011-01-27 20:10+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"
@@ -355,7 +355,7 @@ msgid "Delete selected"
 msgstr "IzbriÅ¡i izbor"
 
 #: ../meld/dirdiff.py:146
-#: ../meld/filediff.py:974
+#: ../meld/filediff.py:982
 msgid "Hide"
 msgstr "Skrij"
 
@@ -364,7 +364,7 @@ msgid "Hide selected"
 msgstr "Skrij izbrano"
 
 #: ../meld/dirdiff.py:148
-#: ../meld/filediff.py:249
+#: ../meld/filediff.py:250
 #: ../meld/vcview.py:119
 msgid "Open selected"
 msgstr "Odpri izbrano"
@@ -553,200 +553,208 @@ msgstr[1] "%i leto"
 msgstr[2] "%i leti"
 msgstr[3] "%i leta"
 
-#: ../meld/filediff.py:250
+#: ../meld/filediff.py:251
 msgid "Format as patch..."
 msgstr "Oblikuj kot popravek ..."
 
-#: ../meld/filediff.py:250
+#: ../meld/filediff.py:251
 msgid "Create a patch using differences between files"
 msgstr "Ustvari popravek z razlikovanjem med datotekami"
 
-#: ../meld/filediff.py:251
+#: ../meld/filediff.py:252
 msgid "Previous conflict"
 msgstr "Predhodni spor"
 
-#: ../meld/filediff.py:251
+#: ../meld/filediff.py:252
 msgid "Go to the previous conflict"
 msgstr "SkoÄ?i na predhodni niz v sporu"
 
-#: ../meld/filediff.py:252
+#: ../meld/filediff.py:253
 msgid "Next conflict"
 msgstr "Naslednji spor"
 
-#: ../meld/filediff.py:252
+#: ../meld/filediff.py:253
 msgid "Go to the next conflict"
 msgstr "SkoÄ?i na naslednji niz v sporu"
 
-#: ../meld/filediff.py:253
+#: ../meld/filediff.py:254
 msgid "Push to left"
 msgstr "Potisni levo"
 
-#: ../meld/filediff.py:253
+#: ../meld/filediff.py:254
 msgid "Push current change to the left"
 msgstr "Potisni trenutne spremembe na levo"
 
-#: ../meld/filediff.py:254
+#: ../meld/filediff.py:255
 msgid "Push to right"
 msgstr "Potisni desno"
 
-#: ../meld/filediff.py:254
+#: ../meld/filediff.py:255
 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:256
+#: ../meld/filediff.py:257
 msgid "Pull from left"
 msgstr "Potegni z leve"
 
-#: ../meld/filediff.py:256
+#: ../meld/filediff.py:257
 msgid "Pull change from the left"
 msgstr "Potegni spremembe z leve"
 
-#: ../meld/filediff.py:257
+#: ../meld/filediff.py:258
 msgid "Pull from right"
 msgstr "Potegni z desne"
 
-#: ../meld/filediff.py:257
+#: ../meld/filediff.py:258
 msgid "Pull change from the right"
 msgstr "Potegni spremembe z desne"
 
-#: ../meld/filediff.py:258
+#: ../meld/filediff.py:259
 msgid "Copy above left"
 msgstr "Kopiraj nad levo"
 
-#: ../meld/filediff.py:258
+#: ../meld/filediff.py:259
 msgid "Copy change above the left chunk"
 msgstr "Kopiraj spremembe nad levi del"
 
-#: ../meld/filediff.py:259
+#: ../meld/filediff.py:260
 msgid "Copy below left"
 msgstr "Kopiraj pod levo"
 
-#: ../meld/filediff.py:259
+#: ../meld/filediff.py:260
 msgid "Copy change below the left chunk"
 msgstr "Kopiraj spremembe pod levi del"
 
-#: ../meld/filediff.py:260
+#: ../meld/filediff.py:261
 msgid "Copy above right"
 msgstr "Kopiraj nad desno"
 
-#: ../meld/filediff.py:260
+#: ../meld/filediff.py:261
 msgid "Copy change above the right chunk"
 msgstr "Kopiraj spremembe nad desni del"
 
-#: ../meld/filediff.py:261
+#: ../meld/filediff.py:262
 msgid "Copy below right"
 msgstr "Kopiraj pod desno"
 
-#: ../meld/filediff.py:261
+#: ../meld/filediff.py:262
 msgid "Copy change below the right chunk"
 msgstr "Kopiraj spremembe pod desni del"
 
-#: ../meld/filediff.py:262
+#: ../meld/filediff.py:263
 msgid "Delete"
 msgstr "IzbriÅ¡i"
 
-#: ../meld/filediff.py:262
+#: ../meld/filediff.py:263
 msgid "Delete change"
 msgstr "IzbriÅ¡i spremembo"
 
-#: ../meld/filediff.py:263
+#: ../meld/filediff.py:264
 msgid "Merge all changes from left"
 msgstr "ZdruÅ¾i vse spremembe z leve"
 
-#: ../meld/filediff.py:263
+#: ../meld/filediff.py:264
 msgid "Merge all non-conflicting changes from the left"
 msgstr "ZdruÅ¾i vse spremembe brez sporov z leve"
 
-#: ../meld/filediff.py:264
+#: ../meld/filediff.py:265
 msgid "Merge all changes from right"
 msgstr "ZdruÅ¾i vse spremembe z desne"
 
-#: ../meld/filediff.py:264
+#: ../meld/filediff.py:265
 msgid "Merge all non-conflicting changes from the right"
 msgstr "ZdruÅ¾i vse spremembe brez sporov z desne"
 
-#: ../meld/filediff.py:265
+#: ../meld/filediff.py:266
 msgid "Merge all non-conflicting"
 msgstr "ZdruÅ¾i vse spremembe brez sporov"
 
-#: ../meld/filediff.py:265
+#: ../meld/filediff.py:266
 msgid "Merge all non-conflicting changes from left and right panes"
 msgstr "ZdruÅ¾i vse spremembe brez sporov z leve in z desne"
 
+#: ../meld/filediff.py:270
+msgid "Lock scrolling"
+msgstr "Zakleni drsenje"
+
+#: ../meld/filediff.py:271
+msgid "Lock scrolling of all panes"
+msgstr "Zakleni drsenje vseh pladnjev"
+
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:337
+#: ../meld/filediff.py:345
 msgid "INS"
 msgstr "VST"
 
-#: ../meld/filediff.py:337
+#: ../meld/filediff.py:345
 msgid "OVR"
 msgstr "PRE"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:339
+#: ../meld/filediff.py:347
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Vr. %i, St. %i"
 
-#: ../meld/filediff.py:541
+#: ../meld/filediff.py:549
 #, 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:649
+#: ../meld/filediff.py:657
 msgid "<unnamed>"
 msgstr "<neimenovano>"
 
-#: ../meld/filediff.py:839
+#: ../meld/filediff.py:847
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] DoloÄ?i okna"
 
-#: ../meld/filediff.py:845
+#: ../meld/filediff.py:853
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Odpiranje datotek"
 
-#: ../meld/filediff.py:851
-#: ../meld/filediff.py:978
+#: ../meld/filediff.py:859
+#: ../meld/filediff.py:986
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: ../meld/filediff.py:872
-#: ../meld/filediff.py:881
-#: ../meld/filediff.py:893
-#: ../meld/filediff.py:899
+#: ../meld/filediff.py:880
+#: ../meld/filediff.py:889
+#: ../meld/filediff.py:901
+#: ../meld/filediff.py:907
 msgid "Could not read file"
 msgstr "Ni mogoÄ?e prebrati datoteke"
 
-#: ../meld/filediff.py:873
+#: ../meld/filediff.py:881
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Branje datotek"
 
-#: ../meld/filediff.py:882
+#: ../meld/filediff.py:890
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s je videti kot dvojiÅ¡ka datoteka."
 
-#: ../meld/filediff.py:894
+#: ../meld/filediff.py:902
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ni zapisan v naboru: %s"
 
-#: ../meld/filediff.py:924
+#: ../meld/filediff.py:932
 #: ../meld/filemerge.py:69
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] RaÄ?unanje razlik"
 
-#: ../meld/filediff.py:972
+#: ../meld/filediff.py:980
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: ../meld/filediff.py:1115
+#: ../meld/filediff.py:1123
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -755,7 +763,7 @@ msgstr ""
 "\"%s\" Å¾e obstaja!\n"
 "Ali naj bo datoteka prepisana?"
 
-#: ../meld/filediff.py:1128
+#: ../meld/filediff.py:1136
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -766,12 +774,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1137
+#: ../meld/filediff.py:1145
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Izbor imena za medpomnilnik %i."
 
-#: ../meld/filediff.py:1152
+#: ../meld/filediff.py:1160
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -782,7 +790,7 @@ msgstr ""
 "\n"
 "Kateri zapis Å¾elite uporabiti?"
 
-#: ../meld/filediff.py:1168
+#: ../meld/filediff.py:1176
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -791,7 +799,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:1227
+#: ../meld/filediff.py:1235
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -1366,27 +1374,27 @@ msgstr ""
 "Napaka v logiÄ?nem izrazu\n"
 "'%s'"
 
-#: ../meld/ui/historyentry.py:290
+#: ../meld/ui/historyentry.py:293
 msgid "_Browse..."
 msgstr "_Prebrskaj ..."
 
-#: ../meld/ui/historyentry.py:298
+#: ../meld/ui/historyentry.py:301
 msgid "Path"
 msgstr "Pot"
 
-#: ../meld/ui/historyentry.py:299
+#: ../meld/ui/historyentry.py:302
 msgid "Path to file"
 msgstr "Pot do datoteke"
 
-#: ../meld/ui/historyentry.py:300
+#: ../meld/ui/historyentry.py:303
 msgid "Pop up a file selector to choose a file"
 msgstr "PokaÅ¾i izbirnik za izbor datoteke"
 
-#: ../meld/ui/historyentry.py:419
+#: ../meld/ui/historyentry.py:441
 msgid "Select directory"
 msgstr "Izbor mape"
 
-#: ../meld/ui/historyentry.py:423
+#: ../meld/ui/historyentry.py:445
 msgid "Select file"
 msgstr "Izbor datoteke"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]