GNOME.org
 

[meld] Updated Slovenian translation

commit 2a0bde929d723b739d9ccd71dc0cfc70e911ae36
Author: Matej UrbanÄ?iÄ? <mateju svn gnome org>
Date:   Tue Oct 12 20:09:36 2010 +0200

    Updated Slovenian translation

 po/sl.po |  132 ++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 65 insertions(+), 67 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 64c0201..8300d83 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-08 19:51+0000\n"
-"PO-Revision-Date: 2010-10-09 20:04+0100\n"
+"POT-Creation-Date: 2010-10-10 21:16+0000\n"
+"PO-Revision-Date: 2010-10-12 19:49+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"
@@ -48,19 +48,10 @@ msgid "Meld Diff Viewer"
 msgstr "Meld pregledovalnik razliÄ?ic"
 
 #: ../data/ui/filediff.ui.h:1
-msgid "Copy to Clipboard"
-msgstr "Kopiraj v odložiÅ¡Ä?e"
-
-#: ../data/ui/filediff.ui.h:2
-#: ../meld/filediff.py:226
-msgid "Create Patch"
-msgstr "Ustvari popravek"
-
-#: ../data/ui/filediff.ui.h:3
 msgid "Save modified files?"
 msgstr "Ali naj se spremenjene datoteke shranijo?"
 
-#: ../data/ui/filediff.ui.h:4
+#: ../data/ui/filediff.ui.h:2
 msgid ""
 "Some files have been modified.\n"
 "Which ones would you like to save?"
@@ -68,11 +59,11 @@ msgstr ""
 "Nekatere datoteke so bile spremenjene.\n"
 "Katere datoteke naj se shranjenijo?"
 
-#: ../data/ui/filediff.ui.h:6
+#: ../data/ui/filediff.ui.h:4
 msgid "_Discard Changes"
 msgstr "_Prezri spremembe"
 
-#: ../data/ui/filediff.ui.h:7
+#: ../data/ui/filediff.ui.h:5
 msgid "_Save Selected"
 msgstr "_Shrani izbrano"
 
@@ -321,7 +312,7 @@ msgid "Delete selected"
 msgstr "Izbriši izbor"
 
 #: ../meld/dirdiff.py:188
-#: ../meld/filediff.py:907
+#: ../meld/filediff.py:908
 msgid "Hide"
 msgstr "Skrij"
 
@@ -330,7 +321,7 @@ msgid "Hide selected"
 msgstr "Skrij izbrano"
 
 #: ../meld/dirdiff.py:190
-#: ../meld/filediff.py:225
+#: ../meld/filediff.py:226
 #: ../meld/vcview.py:126
 msgid "Open selected"
 msgstr "Odpri izbrano"
@@ -519,164 +510,168 @@ msgstr[1] "%i leto"
 msgstr[2] "%i leti"
 msgstr[3] "%i leta"
 
-#: ../meld/filediff.py:226
-msgid "Create a patch"
-msgstr "Ustvari programski popravek"
+#: ../meld/filediff.py:227
+msgid "Format as patch..."
+msgstr "Oblikuj kot popravek ..."
 
 #: ../meld/filediff.py:227
+msgid "Create a patch using differences between files"
+msgstr "Ustvari popravek z razlikovanjem med datotekami"
+
+#: ../meld/filediff.py:228
 msgid "Previous conflict"
 msgstr "Predhodni spor"
 
-#: ../meld/filediff.py:227
+#: ../meld/filediff.py:228
 msgid "Go to the previous conflict"
 msgstr "SkoÄ?i na predhodni niz v sporu"
 
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:229
 msgid "Next conflict"
 msgstr "Naslednji spor"
 
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:229
 msgid "Go to the next conflict"
 msgstr "SkoÄ?i na naslednji niz v sporu"
 
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:230
 msgid "Push to left"
 msgstr "Potisni levo"
 
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:230
 msgid "Push current change to the left"
 msgstr "Potisni trenutne spremembe na levo"
 
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:231
 msgid "Push to right"
 msgstr "Potisni desno"
 
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:231
 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:232
+#: ../meld/filediff.py:233
 msgid "Pull from left"
 msgstr "Potegni z leve"
 
-#: ../meld/filediff.py:232
+#: ../meld/filediff.py:233
 msgid "Pull change from the left"
 msgstr "Potegni spremembe z leve"
 
-#: ../meld/filediff.py:233
+#: ../meld/filediff.py:234
 msgid "Pull from right"
 msgstr "Potegni z desne"
 
-#: ../meld/filediff.py:233
+#: ../meld/filediff.py:234
 msgid "Pull change from the right"
 msgstr "Potegni spremembe z desne"
 
-#: ../meld/filediff.py:234
+#: ../meld/filediff.py:235
 msgid "Delete"
 msgstr "Izbriši"
 
-#: ../meld/filediff.py:234
+#: ../meld/filediff.py:235
 msgid "Delete change"
 msgstr "Izbriši spremembo"
 
-#: ../meld/filediff.py:235
+#: ../meld/filediff.py:236
 msgid "Merge all changes from left"
 msgstr "Združi vse spremembe z leve"
 
-#: ../meld/filediff.py:235
+#: ../meld/filediff.py:236
 msgid "Merge all non-conflicting changes from the left"
 msgstr "Združi vse spremembe brez sporov z leve"
 
-#: ../meld/filediff.py:236
+#: ../meld/filediff.py:237
 msgid "Merge all changes from right"
 msgstr "Združi vse spremembe z desne"
 
-#: ../meld/filediff.py:236
+#: ../meld/filediff.py:237
 msgid "Merge all non-conflicting changes from the right"
 msgstr "Združi vse spremembe brez sporov z desne"
 
-#: ../meld/filediff.py:237
+#: ../meld/filediff.py:238
 msgid "Merge all non-conflicting"
 msgstr "Združi vse spremembe brez sporov"
 
-#: ../meld/filediff.py:237
+#: ../meld/filediff.py:238
 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:308
+#: ../meld/filediff.py:309
 msgid "INS"
 msgstr "VST"
 
-#: ../meld/filediff.py:308
+#: ../meld/filediff.py:309
 msgid "OVR"
 msgstr "PRE"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:310
+#: ../meld/filediff.py:311
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Vr. %i, St. %i"
 
-#: ../meld/filediff.py:492
+#: ../meld/filediff.py:493
 #, 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:589
+#: ../meld/filediff.py:590
 msgid "<unnamed>"
 msgstr "<neimenovano>"
 
-#: ../meld/filediff.py:765
+#: ../meld/filediff.py:766
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] DoloÄ?i okna"
 
-#: ../meld/filediff.py:771
+#: ../meld/filediff.py:772
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Odpiranje datotek"
 
-#: ../meld/filediff.py:777
-#: ../meld/filediff.py:911
+#: ../meld/filediff.py:778
+#: ../meld/filediff.py:912
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: ../meld/filediff.py:799
-#: ../meld/filediff.py:810
-#: ../meld/filediff.py:823
-#: ../meld/filediff.py:829
+#: ../meld/filediff.py:800
+#: ../meld/filediff.py:811
+#: ../meld/filediff.py:824
+#: ../meld/filediff.py:830
 msgid "Could not read file"
 msgstr "Ni mogoÄ?e prebrati datoteke"
 
-#: ../meld/filediff.py:802
+#: ../meld/filediff.py:803
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Branje datotek"
 
-#: ../meld/filediff.py:811
+#: ../meld/filediff.py:812
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s je videti kot dvojiška datoteka."
 
-#: ../meld/filediff.py:824
+#: ../meld/filediff.py:825
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ni zapisan v naboru: %s"
 
-#: ../meld/filediff.py:856
+#: ../meld/filediff.py:857
 #: ../meld/filemerge.py:70
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] RaÄ?unanje razlik"
 
-#: ../meld/filediff.py:905
+#: ../meld/filediff.py:906
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: ../meld/filediff.py:1040
+#: ../meld/filediff.py:1041
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -685,7 +680,7 @@ msgstr ""
 "\"%s\" že obstaja!\n"
 "Ali naj bo datoteka prepisana?"
 
-#: ../meld/filediff.py:1053
+#: ../meld/filediff.py:1054
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -696,12 +691,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1062
+#: ../meld/filediff.py:1063
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Izbor imena za medpomnilnik %i."
 
-#: ../meld/filediff.py:1076
+#: ../meld/filediff.py:1077
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -712,7 +707,7 @@ msgstr ""
 "\n"
 "Kateri zapis želite uporabiti?"
 
-#: ../meld/filediff.py:1092
+#: ../meld/filediff.py:1093
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -721,12 +716,7 @@ msgstr ""
 "'%s' vsebuje znake, ki jih ni mogoÄ?e kodirati v naboru '%s'\n"
 "Ali naj se datoteka shrani v naboru UTF-8?"
 
-#. save as
-#: ../meld/filediff.py:1129
-msgid "Save patch as..."
-msgstr "Shrani popravke kot ..."
-
-#: ../meld/filediff.py:1176
+#: ../meld/filediff.py:1150
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -987,6 +977,10 @@ msgstr "neimenovano"
 msgid "[None]"
 msgstr "[noben]"
 
+#: ../meld/patchdialog.py:118
+msgid "Save Patch As..."
+msgstr "Shrani popravke kot ..."
+
 #: ../meld/preferences.py:81
 msgid "label"
 msgstr "oznaka"
@@ -1338,6 +1332,10 @@ msgstr ""
 "DoloÄ?en je bil vzorec '%s'\n"
 "Javljena napaka je '%s'"
 
+#~ msgid "Copy to Clipboard"
+#~ msgstr "Kopiraj v odložiÅ¡Ä?e"
+#~ msgid "Create Patch"
+#~ msgstr "Ustvari popravek"
 #~ 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]