[meld] Updated Slovenian translation

From: Matej Urbančič <mateju src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] Updated Slovenian translation
Date: Mon, 14 Oct 2013 21:27:19 +0000 (UTC)
commit 6b35a536171b638c4d284a4cb9d7093a7d622c3a
Author: Matej Urbančič <mateju svn gnome org>
Date:   Mon Oct 14 23:27:12 2013 +0200

    Updated Slovenian translation

 po/sl.po |  644 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 311 insertions(+), 333 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 26ade8d..79433f1 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -9,8 +9,8 @@ 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-09-29 06:47+0000\n"
-"PO-Revision-Date: 2013-09-29 14:08+0100\n"
+"POT-Creation-Date: 2013-10-14 21:08+0000\n"
+"PO-Revision-Date: 2013-10-14 23:24+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"
@@ -22,11 +22,11 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: ../bin/meld:121
+#: ../bin/meld:107
 msgid "Cannot import: "
 msgstr "Ni mogoče uvoziti:"
 
-#: ../bin/meld:124
+#: ../bin/meld:110
 #, c-format
 msgid "Meld requires %s or higher."
 msgstr "Program Meld zahteva najmanj različico %s."
@@ -79,7 +79,7 @@ msgstr "Kopiraj na desno"
 msgid "Delete selected"
 msgstr "Izbriši izbor"
 
-#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1379
+#: ../data/ui/dirdiff.ui.h:8 ../meld/filediff.py:1387
 msgid "Hide"
 msgstr "Skrij"
 
@@ -148,7 +148,7 @@ msgid "_Add"
 msgstr "_Dodaj"
 
 #: ../data/ui/EditableList.ui.h:5 ../data/ui/vcview.ui.h:11
-#: ../meld/vcview.py:644
+#: ../meld/vcview.py:647
 msgid "_Remove"
 msgstr "_Odstrani"
 
@@ -169,8 +169,8 @@ msgid "Move _Down"
 msgstr "Premakni navz_dol"
 
 #. Create icon and filename CellRenderer
-#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:324
-#: ../meld/vcview.py:174
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:323
+#: ../meld/vcview.py:176
 msgid "Name"
 msgstr "Ime"
 
@@ -207,14 +207,6 @@ msgid "_Save"
 msgstr "_Shrani"
 
 #: ../data/ui/filediff.ui.h:6
-msgid "Revert unsaved changes to documents?"
-msgstr "Ali naj se povrnejo neshranjene spremembe dokumentov?"
-
-#: ../data/ui/filediff.ui.h:7
-msgid "Changes made to the following documents will be permanently lost:\n"
-msgstr "Spremembe navedenih dokumentov bodo trajno izgubljene:\n"
-
-#: ../data/ui/filediff.ui.h:9
 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."
@@ -223,10 +215,18 @@ msgstr ""
 "in vsebino spreminjate, vendar pa je treba spremembe shraniti v datoteko z "
 "drugim imenom."
 
-#: ../data/ui/filediff.ui.h:10 ../meld/filediff.py:299
+#: ../data/ui/filediff.ui.h:7 ../meld/filediff.py:294
 msgid "Lock scrolling of all panes"
 msgstr "Zakleni drsenje vseh pladnjev"
 
+#: ../data/ui/filediff.ui.h:8
+msgid "Revert unsaved changes to documents?"
+msgstr "Ali naj se povrnejo neshranjene spremembe dokumentov?"
+
+#: ../data/ui/filediff.ui.h:9
+msgid "Changes made to the following documents will be permanently lost:\n"
+msgstr "Spremembe navedenih dokumentov bodo trajno izgubljene:\n"
+
 #: ../data/ui/findbar.ui.h:1
 msgid "_Replace"
 msgstr "_Zamenjaj"
@@ -267,46 +267,6 @@ msgstr "_Logični izraz"
 msgid "Wrapped"
 msgstr "Prelomljeno"
 
-#: ../data/ui/meldapp.ui.h:2
-msgid ""
-"Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
-"Copyright &#xA9; 2009-2013 Kai Willadsen"
-msgstr ""
-"Avtorske pravice &#xA9; 2002-2009 Stephen Kennedy\n"
-"Avtorske pravice &#xA9; 2009-2013 Kai Willadsen"
-
-#: ../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"
-"\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/>."
-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"
-"\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/>."
-
-#: ../data/ui/meldapp.ui.h:9
-msgid "translator-credits"
-msgstr "Matej Urbančič <mateju svn gnome org>"
-
 #: ../data/ui/patch-dialog.ui.h:1
 msgid "Format as Patch"
 msgstr "Oblikuj kot popravek"
@@ -331,7 +291,7 @@ msgstr "Obrni smer popravka"
 msgid "Copy to Clipboard"
 msgstr "Kopiraj v odložišče"
 
-#: ../data/ui/patch-dialog.ui.h:7 ../meld/patchdialog.py:124
+#: ../data/ui/patch-dialog.ui.h:7 ../meld/patchdialog.py:123
 msgid "Save Patch"
 msgstr "Shrani popravek"
 
@@ -473,7 +433,7 @@ msgstr ""
 "vzorec na seznamu je zapisan z nadomestnimi znaki (npr: * in ?), ločenimi s "
 "presledki."
 
-#: ../data/ui/preferences.ui.h:34 ../meld/meldwindow.py:122
+#: ../data/ui/preferences.ui.h:34 ../meld/meldwindow.py:104
 msgid "File Filters"
 msgstr "Filtri datotek"
 
@@ -512,7 +472,7 @@ msgstr ""
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:681
+#: ../data/ui/tab-placeholder.ui.h:1 ../meld/meldwindow.py:616
 msgid "New comparison"
 msgstr "Nova primerjava"
 
@@ -693,55 +653,55 @@ msgid "_Push commits"
 msgstr "_Objavi uveljavitve"
 
 #. Create file size CellRenderer
-#: ../meld/dirdiff.py:342
+#: ../meld/dirdiff.py:341
 msgid "Size"
 msgstr "Velikost"
 
 #. Create date-time CellRenderer
-#: ../meld/dirdiff.py:350
+#: ../meld/dirdiff.py:349
 msgid "Modification time"
 msgstr "Čas spremembe"
 
 #. Create permissions CellRenderer
-#: ../meld/dirdiff.py:358
+#: ../meld/dirdiff.py:357
 msgid "Permissions"
 msgstr "Dovoljenja"
 
-#: ../meld/dirdiff.py:492
+#: ../meld/dirdiff.py:496
 #, python-format
 msgid "Hide %s"
 msgstr "Skrij %s"
 
-#: ../meld/dirdiff.py:618 ../meld/dirdiff.py:637
+#: ../meld/dirdiff.py:623 ../meld/dirdiff.py:645
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Preiskovanje %s"
 
-#: ../meld/dirdiff.py:737
+#: ../meld/dirdiff.py:745
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] končano"
 
-#: ../meld/dirdiff.py:743
+#: ../meld/dirdiff.py:751
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Med preiskovanjem mape, je prišlo do več napak."
 
-#: ../meld/dirdiff.py:744
+#: ../meld/dirdiff.py:752
 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:746
+#: ../meld/dirdiff.py:754
 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:"
 
-#: ../meld/dirdiff.py:748
+#: ../meld/dirdiff.py:756
 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:750
+#: ../meld/dirdiff.py:758
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -750,17 +710,17 @@ msgstr ""
 "razlike velikosti upošteva. Nekatere datoteke so skrite:\n"
 "%s"
 
-#: ../meld/dirdiff.py:761
+#: ../meld/dirdiff.py:769
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' je skrit; '%s'"
 
-#: ../meld/dirdiff.py:786 ../meld/filediff.py:1095 ../meld/filediff.py:1381
-#: ../meld/filediff.py:1411 ../meld/filediff.py:1413
+#: ../meld/dirdiff.py:794 ../meld/filediff.py:1103 ../meld/filediff.py:1389
+#: ../meld/filediff.py:1419 ../meld/filediff.py:1421
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: ../meld/dirdiff.py:817
+#: ../meld/dirdiff.py:825
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -769,11 +729,11 @@ msgstr ""
 "'%s' že obstaja.\n"
 "Ali naj bo prepisana?"
 
-#: ../meld/dirdiff.py:825
+#: ../meld/dirdiff.py:833
 msgid "Error copying file"
 msgstr "Napaka kopiranja datoteke"
 
-#: ../meld/dirdiff.py:826
+#: ../meld/dirdiff.py:834
 #, python-format
 msgid ""
 "Couldn't copy %s\n"
@@ -786,12 +746,12 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../meld/dirdiff.py:849
+#: ../meld/dirdiff.py:857
 #, python-format
 msgid "Error deleting %s"
 msgstr "Napaka med brisanjem %s"
 
-#: ../meld/dirdiff.py:980
+#: ../meld/dirdiff.py:988
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -800,7 +760,7 @@ msgstr[1] "%i sekunda"
 msgstr[2] "%i sekundi"
 msgstr[3] "%i sekunde"
 
-#: ../meld/dirdiff.py:981
+#: ../meld/dirdiff.py:989
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -809,7 +769,7 @@ msgstr[1] "%i minuta"
 msgstr[2] "%i minuti"
 msgstr[3] "%i minute"
 
-#: ../meld/dirdiff.py:982
+#: ../meld/dirdiff.py:990
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -818,7 +778,7 @@ msgstr[1] "%i ura"
 msgstr[2] "%i uri"
 msgstr[3] "%i ure"
 
-#: ../meld/dirdiff.py:983
+#: ../meld/dirdiff.py:991
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -827,7 +787,7 @@ msgstr[1] "%i dan"
 msgstr[2] "%i dni"
 msgstr[3] "%i dni"
 
-#: ../meld/dirdiff.py:984
+#: ../meld/dirdiff.py:992
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -836,7 +796,7 @@ msgstr[1] "%i teden"
 msgstr[2] "%i tedna"
 msgstr[3] "%i tedni"
 
-#: ../meld/dirdiff.py:985
+#: ../meld/dirdiff.py:993
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -845,7 +805,7 @@ msgstr[1] "%i mesec"
 msgstr[2] "%i meseca"
 msgstr[3] "%i meseci"
 
-#: ../meld/dirdiff.py:986
+#: ../meld/dirdiff.py:994
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -854,182 +814,182 @@ msgstr[1] "%i leto"
 msgstr[2] "%i leti"
 msgstr[3] "%i leta"
 
-#: ../meld/filediff.py:227
+#: ../meld/filediff.py:222
 msgid "Format as Patch..."
 msgstr "Oblikuj kot popravek ..."
 
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:223
 msgid "Create a patch using differences between files"
 msgstr "Ustvari popravek z razlikovanjem med datotekami"
 
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:225
 msgid "Save A_ll"
 msgstr "Shrani _vse"
 
-#: ../meld/filediff.py:231
+#: ../meld/filediff.py:226
 msgid "Save all files in the current comparison"
 msgstr "Shrani vse datoteke trenutne primerjave"
 
-#: ../meld/filediff.py:234
+#: ../meld/filediff.py:229
 msgid "Revert files to their saved versions"
 msgstr "Povrni datoteke na shranjene različice"
 
-#: ../meld/filediff.py:236
+#: ../meld/filediff.py:231
 msgid "Add Synchronization Point"
 msgstr "Dodaj točko usklajevanja"
 
-#: ../meld/filediff.py:237
+#: ../meld/filediff.py:232
 msgid "Add a manual point for synchronization of changes between files"
 msgstr "Dodaj ročno točko usklajevanja sprememb med datotekami"
 
-#: ../meld/filediff.py:240
+#: ../meld/filediff.py:235
 msgid "Clear Synchronization Points"
 msgstr "Počisti točke usklajevanja"
 
-#: ../meld/filediff.py:241
+#: ../meld/filediff.py:236
 msgid "Clear manual change sychronization points"
 msgstr "Počisti ročno spremenjene točke usklajevanja"
 
-#: ../meld/filediff.py:243
+#: ../meld/filediff.py:238
 msgid "Previous Conflict"
 msgstr "Predhodni spor"
 
-#: ../meld/filediff.py:244
+#: ../meld/filediff.py:239
 msgid "Go to the previous conflict"
 msgstr "Skoči na predhodni niz v sporu"
 
-#: ../meld/filediff.py:246
+#: ../meld/filediff.py:241
 msgid "Next Conflict"
 msgstr "Naslednji spor"
 
-#: ../meld/filediff.py:247
+#: ../meld/filediff.py:242
 msgid "Go to the next conflict"
 msgstr "Skoči na naslednji niz v sporu"
 
-#: ../meld/filediff.py:249
+#: ../meld/filediff.py:244
 msgid "Push to Left"
 msgstr "Potisni levo"
 
-#: ../meld/filediff.py:250
+#: ../meld/filediff.py:245
 msgid "Push current change to the left"
 msgstr "Potisni trenutne spremembe na levo"
 
-#: ../meld/filediff.py:253
+#: ../meld/filediff.py:248
 msgid "Push to Right"
 msgstr "Potisni desno"
 
-#: ../meld/filediff.py:254
+#: ../meld/filediff.py:249
 msgid "Push current change to the right"
 msgstr "Potisni trenutne spremembe na desno"
 
-#: ../meld/filediff.py:258
+#: ../meld/filediff.py:253
 msgid "Pull from Left"
 msgstr "Potegni z leve"
 
-#: ../meld/filediff.py:259
+#: ../meld/filediff.py:254
 msgid "Pull change from the left"
 msgstr "Potegni spremembe z leve"
 
-#: ../meld/filediff.py:262
+#: ../meld/filediff.py:257
 msgid "Pull from Right"
 msgstr "Potegni z desne"
 
-#: ../meld/filediff.py:263
+#: ../meld/filediff.py:258
 msgid "Pull change from the right"
 msgstr "Potegni spremembe z desne"
 
-#: ../meld/filediff.py:265
+#: ../meld/filediff.py:260
 msgid "Copy Above Left"
 msgstr "Kopiraj nad levo"
 
-#: ../meld/filediff.py:266
+#: ../meld/filediff.py:261
 msgid "Copy change above the left chunk"
 msgstr "Kopiraj spremembe nad levi del"
 
-#: ../meld/filediff.py:268
+#: ../meld/filediff.py:263
 msgid "Copy Below Left"
 msgstr "Kopiraj pod levo"
 
-#: ../meld/filediff.py:269
+#: ../meld/filediff.py:264
 msgid "Copy change below the left chunk"
 msgstr "Kopiraj spremembe pod levi del"
 
-#: ../meld/filediff.py:271
+#: ../meld/filediff.py:266
 msgid "Copy Above Right"
 msgstr "Kopiraj nad desno"
 
-#: ../meld/filediff.py:272
+#: ../meld/filediff.py:267
 msgid "Copy change above the right chunk"
 msgstr "Kopiraj spremembe nad desni del"
 
-#: ../meld/filediff.py:274
+#: ../meld/filediff.py:269
 msgid "Copy Below Right"
 msgstr "Kopiraj pod desno"
 
-#: ../meld/filediff.py:275
+#: ../meld/filediff.py:270
 msgid "Copy change below the right chunk"
 msgstr "Kopiraj spremembe pod desni del"
 
-#: ../meld/filediff.py:277
+#: ../meld/filediff.py:272
 msgid "Delete"
 msgstr "Izbriši"
 
-#: ../meld/filediff.py:278
+#: ../meld/filediff.py:273
 msgid "Delete change"
 msgstr "Izbriši spremembo"
 
-#: ../meld/filediff.py:280
+#: ../meld/filediff.py:275
 msgid "Merge All from Left"
 msgstr "Združi vse spremembe z leve"
 
-#: ../meld/filediff.py:281
+#: ../meld/filediff.py:276
 msgid "Merge all non-conflicting changes from the left"
 msgstr "Združi vse spremembe brez sporov z leve"
 
-#: ../meld/filediff.py:283
+#: ../meld/filediff.py:278
 msgid "Merge All from Right"
 msgstr "Združi vse spremembe z desne"
 
-#: ../meld/filediff.py:284
+#: ../meld/filediff.py:279
 msgid "Merge all non-conflicting changes from the right"
 msgstr "Združi vse spremembe brez sporov z desne"
 
-#: ../meld/filediff.py:286
+#: ../meld/filediff.py:281
 msgid "Merge All"
 msgstr "Združi vse"
 
-#: ../meld/filediff.py:287
+#: ../meld/filediff.py:282
 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:291
+#: ../meld/filediff.py:286
 msgid "Cycle Through Documents"
 msgstr "Preklopi med dokumenti"
 
-#: ../meld/filediff.py:292
+#: ../meld/filediff.py:287
 msgid "Move keyboard focus to the next document in this comparison"
 msgstr "Premakni dejavnost tipkovnice na naslednji dokument primerjave"
 
-#: ../meld/filediff.py:298
+#: ../meld/filediff.py:293
 msgid "Lock Scrolling"
 msgstr "Zakleni drsenje"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:420
+#: ../meld/filediff.py:438
 msgid "INS"
 msgstr "VST"
 
-#: ../meld/filediff.py:420
+#: ../meld/filediff.py:438
 msgid "OVR"
 msgstr "PRE"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:422
+#: ../meld/filediff.py:440
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Vr. %i, St. %i"
 
-#: ../meld/filediff.py:757
+#: ../meld/filediff.py:777
 #, python-format
 msgid ""
 "Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -1038,42 +998,42 @@ 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:1083
+#: ../meld/filediff.py:1091
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Določi okna"
 
-#: ../meld/filediff.py:1089
+#: ../meld/filediff.py:1097
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Odpiranje datotek"
 
-#: ../meld/filediff.py:1112 ../meld/filediff.py:1122 ../meld/filediff.py:1135
-#: ../meld/filediff.py:1141
+#: ../meld/filediff.py:1120 ../meld/filediff.py:1130 ../meld/filediff.py:1143
+#: ../meld/filediff.py:1149
 msgid "Could not read file"
 msgstr "Ni mogoče prebrati datoteke"
 
-#: ../meld/filediff.py:1113
+#: ../meld/filediff.py:1121
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Branje datotek"
 
-#: ../meld/filediff.py:1123
+#: ../meld/filediff.py:1131
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s je videti kot dvojiška datoteka."
 
-#: ../meld/filediff.py:1136
+#: ../meld/filediff.py:1144
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ni zapisan v naboru: %s"
 
-#: ../meld/filediff.py:1170
+#: ../meld/filediff.py:1178
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Računanje razlik"
 
-#: ../meld/filediff.py:1370
+#: ../meld/filediff.py:1378
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -1081,19 +1041,19 @@ msgstr ""
 "Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. "
 "Ali naj se primerja vsebina brez dejavnih filtrov?"
 
-#: ../meld/filediff.py:1376
+#: ../meld/filediff.py:1384
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: ../meld/filediff.py:1384
+#: ../meld/filediff.py:1392
 msgid "Show without filters"
 msgstr "Pokaži brez filtrov"
 
-#: ../meld/filediff.py:1406
+#: ../meld/filediff.py:1414
 msgid "Change highlighting incomplete"
 msgstr "Spremeni označevanje kot nedokončano"
 
-#: ../meld/filediff.py:1407
+#: ../meld/filediff.py:1415
 msgid ""
 "Some changes were not highlighted because they were too large. You can force "
 "Meld to take longer to highlight larger changes, though this may be slow."
@@ -1101,15 +1061,15 @@ msgstr ""
 "Nekaterih sprememb ni mogoče poudariti, ker so prevelike. Označevanje je "
 "mogoče vsiliti, vendar je postopek lahko zelo dolgotrajen."
 
-#: ../meld/filediff.py:1415
+#: ../meld/filediff.py:1423
 msgid "Keep highlighting"
 msgstr "Poudarjanje skladnje"
 
-#: ../meld/filediff.py:1417
+#: ../meld/filediff.py:1425
 msgid "_Keep highlighting"
 msgstr "_Poudarjanje skladnje"
 
-#: ../meld/filediff.py:1549
+#: ../meld/filediff.py:1556
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -1118,7 +1078,7 @@ msgstr ""
 "\"%s\" že obstaja!\n"
 "Ali naj bo datoteka prepisana?"
 
-#: ../meld/filediff.py:1562
+#: ../meld/filediff.py:1569
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -1129,19 +1089,19 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1573
+#: ../meld/filediff.py:1580
 msgid "Save Left Pane As"
 msgstr "Shrani levi pladenj kot"
 
-#: ../meld/filediff.py:1575
+#: ../meld/filediff.py:1582
 msgid "Save Middle Pane As"
 msgstr "Shrani srednji pladenj kot"
 
-#: ../meld/filediff.py:1577
+#: ../meld/filediff.py:1584
 msgid "Save Right Pane As"
 msgstr "Shrani desni pladenj kot"
 
-#: ../meld/filediff.py:1598
+#: ../meld/filediff.py:1604
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -1152,7 +1112,7 @@ msgstr ""
 "\n"
 "Kateri zapis želite uporabiti?"
 
-#: ../meld/filediff.py:1614
+#: ../meld/filediff.py:1620
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -1161,11 +1121,11 @@ 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:1982
+#: ../meld/filediff.py:1990
 msgid "Live comparison updating disabled"
 msgstr "Živo posodabljanje ob primerjavi je onemogočeno"
 
-#: ../meld/filediff.py:1983
+#: ../meld/filediff.py:1991
 msgid ""
 "Live updating of comparisons is disabled when synchronization points are "
 "active. You can still manually refresh the comparison, and live updates will "
@@ -1180,92 +1140,84 @@ msgstr ""
 msgid "[%s] Merging files"
 msgstr "[%s] Združevanje datotek"
 
-#: ../meld/meldapp.py:95
+#: ../meld/meldapp.py:169
 msgid "wrong number of arguments supplied to --diff"
 msgstr "Neveljavno število argumentov pri ukazu --diff."
 
-#: ../meld/meldapp.py:99
+#: ../meld/meldapp.py:174
 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:175 ../meld/meldapp.py:177
 msgid "file"
 msgstr "datoteka"
 
-#: ../meld/meldapp.py:100 ../meld/meldapp.py:104 ../meld/meldapp.py:106
+#: ../meld/meldapp.py:175 ../meld/meldapp.py:179
 msgid "dir"
 msgstr "mapa"
 
-#: ../meld/meldapp.py:101
+#: ../meld/meldapp.py:176
 msgid "Start a version control comparison"
 msgstr "Zagon primerjave nadzora različic"
 
-#: ../meld/meldapp.py:103
+#: ../meld/meldapp.py:178
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo datotek"
 
-#: ../meld/meldapp.py:105
+#: ../meld/meldapp.py:180
 msgid "Start a 2- or 3-way directory comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo map"
 
-#: ../meld/meldapp.py:107
-msgid "Start a comparison between file and dir/file"
-msgstr "Zagon primerjave med datoteko in mapo/datoteko"
-
-#: ../meld/meldapp.py:114
+#: ../meld/meldapp.py:188
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld je orodje za primerjavo vsebine datotek in map."
 
-#: ../meld/meldapp.py:117
+#: ../meld/meldapp.py:191
 msgid "Set label to use instead of file name"
 msgstr "Določi naslov namesto imena datoteke"
 
-#: ../meld/meldapp.py:119
+#: ../meld/meldapp.py:193
 msgid "Open a new tab in an already running instance"
 msgstr "Odpri nov zavihek v že zagnanem programu"
 
-#: ../meld/meldapp.py:122
+#: ../meld/meldapp.py:196
 msgid "Automatically compare all differing files on startup"
 msgstr "Ob zagonu samodejno primerjaj vse različne datoteke."
 
-#: ../meld/meldapp.py:124
+#: ../meld/meldapp.py:198
 msgid "Ignored for compatibility"
 msgstr "Prezrto zaradi skladnosti"
 
-#: ../meld/meldapp.py:127
+#: ../meld/meldapp.py:201
 msgid "Set the target file for saving a merge result"
 msgstr "Določitev ciljne datoteke za shranjevanje rezultatov združevanja."
 
-#: ../meld/meldapp.py:129
+#: ../meld/meldapp.py:203
 msgid "Automatically merge files"
 msgstr "Samodejno združi datoteke"
 
-#: ../meld/meldapp.py:132
+#: ../meld/meldapp.py:206
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "Naloži shranjeno datoteko primerjav Meld"
 
-#: ../meld/meldapp.py:135
+#: ../meld/meldapp.py:209
 msgid "Create a diff tab for the supplied files or folders"
 msgstr "Ustvari zavihke primerjav za navedene datoteke ali mape."
 
-#: ../meld/meldapp.py:138
+#: ../meld/meldapp.py:212
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "preveč argumentov (zahtevanih 0-3, prejetih %d)"
 
-#: ../meld/meldapp.py:141
+#: ../meld/meldapp.py:215
 msgid "can't auto-merge less than 3 files"
 msgstr "manj kot treh datotek ni mogoče samodejno združevati"
 
-#: ../meld/meldapp.py:143
+#: ../meld/meldapp.py:217
 msgid "can't auto-merge directories"
 msgstr "map ni mogoče samodejno združevati"
 
-#: ../meld/meldapp.py:149
-msgid "D-Bus error; comparisons will open in a new window."
-msgstr "Napaka vodila D-Bus; primerjave se odprejo v novem oknu."
-
-#: ../meld/meldapp.py:167
+#: ../meld/meldapp.py:227
 msgid "Error reading saved comparison file"
 msgstr "Napaka med branjem datoteke primerjav"
 
@@ -1274,279 +1226,238 @@ msgstr "Napaka med branjem datoteke primerjav"
 msgid "<unnamed>"
 msgstr "<neimenovano>"
 
-#: ../meld/melddoc.py:58 ../meld/melddoc.py:59
+#: ../meld/melddoc.py:59 ../meld/melddoc.py:60
 msgid "untitled"
 msgstr "neimenovano"
 
-#: ../meld/meldwindow.py:61
+#: ../meld/meldwindow.py:49
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../meld/meldwindow.py:62
+#: ../meld/meldwindow.py:50
 msgid "_New Comparison..."
 msgstr "_Nova primerjava ..."
 
-#: ../meld/meldwindow.py:63
+#: ../meld/meldwindow.py:51
 msgid "Start a new comparison"
 msgstr "Nova primerjava"
 
-#: ../meld/meldwindow.py:66
+#: ../meld/meldwindow.py:54
 msgid "Save the current file"
 msgstr "Shrani trenutno datoteko"
 
-#: ../meld/meldwindow.py:68
+#: ../meld/meldwindow.py:56
 msgid "Save As..."
 msgstr "Shrani kot ..."
 
-#: ../meld/meldwindow.py:69
+#: ../meld/meldwindow.py:57
 msgid "Save the current file with a different name"
 msgstr "Shrani trenutno datoteko z drugim imenom"
 
-#: ../meld/meldwindow.py:72
+#: ../meld/meldwindow.py:60
 msgid "Close the current file"
 msgstr "Zapri trenutno datoteko"
 
-#: ../meld/meldwindow.py:75
-msgid "Quit the program"
-msgstr "Končaj program"
-
-#: ../meld/meldwindow.py:78
+#: ../meld/meldwindow.py:63
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../meld/meldwindow.py:80
+#: ../meld/meldwindow.py:65
 msgid "Undo the last action"
 msgstr "Razveljavi zadnje dejanje"
 
-#: ../meld/meldwindow.py:83
+#: ../meld/meldwindow.py:68
 msgid "Redo the last undone action"
 msgstr "Obnovi zadnje razveljavljeno dejanje"
 
-#: ../meld/meldwindow.py:85
+#: ../meld/meldwindow.py:70
 msgid "Cut the selection"
 msgstr "Izreži izbrano"
 
-#: ../meld/meldwindow.py:87
+#: ../meld/meldwindow.py:72
 msgid "Copy the selection"
 msgstr "Kopiraj izbrano"
 
-#: ../meld/meldwindow.py:89
+#: ../meld/meldwindow.py:74
 msgid "Paste the clipboard"
 msgstr "Prilepi iz odložišča"
 
-#: ../meld/meldwindow.py:91
+#: ../meld/meldwindow.py:76
 msgid "Find..."
 msgstr "Najdi ..."
 
-#: ../meld/meldwindow.py:91
+#: ../meld/meldwindow.py:76
 msgid "Search for text"
 msgstr "Poišči besedilo"
 
-#: ../meld/meldwindow.py:93
+#: ../meld/meldwindow.py:78
 msgid "Find Ne_xt"
 msgstr "Najdi _naslednje"
 
-#: ../meld/meldwindow.py:94
+#: ../meld/meldwindow.py:79
 msgid "Search forwards for the same text"
 msgstr "Poišči niz naprej po besedilu"
 
-#: ../meld/meldwindow.py:96
+#: ../meld/meldwindow.py:81
 msgid "Find _Previous"
 msgstr "Najdi _predhodne"
 
-#: ../meld/meldwindow.py:97
+#: ../meld/meldwindow.py:82
 msgid "Search backwards for the same text"
 msgstr "Besedilo najdi nazaj po besedilu"
 
-#: ../meld/meldwindow.py:100
+#: ../meld/meldwindow.py:85
 msgid "_Replace..."
 msgstr "_Zamenjaj ..."
 
-#: ../meld/meldwindow.py:101
+#: ../meld/meldwindow.py:86
 msgid "Find and replace text"
 msgstr "Poišči in zamenjaj besedilo"
 
-#: ../meld/meldwindow.py:103
-msgid "Prefere_nces"
-msgstr "_Lastnosti"
-
-#: ../meld/meldwindow.py:104
-msgid "Configure the application"
-msgstr "Spremeni nastavitve programa"
-
-#: ../meld/meldwindow.py:107
+#: ../meld/meldwindow.py:89
 msgid "_Changes"
 msgstr "_Spremembe"
 
-#: ../meld/meldwindow.py:108
+#: ../meld/meldwindow.py:90
 msgid "Next Change"
 msgstr "Naslednja sprememba"
 
-#: ../meld/meldwindow.py:109
+#: ../meld/meldwindow.py:91
 msgid "Go to the next change"
 msgstr "Skoči na naslednjo spremembo"
 
-#: ../meld/meldwindow.py:111
+#: ../meld/meldwindow.py:93
 msgid "Previous Change"
 msgstr "Predhodna sprememba"
 
-#: ../meld/meldwindow.py:112
+#: ../meld/meldwindow.py:94
 msgid "Go to the previous change"
 msgstr "Skoči na predhodno spremembo"
 
-#: ../meld/meldwindow.py:114
+#: ../meld/meldwindow.py:96
 msgid "Open Externally"
 msgstr "Odpri v zunanjem programu"
 
-#: ../meld/meldwindow.py:115
+#: ../meld/meldwindow.py:97
 msgid "Open selected file or directory in the default external application"
 msgstr "Odpri zbrano datoteko ali mapo v privzetem  zunanjem programu"
 
-#: ../meld/meldwindow.py:119
+#: ../meld/meldwindow.py:101
 msgid "_View"
 msgstr "_Pogled"
 
-#: ../meld/meldwindow.py:120
+#: ../meld/meldwindow.py:102
 msgid "File Status"
 msgstr "Stanje datoteke"
 
-#: ../meld/meldwindow.py:121
+#: ../meld/meldwindow.py:103
 msgid "Version Status"
 msgstr "Stanje različice"
 
-#: ../meld/meldwindow.py:124
+#: ../meld/meldwindow.py:106
 msgid "Stop the current action"
 msgstr "Ustavi trenutno dejanje"
 
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:109
 msgid "Refresh the view"
 msgstr "Osveži pogled"
 
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:112
 msgid "_Tabs"
 msgstr "_Zavihki"
 
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:113
 msgid "_Previous Tab"
 msgstr "_Predhodni zavihek"
 
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:114
 msgid "Activate previous tab"
 msgstr "Pokaži predhodni zavihek"
 
-#: ../meld/meldwindow.py:134
+#: ../meld/meldwindow.py:116
 msgid "_Next Tab"
 msgstr "_Naslednji zavihek"
 
-#: ../meld/meldwindow.py:135
+#: ../meld/meldwindow.py:117
 msgid "Activate next tab"
 msgstr "Pokaži naslednji zavihek"
 
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:120
 msgid "Move Tab _Left"
 msgstr "Premakni zavihek _levo"
 
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:121
 msgid "Move current tab to left"
 msgstr "Premakni trenutni zavihek na levo"
 
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:124
 msgid "Move Tab _Right"
 msgstr "Premakni zavihek _desno"
 
-#: ../meld/meldwindow.py:143
+#: ../meld/meldwindow.py:125
 msgid "Move current tab to right"
 msgstr "Premakni trenutni zavihek na desno"
 
-#: ../meld/meldwindow.py:146
-msgid "_Help"
-msgstr "Pomo_č"
-
-#: ../meld/meldwindow.py:147
-msgid "_Contents"
-msgstr "_Vsebina"
-
-#: ../meld/meldwindow.py:148
-msgid "Open the Meld manual"
-msgstr "Odpri priročnik Meld"
-
-#: ../meld/meldwindow.py:149
-msgid "Report _Bug"
-msgstr "Pošlji poročilo o _hrošču"
-
-#: ../meld/meldwindow.py:150
-msgid "Report a bug in Meld"
-msgstr "Poročilo o hrošču programa Meld"
-
-#: ../meld/meldwindow.py:153
-msgid "About this program"
-msgstr "O programu"
-
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:129
 msgid "Fullscreen"
 msgstr "Celozaslonski način"
 
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:130
 msgid "View the comparison in fullscreen"
 msgstr "Pokaži primerjavo v celozaslonskem načinu"
 
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:132
 msgid "_Toolbar"
 msgstr "_Orodna vrstica"
 
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:133
 msgid "Show or hide the toolbar"
 msgstr "Pokaži ali skrij orodno vrstico"
 
-#: ../meld/meldwindow.py:163
+#: ../meld/meldwindow.py:135
 msgid "_Statusbar"
 msgstr "_Vrstica stanja"
 
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:136
 msgid "Show or hide the statusbar"
 msgstr "Pokaži ali skrij vrstico stanja"
 
-#: ../meld/meldwindow.py:173
+#: ../meld/meldwindow.py:145
 msgid "Open Recent"
 msgstr "Odpri nedavno"
 
-#: ../meld/meldwindow.py:174
+#: ../meld/meldwindow.py:146
 msgid "Open recent files"
 msgstr "Odpri nedavne datoteke"
 
-#: ../meld/meldwindow.py:601
+#: ../meld/meldwindow.py:537
 msgid "Switch to this tab"
 msgstr "Preklopi na ta zavihek"
 
-#. exit at first non found directory + file
-#: ../meld/meldwindow.py:734
-msgid "Cannot compare a mixture of files and directories.\n"
-msgstr "Ni mogoče primerjati mešanice datotek in map.\n"
+#: ../meld/meldwindow.py:660
+msgid "Cannot compare a mixture of files and directories"
+msgstr "Ni mogoče sočasno primerjati datotek in map"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:189
+#: ../meld/misc.py:180
 msgid "[None]"
 msgstr "[noben]"
 
-#: ../meld/preferences.py:49
+#: ../meld/preferences.py:46
 msgid "label"
 msgstr "oznaka"
 
-#: ../meld/preferences.py:49
+#: ../meld/preferences.py:46
 msgid "pattern"
 msgstr "vzorec"
 
-#: ../meld/preferences.py:168 ../meld/preferences.py:240
-msgid "Only available if you have PyGtkSourceView 2 installed"
-msgstr "Na voljo le, če je nameščen paket PyGtkSourceView"
-
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:356
+#: ../meld/preferences.py:338
 msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 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:358
+#: ../meld/preferences.py:340
 msgid ""
 "OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
 "Desktop.ini\n"
@@ -1555,103 +1466,103 @@ msgstr ""
 "Desktop.ini\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:360
+#: ../meld/preferences.py:342
 #, python-format
 msgid "Version Control\t1\t%s\n"
 msgstr "Nadzor različic\t1\t%s\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:362
+#: ../meld/preferences.py:344
 msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
 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:364
+#: ../meld/preferences.py:346
 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}"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:366
+#: ../meld/preferences.py:348
 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:368
+#: ../meld/preferences.py:350
 msgid "C++ comment\t0\t//.*\n"
 msgstr "C++ opombe\t0\t//.*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:370
+#: ../meld/preferences.py:352
 msgid "C comment\t0\t/\\*.*?\\*/\n"
 msgstr "C opombe\t0\t/\\*.*?\\*/\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:372
+#: ../meld/preferences.py:354
 msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
 msgstr "Vsi presledni znaki\t0\t[ \\t\\r\\f\\v]*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:374
+#: ../meld/preferences.py:356
 msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
 msgstr "Začetni presledni znaki\t0\t^[ \\t\\r\\f\\v]*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:376
+#: ../meld/preferences.py:358
 msgid "Script comment\t0\t#.*"
 msgstr "Opomba skripta\t0\t#.*"
 
-#: ../meld/recent.py:104
+#: ../meld/recent.py:105
 msgid "Version control:"
 msgstr "Nadzor različic:"
 
-#: ../meld/vcview.py:205 ../meld/vcview.py:363
+#: ../meld/vcview.py:206 ../meld/vcview.py:363
 msgid "Location"
 msgstr "Mesto"
 
-#: ../meld/vcview.py:206
+#: ../meld/vcview.py:207
 msgid "Status"
 msgstr "Stanje"
 
-#: ../meld/vcview.py:207
+#: ../meld/vcview.py:208
 msgid "Revision"
 msgstr "Predelava"
 
-#: ../meld/vcview.py:208
+#: ../meld/vcview.py:209
 msgid "Options"
 msgstr "Možnosti"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:273
+#: ../meld/vcview.py:274
 #, python-format
 msgid "%s not installed"
 msgstr "Program %s ni nameščen"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:277
+#: ../meld/vcview.py:278
 msgid "Invalid repository"
 msgstr "Neveljavno skladišče"
 
-#: ../meld/vcview.py:286
+#: ../meld/vcview.py:287
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../meld/vcview.py:288 ../meld/vcview.py:296
+#: ../meld/vcview.py:289 ../meld/vcview.py:297
 msgid "None"
 msgstr "Brez"
 
-#: ../meld/vcview.py:307
+#: ../meld/vcview.py:308
 msgid "No valid version control system found in this folder"
 msgstr "Ni veljavnega sistema za nadzor različic v tej mapi"
 
-#: ../meld/vcview.py:309
+#: ../meld/vcview.py:310
 msgid "Only one version control system found in this folder"
 msgstr "V tej mapi je le en sistem nadzora različic"
 
-#: ../meld/vcview.py:311
+#: ../meld/vcview.py:312
 msgid "Choose which version control system to use"
 msgstr "Izbor različice sistema za nadzor različic za uporabo"
 
@@ -1670,11 +1581,11 @@ msgstr "Preiskovanje %s"
 msgid "(Empty)"
 msgstr "(Prazno)"
 
-#: ../meld/vcview.py:638
+#: ../meld/vcview.py:641
 msgid "Remove folder and all its files?"
 msgstr "Ali želite izbrisati mapo in vse njene datoteke?"
 
-#: ../meld/vcview.py:640
+#: ../meld/vcview.py:643
 msgid ""
 "This will remove all selected files and folders, and all files within any "
 "selected folders, from version control."
@@ -1682,44 +1593,20 @@ msgstr ""
 "S tem dejanjem bodo odstranjene vse izbrane datoteke in mape in vse "
 "podrejene datoteke iz sistema za nadzor različic"
 
-#: ../meld/vcview.py:674
+#: ../meld/vcview.py:677
 #, python-format
 msgid "Error removing %s"
 msgstr "Napaka med odstranjevanjem %s"
 
-#: ../meld/ui/findbar.py:143
+#: ../meld/ui/findbar.py:142
 msgid "Regular expression error"
 msgstr "Napaka v logičnem izrazu"
 
-#: ../meld/ui/historyentry.py:381
-msgid "_Browse..."
-msgstr "_Prebrskaj ..."
-
-#: ../meld/ui/historyentry.py:389
-msgid "Path"
-msgstr "Pot"
-
-#: ../meld/ui/historyentry.py:390
-msgid "Path to file"
-msgstr "Pot do datoteke"
-
-#: ../meld/ui/historyentry.py:391
-msgid "Pop up a file selector to choose a file"
-msgstr "Pokaži izbirnik za izbor datoteke"
-
-#: ../meld/ui/historyentry.py:529
-msgid "Select directory"
-msgstr "Izbor mape"
-
-#: ../meld/ui/historyentry.py:533
-msgid "Select file"
-msgstr "Izbor datoteke"
-
-#: ../meld/ui/notebooklabel.py:63
+#: ../meld/ui/notebooklabel.py:65
 msgid "Close tab"
 msgstr "Zapri zavihek"
 
-#: ../meld/ui/vcdialogs.py:57
+#: ../meld/ui/vcdialogs.py:55
 msgid "No files will be committed"
 msgstr "Ni pripravljenih datotek za uveljavitev"
 
@@ -1780,6 +1667,97 @@ msgstr[3] "%d veje"
 msgid "Mode changed from %s to %s"
 msgstr "Način je spremenjen iz %s v %s"
 
+#~ msgid ""
+#~ "Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
+#~ "Copyright &#xA9; 2009-2013 Kai Willadsen"
+#~ msgstr ""
+#~ "Avtorske pravice &#xA9; 2002-2009 Stephen Kennedy\n"
+#~ "Avtorske pravice &#xA9; 2009-2013 Kai Willadsen"
+
+#~ 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"
+#~ "\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/>."
+#~ 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"
+#~ "\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/>."
+
+#~ msgid "translator-credits"
+#~ msgstr "Matej Urbančič <mateju svn gnome org>"
+
+#~ msgid "Start a comparison between file and dir/file"
+#~ msgstr "Zagon primerjave med datoteko in mapo/datoteko"
+
+#~ msgid "D-Bus error; comparisons will open in a new window."
+#~ msgstr "Napaka vodila D-Bus; primerjave se odprejo v novem oknu."
+
+#~ msgid "Quit the program"
+#~ msgstr "Končaj program"
+
+#~ msgid "Prefere_nces"
+#~ msgstr "_Lastnosti"
+
+#~ msgid "Configure the application"
+#~ msgstr "Spremeni nastavitve programa"
+
+#~ msgid "_Help"
+#~ msgstr "Pomo_č"
+
+#~ msgid "_Contents"
+#~ msgstr "_Vsebina"
+
+#~ msgid "Open the Meld manual"
+#~ msgstr "Odpri priročnik Meld"
+
+#~ msgid "Report _Bug"
+#~ msgstr "Pošlji poročilo o _hrošču"
+
+#~ msgid "Report a bug in Meld"
+#~ msgstr "Poročilo o hrošču programa Meld"
+
+#~ msgid "About this program"
+#~ msgstr "O programu"
+
+#~ msgid "Only available if you have PyGtkSourceView 2 installed"
+#~ msgstr "Na voljo le, če je nameščen paket PyGtkSourceView"
+
+#~ msgid "_Browse..."
+#~ msgstr "_Prebrskaj ..."
+
+#~ msgid "Path"
+#~ msgstr "Pot"
+
+#~ msgid "Path to file"
+#~ msgstr "Pot do datoteke"
+
+#~ msgid "Pop up a file selector to choose a file"
+#~ msgstr "Pokaži izbirnik za izbor datoteke"
+
+#~ msgid "Select directory"
+#~ msgstr "Izbor mape"
+
+#~ msgid "Select file"
+#~ msgstr "Izbor datoteke"
+
 #~ msgid "Compare selected"
 #~ msgstr "Primerjaj izbrano"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]