[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, 4 Apr 2013 19:20:42 +0000 (UTC)
commit 9588b399224ec2a2762d18eb79a65baf5dcb511a
Author: Matej Urbančič <mateju svn gnome org>
Date:   Thu Apr 4 21:20:37 2013 +0200

    Updated Slovenian translation

 po/sl.po |  506 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 281 insertions(+), 225 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 82b711f..7b5de06 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,20 +7,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: meld master\n"
-"Report-Msgid-Bugs-To: 
http://bugzilla.gnome.org/enter_bug.cgi?product=meld&keywords=I18N+L10N&component=general\n";
-"POT-Creation-Date: 2013-03-14 20:55+0000\n"
-"PO-Revision-Date: 2013-03-15 16:45+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=meld&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-03 20:50+0000\n"
+"PO-Revision-Date: 2013-04-04 21:18+0100\n"
 "Last-Translator: Matej Urbančič <mateju svn gnome org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
 "Language: sl_SI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: Poedit 1.5.4\n"
-"X-Poedit-Language: Slovenian\n"
-"X-Poedit-Country: SLOVENIA\n"
 
 #: ../bin/meld:121
 msgid "Cannot import: "
@@ -31,8 +31,7 @@ msgstr "Ni mogoče uvoziti:"
 msgid "Meld requires %s or higher."
 msgstr "Program Meld zahteva najmanj različico %s."
 
-#: ../data/meld.desktop.in.h:1
-#: ../data/ui/meldapp.ui.h:1
+#: ../data/meld.desktop.in.h:1 ../data/ui/meldapp.ui.h:1
 msgid "Meld"
 msgstr "Meld"
 
@@ -60,13 +59,11 @@ msgstr "Dejavno"
 msgid "Column name"
 msgstr "Ime stolpca"
 
-#: ../data/ui/EditableList.ui.h:4
-#: ../meld/vcview.py:163
+#: ../data/ui/EditableList.ui.h:4 ../meld/vcview.py:167
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../data/ui/EditableList.ui.h:5
-#: ../meld/vcview.py:164
+#: ../data/ui/EditableList.ui.h:5 ../meld/vcview.py:168
 msgid "_Remove"
 msgstr "_Odstrani"
 
@@ -87,9 +84,8 @@ msgid "Move _Down"
 msgstr "Premakni navz_dol"
 
 #. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10
-#: ../meld/dirdiff.py:326
-#: ../meld/vcview.py:200
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:339
+#: ../meld/vcview.py:204
 msgid "Name"
 msgstr "Ime"
 
@@ -126,11 +122,15 @@ msgid "_Save"
 msgstr "_Shrani"
 
 #: ../data/ui/filediff.ui.h:6
-msgid "This file can not be written to. You may click here to unlock this file and make changes anyway, but 
these changes must be saved to a new file."
-msgstr "V datoteko ni mogoče pisati. S klikom na to mesto lahko odklenete datoteko in vsebino spreminjate, 
vendar pa je treba spremembe shraniti v datoteko z drugim imenom."
+msgid ""
+"This file can not be written to. You may click here to unlock this file and "
+"make changes anyway, but these changes must be saved to a new file."
+msgstr ""
+"V datoteko ni mogoče pisati. S klikom na to mesto lahko odklenete datoteko "
+"in vsebino spreminjate, vendar pa je treba spremembe shraniti v datoteko z "
+"drugim imenom."
 
-#: ../data/ui/findbar.ui.h:1
-#: ../meld/meldwindow.py:78
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:78
 msgid "_Replace"
 msgstr "_Zamenjaj"
 
@@ -180,17 +180,31 @@ msgstr ""
 
 #: ../data/ui/meldapp.ui.h:4
 msgid ""
-"Meld is free software: you can redistribute it and/or modify it under the terms of the GNU General Public 
License as published by the Free Software Foundation, either version 2 of the License, or (at your option) 
any later version.\n"
+"Meld is free software: you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation, either version 2 of the License, or (at your option) any later "
+"version.\n"
 "\n"
-"Meld is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied 
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more 
details. \n"
+"Meld is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details. \n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program.  If not, see 
<http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"this program.  If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
-"Meld je prosta programska oprema; lahko jo razširjate in/ali spreminjate pod pogoji Splošnega javnega 
dovoljenja GNU (GNU General Public License), kot ga je objavila ustanova Free Software Foundation; bodisi 
različice 2 ali (po vaši izbiri) katerekoli poznejše različice.\n"
+"Meld je prosta programska oprema; lahko jo razširjate in/ali spreminjate pod "
+"pogoji Splošnega javnega dovoljenja GNU (GNU General Public License), kot ga "
+"je objavila ustanova Free Software Foundation; bodisi različice 2 ali (po "
+"vaši izbiri) katerekoli poznejše različice.\n"
 "\n"
-"Program Meld se razširja v upanju, da bo uporaben, vendar BREZ VSAKRŠNEGA JAMSTVA; tudi brez posredne 
zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA DOLOČEN NAMEN. Za podrobnosti glejte besedilo Javnega 
dovoljenja GNU.\n"
+"Program Meld se razširja v upanju, da bo uporaben, vendar BREZ VSAKRŠNEGA "
+"JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA "
+"DOLOČEN NAMEN. Za podrobnosti glejte besedilo Javnega dovoljenja GNU.\n"
 "\n"
-"Skupaj s programom bi morali prejeti izvod splošnega javnega dovoljenja GNU (GNU General Public License); 
če ga niste si oglejte spletno stran <http://www.gnu.org/licenses/>."
+"Skupaj s programom bi morali prejeti izvod splošnega javnega dovoljenja GNU "
+"(GNU General Public License); če ga niste si oglejte spletno stran <http://";
+"www.gnu.org/licenses/>."
 
 #: ../data/ui/meldapp.ui.h:9
 msgid "translator-credits"
@@ -317,16 +331,32 @@ msgid "Folder comparisons"
 msgstr "Primerjave map"
 
 #: ../data/ui/preferences.ui.h:24
-msgid "When performing directory comparisons, you may filter out files and directories by name. Each pattern 
is a list of shell style wildcards separated by spaces."
-msgstr "Pri primerjavi map je mogoče filtrirati datoteke in mape po imenu. Vsak vzorec na seznamu je zapisan 
z nadomestnimi znaki (npr: * in ?), ločenimi s presledki."
+msgid ""
+"When performing directory comparisons, you may filter out files and "
+"directories by name. Each pattern is a list of shell style wildcards "
+"separated by spaces."
+msgstr ""
+"Pri primerjavi map je mogoče filtrirati datoteke in mape po imenu. Vsak "
+"vzorec na seznamu je zapisan z nadomestnimi znaki (npr: * in ?), ločenimi s "
+"presledki."
 
 #: ../data/ui/preferences.ui.h:25
 msgid "File Filters"
 msgstr "Filtri datotek"
 
 #: ../data/ui/preferences.ui.h:26
-msgid "When performing file comparisons, you may ignore certain types of changes. Each pattern here is a 
python regular expression which replaces matching text with the empty string before comparison is performed. 
If the expression contains groups, only the groups are replaced. See the user manual for more details."
-msgstr "Pri primerjavi datotek je mogoče prezreti nekatere vrste sprememb. Vsak vzorec na seznamu je zapisan 
z logičnimi izrazi, s katerimi se zamenja želeno besedilo s praznim nizom, preden je primerjava izvede. V 
primeru, da izraz vključuje skupine, so zamenjane le te. Več podrobnosti je zapisanih v priročniku."
+msgid ""
+"When performing file comparisons, you may ignore certain types of changes. "
+"Each pattern here is a python regular expression which replaces matching "
+"text with the empty string before comparison is performed. If the expression "
+"contains groups, only the groups are replaced. See the user manual for more "
+"details."
+msgstr ""
+"Pri primerjavi datotek je mogoče prezreti nekatere vrste sprememb. Vsak "
+"vzorec na seznamu je zapisan z logičnimi izrazi, s katerimi se zamenja "
+"želeno besedilo s praznim nizom, preden je primerjava izvede. V primeru, da "
+"izraz vključuje skupine, so zamenjane le te. Več podrobnosti je zapisanih v "
+"priročniku."
 
 #: ../data/ui/preferences.ui.h:27
 msgid "Ignore changes which insert or delete blank lines"
@@ -342,14 +372,14 @@ msgstr "Nalaganje"
 
 #: ../data/ui/preferences.ui.h:30
 msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
-msgstr "Med nalaganjem naj bodo preverjeni nabori v vrsti (na primer: utf8, iso1250)"
+msgstr ""
+"Med nalaganjem naj bodo preverjeni nabori v vrsti (na primer: utf8, iso1250)"
 
 #: ../data/ui/preferences.ui.h:31
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: ../data/ui/tab-placeholder.ui.h:1
-#: ../meld/meldwindow.py:605
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:612
 msgid "New comparison"
 msgstr "Nova primerjava"
 
@@ -421,157 +451,156 @@ msgstr "Predhodni dnevniki"
 msgid "Log Message"
 msgstr "Sporočilo beleženja"
 
-#: ../meld/dirdiff.py:255
-#: ../meld/vcview.py:160
+#: ../meld/dirdiff.py:268 ../meld/vcview.py:164
 msgid "_Compare"
 msgstr "_Primerjava"
 
-#: ../meld/dirdiff.py:255
-#: ../meld/vcview.py:160
+#: ../meld/dirdiff.py:268 ../meld/vcview.py:164
 msgid "Compare selected"
 msgstr "Primerjaj izbrano"
 
-#: ../meld/dirdiff.py:256
+#: ../meld/dirdiff.py:269
 msgid "Copy _Left"
 msgstr "Kopiraj _levo"
 
-#: ../meld/dirdiff.py:256
+#: ../meld/dirdiff.py:269
 msgid "Copy to left"
 msgstr "Kopiraj na levo"
 
-#: ../meld/dirdiff.py:257
+#: ../meld/dirdiff.py:270
 msgid "Copy _Right"
 msgstr "Kopiraj _desno"
 
-#: ../meld/dirdiff.py:257
+#: ../meld/dirdiff.py:270
 msgid "Copy to right"
 msgstr "Kopiraj na desno"
 
-#: ../meld/dirdiff.py:258
+#: ../meld/dirdiff.py:271
 msgid "Delete selected"
 msgstr "Izbriši izbor"
 
-#: ../meld/dirdiff.py:259
-#: ../meld/filediff.py:1256
+#: ../meld/dirdiff.py:272 ../meld/filediff.py:1282
 msgid "Hide"
 msgstr "Skrij"
 
-#: ../meld/dirdiff.py:259
+#: ../meld/dirdiff.py:272
 msgid "Hide selected"
 msgstr "Skrij izbrano"
 
-#: ../meld/dirdiff.py:263
+#: ../meld/dirdiff.py:276
 msgid "Ignore filename case"
 msgstr "Prezri velikost črk imen datotek"
 
-#: ../meld/dirdiff.py:263
-msgid "Consider differently-cased filenames that are otherwise-identical to be the same"
-msgstr "Obravnavaj datoteke, ki imajo v imenu črke različne velikosti, vendar so sicer enake, kot da so 
enake."
+#: ../meld/dirdiff.py:276
+msgid ""
+"Consider differently-cased filenames that are otherwise-identical to be the "
+"same"
+msgstr ""
+"Obravnavaj datoteke, ki imajo v imenu črke različne velikosti, vendar so "
+"sicer enake, kot da so enake."
 
-#: ../meld/dirdiff.py:264
+#: ../meld/dirdiff.py:277
 msgid "Same"
 msgstr "Enako"
 
-#: ../meld/dirdiff.py:264
+#: ../meld/dirdiff.py:277
 msgid "Show identical"
 msgstr "Pokaži enako"
 
-#: ../meld/dirdiff.py:265
+#: ../meld/dirdiff.py:278
 msgid "New"
 msgstr "Novo"
 
-#: ../meld/dirdiff.py:265
+#: ../meld/dirdiff.py:278
 msgid "Show new"
 msgstr "Pokaži novejše"
 
-#: ../meld/dirdiff.py:266
+#: ../meld/dirdiff.py:279
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: ../meld/dirdiff.py:266
-#: ../meld/vcview.py:172
+#: ../meld/dirdiff.py:279 ../meld/vcview.py:176
 msgid "Show modified"
 msgstr "Pokaži spremenjeno"
 
-#: ../meld/dirdiff.py:268
+#: ../meld/dirdiff.py:281
 msgid "Filters"
 msgstr "Filtri"
 
-#: ../meld/dirdiff.py:268
+#: ../meld/dirdiff.py:281
 msgid "Set active filters"
 msgstr "Določi dejavne filtre"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:343
+#: ../meld/dirdiff.py:356
 msgid "Size"
 msgstr "Velikost"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:350
+#: ../meld/dirdiff.py:363
 msgid "Modification time"
 msgstr "Čas spremembe"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:357
+#: ../meld/dirdiff.py:370
 msgid "Permissions"
 msgstr "Dovoljenja"
 
-#: ../meld/dirdiff.py:482
+#: ../meld/dirdiff.py:503
 #, python-format
 msgid "Hide %s"
 msgstr "Skrij %s"
 
-#: ../meld/dirdiff.py:596
-#: ../meld/dirdiff.py:615
-#: ../meld/vcview.py:370
-#: ../meld/vcview.py:394
+#: ../meld/dirdiff.py:620 ../meld/dirdiff.py:639 ../meld/vcview.py:382
+#: ../meld/vcview.py:406
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Preiskovanje %s"
 
-#: ../meld/dirdiff.py:714
+#: ../meld/dirdiff.py:738
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] končano"
 
-#: ../meld/dirdiff.py:719
+#: ../meld/dirdiff.py:744
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Med preiskovanjem mape, je prišlo do več napak."
 
-#: ../meld/dirdiff.py:720
+#: ../meld/dirdiff.py:745
 msgid "Files with invalid encodings found"
 msgstr "Zaznane so datoteke z neveljavnim znakovnim naborom"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:722
+#: ../meld/dirdiff.py:747
 msgid "Some files were in an incorrect encoding. The names are something like:"
-msgstr "Zaznane so datoteke z neveljavnim znakovnim naborom. Imena so na primer:"
+msgstr ""
+"Zaznane so datoteke z neveljavnim znakovnim naborom. Imena so na primer:"
 
-#: ../meld/dirdiff.py:724
+#: ../meld/dirdiff.py:749
 msgid "Files hidden by case insensitive comparison"
 msgstr "Datoteke skrite zaradi primerjave brez upoštevanja velikosti črk"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:726
-msgid "You are running a case insensitive comparison on a case sensitive filesystem. The following files in 
this folder are hidden:"
+#: ../meld/dirdiff.py:751
+msgid ""
+"You are running a case insensitive comparison on a case sensitive "
+"filesystem. The following files in this folder are hidden:"
 msgstr ""
-"Zagnan je način primerjave brez upoštevanja velikosti črk na sistemu, ki razlike velikosti upošteva. 
Nekatere datoteke so skrite:\n"
+"Zagnan je način primerjave brez upoštevanja velikosti črk na sistemu, ki "
+"razlike velikosti upošteva. Nekatere datoteke so skrite:\n"
 "%s"
 
-#: ../meld/dirdiff.py:737
+#: ../meld/dirdiff.py:762
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' je skrit; '%s'"
 
-#: ../meld/dirdiff.py:762
-#: ../meld/filediff.py:1004
-#: ../meld/filediff.py:1260
-#: ../meld/vcview.py:642
-#: ../meld/vcview.py:684
+#: ../meld/dirdiff.py:787 ../meld/filediff.py:1025 ../meld/filediff.py:1286
+#: ../meld/vcview.py:676 ../meld/vcview.py:718
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: ../meld/dirdiff.py:794
+#: ../meld/dirdiff.py:819
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -580,7 +609,7 @@ msgstr ""
 "'%s' že obstaja.\n"
 "Ali naj bo prepisana?"
 
-#: ../meld/dirdiff.py:801
+#: ../meld/dirdiff.py:826
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -591,8 +620,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:819
-#: ../meld/vcview.py:616
+#: ../meld/dirdiff.py:844 ../meld/vcview.py:650
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -601,8 +629,7 @@ msgstr ""
 "'%s' je mapa.\n"
 "Ali naj bo odstranjena vsa vsebina?"
 
-#: ../meld/dirdiff.py:826
-#: ../meld/vcview.py:621
+#: ../meld/dirdiff.py:851 ../meld/vcview.py:655
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -613,7 +640,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:926
+#: ../meld/dirdiff.py:979
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -622,7 +649,7 @@ msgstr[1] "%i sekunda"
 msgstr[2] "%i sekundi"
 msgstr[3] "%i sekunde"
 
-#: ../meld/dirdiff.py:927
+#: ../meld/dirdiff.py:980
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -631,7 +658,7 @@ msgstr[1] "%i minuta"
 msgstr[2] "%i minuti"
 msgstr[3] "%i minute"
 
-#: ../meld/dirdiff.py:928
+#: ../meld/dirdiff.py:981
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -640,7 +667,7 @@ msgstr[1] "%i ura"
 msgstr[2] "%i uri"
 msgstr[3] "%i ure"
 
-#: ../meld/dirdiff.py:929
+#: ../meld/dirdiff.py:982
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -649,7 +676,7 @@ msgstr[1] "%i dan"
 msgstr[2] "%i dni"
 msgstr[3] "%i dni"
 
-#: ../meld/dirdiff.py:930
+#: ../meld/dirdiff.py:983
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -658,7 +685,7 @@ msgstr[1] "%i teden"
 msgstr[2] "%i tedna"
 msgstr[3] "%i tedni"
 
-#: ../meld/dirdiff.py:931
+#: ../meld/dirdiff.py:984
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -667,7 +694,7 @@ msgstr[1] "%i mesec"
 msgstr[2] "%i meseca"
 msgstr[3] "%i meseci"
 
-#: ../meld/dirdiff.py:932
+#: ../meld/dirdiff.py:985
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -676,213 +703,235 @@ msgstr[1] "%i leto"
 msgstr[2] "%i leti"
 msgstr[3] "%i leta"
 
-#: ../meld/filediff.py:219
+#: ../meld/filediff.py:220
 msgid "Format as patch..."
 msgstr "Oblikuj kot popravek ..."
 
-#: ../meld/filediff.py:219
+#: ../meld/filediff.py:220
 msgid "Create a patch using differences between files"
 msgstr "Ustvari popravek z razlikovanjem med datotekami"
 
-#: ../meld/filediff.py:220
+#: ../meld/filediff.py:221
+msgid "Add synchronization point"
+msgstr "Dodaj točko usklajevanja"
+
+#: ../meld/filediff.py:222
+msgid "Add a manual point for synchronization of changes between files"
+msgstr "Dodaj ročno točko usklajevanja sprememb med datotekami"
+
+#: ../meld/filediff.py:225
+msgid "Clear synchronization points"
+msgstr "Počisti točke usklajevanja"
+
+#: ../meld/filediff.py:226
+msgid "Clear manual change sychronization points"
+msgstr "Počisti ročno spremenjene točke usklajevanja"
+
+#: ../meld/filediff.py:228
 msgid "Previous conflict"
 msgstr "Predhodni spor"
 
-#: ../meld/filediff.py:220
+#: ../meld/filediff.py:228
 msgid "Go to the previous conflict"
 msgstr "Skoči na predhodni niz v sporu"
 
-#: ../meld/filediff.py:221
+#: ../meld/filediff.py:229
 msgid "Next conflict"
 msgstr "Naslednji spor"
 
-#: ../meld/filediff.py:221
+#: ../meld/filediff.py:229
 msgid "Go to the next conflict"
 msgstr "Skoči na naslednji niz v sporu"
 
-#: ../meld/filediff.py:222
+#: ../meld/filediff.py:230
 msgid "Push to left"
 msgstr "Potisni levo"
 
-#: ../meld/filediff.py:222
+#: ../meld/filediff.py:230
 msgid "Push current change to the left"
 msgstr "Potisni trenutne spremembe na levo"
 
-#: ../meld/filediff.py:223
+#: ../meld/filediff.py:231
 msgid "Push to right"
 msgstr "Potisni desno"
 
-#: ../meld/filediff.py:223
+#: ../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:225
+#: ../meld/filediff.py:233
 msgid "Pull from left"
 msgstr "Potegni z leve"
 
-#: ../meld/filediff.py:225
+#: ../meld/filediff.py:233
 msgid "Pull change from the left"
 msgstr "Potegni spremembe z leve"
 
-#: ../meld/filediff.py:226
+#: ../meld/filediff.py:234
 msgid "Pull from right"
 msgstr "Potegni z desne"
 
-#: ../meld/filediff.py:226
+#: ../meld/filediff.py:234
 msgid "Pull change from the right"
 msgstr "Potegni spremembe z desne"
 
-#: ../meld/filediff.py:227
+#: ../meld/filediff.py:235
 msgid "Copy above left"
 msgstr "Kopiraj nad levo"
 
-#: ../meld/filediff.py:227
+#: ../meld/filediff.py:235
 msgid "Copy change above the left chunk"
 msgstr "Kopiraj spremembe nad levi del"
 
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:236
 msgid "Copy below left"
 msgstr "Kopiraj pod levo"
 
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:236
 msgid "Copy change below the left chunk"
 msgstr "Kopiraj spremembe pod levi del"
 
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:237
 msgid "Copy above right"
 msgstr "Kopiraj nad desno"
 
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:237
 msgid "Copy change above the right chunk"
 msgstr "Kopiraj spremembe nad desni del"
 
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:238
 msgid "Copy below right"
 msgstr "Kopiraj pod desno"
 
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:238
 msgid "Copy change below the right chunk"
 msgstr "Kopiraj spremembe pod desni del"
 
-#: ../meld/filediff.py:231
+#: ../meld/filediff.py:239
 msgid "Delete"
 msgstr "Izbriši"
 
-#: ../meld/filediff.py:231
+#: ../meld/filediff.py:239
 msgid "Delete change"
 msgstr "Izbriši spremembo"
 
-#: ../meld/filediff.py:232
+#: ../meld/filediff.py:240
 msgid "Merge all changes from left"
 msgstr "Združi vse spremembe z leve"
 
-#: ../meld/filediff.py:232
+#: ../meld/filediff.py:240
 msgid "Merge all non-conflicting changes from the left"
 msgstr "Združi vse spremembe brez sporov z leve"
 
-#: ../meld/filediff.py:233
+#: ../meld/filediff.py:241
 msgid "Merge all changes from right"
 msgstr "Združi vse spremembe z desne"
 
-#: ../meld/filediff.py:233
+#: ../meld/filediff.py:241
 msgid "Merge all non-conflicting changes from the right"
 msgstr "Združi vse spremembe brez sporov z desne"
 
-#: ../meld/filediff.py:234
+#: ../meld/filediff.py:242
 msgid "Merge all non-conflicting"
 msgstr "Združi vse spremembe brez sporov"
 
-#: ../meld/filediff.py:234
+#: ../meld/filediff.py:242
 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:235
+#: ../meld/filediff.py:243
 msgid "Cycle through documents"
 msgstr "Preklopi med dokumenti"
 
-#: ../meld/filediff.py:235
+#: ../meld/filediff.py:243
 msgid "Move keyboard focus to the next document in this comparison"
 msgstr "Premakni dejavnost tipkovnice na naslednji dokument primerjave"
 
-#: ../meld/filediff.py:239
+#: ../meld/filediff.py:247
 msgid "Lock scrolling"
 msgstr "Zakleni drsenje"
 
-#: ../meld/filediff.py:240
+#: ../meld/filediff.py:248
 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:357
+#: ../meld/filediff.py:370
 msgid "INS"
 msgstr "VST"
 
-#: ../meld/filediff.py:357
+#: ../meld/filediff.py:370
 msgid "OVR"
 msgstr "PRE"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:359
+#: ../meld/filediff.py:372
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Vr. %i, St. %i"
 
-#: ../meld/filediff.py:695
+#: ../meld/filediff.py:709
 #, python-format
-msgid "Filter '%s' changed the number of lines in the file. Comparison will be incorrect. See the user 
manual for more details."
-msgstr "Po uporabi filtra '%s' se je spremenilo število vrstic v datoteki, zato primerjava ne bo natančna. 
Za več podrobnosti si oglejte priročnik."
+msgid ""
+"Filter '%s' changed the number of lines in the file. Comparison will be "
+"incorrect. See the user manual for more details."
+msgstr ""
+"Po uporabi filtra '%s' se je spremenilo število vrstic v datoteki, zato "
+"primerjava ne bo natančna. Za več podrobnosti si oglejte priročnik."
 
-#: ../meld/filediff.py:992
+#: ../meld/filediff.py:1013
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Določi okna"
 
-#: ../meld/filediff.py:998
+#: ../meld/filediff.py:1019
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Odpiranje datotek"
 
-#: ../meld/filediff.py:1022
-#: ../meld/filediff.py:1032
-#: ../meld/filediff.py:1045
-#: ../meld/filediff.py:1051
+#: ../meld/filediff.py:1043 ../meld/filediff.py:1053 ../meld/filediff.py:1066
+#: ../meld/filediff.py:1072
 msgid "Could not read file"
 msgstr "Ni mogoče prebrati datoteke"
 
-#: ../meld/filediff.py:1023
+#: ../meld/filediff.py:1044
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Branje datotek"
 
-#: ../meld/filediff.py:1033
+#: ../meld/filediff.py:1054
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s je videti kot dvojiška datoteka."
 
-#: ../meld/filediff.py:1046
+#: ../meld/filediff.py:1067
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ni zapisan v naboru: %s"
 
-#: ../meld/filediff.py:1080
+#: ../meld/filediff.py:1101
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Računanje razlik"
 
-#: ../meld/filediff.py:1247
-msgid "Text filters are being used, and may be masking differences between files. Would you like to compare 
the unfiltered files?"
-msgstr "Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. Ali naj se primerja 
vsebina brez dejavnih filtrov?"
+#: ../meld/filediff.py:1273
+msgid ""
+"Text filters are being used, and may be masking differences between files. "
+"Would you like to compare the unfiltered files?"
+msgstr ""
+"Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. "
+"Ali naj se primerja vsebina brez dejavnih filtrov?"
 
-#: ../meld/filediff.py:1253
+#: ../meld/filediff.py:1279
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: ../meld/filediff.py:1263
+#: ../meld/filediff.py:1289
 msgid "Show without filters"
 msgstr "Pokaži brez filtrov"
 
-#: ../meld/filediff.py:1387
+#: ../meld/filediff.py:1420
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -891,7 +940,7 @@ msgstr ""
 "\"%s\" že obstaja!\n"
 "Ali naj bo datoteka prepisana?"
 
-#: ../meld/filediff.py:1400
+#: ../meld/filediff.py:1433
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -902,12 +951,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1409
+#: ../meld/filediff.py:1442
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Izbor imena za medpomnilnik %i."
 
-#: ../meld/filediff.py:1425
+#: ../meld/filediff.py:1458
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -918,7 +967,7 @@ msgstr ""
 "\n"
 "Kateri zapis želite uporabiti?"
 
-#: ../meld/filediff.py:1441
+#: ../meld/filediff.py:1474
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -927,7 +976,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:1506
+#: ../meld/filediff.py:1539
 msgid "Save changes to documents before reloading?"
 msgstr "Ali naj bodo spremembe v dokumentu shranjene pred ponovnim nalaganjem?"
 
@@ -944,15 +993,11 @@ msgstr "Neveljavno število argumentov pri ukazu --diff."
 msgid "Start with an empty window"
 msgstr "Zagon brez odprtih oken"
 
-#: ../meld/meldapp.py:100
-#: ../meld/meldapp.py:102
-#: ../meld/meldapp.py:106
+#: ../meld/meldapp.py:100 ../meld/meldapp.py:102 ../meld/meldapp.py:106
 msgid "file"
 msgstr "datoteka"
 
-#: ../meld/meldapp.py:100
-#: ../meld/meldapp.py:104
-#: ../meld/meldapp.py:106
+#: ../meld/meldapp.py:100 ../meld/meldapp.py:104 ../meld/meldapp.py:106
 msgid "dir"
 msgstr "mapa"
 
@@ -1034,8 +1079,7 @@ msgstr "Napaka med branjem datoteke primerjav"
 msgid "<unnamed>"
 msgstr "<neimenovano>"
 
-#: ../meld/melddoc.py:59
-#: ../meld/melddoc.py:60
+#: ../meld/melddoc.py:59 ../meld/melddoc.py:60
 msgid "untitled"
 msgstr "neimenovano"
 
@@ -1271,17 +1315,17 @@ msgstr "Odpri nedavno"
 msgid "Open recent files"
 msgstr "Odpri nedavne datoteke"
 
-#: ../meld/meldwindow.py:526
+#: ../meld/meldwindow.py:533
 msgid "Switch to this tab"
 msgstr "Preklopi na ta zavihek"
 
 #. exit at first non found directory + file
-#: ../meld/meldwindow.py:658
+#: ../meld/meldwindow.py:665
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Ni mogoče primerjati mešanice datotek in map.\n"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:180
+#: ../meld/misc.py:189
 msgid "[None]"
 msgstr "[noben]"
 
@@ -1308,8 +1352,12 @@ msgstr "Varnostne kopije\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
 #: ../meld/preferences.py:308
-msgid "OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db Desktop.ini\n"
-msgstr "Značilni metapodatki OS\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db Desktop.ini\n"
+msgid ""
+"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
+"Desktop.ini\n"
+msgstr ""
+"Značilni metapodatki OS\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
+"Desktop.ini\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
 #: ../meld/preferences.py:310
@@ -1325,16 +1373,13 @@ msgstr "Binarne datoteke\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
 #: ../meld/preferences.py:314
 msgid "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
-msgstr "Predstavne datoteke\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
+msgstr ""
+"Predstavne datoteke\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
 #: ../meld/preferences.py:316
-msgid ""
-"CVS keywords\t0\t\\$\\w+(:[^\\n"
-"$]+)?\\$\n"
-msgstr ""
-"Ključne besede CVS\t0\t\\$\\w+(:[^\\n"
-"$]+)?\\$\n"
+msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
+msgstr "Ključne besede CVS\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
 #: ../meld/preferences.py:318
@@ -1361,167 +1406,177 @@ 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:161
+#: ../meld/vcview.py:165
 msgid "Co_mmit"
 msgstr "_Uveljavi"
 
-#: ../meld/vcview.py:161
+#: ../meld/vcview.py:165
 msgid "Commit"
 msgstr "Uveljavi"
 
-#: ../meld/vcview.py:162
+#: ../meld/vcview.py:166
 msgid "_Update"
 msgstr "_Posodobi"
 
-#: ../meld/vcview.py:162
+#: ../meld/vcview.py:166
 msgid "Update"
 msgstr "Posodobi"
 
-#: ../meld/vcview.py:163
+#: ../meld/vcview.py:167
 msgid "Add to VC"
 msgstr "Dodaj v VC"
 
-#: ../meld/vcview.py:164
+#: ../meld/vcview.py:168
 msgid "Remove from VC"
 msgstr "Odstrani iz VC"
 
-#: ../meld/vcview.py:165
+#: ../meld/vcview.py:169
 msgid "_Resolved"
 msgstr "_Razrešeno"
 
-#: ../meld/vcview.py:165
+#: ../meld/vcview.py:169
 msgid "Mark as resolved for VC"
 msgstr "Označi kot razrešeno v VC"
 
-#: ../meld/vcview.py:166
+#: ../meld/vcview.py:170
 msgid "Revert to original"
 msgstr "_Povrni na izvirne vrednosti"
 
-#: ../meld/vcview.py:167
+#: ../meld/vcview.py:171
 msgid "Delete locally"
 msgstr "Izbriši krajevno"
 
-#: ../meld/vcview.py:171
+#: ../meld/vcview.py:175
 msgid "_Flatten"
 msgstr "_Razpni"
 
-#: ../meld/vcview.py:171
+#: ../meld/vcview.py:175
 msgid "Flatten directories"
 msgstr "_Razpni mape"
 
-#: ../meld/vcview.py:172
+#: ../meld/vcview.py:176
 msgid "_Modified"
 msgstr "_Spremenjeno"
 
-#: ../meld/vcview.py:173
+#: ../meld/vcview.py:177
 msgid "_Normal"
 msgstr "_Običajno"
 
-#: ../meld/vcview.py:173
+#: ../meld/vcview.py:177
 msgid "Show normal"
 msgstr "Pokaži običajno"
 
-#: ../meld/vcview.py:174
+#: ../meld/vcview.py:178
 msgid "Non _VC"
 msgstr "Ni _VC"
 
-#: ../meld/vcview.py:174
+#: ../meld/vcview.py:178
 msgid "Show unversioned files"
 msgstr "Pokaži datoteke z nedoločenimi različicami"
 
-#: ../meld/vcview.py:175
+#: ../meld/vcview.py:179
 msgid "Ignored"
 msgstr "Prezrto"
 
-#: ../meld/vcview.py:175
+#: ../meld/vcview.py:179
 msgid "Show ignored files"
 msgstr "Pokaži prezrte datoteke"
 
-#: ../meld/vcview.py:226
-#: ../meld/vcview.py:366
+#: ../meld/vcview.py:230 ../meld/vcview.py:378
 msgid "Location"
 msgstr "Mesto"
 
-#: ../meld/vcview.py:227
+#: ../meld/vcview.py:231
 msgid "Status"
 msgstr "Stanje"
 
-#: ../meld/vcview.py:228
+#: ../meld/vcview.py:232
 msgid "Rev"
 msgstr "Rev"
 
-#: ../meld/vcview.py:229
+#: ../meld/vcview.py:233
 msgid "Tag"
 msgstr "Oznaka"
 
-#: ../meld/vcview.py:230
+#: ../meld/vcview.py:234
 msgid "Options"
 msgstr "Možnosti"
 
-#: ../meld/vcview.py:292
+#: ../meld/vcview.py:296
 msgid "Choose one Version Control"
 msgstr "Izbor nadzora različic"
 
-#: ../meld/vcview.py:293
+#: ../meld/vcview.py:297
 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:306
+#: ../meld/vcview.py:318
 #, 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:310
+#: ../meld/vcview.py:322
 msgid "Invalid Repository"
 msgstr "Neveljavno skladišče"
 
-#: ../meld/vcview.py:319
+#: ../meld/vcview.py:331
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:366
+#: ../meld/vcview.py:378
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:409
+#: ../meld/vcview.py:421
 msgid "(Empty)"
 msgstr "(Prazno)"
 
-#: ../meld/vcview.py:441
+#: ../meld/vcview.py:453
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] Iskanje razlik"
 
-#: ../meld/vcview.py:454
+#: ../meld/vcview.py:466
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] Pripenjanje popravka"
 
-#: ../meld/vcview.py:635
+#: ../meld/vcview.py:669
 msgid "Patch tool not found"
 msgstr "Orodja za uveljavljanje popravkov ni mogoče najti"
 
-#: ../meld/vcview.py:636
+#: ../meld/vcview.py:670
 #, python-format
-msgid "Meld needs the <i>patch</i> tool to be installed to perform comparisons in %s repositories. Please 
install <i>patch</i> and try again."
-msgstr "Program Meld zahteva namestitev orodja <i>patch</i> za uveljavljanje popravkov pri izvajanju 
primerjav v skladiščih %s. Namestite orodje <i>patch</i> in poskusite znova."
+msgid ""
+"Meld needs the <i>patch</i> tool to be installed to perform comparisons in "
+"%s repositories. Please install <i>patch</i> and try again."
+msgstr ""
+"Program Meld zahteva namestitev orodja <i>patch</i> za uveljavljanje "
+"popravkov pri izvajanju primerjav v skladiščih %s. Namestite orodje "
+"<i>patch</i> in poskusite znova."
 
-#: ../meld/vcview.py:676
+#: ../meld/vcview.py:710
 msgid "Error fetching original comparison file"
 msgstr "Napaka pridobivanja izvorne datoteke za primerjavo"
 
-#: ../meld/vcview.py:677
-msgid "Meld couldn't obtain the original version of your comparison file. If you are using the most recent 
version of Meld, please report a bug, including as many details as possible."
-msgstr "Ni mogoče pridobiti izvorne različice datoteke za primerjavo. V primeru, da uporabljate najnovejšo 
različico programa, pošljite poročilo o hrošču s čim več podrobnostmi."
+#: ../meld/vcview.py:711
+msgid ""
+"Meld couldn't obtain the original version of your comparison file. If you "
+"are using the most recent version of Meld, please report a bug, including as "
+"many details as possible."
+msgstr ""
+"Ni mogoče pridobiti izvorne različice datoteke za primerjavo. V primeru, da "
+"uporabljate najnovejšo različico programa, pošljite poročilo o hrošču s čim "
+"več podrobnostmi."
 
-#: ../meld/vcview.py:685
+#: ../meld/vcview.py:719
 msgid "Report a bug"
 msgstr "Pošlji poročilo o hrošču"
 
@@ -1558,7 +1613,7 @@ msgstr "Izbor mape"
 msgid "Select file"
 msgstr "Izbor datoteke"
 
-#: ../meld/ui/notebooklabel.py:61
+#: ../meld/ui/notebooklabel.py:63
 msgid "Close tab"
 msgstr "Zapri zavihek"
 
@@ -1571,21 +1626,23 @@ msgid "Base"
 msgstr "Osnova"
 
 #: ../meld/vc/_vc.py:45
-#| msgid "Location"
 msgid "Local"
 msgstr "Krajevno"
 
 #: ../meld/vc/_vc.py:45
-#| msgid "_Remove"
 msgid "Remote"
 msgstr "Oddaljeno"
 
 #. These are the possible states of files. Be sure to get the colons correct.
 #: ../meld/vc/_vc.py:51
-msgid "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing:Not present"
-msgstr "Prezrto:Nedoločeno:::Napaka::Novo dodano:Spremenjeno:V sporu:Odstranjeno:Manjkajoče:Nedostopno"
+msgid ""
+"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing:"
+"Not present"
+msgstr ""
+"Prezrto:Nedoločeno:::Napaka::Novo dodano:Spremenjeno:V sporu:Odstranjeno:"
+"Manjkajoče:Nedostopno"
 
-#: ../meld/vc/cvs.py:165
+#: ../meld/vc/cvs.py:181
 #, python-format
 msgid ""
 "Error converting to a regular expression\n"
@@ -1596,8 +1653,7 @@ msgstr ""
 "Določen je bil vzorec '%s'\n"
 "Javljena napaka je '%s'"
 
-#: ../meld/vc/git.py:201
+#: ../meld/vc/git.py:218
 #, python-format
 msgid "Mode changed from %s to %s"
 msgstr "Način je spremenjen iz %s v %s"
-
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]