[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, 10 Jan 2013 20:09:45 +0000 (UTC)
commit 12a7b1778f7641bdce435b5e896d14fafff97378
Author: Matej UrbanÄiÄ <mateju svn gnome org>
Date:   Thu Jan 10 21:09:41 2013 +0100

    Updated Slovenian translation

 po/sl.po |  574 ++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 301 insertions(+), 273 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 38d20e5..283a7df 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,15 +2,15 @@
 # Copyright (C) 2009 meld's COPYRIGHT HOLDER
 # This file is distributed under the same license as the meld package.
 #
-# Matej UrbanÄiÄ <mateju svn gnome org>, 2009 - 2012.
+# Matej UrbanÄiÄ <mateju svn gnome org>, 2009 - 2013.
 #
 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: 2012-12-16 20:03+0000\n"
-"PO-Revision-Date: 2012-12-19 11:28+0100\n"
+"POT-Creation-Date: 2013-01-09 20:24+0000\n"
+"PO-Revision-Date: 2013-01-10 21:05+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"
@@ -55,46 +55,52 @@ msgstr "Uredljiv seznam"
 msgid "Active"
 msgstr "Dejavno"
 
-#: ../data/ui/EditableList.ui.h:3 ../meld/vcview.py:200
-msgid "Name"
-msgstr "Ime"
-
-#: ../data/ui/EditableList.ui.h:4
-msgid "Pattern"
-msgstr "Vzorec"
+#: ../data/ui/EditableList.ui.h:3
+msgid "Column name"
+msgstr "Ime stolpca"
 
-#: ../data/ui/EditableList.ui.h:5
-msgid "Add new filter"
-msgstr "Dodaj nov filter"
-
-#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:163
+#: ../data/ui/EditableList.ui.h:4 ../meld/vcview.py:163
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../data/ui/EditableList.ui.h:7
-msgid "Remove selected filter"
-msgstr "Odstrani izbrani filter"
-
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:164
+#: ../data/ui/EditableList.ui.h:5 ../meld/vcview.py:164
 msgid "_Remove"
 msgstr "_Odstrani"
 
-#: ../data/ui/EditableList.ui.h:9
+#: ../data/ui/EditableList.ui.h:6
 msgid "Move item up"
 msgstr "Premakni predmet navzgor"
 
-#: ../data/ui/EditableList.ui.h:10
+#: ../data/ui/EditableList.ui.h:7
 msgid "Move _Up"
 msgstr "Premakni _navzgor"
 
-#: ../data/ui/EditableList.ui.h:11
+#: ../data/ui/EditableList.ui.h:8
 msgid "Move item down"
 msgstr "Premakni predmet navzdol"
 
-#: ../data/ui/EditableList.ui.h:12
+#: ../data/ui/EditableList.ui.h:9
 msgid "Move _Down"
 msgstr "Premakni navz_dol"
 
+#. Create icon and filename CellRenderer
+#: ../data/ui/EditableList.ui.h:10 ../meld/dirdiff.py:303
+#: ../meld/vcview.py:200
+msgid "Name"
+msgstr "Ime"
+
+#: ../data/ui/EditableList.ui.h:11
+msgid "Pattern"
+msgstr "Vzorec"
+
+#: ../data/ui/EditableList.ui.h:12
+msgid "Add new filter"
+msgstr "Dodaj nov filter"
+
+#: ../data/ui/EditableList.ui.h:13
+msgid "Remove selected filter"
+msgstr "Odstrani izbrani filter"
+
 #: ../data/ui/filediff.ui.h:1
 msgid "Save changes to documents before closing?"
 msgstr "Ali Åelite shraniti spremembe dokumenta pred zapiranjem?"
@@ -115,7 +121,16 @@ msgstr "_PrekliÄi"
 msgid "_Save"
 msgstr "_Shrani"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:132
+#: ../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."
+
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:78
 msgid "_Replace"
 msgstr "_Zamenjaj"
 
@@ -195,49 +210,6 @@ msgstr ""
 msgid "translator-credits"
 msgstr "Matej UrbanÄiÄ <mateju svn gnome org>"
 
-#: ../data/ui/meldapp.ui.h:10
-msgid "Choose Files"
-msgstr "Izbor datotek"
-
-#: ../data/ui/meldapp.ui.h:11
-msgid "_Three Way Compare"
-msgstr "_Trojna primerjava"
-
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:13
-msgid "Mine"
-msgstr "Lastno"
-
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:15
-msgid "Original"
-msgstr "Izvorno"
-
-#. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:17
-msgid "Other"
-msgstr "Drugo"
-
-#: ../data/ui/meldapp.ui.h:18
-msgid "_File Comparison"
-msgstr "_Primerjava datotek"
-
-#: ../data/ui/meldapp.ui.h:19
-msgid "_Directory Comparison"
-msgstr "_Primerjava vsebine map"
-
-#: ../data/ui/meldapp.ui.h:20
-msgid "Select VC Directory"
-msgstr "Izbor VC mape"
-
-#: ../data/ui/meldapp.ui.h:21
-msgid "Directory"
-msgstr "Mapa"
-
-#: ../data/ui/meldapp.ui.h:22
-msgid "_Version Control Browser"
-msgstr "_Brskalnik po nadzoru razliÄic"
-
 #: ../data/ui/patch-dialog.ui.h:1
 msgid "Create Patch"
 msgstr "Ustvari popravek"
@@ -331,6 +303,22 @@ msgid "Editor"
 msgstr "Urejevalnik"
 
 #: ../data/ui/preferences.ui.h:17
+msgid "Symbolic links"
+msgstr "Simbolne povezave"
+
+#: ../data/ui/preferences.ui.h:18
+msgid "Ignore symbolic links"
+msgstr "Prezri simbolne povezave"
+
+#: ../data/ui/preferences.ui.h:19
+msgid "Visible columns"
+msgstr "Vidni stolpci"
+
+#: ../data/ui/preferences.ui.h:20
+msgid "Folder comparisons"
+msgstr "Primerjave map"
+
+#: ../data/ui/preferences.ui.h:21
 msgid ""
 "When performing directory comparisons, you may filter out files and "
 "directories by name. Each pattern is a list of shell style wildcards "
@@ -340,15 +328,11 @@ msgstr ""
 "vzorec na seznamu je zapisan z nadomestnimi znaki (npr: * in ?), loÄenimi s "
 "presledki."
 
-#: ../data/ui/preferences.ui.h:18
-msgid "Ignore symbolic links"
-msgstr "Prezri simbolne povezave"
-
-#: ../data/ui/preferences.ui.h:19
+#: ../data/ui/preferences.ui.h:22
 msgid "File Filters"
 msgstr "Filtri datotek"
 
-#: ../data/ui/preferences.ui.h:20
+#: ../data/ui/preferences.ui.h:23
 msgid ""
 "When performing file comparisons, you may ignore certain types of changes. "
 "Each pattern here is a python regular expression which replaces matching "
@@ -362,24 +346,24 @@ msgstr ""
 "izraz vkljuÄuje skupine, so zamenjane le te. VeÄ podrobnosti je zapisanih v "
 "priroÄniku."
 
-#: ../data/ui/preferences.ui.h:21
+#: ../data/ui/preferences.ui.h:24
 msgid "Ignore changes which insert or delete blank lines"
 msgstr "Prezri spremembe, s katerimi se vstavijo ali izbriÅejo prazne vrstice"
 
-#: ../data/ui/preferences.ui.h:22
+#: ../data/ui/preferences.ui.h:25
 msgid "Text Filters"
 msgstr "Filtri besedila"
 
-#: ../data/ui/preferences.ui.h:23
+#: ../data/ui/preferences.ui.h:26
 msgid "Loading"
 msgstr "Nalaganje"
 
-#: ../data/ui/preferences.ui.h:24
+#: ../data/ui/preferences.ui.h:27
 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)"
 
-#: ../data/ui/preferences.ui.h:25
+#: ../data/ui/preferences.ui.h:28
 msgid "Encoding"
 msgstr "Nabor znakov"
 
@@ -399,47 +383,47 @@ msgstr "Predhodni dnevniki"
 msgid "Log Message"
 msgstr "SporoÄilo beleÅenja"
 
-#: ../meld/dirdiff.py:233 ../meld/vcview.py:160
+#: ../meld/dirdiff.py:234 ../meld/vcview.py:160
 msgid "_Compare"
 msgstr "_Primerjava"
 
-#: ../meld/dirdiff.py:233 ../meld/vcview.py:160
+#: ../meld/dirdiff.py:234 ../meld/vcview.py:160
 msgid "Compare selected"
 msgstr "Primerjaj izbrano"
 
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:235
 msgid "Copy _Left"
 msgstr "Kopiraj _levo"
 
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:235
 msgid "Copy to left"
 msgstr "Kopiraj na levo"
 
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:236
 msgid "Copy _Right"
 msgstr "Kopiraj _desno"
 
-#: ../meld/dirdiff.py:235
+#: ../meld/dirdiff.py:236
 msgid "Copy to right"
 msgstr "Kopiraj na desno"
 
-#: ../meld/dirdiff.py:236
+#: ../meld/dirdiff.py:237
 msgid "Delete selected"
 msgstr "IzbriÅi izbor"
 
-#: ../meld/dirdiff.py:237 ../meld/filediff.py:1239
+#: ../meld/dirdiff.py:238 ../meld/filediff.py:1247
 msgid "Hide"
 msgstr "Skrij"
 
-#: ../meld/dirdiff.py:237
+#: ../meld/dirdiff.py:238
 msgid "Hide selected"
 msgstr "Skrij izbrano"
 
-#: ../meld/dirdiff.py:241
+#: ../meld/dirdiff.py:242
 msgid "Ignore filename case"
 msgstr "Prezri velikost Ärk imen datotek"
 
-#: ../meld/dirdiff.py:241
+#: ../meld/dirdiff.py:242
 msgid ""
 "Consider differently-cased filenames that are otherwise-identical to be the "
 "same"
@@ -447,74 +431,84 @@ msgstr ""
 "Obravnavaj datoteke, ki imajo v imenu Ärke razliÄne velikosti, vendar so "
 "sicer enake, kot da so enake."
 
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:243
 msgid "Same"
 msgstr "Enako"
 
-#: ../meld/dirdiff.py:242
+#: ../meld/dirdiff.py:243
 msgid "Show identical"
 msgstr "PokaÅi enako"
 
-#: ../meld/dirdiff.py:243
+#: ../meld/dirdiff.py:244
 msgid "New"
 msgstr "Novo"
 
-#: ../meld/dirdiff.py:243
+#: ../meld/dirdiff.py:244
 msgid "Show new"
 msgstr "PokaÅi novejÅe"
 
-#: ../meld/dirdiff.py:244
+#: ../meld/dirdiff.py:245
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: ../meld/dirdiff.py:244 ../meld/vcview.py:172
+#: ../meld/dirdiff.py:245 ../meld/vcview.py:172
 msgid "Show modified"
 msgstr "PokaÅi spremenjeno"
 
-#: ../meld/dirdiff.py:246
+#: ../meld/dirdiff.py:247
 msgid "Filters"
 msgstr "Filtri"
 
-#: ../meld/dirdiff.py:246
+#: ../meld/dirdiff.py:247
 msgid "Set active filters"
 msgstr "DoloÄi dejavne filtre"
 
-#: ../meld/dirdiff.py:407
+#. Create file size CellRenderer
+#: ../meld/dirdiff.py:320
+msgid "Size"
+msgstr "Velikost"
+
+#. Create date-time CellRenderer
+#: ../meld/dirdiff.py:327
+msgid "Modification time"
+msgstr "Äas spremembe"
+
+#: ../meld/dirdiff.py:448
 #, python-format
 msgid "Hide %s"
 msgstr "Skrij %s"
 
-#: ../meld/dirdiff.py:521 ../meld/dirdiff.py:540 ../meld/vcview.py:370
+#: ../meld/dirdiff.py:562 ../meld/dirdiff.py:581 ../meld/vcview.py:370
 #: ../meld/vcview.py:394
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Preiskovanje %s"
 
-#: ../meld/dirdiff.py:639
+#: ../meld/dirdiff.py:680
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] konÄano"
 
-#: ../meld/dirdiff.py:644
+#: ../meld/dirdiff.py:685
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Med preiskovanjem mape, je priÅlo do veÄ napak."
 
-#: ../meld/dirdiff.py:645
+#: ../meld/dirdiff.py:686
 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:647
+#: ../meld/dirdiff.py:688
 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:649
+#: ../meld/dirdiff.py:690
 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:651
+#: ../meld/dirdiff.py:692
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -523,17 +517,17 @@ msgstr ""
 "razlike velikosti upoÅteva. Nekatere datoteke so skrite:\n"
 "%s"
 
-#: ../meld/dirdiff.py:662
+#: ../meld/dirdiff.py:703
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "'%s' je skrit; '%s'"
 
-#: ../meld/dirdiff.py:687 ../meld/filediff.py:1002 ../meld/filediff.py:1243
+#: ../meld/dirdiff.py:728 ../meld/filediff.py:1010 ../meld/filediff.py:1251
 #: ../meld/vcview.py:620 ../meld/vcview.py:662
 msgid "Hi_de"
 msgstr "S_krij"
 
-#: ../meld/dirdiff.py:719
+#: ../meld/dirdiff.py:760
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -542,7 +536,7 @@ msgstr ""
 "'%s' Åe obstaja.\n"
 "Ali naj bo prepisana?"
 
-#: ../meld/dirdiff.py:726
+#: ../meld/dirdiff.py:767
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -553,7 +547,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:744 ../meld/vcview.py:594
+#: ../meld/dirdiff.py:785 ../meld/vcview.py:594
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -562,7 +556,7 @@ msgstr ""
 "'%s' je mapa.\n"
 "Ali naj bo odstranjena vsa vsebina?"
 
-#: ../meld/dirdiff.py:751 ../meld/vcview.py:599
+#: ../meld/dirdiff.py:792 ../meld/vcview.py:599
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -573,7 +567,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:851
+#: ../meld/dirdiff.py:892
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -582,7 +576,7 @@ msgstr[1] "%i sekunda"
 msgstr[2] "%i sekundi"
 msgstr[3] "%i sekunde"
 
-#: ../meld/dirdiff.py:852
+#: ../meld/dirdiff.py:893
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -591,7 +585,7 @@ msgstr[1] "%i minuta"
 msgstr[2] "%i minuti"
 msgstr[3] "%i minute"
 
-#: ../meld/dirdiff.py:853
+#: ../meld/dirdiff.py:894
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -600,7 +594,7 @@ msgstr[1] "%i ura"
 msgstr[2] "%i uri"
 msgstr[3] "%i ure"
 
-#: ../meld/dirdiff.py:854
+#: ../meld/dirdiff.py:895
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -609,7 +603,7 @@ msgstr[1] "%i dan"
 msgstr[2] "%i dni"
 msgstr[3] "%i dni"
 
-#: ../meld/dirdiff.py:855
+#: ../meld/dirdiff.py:896
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -618,7 +612,7 @@ msgstr[1] "%i teden"
 msgstr[2] "%i tedna"
 msgstr[3] "%i tedni"
 
-#: ../meld/dirdiff.py:856
+#: ../meld/dirdiff.py:897
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -627,7 +621,7 @@ msgstr[1] "%i mesec"
 msgstr[2] "%i meseca"
 msgstr[3] "%i meseci"
 
-#: ../meld/dirdiff.py:857
+#: ../meld/dirdiff.py:898
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -636,159 +630,159 @@ msgstr[1] "%i leto"
 msgstr[2] "%i leti"
 msgstr[3] "%i leta"
 
-#: ../meld/filediff.py:217
+#: ../meld/filediff.py:228
 msgid "Format as patch..."
 msgstr "Oblikuj kot popravek ..."
 
-#: ../meld/filediff.py:217
+#: ../meld/filediff.py:228
 msgid "Create a patch using differences between files"
 msgstr "Ustvari popravek z razlikovanjem med datotekami"
 
-#: ../meld/filediff.py:218
+#: ../meld/filediff.py:229
 msgid "Previous conflict"
 msgstr "Predhodni spor"
 
-#: ../meld/filediff.py:218
+#: ../meld/filediff.py:229
 msgid "Go to the previous conflict"
 msgstr "SkoÄi na predhodni niz v sporu"
 
-#: ../meld/filediff.py:219
+#: ../meld/filediff.py:230
 msgid "Next conflict"
 msgstr "Naslednji spor"
 
-#: ../meld/filediff.py:219
+#: ../meld/filediff.py:230
 msgid "Go to the next conflict"
 msgstr "SkoÄi na naslednji niz v sporu"
 
-#: ../meld/filediff.py:220
+#: ../meld/filediff.py:231
 msgid "Push to left"
 msgstr "Potisni levo"
 
-#: ../meld/filediff.py:220
+#: ../meld/filediff.py:231
 msgid "Push current change to the left"
 msgstr "Potisni trenutne spremembe na levo"
 
-#: ../meld/filediff.py:221
+#: ../meld/filediff.py:232
 msgid "Push to right"
 msgstr "Potisni desno"
 
-#: ../meld/filediff.py:221
+#: ../meld/filediff.py:232
 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:223
+#: ../meld/filediff.py:234
 msgid "Pull from left"
 msgstr "Potegni z leve"
 
-#: ../meld/filediff.py:223
+#: ../meld/filediff.py:234
 msgid "Pull change from the left"
 msgstr "Potegni spremembe z leve"
 
-#: ../meld/filediff.py:224
+#: ../meld/filediff.py:235
 msgid "Pull from right"
 msgstr "Potegni z desne"
 
-#: ../meld/filediff.py:224
+#: ../meld/filediff.py:235
 msgid "Pull change from the right"
 msgstr "Potegni spremembe z desne"
 
-#: ../meld/filediff.py:225
+#: ../meld/filediff.py:236
 msgid "Copy above left"
 msgstr "Kopiraj nad levo"
 
-#: ../meld/filediff.py:225
+#: ../meld/filediff.py:236
 msgid "Copy change above the left chunk"
 msgstr "Kopiraj spremembe nad levi del"
 
-#: ../meld/filediff.py:226
+#: ../meld/filediff.py:237
 msgid "Copy below left"
 msgstr "Kopiraj pod levo"
 
-#: ../meld/filediff.py:226
+#: ../meld/filediff.py:237
 msgid "Copy change below the left chunk"
 msgstr "Kopiraj spremembe pod levi del"
 
-#: ../meld/filediff.py:227
+#: ../meld/filediff.py:238
 msgid "Copy above right"
 msgstr "Kopiraj nad desno"
 
-#: ../meld/filediff.py:227
+#: ../meld/filediff.py:238
 msgid "Copy change above the right chunk"
 msgstr "Kopiraj spremembe nad desni del"
 
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:239
 msgid "Copy below right"
 msgstr "Kopiraj pod desno"
 
-#: ../meld/filediff.py:228
+#: ../meld/filediff.py:239
 msgid "Copy change below the right chunk"
 msgstr "Kopiraj spremembe pod desni del"
 
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:240
 msgid "Delete"
 msgstr "IzbriÅi"
 
-#: ../meld/filediff.py:229
+#: ../meld/filediff.py:240
 msgid "Delete change"
 msgstr "IzbriÅi spremembo"
 
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:241
 msgid "Merge all changes from left"
 msgstr "ZdruÅi vse spremembe z leve"
 
-#: ../meld/filediff.py:230
+#: ../meld/filediff.py:241
 msgid "Merge all non-conflicting changes from the left"
 msgstr "ZdruÅi vse spremembe brez sporov z leve"
 
-#: ../meld/filediff.py:231
+#: ../meld/filediff.py:242
 msgid "Merge all changes from right"
 msgstr "ZdruÅi vse spremembe z desne"
 
-#: ../meld/filediff.py:231
+#: ../meld/filediff.py:242
 msgid "Merge all non-conflicting changes from the right"
 msgstr "ZdruÅi vse spremembe brez sporov z desne"
 
-#: ../meld/filediff.py:232
+#: ../meld/filediff.py:243
 msgid "Merge all non-conflicting"
 msgstr "ZdruÅi vse spremembe brez sporov"
 
-#: ../meld/filediff.py:232
+#: ../meld/filediff.py:243
 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:233
+#: ../meld/filediff.py:244
 msgid "Cycle through documents"
 msgstr "Preklopi med dokumenti"
 
-#: ../meld/filediff.py:233
+#: ../meld/filediff.py:244
 msgid "Move keyboard focus to the next document in this comparison"
 msgstr "Premakni dejavnost tipkovnice na naslednji dokument primerjave"
 
-#: ../meld/filediff.py:237
+#: ../meld/filediff.py:248
 msgid "Lock scrolling"
 msgstr "Zakleni drsenje"
 
-#: ../meld/filediff.py:238
+#: ../meld/filediff.py:249
 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:354
+#: ../meld/filediff.py:365
 msgid "INS"
 msgstr "VST"
 
-#: ../meld/filediff.py:354
+#: ../meld/filediff.py:365
 msgid "OVR"
 msgstr "PRE"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:356
+#: ../meld/filediff.py:367
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Vr. %i, St. %i"
 
-#: ../meld/filediff.py:693
+#: ../meld/filediff.py:703
 #, python-format
 msgid ""
 "Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -797,42 +791,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:990
+#: ../meld/filediff.py:998
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] DoloÄi okna"
 
-#: ../meld/filediff.py:996
+#: ../meld/filediff.py:1004
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Odpiranje datotek"
 
-#: ../meld/filediff.py:1020 ../meld/filediff.py:1030 ../meld/filediff.py:1043
-#: ../meld/filediff.py:1049
+#: ../meld/filediff.py:1028 ../meld/filediff.py:1038 ../meld/filediff.py:1051
+#: ../meld/filediff.py:1057
 msgid "Could not read file"
 msgstr "Ni mogoÄe prebrati datoteke"
 
-#: ../meld/filediff.py:1021
+#: ../meld/filediff.py:1029
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Branje datotek"
 
-#: ../meld/filediff.py:1031
+#: ../meld/filediff.py:1039
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "%s je videti kot dvojiÅka datoteka."
 
-#: ../meld/filediff.py:1044
+#: ../meld/filediff.py:1052
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "%s ni zapisan v naboru: %s"
 
-#: ../meld/filediff.py:1075
+#: ../meld/filediff.py:1083
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] RaÄunanje razlik"
 
-#: ../meld/filediff.py:1230
+#: ../meld/filediff.py:1238
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -840,15 +834,15 @@ msgstr ""
 "Uporabljani so filtri besedila, zato so lahko razlike med datotekami skrite. "
 "Ali naj se primerja vsebina brez dejavnih filtrov?"
 
-#: ../meld/filediff.py:1236
+#: ../meld/filediff.py:1244
 msgid "Files are identical"
 msgstr "Datoteki sta enaki"
 
-#: ../meld/filediff.py:1246
+#: ../meld/filediff.py:1254
 msgid "Show without filters"
 msgstr "PokaÅi brez filtrov"
 
-#: ../meld/filediff.py:1370
+#: ../meld/filediff.py:1378
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -857,7 +851,7 @@ msgstr ""
 "\"%s\" Åe obstaja!\n"
 "Ali naj bo datoteka prepisana?"
 
-#: ../meld/filediff.py:1383
+#: ../meld/filediff.py:1391
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -868,12 +862,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1392
+#: ../meld/filediff.py:1400
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Izbor imena za medpomnilnik %i."
 
-#: ../meld/filediff.py:1407
+#: ../meld/filediff.py:1416
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -884,7 +878,7 @@ msgstr ""
 "\n"
 "Kateri zapis Åelite uporabiti?"
 
-#: ../meld/filediff.py:1423
+#: ../meld/filediff.py:1432
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -893,7 +887,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:1476
+#: ../meld/filediff.py:1497
 msgid "Save changes to documents before reloading?"
 msgstr "Ali naj bodo spremembe v dokumentu shranjene pred ponovnim nalaganjem?"
 
@@ -902,97 +896,97 @@ msgstr "Ali naj bodo spremembe v dokumentu shranjene pred ponovnim nalaganjem?"
 msgid "[%s] Merging files"
 msgstr "[%s] ZdruÅevanje datotek"
 
-#: ../meld/meldapp.py:93
+#: ../meld/meldapp.py:95
 msgid "wrong number of arguments supplied to --diff"
 msgstr "Neveljavno Åtevilo argumentov pri ukazu --diff."
 
-#: ../meld/meldapp.py:97
+#: ../meld/meldapp.py:99
 msgid "Start with an empty window"
 msgstr "Zagon brez odprtih oken"
 
-#: ../meld/meldapp.py:98 ../meld/meldapp.py:99 ../meld/meldapp.py:101
+#: ../meld/meldapp.py:100 ../meld/meldapp.py:102 ../meld/meldapp.py:106
 msgid "file"
 msgstr "datoteka"
 
-#: ../meld/meldapp.py:98 ../meld/meldapp.py:100 ../meld/meldapp.py:101
+#: ../meld/meldapp.py:100 ../meld/meldapp.py:104 ../meld/meldapp.py:106
 msgid "dir"
 msgstr "mapa"
 
-#: ../meld/meldapp.py:98
+#: ../meld/meldapp.py:101
 msgid "Start a version control comparison"
 msgstr "Zagon primerjave nadzora razliÄic"
 
-#: ../meld/meldapp.py:99
+#: ../meld/meldapp.py:103
 msgid "Start a 2- or 3-way file comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo datotek"
 
-#: ../meld/meldapp.py:100
+#: ../meld/meldapp.py:105
 msgid "Start a 2- or 3-way directory comparison"
 msgstr "Zagon z dvojno ali trojno primerjavo map"
 
-#: ../meld/meldapp.py:101
+#: ../meld/meldapp.py:107
 msgid "Start a comparison between file and dir/file"
 msgstr "Zagon primerjave med datoteko in mapo/datoteko"
 
-#: ../meld/meldapp.py:107
+#: ../meld/meldapp.py:114
 msgid "Meld is a file and directory comparison tool."
 msgstr "Meld je orodje za primerjavo vsebine datotek in map."
 
-#: ../meld/meldapp.py:110
+#: ../meld/meldapp.py:117
 msgid "Set label to use instead of file name"
 msgstr "DoloÄi naslov namesto imena datoteke"
 
-#: ../meld/meldapp.py:112
+#: ../meld/meldapp.py:119
 msgid "Open a new tab in an already running instance"
 msgstr "Odpri nov zavihek v Åe zagnanem programu"
 
-#: ../meld/meldapp.py:114
+#: ../meld/meldapp.py:122
 msgid "Automatically compare all differing files on startup"
 msgstr "Ob zagonu samodejno primerjaj vse razliÄne datoteke."
 
-#: ../meld/meldapp.py:116
+#: ../meld/meldapp.py:124
 msgid "Ignored for compatibility"
 msgstr "Prezrto zaradi skladnosti"
 
-#: ../meld/meldapp.py:119
+#: ../meld/meldapp.py:127
 msgid "Set the target file for saving a merge result"
 msgstr "DoloÄitev ciljne datoteke za shranjevanje rezultatov zdruÅevanja."
 
-#: ../meld/meldapp.py:121
+#: ../meld/meldapp.py:129
 msgid "Automatically merge files"
 msgstr "Samodejno zdruÅi datoteke"
 
-#: ../meld/meldapp.py:124
+#: ../meld/meldapp.py:132
 msgid "Load a saved comparison from a Meld comparison file"
 msgstr "NaloÅi shranjeno datoteko primerjav Meld"
 
-#: ../meld/meldapp.py:127
-msgid "Creates a diff tab for up to 3 supplied files or directories."
-msgstr "Ustvari zavihke primerjav za do tri datoteke ali mape."
+#: ../meld/meldapp.py:135
+msgid "Create a diff tab for the supplied files or folders"
+msgstr "Ustvari zavihke primerjav za navedene datoteke ali mape."
 
-#: ../meld/meldapp.py:130
+#: ../meld/meldapp.py:138
 #, python-format
 msgid "too many arguments (wanted 0-3, got %d)"
 msgstr "preveÄ argumentov (zahtevanih 0-3, prejetih %d)"
 
-#: ../meld/meldapp.py:132
+#: ../meld/meldapp.py:141
 msgid "can't auto-merge less than 3 files"
 msgstr "manj kot treh datotek ni mogoÄe samodejno zdruÅevati"
 
-#: ../meld/meldapp.py:134
+#: ../meld/meldapp.py:143
 msgid "can't auto-merge directories"
 msgstr "map ni mogoÄe samodejno zdruÅevati"
 
-#: ../meld/meldapp.py:140
+#: ../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:158
+#: ../meld/meldapp.py:167
 msgid "Error reading saved comparison file"
 msgstr "Napaka med branjem datoteke primerjav"
 
 #. TRANSLATORS: This is the label of a new, currently-unnamed file.
-#: ../meld/meldbuffer.py:88
+#: ../meld/meldbuffer.py:89
 msgid "<unnamed>"
 msgstr "<neimenovano>"
 
@@ -1000,244 +994,248 @@ msgstr "<neimenovano>"
 msgid "untitled"
 msgstr "neimenovano"
 
-#: ../meld/meldwindow.py:116
+#: ../meld/meldwindow.py:62
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../meld/meldwindow.py:117
-msgid "_New..."
-msgstr "_Novo ..."
+#: ../meld/meldwindow.py:63
+msgid "_New comparison"
+msgstr "_Nova primerjava"
 
-#: ../meld/meldwindow.py:117
+#: ../meld/meldwindow.py:63
 msgid "Start a new comparison"
 msgstr "Nova primerjava"
 
-#: ../meld/meldwindow.py:118
+#: ../meld/meldwindow.py:64
 msgid "Save the current file"
 msgstr "Shrani trenutno datoteko"
 
-#: ../meld/meldwindow.py:120
+#: ../meld/meldwindow.py:66
 msgid "Close the current file"
 msgstr "Zapri trenutno datoteko"
 
-#: ../meld/meldwindow.py:121
+#: ../meld/meldwindow.py:67
 msgid "Quit the program"
 msgstr "KonÄaj program"
 
-#: ../meld/meldwindow.py:123
+#: ../meld/meldwindow.py:69
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../meld/meldwindow.py:124
+#: ../meld/meldwindow.py:70
 msgid "Undo the last action"
 msgstr "Razveljavi zadnje dejanje"
 
-#: ../meld/meldwindow.py:125
+#: ../meld/meldwindow.py:71
 msgid "Redo the last undone action"
 msgstr "Obnovi zadnje razveljavljeno dejanje"
 
-#: ../meld/meldwindow.py:126
+#: ../meld/meldwindow.py:72
 msgid "Cut the selection"
 msgstr "IzreÅi izbrano"
 
-#: ../meld/meldwindow.py:127
+#: ../meld/meldwindow.py:73
 msgid "Copy the selection"
 msgstr "Kopiraj izbrano"
 
-#: ../meld/meldwindow.py:128
+#: ../meld/meldwindow.py:74
 msgid "Paste the clipboard"
 msgstr "Prilepi iz odloÅiÅÄa"
 
-#: ../meld/meldwindow.py:129
+#: ../meld/meldwindow.py:75
 msgid "Search for text"
 msgstr "PoiÅÄi besedilo"
 
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:76
 msgid "Find Ne_xt"
 msgstr "Najdi _naslednje"
 
-#: ../meld/meldwindow.py:130
+#: ../meld/meldwindow.py:76
 msgid "Search forwards for the same text"
 msgstr "PoiÅÄi niz naprej po besedilu"
 
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:77
 msgid "Find _Previous"
 msgstr "Najdi _predhodne"
 
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:77
 msgid "Search backwards for the same text"
 msgstr "Besedilo najdi nazaj po besedilu"
 
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:78
 msgid "Find and replace text"
 msgstr "PoiÅÄi in zamenjaj besedilo"
 
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:79
 msgid "Prefere_nces"
 msgstr "_Lastnosti"
 
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:79
 msgid "Configure the application"
 msgstr "Spremeni nastavitve programa"
 
-#: ../meld/meldwindow.py:135
+#: ../meld/meldwindow.py:81
 msgid "_Changes"
 msgstr "_Spremembe"
 
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:82
 msgid "Next change"
 msgstr "Naslednja sprememba"
 
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:82
 msgid "Go to the next change"
 msgstr "SkoÄi na naslednjo spremembo"
 
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:83
 msgid "Previous change"
 msgstr "Predhodna sprememba"
 
-#: ../meld/meldwindow.py:137
+#: ../meld/meldwindow.py:83
 msgid "Go to the previous change"
 msgstr "SkoÄi na predhodno spremembo"
 
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:84
 msgid "Open externally"
 msgstr "Odpri v zunanjem programu"
 
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:84
 msgid "Open selected file or directory in the default external application"
 msgstr "Odpri zbrano datoteko ali mapo v privzetem  zunanjem programu"
 
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:86
 msgid "_View"
 msgstr "_Pogled"
 
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:87
 msgid "File status"
 msgstr "Stanje datoteke"
 
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:88
 msgid "Version status"
 msgstr "Stanje razliÄice"
 
-#: ../meld/meldwindow.py:143
+#: ../meld/meldwindow.py:89
 msgid "File filters"
 msgstr "Filtri datotek"
 
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:90
 msgid "Stop the current action"
 msgstr "Ustavi trenutno dejanje"
 
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:91
 msgid "Refresh the view"
 msgstr "OsveÅi pogled"
 
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:92
 msgid "Reload"
 msgstr "Ponovno naloÅi"
 
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:92
 msgid "Reload the comparison"
 msgstr "Ponovno naloÅi primerjavo"
 
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:94
 msgid "_Tabs"
 msgstr "_Zavihki"
 
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:95
 msgid "_Previous Tab"
 msgstr "_Predhodni zavihek"
 
-#: ../meld/meldwindow.py:149
+#: ../meld/meldwindow.py:95
 msgid "Activate previous tab"
 msgstr "PokaÅi predhodni zavihek"
 
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:96
 msgid "_Next Tab"
 msgstr "_Naslednji zavihek"
 
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:96
 msgid "Activate next tab"
 msgstr "PokaÅi naslednji zavihek"
 
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:97
 msgid "Move Tab _Left"
 msgstr "Premakni zavihek _levo"
 
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:97
 msgid "Move current tab to left"
 msgstr "Premakni trenutni zavihek na levo"
 
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:98
 msgid "Move Tab _Right"
 msgstr "Premakni zavihek _desno"
 
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:98
 msgid "Move current tab to right"
 msgstr "Premakni trenutni zavihek na desno"
 
-#: ../meld/meldwindow.py:154
+#: ../meld/meldwindow.py:100
 msgid "_Help"
 msgstr "Pomo_Ä"
 
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:101
 msgid "_Contents"
 msgstr "_Vsebina"
 
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:101
 msgid "Open the Meld manual"
 msgstr "Odpri priroÄnik Meld"
 
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:102
 msgid "Report _Bug"
 msgstr "PoÅlji poroÄilo o _hroÅÄu"
 
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:102
 msgid "Report a bug in Meld"
 msgstr "PoroÄilo o hroÅÄu programa Meld"
 
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:103
 msgid "About this program"
 msgstr "O programu"
 
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:106
 msgid "Full Screen"
 msgstr "Celozaslonski naÄin"
 
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:106
 msgid "View the comparison in full screen"
 msgstr "Ogled primerjave v celozaslonskem naÄinu"
 
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:107
 msgid "_Toolbar"
 msgstr "_Orodna vrstica"
 
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:107
 msgid "Show or hide the toolbar"
 msgstr "PokaÅi ali skrij orodno vrstico"
 
-#: ../meld/meldwindow.py:162
+#: ../meld/meldwindow.py:108
 msgid "_Statusbar"
 msgstr "_Vrstica stanja"
 
-#: ../meld/meldwindow.py:162
+#: ../meld/meldwindow.py:108
 msgid "Show or hide the statusbar"
 msgstr "PokaÅi ali skrij vrstico stanja"
 
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:116
 msgid "Open Recent"
 msgstr "Odpri nedavno"
 
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:117
 msgid "Open recent files"
 msgstr "Odpri nedavne datoteke"
 
-#: ../meld/meldwindow.py:569
+#: ../meld/meldwindow.py:521
 msgid "Switch to this tab"
 msgstr "Preklopi na ta zavihek"
 
+#: ../meld/meldwindow.py:599
+msgid "New comparison"
+msgstr "Nova primerjava"
+
 #. exit at first non found directory + file
-#: ../meld/meldwindow.py:674
+#: ../meld/meldwindow.py:647
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Ni mogoÄe primerjati meÅanice datotek in map.\n"
 
@@ -1258,17 +1256,17 @@ msgstr "oznaka"
 msgid "pattern"
 msgstr "vzorec"
 
-#: ../meld/preferences.py:112
+#: ../meld/preferences.py:142
 msgid "Only available if you have gnome-python-desktop installed"
 msgstr "Na voljo le, Äe je nameÅÄen paket gnome-python-desktop"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:229
+#: ../meld/preferences.py:263
 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:231
+#: ../meld/preferences.py:265
 msgid ""
 "OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
 "Desktop.ini\n"
@@ -1277,49 +1275,49 @@ msgstr ""
 "Desktop.ini\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:233
+#: ../meld/preferences.py:267
 #, 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:235
+#: ../meld/preferences.py:269
 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:237
+#: ../meld/preferences.py:271
 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:239
+#: ../meld/preferences.py:273
 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:241
+#: ../meld/preferences.py:275
 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:243
+#: ../meld/preferences.py:277
 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:245
+#: ../meld/preferences.py:279
 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:247
+#: ../meld/preferences.py:281
 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:249
+#: ../meld/preferences.py:283
 msgid "Script comment\t0\t#.*"
 msgstr "Opomba skripta\t0\t#.*"
 
@@ -1559,6 +1557,36 @@ msgstr ""
 msgid "Mode changed from %s to %s"
 msgstr "NaÄin je spremenjen iz %s v %s"
 
+#~ msgid "Choose Files"
+#~ msgstr "Izbor datotek"
+
+#~ msgid "_Three Way Compare"
+#~ msgstr "_Trojna primerjava"
+
+#~ msgid "Mine"
+#~ msgstr "Lastno"
+
+#~ msgid "Original"
+#~ msgstr "Izvorno"
+
+#~ msgid "Other"
+#~ msgstr "Drugo"
+
+#~ msgid "_Directory Comparison"
+#~ msgstr "_Primerjava vsebine map"
+
+#~ msgid "Select VC Directory"
+#~ msgstr "Izbor VC mape"
+
+#~ msgid "Directory"
+#~ msgstr "Mapa"
+
+#~ msgid "_Version Control Browser"
+#~ msgstr "_Brskalnik po nadzoru razliÄic"
+
+#~ msgid "_New..."
+#~ msgstr "_Novo ..."
+
 #~ msgid "Save modified files?"
 #~ msgstr "Ali naj se spremenjene datoteke shranijo?"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]