[meld] Updated Serbian translation

From: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <mirosnik src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] Updated Serbian translation
Date: Fri, 7 Sep 2012 08:29:53 +0000 (UTC)
commit 3e717fdb113bcd520e133fa55b69fd703ea50669
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date:   Fri Sep 7 10:29:55 2012 +0200

    Updated Serbian translation

 po/sr.po       |  483 ++++++++++++++++++++++++++++++--------------------------
 po/sr latin po |  483 ++++++++++++++++++++++++++++++--------------------------
 2 files changed, 516 insertions(+), 450 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 7411f9f..7f83c50 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&k";
 "eywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-06-17 00:26+0000\n"
-"PO-Revision-Date: 2012-08-07 22:43+0200\n"
+"POT-Creation-Date: 2012-09-04 20:32+0000\n"
+"PO-Revision-Date: 2012-09-07 10:27+0200\n"
 "Last-Translator: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
@@ -65,7 +65,7 @@ msgstr "ÐÐÑÐÐÐÑ"
 msgid "Add new filter"
 msgstr "ÐÐÐÐÑÑÐ ÐÐÐÐ ÑÐÐÑÐÑ"
 
-#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:130
+#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:129
 msgid "_Add"
 msgstr "_ÐÐÐÐÑ"
 
@@ -73,7 +73,7 @@ msgstr "_ÐÐÐÐÑ"
 msgid "Remove selected filter"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÑÐÑ"
 
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:132
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:131
 msgid "_Remove"
 msgstr "_ÐÐÐÐÐÐ"
 
@@ -113,7 +113,7 @@ msgstr "_ÐÐÐÐÑÐ ÐÐÐÐÐÐ"
 msgid "_Save Selected"
 msgstr "_ÐÐÑÑÐÐÑ ÐÐÐÐÑÐÐÐ"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:147
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:148
 msgid "_Replace"
 msgstr "_ÐÐÐÐÐÐ"
 
@@ -158,6 +158,34 @@ msgstr ""
 "ÐÑÑÐÑÑÐÐ ÐÑÐÐÐ &#xA9; 2009-2012 ÐÐÑ ÐÐÐÐÐÑÐÐ"
 
 #: ../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 ""
+"ÐÐÐÐ ÑÐ ÑÐÐÐÐÐÐÐ ÑÐÑÑÐÐÑ; ÐÐÐÐÑÐ ÐÐ ÐÑÐÑÐÐÑÐÐÐÑÐ Ð/ÐÐÐ ÐÐÑÐÑÐ ÐÐÐ\n"
+"ÑÑÐÐÐÐÐÐ ÐÐÑÐÐÐ ÐÐÑÑÐ ÑÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐÑÑ ÑÐ ÐÐÑÐÐÐÐÐ ÐÐÐÑÐÐÐÐÐ\n"
+"ÑÐÐÐÐÐÐÐÐ ÑÐÑÑÐÐÑÐ; ÐÐÐÐÑÐ 2 ÑÐ ÐÐÐÐÐÐÐ ÐÐÐ (ÐÐ ÐÐÑÐÐ ÐÐÐÐÑÑ)\n"
+"ÐÐÐÐ ÐÐÑÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÑÐ.\n"
+"\n"
+"ÐÐÐÐ ÑÐ ÑÐÑÐÐÐÐÑÑÑÐ Ñ ÐÐÐÐ ÐÐ ÑÐ ÐÐÑÐ ÐÐÑÐÑÑÐÐ, ÐÐÐ ÐÐÐ ÐÐÐÐÐÐ\n"
+"ÐÐÐÐÐÐÐÐÐ; ÑÐÐ Ð ÐÐÐ ÐÑÐÐÐÑÐÐÐ ÐÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÐ\n"
+"ÐÐÐÐÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐ. ÐÐÐÐÐÐÐÑÑÐ ÐÐÑÐÐÑ ÐÐÑÑÑ ÑÐÐÐÑ\n"
+"ÐÐÐÐÐÐÑ ÐÐ ÐÐÑÐ ÐÐÑÐÑÐ.\n"
+"\n"
+"ÐÑÐÐÐ ÐÐ ÑÑÐ ÐÑÐÐÐÐÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐÐ ÐÐÑÑÐ ÑÐÐÐÐ ÐÐÑÐÐÑÐ ÑÐ ÐÐÐÑ\n"
+"ÐÑÐÐÑÐÐ; ÐÐÐ ÐÐÑÑÐ, ÐÐÐÐÐÐÐÑÑÐ <http://www.gnu.org/licenses/>"
+
+#: ../data/ui/meldapp.ui.h:9
 msgid "translator-credits"
 msgstr ""
 "ÐÐÐÐÐÐ ÐÐÐÐÐ <danilo prevod org>\n"
@@ -165,46 +193,46 @@ msgstr ""
 "\n"
 "Prevod.org â ÐÑÐÐÐÐ ÐÐ ÑÑÐÑÐÐ ÑÐÐÐÐ."
 
-#: ../data/ui/meldapp.ui.h:5
+#: ../data/ui/meldapp.ui.h:10
 msgid "Choose Files"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../data/ui/meldapp.ui.h:6
+#: ../data/ui/meldapp.ui.h:11
 msgid "_Three Way Compare"
 msgstr "ÐÐÑÐÑÐÑÐ _ÑÑÐ ÐÐÐÐÐÐÑÐ"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:8
+#: ../data/ui/meldapp.ui.h:13
 msgid "Mine"
 msgstr "ÐÐÑÐ"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:10
+#: ../data/ui/meldapp.ui.h:15
 msgid "Original"
 msgstr "ÐÐÐÐÑÐÐ"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:12
+#: ../data/ui/meldapp.ui.h:17
 msgid "Other"
 msgstr "ÐÑÑÐÐ"
 
-#: ../data/ui/meldapp.ui.h:13
+#: ../data/ui/meldapp.ui.h:18
 msgid "_File Comparison"
 msgstr "ÐÐÑÐÑÐÑÐ _ÐÐÑÐÑÐÐÐ"
 
-#: ../data/ui/meldapp.ui.h:14
+#: ../data/ui/meldapp.ui.h:19
 msgid "_Directory Comparison"
 msgstr "ÐÐÑÐÑÐÑÐ _ÑÐÑÑÐÐÐÐ"
 
-#: ../data/ui/meldapp.ui.h:15
+#: ../data/ui/meldapp.ui.h:20
 msgid "Select VC Directory"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐ ÑÐÑÑÐÐÐÑ"
 
-#: ../data/ui/meldapp.ui.h:16
+#: ../data/ui/meldapp.ui.h:21
 msgid "Directory"
 msgstr "ÐÐÑÑÐÐÐÐ"
 
-#: ../data/ui/meldapp.ui.h:17
+#: ../data/ui/meldapp.ui.h:22
 msgid "_Version Control Browser"
 msgstr "ÐÑÐÐÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐ _ÐÐÑÐÐÑÐ"
 
@@ -368,47 +396,47 @@ msgstr "ÐÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐÑÐ"
 msgid "Log Message"
 msgstr "ÐÐÑÑÐÐ ÐÐÐÐÐÐÐÐ"
 
-#: ../meld/dirdiff.py:230 ../meld/vcview.py:127
+#: ../meld/dirdiff.py:229 ../meld/vcview.py:126
 msgid "_Compare"
 msgstr "_ÐÐÐÑÐÐÐ"
 
-#: ../meld/dirdiff.py:230 ../meld/vcview.py:127
+#: ../meld/dirdiff.py:229 ../meld/vcview.py:126
 msgid "Compare selected"
 msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../meld/dirdiff.py:231
+#: ../meld/dirdiff.py:230
 msgid "Copy _Left"
 msgstr "ÐÐÐÐÐÐ _ÐÐÐÐ"
 
-#: ../meld/dirdiff.py:231
+#: ../meld/dirdiff.py:230
 msgid "Copy to left"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐ"
 
-#: ../meld/dirdiff.py:232
+#: ../meld/dirdiff.py:231
 msgid "Copy _Right"
 msgstr "ÐÐÐÐÐÐ _ÐÐÑÐÐ"
 
-#: ../meld/dirdiff.py:232
+#: ../meld/dirdiff.py:231
 msgid "Copy to right"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÐÐ"
 
-#: ../meld/dirdiff.py:233
+#: ../meld/dirdiff.py:232
 msgid "Delete selected"
 msgstr "ÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../meld/dirdiff.py:234 ../meld/filediff.py:1078
+#: ../meld/dirdiff.py:233 ../meld/filediff.py:1101
 msgid "Hide"
 msgstr "ÐÐÐÑÐÑ"
 
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:233
 msgid "Hide selected"
 msgstr "ÐÐÐÑÐÑ ÐÐÐÐÑÐÐÐ"
 
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:237
 msgid "Ignore filename case"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ ÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:237
 msgid ""
 "Consider differently-cased filenames that are otherwise-identical to be the "
 "same"
@@ -416,73 +444,73 @@ msgstr ""
 "ÐÐÐÑÑÐÑÐ ÐÑÑÐÐ ÑÐÐÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÐÐ Ñ ÐÐÐÐÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÑÑ "
 "ÐÐÑÑÑÐÐÐÐ ÐÑÑÐÐÐÑÐÐ"
 
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:238
 msgid "Same"
 msgstr "ÐÑÑÐ"
 
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:238
 msgid "Show identical"
 msgstr "ÐÑÐÐÐÐÐ ÐÑÑÐÐÐÑÐÐ"
 
-#: ../meld/dirdiff.py:240
+#: ../meld/dirdiff.py:239
 msgid "New"
 msgstr "ÐÐÐÐ"
 
-#: ../meld/dirdiff.py:240
+#: ../meld/dirdiff.py:239
 msgid "Show new"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐ"
 
-#: ../meld/dirdiff.py:241
+#: ../meld/dirdiff.py:240
 msgid "Modified"
 msgstr "ÐÐÐÐÑÐÐÐ"
 
-#: ../meld/dirdiff.py:241 ../meld/vcview.py:140
+#: ../meld/dirdiff.py:240 ../meld/vcview.py:139
 msgid "Show modified"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../meld/dirdiff.py:243
+#: ../meld/dirdiff.py:242
 msgid "Filters"
 msgstr "ÐÐÐÑÐÑÐ"
 
-#: ../meld/dirdiff.py:243
+#: ../meld/dirdiff.py:242
 msgid "Set active filters"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÐÑÐÐÐÐ ÑÐÐÑÐÑÐ"
 
-#: ../meld/dirdiff.py:360
+#: ../meld/dirdiff.py:398
 #, python-format
 msgid "Hide %s"
 msgstr "ÐÐÐÑÐÑ â%sâ"
 
-#: ../meld/dirdiff.py:464 ../meld/dirdiff.py:477 ../meld/vcview.py:323
-#: ../meld/vcview.py:347
+#: ../meld/dirdiff.py:502 ../meld/dirdiff.py:515 ../meld/vcview.py:329
+#: ../meld/vcview.py:353
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] ÐÑÐÐÐÐÐÐÐ â%sâ"
 
-#: ../meld/dirdiff.py:576
+#: ../meld/dirdiff.py:614
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] ÐÐÑÐÐÐ"
 
-#: ../meld/dirdiff.py:580
+#: ../meld/dirdiff.py:618
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÐÑÐ ÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐÐ ÐÑÐÑÑÐÐÐÐÐÑÐ ÐÐÐ ÑÐÑÑÐÐÐÐ"
 
-#: ../meld/dirdiff.py:581
+#: ../meld/dirdiff.py:619
 msgid "Files with invalid encodings found"
 msgstr "ÐÑÐÐÐÑÐÐÐ ÑÑ ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÐÐ"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:583
+#: ../meld/dirdiff.py:621
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÑÑ Ñ ÐÐÐÑÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÑ. ÐÐÐÐÐÐ ÑÑ ÐÐÑÑÐ ÐÐÐ:"
 
-#: ../meld/dirdiff.py:585
+#: ../meld/dirdiff.py:623
 msgid "Files hidden by case insensitive comparison"
 msgstr "ÐÐÑÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÑÐÑÐÑÐÐ ÐÐÐÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:587
+#: ../meld/dirdiff.py:625
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -490,16 +518,16 @@ msgstr ""
 "ÐÐÐÑÐÐÑÐÐ ÑÑÐ ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÐÐ ÐÐ ÑÐÑÑÐÐÑ ÐÐÑÐÑÐÐÐ ÐÐÐ "
 "ÑÐ ÐÐÐ ÐÐÑÐÐ. ÐÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÑ ÐÐÐÑÐÐÐ:"
 
-#: ../meld/dirdiff.py:598
+#: ../meld/dirdiff.py:636
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "â%sâ ÑÐÐÑÐÐÐÐÐ ÐÐ ÑÑÑÐÐÐ â%sâ"
 
-#: ../meld/dirdiff.py:623 ../meld/filediff.py:921 ../meld/filediff.py:1082
+#: ../meld/dirdiff.py:661 ../meld/filediff.py:937 ../meld/filediff.py:1105
 msgid "Hi_de"
 msgstr "_ÐÐÐÑÐÑ"
 
-#: ../meld/dirdiff.py:673
+#: ../meld/dirdiff.py:711
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -508,7 +536,7 @@ msgstr ""
 "â%sâ ÐÐÑÑÐÑÐ.\n"
 "ÐÐ ÐÑÐÑÐÐÐÐÐ?"
 
-#: ../meld/dirdiff.py:680
+#: ../meld/dirdiff.py:718
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -519,7 +547,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:698 ../meld/vcview.py:536
+#: ../meld/dirdiff.py:736 ../meld/vcview.py:542
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -528,7 +556,7 @@ msgstr ""
 "â%sâ ÑÐ ÑÐÑÑÐÐÐÐ.\n"
 "ÐÐ ÑÐÐÐÐÐÐ ÑÐÐÑÑÐÐÐÐÐ?"
 
-#: ../meld/dirdiff.py:705 ../meld/vcview.py:541
+#: ../meld/dirdiff.py:743 ../meld/vcview.py:547
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -539,7 +567,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:739
+#: ../meld/dirdiff.py:826
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -548,7 +576,7 @@ msgstr[1] "%i ÑÐÐÑÐÐÐ"
 msgstr[2] "%i ÑÐÐÑÐÐÐ"
 msgstr[3] "%i ÑÐÐÑÐÐÐ"
 
-#: ../meld/dirdiff.py:740
+#: ../meld/dirdiff.py:827
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -557,7 +585,7 @@ msgstr[1] "%i ÐÐÐÑÑÐ"
 msgstr[2] "%i ÐÐÐÑÑÐ"
 msgstr[3] "%i ÐÐÐÑÑ"
 
-#: ../meld/dirdiff.py:741
+#: ../meld/dirdiff.py:828
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -566,7 +594,7 @@ msgstr[1] "%i ÑÐÑÐ"
 msgstr[2] "%i ÑÐÑÐ"
 msgstr[3] "%i ÑÐÑ"
 
-#: ../meld/dirdiff.py:742
+#: ../meld/dirdiff.py:829
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -575,7 +603,7 @@ msgstr[1] "%i ÐÐÐÐ"
 msgstr[2] "%i ÐÐÐÐ"
 msgstr[3] "%i ÐÐÐ"
 
-#: ../meld/dirdiff.py:743
+#: ../meld/dirdiff.py:830
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -584,7 +612,7 @@ msgstr[1] "%i ÐÐÐÐÑÐ"
 msgstr[2] "%i ÐÐÐÐÑÐ"
 msgstr[3] "%i ÐÐÐÐÑÐ"
 
-#: ../meld/dirdiff.py:744
+#: ../meld/dirdiff.py:831
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -593,7 +621,7 @@ msgstr[1] "%i ÐÐÑÐÑÐ"
 msgstr[2] "%i ÐÐÑÐÑÐ"
 msgstr[3] "%i ÐÐÑÐÑ"
 
-#: ../meld/dirdiff.py:745
+#: ../meld/dirdiff.py:832
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -602,159 +630,159 @@ msgstr[1] "%i ÐÐÐÐÐÐ"
 msgstr[2] "%i ÐÐÐÐÐÐ"
 msgstr[3] "%i ÐÐÐÐÐÐ"
 
-#: ../meld/filediff.py:204
+#: ../meld/filediff.py:187
 msgid "Format as patch..."
 msgstr "ÐÐÑÐÐÑÐÑÐÑ ÐÐÐ ÐÑÐÑÐÐÐÑ..."
 
-#: ../meld/filediff.py:204
+#: ../meld/filediff.py:187
 msgid "Create a patch using differences between files"
 msgstr "ÐÐÐÑÐÐÐÑÐ ÐÑÐÑÐÐÐÑ ÐÐÑÐÑÑÐÑÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÑ ÐÐÑÐÑÐÐÐ"
 
-#: ../meld/filediff.py:205
+#: ../meld/filediff.py:188
 msgid "Previous conflict"
 msgstr "ÐÑÐÑÑÐÐÐÐ ÑÑÐÐÐ"
 
-#: ../meld/filediff.py:205
+#: ../meld/filediff.py:188
 msgid "Go to the previous conflict"
 msgstr "ÐÐÐÑÐ ÐÐ ÐÑÐÑÑÐÐÐÐ ÑÑÐÐÐ"
 
-#: ../meld/filediff.py:206
+#: ../meld/filediff.py:189
 msgid "Next conflict"
 msgstr "ÐÐÐÐÐÑÐ ÑÑÐÐÐ"
 
-#: ../meld/filediff.py:206
+#: ../meld/filediff.py:189
 msgid "Go to the next conflict"
 msgstr "ÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÐ ÑÑÐÐÐ"
 
-#: ../meld/filediff.py:207
+#: ../meld/filediff.py:190
 msgid "Push to left"
 msgstr "ÐÑÑÐÐ ÑÐÐÐÐ"
 
-#: ../meld/filediff.py:207
+#: ../meld/filediff.py:190
 msgid "Push current change to the left"
 msgstr "ÐÑÑÐÐÑÐ ÑÐÐÑÑÑ ÐÐÐÐÐÑ ÑÐÐÐÐ"
 
-#: ../meld/filediff.py:208
+#: ../meld/filediff.py:191
 msgid "Push to right"
 msgstr "ÐÑÑÐÐ ÑÐÐÑÐÐ"
 
-#: ../meld/filediff.py:208
+#: ../meld/filediff.py:191
 msgid "Push current change to the right"
 msgstr "ÐÑÑÐÐÑÐ ÑÐÐÑÑÑ ÐÐÐÐÐÑ ÑÐÐÑÐÐ"
 
 #. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:210
+#: ../meld/filediff.py:193
 msgid "Pull from left"
 msgstr "ÐÐÐÑÐ Ñ ÐÐÐÐ"
 
-#: ../meld/filediff.py:210
+#: ../meld/filediff.py:193
 msgid "Pull change from the left"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÑ Ñ ÐÐÐÐ"
 
-#: ../meld/filediff.py:211
+#: ../meld/filediff.py:194
 msgid "Pull from right"
 msgstr "ÐÐÐÑÐ Ñ ÐÐÑÐÐ"
 
-#: ../meld/filediff.py:211
+#: ../meld/filediff.py:194
 msgid "Pull change from the right"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÑ Ñ ÐÐÑÐÐ"
 
-#: ../meld/filediff.py:212
+#: ../meld/filediff.py:195
 msgid "Copy above left"
 msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐ ÑÐÐÐÐ"
 
-#: ../meld/filediff.py:212
+#: ../meld/filediff.py:195
 msgid "Copy change above the left chunk"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐÐ"
 
-#: ../meld/filediff.py:213
+#: ../meld/filediff.py:196
 msgid "Copy below left"
 msgstr "ÐÐÐÐÐÐ ÐÑÐÐÐ ÑÐÐÐÐ"
 
-#: ../meld/filediff.py:213
+#: ../meld/filediff.py:196
 msgid "Copy change below the left chunk"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÑÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐÐ"
 
-#: ../meld/filediff.py:214
+#: ../meld/filediff.py:197
 msgid "Copy above right"
 msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐ ÑÐÐÑÐÐ"
 
-#: ../meld/filediff.py:214
+#: ../meld/filediff.py:197
 msgid "Copy change above the right chunk"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÑÐÐ"
 
-#: ../meld/filediff.py:215
+#: ../meld/filediff.py:198
 msgid "Copy below right"
 msgstr "ÐÐÐÐÐÐ ÐÑÐÐÐ ÑÐÐÑÐÐ"
 
-#: ../meld/filediff.py:215
+#: ../meld/filediff.py:198
 msgid "Copy change below the right chunk"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ ÐÑÐÐÐ ÐÐÐÐÐÐ ÑÐÐÑÐÐ"
 
-#: ../meld/filediff.py:216
+#: ../meld/filediff.py:199
 msgid "Delete"
 msgstr "ÐÐÑÐÑÐ"
 
-#: ../meld/filediff.py:216
+#: ../meld/filediff.py:199
 msgid "Delete change"
 msgstr "ÐÐÑÐÑÐÑÐ ÐÐÐÐÐÑ"
 
-#: ../meld/filediff.py:217
+#: ../meld/filediff.py:200
 msgid "Merge all changes from left"
 msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐ"
 
-#: ../meld/filediff.py:217
+#: ../meld/filediff.py:200
 msgid "Merge all non-conflicting changes from the left"
 msgstr "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐ"
 
-#: ../meld/filediff.py:218
+#: ../meld/filediff.py:201
 msgid "Merge all changes from right"
 msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐ ÐÐÐÐÐÐ Ñ ÐÐÑÐÐ"
 
-#: ../meld/filediff.py:218
+#: ../meld/filediff.py:201
 msgid "Merge all non-conflicting changes from the right"
 msgstr "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐ Ñ ÐÐÑÐÐ"
 
-#: ../meld/filediff.py:219
+#: ../meld/filediff.py:202
 msgid "Merge all non-conflicting"
 msgstr "ÐÐÑÐÐÐÐÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ"
 
-#: ../meld/filediff.py:219
+#: ../meld/filediff.py:202
 msgid "Merge all non-conflicting changes from left and right panes"
 msgstr "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐ ÐÐÑÑÐÐÐÑÐÐÐÑÑÑÐ ÐÐÐÐÐÐ Ñ ÐÐÐÐ Ð ÐÐÑÐÐ ÐÐÐÑÑÐ"
 
-#: ../meld/filediff.py:220
+#: ../meld/filediff.py:203
 msgid "Cycle through documents"
 msgstr "ÐÑÑÐÐ ÐÑÐÐ ÐÐÐÑÐÐÐÑÐ"
 
-#: ../meld/filediff.py:220
+#: ../meld/filediff.py:203
 msgid "Move keyboard focus to the next document in this comparison"
 msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÐÐÑÑ ÑÐÑÑÐÑÑÑÐ ÐÐ ÑÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑ Ñ ÐÐÐÐ ÐÐÑÐÑÐÑÑ"
 
-#: ../meld/filediff.py:224
+#: ../meld/filediff.py:207
 msgid "Lock scrolling"
 msgstr "ÐÐÐÑÑÑÐÑ ÐÐÐÐÐÑÐ"
 
-#: ../meld/filediff.py:225
+#: ../meld/filediff.py:208
 msgid "Lock scrolling of all panes"
 msgstr "ÐÐÐÑÑÑÐÑÑÐ ÐÐÐÐÐÑÐ ÑÐÐÑ ÐÐÐÑÑÐ"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:318
 msgid "INS"
 msgstr "ÐÐÐÐ"
 
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:318
 msgid "OVR"
 msgstr "ÐÐÐÐ"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:307
+#: ../meld/filediff.py:320
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "ÐÐÐ %i, ÐÐÑÑÐ %i"
 
-#: ../meld/filediff.py:631
+#: ../meld/filediff.py:644
 #, python-format
 msgid ""
 "Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -763,42 +791,42 @@ msgstr ""
 "ÐÐÐÑÐÑ â%sâ ÑÐ ÐÐÐÐÐÐÐ ÐÑÐÑ ÑÐÐÐÐÐ Ñ ÐÐÑÐÑÐÑÐ. ÐÐÑÐÑÐÑÐ ÐÐÑÐ ÐÐÑÐ ÑÐÑÐÐ. ÐÐ "
 "ÐÐÑÐ ÐÐÑÐÑÐ ÐÐÐÐÐÐÐÑÑÐ ÐÑÐÑÑÑÐÐÐ ÐÐ ÐÐÑÐÑÐÐÐÐ."
 
-#: ../meld/filediff.py:909
+#: ../meld/filediff.py:925
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] ÐÐÑÑÐÐÐ ÐÑÐÑ ÐÐÐÑÐ"
 
-#: ../meld/filediff.py:915
+#: ../meld/filediff.py:931
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] ÐÑÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../meld/filediff.py:939 ../meld/filediff.py:948 ../meld/filediff.py:960
-#: ../meld/filediff.py:966
+#: ../meld/filediff.py:955 ../meld/filediff.py:965 ../meld/filediff.py:978
+#: ../meld/filediff.py:984
 msgid "Could not read file"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÑÐÑÐÐ ÐÐÑÐÑÐÐÑ"
 
-#: ../meld/filediff.py:940
+#: ../meld/filediff.py:956
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] ÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../meld/filediff.py:949
+#: ../meld/filediff.py:966
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "â%sâ ÐÐÐÐÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÐÐ ÐÐÑÐÑÐÐÐ."
 
-#: ../meld/filediff.py:961
+#: ../meld/filediff.py:979
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "â%sâ ÐÐÑÐ Ñ ÐÐÐÐÑÐÑÐÐÐ: â%sâ"
 
-#: ../meld/filediff.py:991 ../meld/filemerge.py:67
+#: ../meld/filediff.py:1010 ../meld/filemerge.py:67
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] ÐÑÐÑÑÐÐÐÐÐ ÑÐÐÐÐÐÐ"
 
-#: ../meld/filediff.py:1069
+#: ../meld/filediff.py:1092
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -806,15 +834,15 @@ msgstr ""
 "ÐÐÑÐÑÑÐÐÐ ÑÑ ÑÐÐÑÐÑÐ ÑÐÐÑÑÐ, Ð ÐÐÐÑ ÐÐÑÑÐÑÐÑÐ Ð ÐÐÐÐÑÐÐÑÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÑÑ "
 "ÐÐÑÐÑÐÐÐ. ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐÑÐ ÐÐÑÐÐÑÑÐÑÐÐÐ ÐÐÑÐÑÐÐÐ?"
 
-#: ../meld/filediff.py:1075
+#: ../meld/filediff.py:1098
 msgid "Files are identical"
 msgstr "ÐÐÑÐÑÐÐÐ ÑÑ ÐÑÑÐÐÐÑÐÐ"
 
-#: ../meld/filediff.py:1085
+#: ../meld/filediff.py:1108
 msgid "Show without filters"
 msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐ ÑÐÐÑÐÑÐ"
 
-#: ../meld/filediff.py:1274
+#: ../meld/filediff.py:1298
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -823,7 +851,7 @@ msgstr ""
 "â%sâ ÐÐÑÑÐÑÐ!\n"
 "ÐÐ ÐÑÐÑÐÐÐÐÐ?"
 
-#: ../meld/filediff.py:1287
+#: ../meld/filediff.py:1311
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -834,12 +862,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1296
+#: ../meld/filediff.py:1320
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐ %i. ÐÐÑÐÑ."
 
-#: ../meld/filediff.py:1311
+#: ../meld/filediff.py:1335
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -850,7 +878,7 @@ msgstr ""
 "\n"
 "ÐÐÑÐ ÐÐÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÑÐÑÐ?"
 
-#: ../meld/filediff.py:1327
+#: ../meld/filediff.py:1351
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -859,7 +887,7 @@ msgstr ""
 "â%sâ ÑÐÐÑÐÐ ÐÐÐÐÐÐÐ ÐÐÑÐ ÑÐ ÐÐ ÐÐÐÑ ÐÐÐÐÑÐÑÐ ÑÐ â%sâ\n"
 "ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÑÑÐÐÑÐ ÐÐÐ ÐÐÐ-8?"
 
-#: ../meld/filediff.py:1384
+#: ../meld/filediff.py:1408
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -960,241 +988,241 @@ msgstr "<ÐÐÐÐÐÐÐÐÐÐ>"
 msgid "untitled"
 msgstr "ÐÐÐÐÐÐÐÐ"
 
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:132
 msgid "_File"
 msgstr "_ÐÐÑÐÑÐÐÐ"
 
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:133
 msgid "_New..."
 msgstr "_ÐÐÐÐ..."
 
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:133
 msgid "Start a new comparison"
 msgstr "ÐÐÐÐÑÐÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÑÐ"
 
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:134
 msgid "Save the current file"
 msgstr "ÐÐÑÑÐÐÑÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
 
-#: ../meld/meldwindow.py:135
+#: ../meld/meldwindow.py:136
 msgid "Close the current file"
 msgstr "ÐÐÑÐÐÑÐÑÐ ÑÑÐÐÑÑÐÑ ÐÐÑÐÑÐÐÑ"
 
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:137
 msgid "Quit the program"
 msgstr "ÐÐÑÐÐÑÐÑÐ ÐÑÐÐÑÐÐ"
 
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:139
 msgid "_Edit"
 msgstr "_ÐÑÐÑÐÐÐÑÐ"
 
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:140
 msgid "Undo the last action"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÑ ÑÐÐÑÑ"
 
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:141
 msgid "Redo the last undone action"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÑ ÐÐÐÐÐÐÐÑ ÑÐÐÑÑ"
 
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:142
 msgid "Cut the selection"
 msgstr "ÐÑÐÑÐÑÐ ÐÐÐÐÑ"
 
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:143
 msgid "Copy the selection"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÑ"
 
-#: ../meld/meldwindow.py:143
+#: ../meld/meldwindow.py:144
 msgid "Paste the clipboard"
 msgstr "ÐÐÐÑÐÑÐ ÐÑÑÐÐÑ"
 
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:145
 msgid "Search for text"
 msgstr "ÐÑÐÐÐÑÐ ÑÐÐÑÑ"
 
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:146
 msgid "Find Ne_xt"
 msgstr "ÐÐÑÐ Ñ_ÐÐÐÐÑÐ"
 
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:146
 msgid "Search forwards for the same text"
 msgstr "ÐÑÐÐÐÑÐ ÑÐÐÐÑÐÐ ÐÑÑÐ ÑÐÐÑÑ"
 
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:147
 msgid "Find _Previous"
 msgstr "ÐÐÑÐ ÐÑÐ_ÑÑÐÐÐÐ"
 
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:147
 msgid "Search backwards for the same text"
 msgstr "ÐÑÐÐÐÑÐ ÑÐÐÐÐÐ ÐÑÑÐ ÑÐÐÑÑ"
 
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:148
 msgid "Find and replace text"
 msgstr "ÐÑÐÐÐÑÐÑÐ Ð ÐÐÐÐÐÐÑÐ ÑÐÐÑÑ"
 
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:149
 msgid "Prefere_nces"
 msgstr "ÐÐÑ_ÑÐÐÐÐ"
 
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:149
 msgid "Configure the application"
 msgstr "ÐÐÐÐÑÐÑÐ ÐÑÐÐÑÐÐ"
 
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:151
 msgid "_Changes"
 msgstr "_ÐÐÐÐÐÐ"
 
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:152
 msgid "Next change"
 msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐÐÐ"
 
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:152
 msgid "Go to the next change"
 msgstr "ÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÐÑ"
 
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:153
 msgid "Previous change"
 msgstr "ÐÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐ"
 
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:153
 msgid "Go to the previous change"
 msgstr "ÐÐÐÑÐ ÐÐ ÐÑÐÑÑÐÐÐÑ ÐÐÐÐÐÑ"
 
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:154
 msgid "Open externally"
 msgstr "ÐÑÐÐÑÐ ÑÐÐÑÐÐÐ"
 
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:154
 msgid "Open selected file or directory in the default external application"
 msgstr "ÐÑÐÐÑÐÑÐ ÐÐÐÐÑÐÐÑ ÐÐÑÐÑÐÐÑ ÐÐÐ ÑÐÑÑÐÐÐÑ Ñ ÐÑÐÐÐÐÐÐ ÑÐÐÑÐÐÐ ÐÑÐÐÑÐÐÑ"
 
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:156
 msgid "_View"
 msgstr "Ð_ÑÐÐÐÐÐ"
 
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:157
 msgid "File status"
 msgstr "ÐÑÐÑÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:158
 msgid "Version status"
 msgstr "ÐÑÐÑÐ ÐÐÐÐÑÐ"
 
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:159
 msgid "File filters"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:160
 msgid "Stop the current action"
 msgstr "ÐÐÑÑÑÐÐÐÑÐ ÑÑÐÐÑÑÐÑ ÑÐÐÑÑ"
 
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:161
 msgid "Refresh the view"
 msgstr "ÐÑÐÐÐÐÑÐ ÐÑÐÐÐÐÐ"
 
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:162
 msgid "Reload"
 msgstr "ÐÐÐÐÐÐ ÑÑÐÑÐÑ"
 
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:162
 msgid "Reload the comparison"
 msgstr "ÐÐÐÐÐÐ ÑÑÐÑÐÑÑÐ ÐÐÑÐÑÐÑÐ"
 
-#: ../meld/meldwindow.py:163
+#: ../meld/meldwindow.py:164
 msgid "_Tabs"
 msgstr "_ÐÐÐÐÑÑÐ"
 
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:165
 msgid "_Previous Tab"
 msgstr "ÐÑÐ_ÑÑÐÐÐÐ ÑÐÐÐÑÐÐ"
 
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:165
 msgid "Activate previous tab"
 msgstr "ÐÐÐÑÐ ÐÐ ÐÑÐÑÑÐÐÐÐ ÐÐÑÑ"
 
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:166
 msgid "_Next Tab"
 msgstr "ÐÐÐ_ÐÐÑÐ ÑÐÐÐÑÐÐ"
 
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:166
 msgid "Activate next tab"
 msgstr "ÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐÐ ÐÐÑÑ"
 
-#: ../meld/meldwindow.py:166
+#: ../meld/meldwindow.py:167
 msgid "Move Tab _Left"
 msgstr "ÐÑÐÐÐÑÑÐ ÑÐÐÐÑÐÐ _ÐÐÐÐ"
 
-#: ../meld/meldwindow.py:166
+#: ../meld/meldwindow.py:167
 msgid "Move current tab to left"
 msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÑÐÐÑÑÐÐ ÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐ"
 
-#: ../meld/meldwindow.py:167
+#: ../meld/meldwindow.py:168
 msgid "Move Tab _Right"
 msgstr "ÐÑÐÐÐÑÑÐ ÑÐÐÐÑÐÐ _ÐÐÑÐÐ"
 
-#: ../meld/meldwindow.py:167
+#: ../meld/meldwindow.py:168
 msgid "Move current tab to right"
 msgstr "ÐÑÐÐÐÑÑÐÑÐ ÑÑÐÐÑÑÐÐ ÑÐÐÐÑÐÐ ÐÐ ÐÐÑÐÐ"
 
-#: ../meld/meldwindow.py:169
+#: ../meld/meldwindow.py:170
 msgid "_Help"
 msgstr "ÐÐ_ÐÐÑ"
 
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:171
 msgid "_Contents"
 msgstr "_ÐÐÐÑÐÐÑ"
 
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:171
 msgid "Open the Meld manual"
 msgstr "ÐÑÐÐÑÐÑÐ ÑÐÑÑÑÑÐÐ ÐÐÐÐÐ"
 
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:172
 msgid "Report _Bug"
 msgstr "ÐÑÐÑÐÐÐ _ÐÑÐÑÐÑ"
 
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:172
 msgid "Report a bug in Meld"
 msgstr "ÐÑÐÑÐÐÐÑÐ ÐÑÐÑÐÑ Ñ ÐÐÐÐÑ"
 
-#: ../meld/meldwindow.py:172
+#: ../meld/meldwindow.py:173
 msgid "About this program"
 msgstr "Ð ÐÐÐÐ ÐÑÐÐÑÐÐÑ"
 
-#: ../meld/meldwindow.py:175
+#: ../meld/meldwindow.py:176
 msgid "Full Screen"
 msgstr "ÐÑÐÐÐ ÑÐÐÐÐ ÐÐÑÐÐÐ"
 
-#: ../meld/meldwindow.py:175
+#: ../meld/meldwindow.py:176
 msgid "View the comparison in full screen"
 msgstr "ÐÑÐÐÐÐÐÐÑÑÐ ÐÐÑÐÑÐÑÐ ÐÑÐÐÐ ÑÐÐÐÐ ÐÐÑÐÐÐ"
 
-#: ../meld/meldwindow.py:176
+#: ../meld/meldwindow.py:177
 msgid "_Toolbar"
 msgstr "_ÐÐÐÐÑÐ ÐÐÐÑÐ"
 
-#: ../meld/meldwindow.py:176
+#: ../meld/meldwindow.py:177
 msgid "Show or hide the toolbar"
 msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐ ÑÐÐÑÐÑÑÐ ÐÐÐÐÑÑ ÐÐÐÑÐ"
 
-#: ../meld/meldwindow.py:177
+#: ../meld/meldwindow.py:178
 msgid "_Statusbar"
 msgstr "ÐÑÐÐÐ _ÑÑÐÑÐ"
 
-#: ../meld/meldwindow.py:177
+#: ../meld/meldwindow.py:178
 msgid "Show or hide the statusbar"
 msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÐ ÑÐÐÑÐÑÑÐ ÑÑÐÐÑ ÑÑÐÑÐ"
 
-#: ../meld/meldwindow.py:563
+#: ../meld/meldwindow.py:564
 msgid "Switch to this tab"
 msgstr "ÐÑÐÐÐÑÐÑÐ ÑÐ ÐÐ ÐÐÐÑ ÑÐÐÐÑÐÐ"
 
 #. exit at first non found directory + file
-#: ../meld/meldwindow.py:664
+#: ../meld/meldwindow.py:665
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÐÑÐÐÐÐÑ ÐÐÑÐÑÐÐÐ Ð ÑÐÑÑÐÐÐÐ.\n"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:174
+#: ../meld/misc.py:177
 msgid "[None]"
 msgstr "[ÐÐÑÑÐ]"
 
@@ -1215,12 +1243,12 @@ msgid "Only available if you have gnome-python-desktop installed"
 msgstr "ÐÐÑÑÑÐÐÐ ÑÐ ÑÐÐÐ ÐÐÐ ÑÑÐ ÐÐÑÑÐÐÐÑÐÐÐ âgnome-python-desktopâ"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:233
+#: ../meld/preferences.py:228
 msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 msgstr "ÐÐÐÐÑÐÐ 1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:235
+#: ../meld/preferences.py:230
 msgid ""
 "OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
 "Desktop.ini\n"
@@ -1229,206 +1257,208 @@ msgstr ""
 "db Desktop.ini\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:237
+#: ../meld/preferences.py:232
 #, python-format
 msgid "Version Control\t1\t%s\n"
 msgstr "ÐÐÐÑÑÐÐÐ ÐÐÑÐÐÑÐ 1\t%s\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:239
-msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
-msgstr "ÐÐÐÑÑÐÐ\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
+#: ../meld/preferences.py:234
+#| msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
+msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
+msgstr "ÐÐÐÑÑÐÐ \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:241
-msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
-msgstr "ÐÐÐÐÑÐ\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
+#: ../meld/preferences.py:236
+#| msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
+msgid "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
+msgstr "ÐÐÐÐÑÐ\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:243
+#: ../meld/preferences.py:238
 msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
 msgstr "ÐÐÐ ÐÑÑÑÐÐ ÑÐÑÐ\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:245
+#: ../meld/preferences.py:240
 msgid "C++ comment\t0\t//.*\n"
 msgstr "Ð++ ÐÐÐÐÐÑÐÑ\t0\t//.*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:247
+#: ../meld/preferences.py:242
 msgid "C comment\t0\t/\\*.*?\\*/\n"
 msgstr "Ð ÐÐÐÐÐÑÐÑ\t0\t/\\*.*?\\*/\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:249
+#: ../meld/preferences.py:244
 msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
 msgstr "ÐÐÐ ÑÐÐÐÐÑÐ\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:251
+#: ../meld/preferences.py:246
 msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
 msgstr "ÐÐÑÐÑÐÐ ÑÐÐÐÐÐ\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:253
+#: ../meld/preferences.py:248
 msgid "Script comment\t0\t#.*"
 msgstr "ÐÐÐÐÐÑÐÑ ÑÐÑÐÐÑÐ\t0\t#.*"
 
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:127
 msgid "Co_mmit"
 msgstr "Ð_ÐÑÐÐÐ"
 
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:127
 msgid "Commit"
 msgstr "ÐÐÑÐÐÐÑÐ"
 
-#: ../meld/vcview.py:129
+#: ../meld/vcview.py:128
 msgid "_Update"
 msgstr "_ÐÐÑÑÐÑÐÑ"
 
-#: ../meld/vcview.py:129
+#: ../meld/vcview.py:128
 msgid "Update"
 msgstr "ÐÐÑÑÐÑÐÑÑÐ"
 
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:129
 msgid "Add to VC"
 msgstr "ÐÐÐÐÑ Ñ ÐÐ"
 
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:130
 msgid "Add _Binary"
 msgstr "ÐÐÐÐÑ _ÐÐÐÐÑÐÐ"
 
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:130
 msgid "Add binary to VC"
 msgstr "ÐÐÐÐÑ ÐÐÐÐÑÐÐ Ñ ÐÐ"
 
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:131
 msgid "Remove from VC"
 msgstr "ÐÐÐÐÐÐ ÐÐ ÐÐ"
 
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:132
 msgid "_Resolved"
 msgstr "_ÐÐÑÐÐÐ"
 
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:132
 msgid "Mark as resolved for VC"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐ ÑÐÑÐÐÐ ÐÐ ÐÐ"
 
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:133
 msgid "Revert to original"
 msgstr "ÐÑÐÑÐ ÐÐ ÐÑÐÐÐÐÐÐ"
 
-#: ../meld/vcview.py:135
+#: ../meld/vcview.py:134
 msgid "Delete locally"
 msgstr "ÐÐÑÐÑÐ Ñ ÐÐÐÐÐÑ"
 
-#: ../meld/vcview.py:139
+#: ../meld/vcview.py:138
 msgid "_Flatten"
 msgstr "_ÐÐÑÐÐÐÐÑ"
 
-#: ../meld/vcview.py:139
+#: ../meld/vcview.py:138
 msgid "Flatten directories"
 msgstr "ÐÐÑÐÐÐÐÑ ÑÐÑÑÐÐÐÐ"
 
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:139
 msgid "_Modified"
 msgstr "ÐÐ_ÐÐÑÐÐ"
 
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:140
 msgid "_Normal"
 msgstr "_ÐÐÐÑÐÐ"
 
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:140
 msgid "Show normal"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÐÑÐÐ"
 
-#: ../meld/vcview.py:142
+#: ../meld/vcview.py:141
 msgid "Non _VC"
 msgstr "ÐÐ _ÐÐ"
 
-#: ../meld/vcview.py:142
+#: ../meld/vcview.py:141
 msgid "Show unversioned files"
 msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../meld/vcview.py:143
+#: ../meld/vcview.py:142
 msgid "Ignored"
 msgstr "ÐÐÐÐÐÐÑÐÐÐ"
 
-#: ../meld/vcview.py:143
+#: ../meld/vcview.py:142
 msgid "Show ignored files"
 msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../meld/vcview.py:186 ../meld/vcview.py:319
+#: ../meld/vcview.py:192 ../meld/vcview.py:325
 msgid "Location"
 msgstr "ÐÑÑÐÑÐ"
 
-#: ../meld/vcview.py:187
+#: ../meld/vcview.py:193
 msgid "Status"
 msgstr "ÐÑÐÑÐ"
 
-#: ../meld/vcview.py:188
+#: ../meld/vcview.py:194
 msgid "Rev"
 msgstr "ÐÐÐ"
 
-#: ../meld/vcview.py:189
+#: ../meld/vcview.py:195
 msgid "Tag"
 msgstr "ÐÐÐÐÐÐ"
 
-#: ../meld/vcview.py:190
+#: ../meld/vcview.py:196
 msgid "Options"
 msgstr "ÐÐÑÐÑÐ"
 
-#: ../meld/vcview.py:249
+#: ../meld/vcview.py:255
 msgid "Choose one Version Control"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÑÑÐÐÑ ÐÐÑÐÐÑÐ"
 
-#: ../meld/vcview.py:250
+#: ../meld/vcview.py:256
 msgid "Only one Version Control in this directory"
 msgstr "ÐÐÐÐ ÑÐÐÐÐ ÐÐÐÑÑÐÐÐ ÐÐÑÐÐÑÐ Ñ ÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑÑÐÑ"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:263
+#: ../meld/vcview.py:269
 #, python-format
 msgid "%s Not Installed"
 msgstr "â%sâ ÐÐÑÐ ÐÐÑÑÐÐÐÑÐÐ"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:267
+#: ../meld/vcview.py:273
 msgid "Invalid Repository"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÐÐÐÑÑÐ"
 
-#: ../meld/vcview.py:276
+#: ../meld/vcview.py:282
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:319
+#: ../meld/vcview.py:325
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:363
+#: ../meld/vcview.py:369
 msgid "(Empty)"
 msgstr "(ÐÑÐÐÐÐ)"
 
-#: ../meld/vcview.py:401
+#: ../meld/vcview.py:407
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] ÐÑÐÐÐÐÑÐÐ ÑÐÐÐÐÐÐ"
 
-#: ../meld/vcview.py:409
+#: ../meld/vcview.py:415
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] ÐÑÐÐÐÑÑÑÐÐ ÐÐÐÑÐÑ"
 
-#: ../meld/vcview.py:511
+#: ../meld/vcview.py:517
 msgid "Select some files first."
 msgstr "ÐÑÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÐÐ."
 
-#: ../meld/vcview.py:584
+#: ../meld/vcview.py:590
 #, python-format
 msgid ""
 "\n"
@@ -1516,11 +1546,14 @@ msgstr "ÐÐÑÐÐÑÐÑÐ ÑÐÐÐÑÐÐ"
 
 #. These are the possible states of files. Be sure to get the colons correct.
 #: ../meld/vc/_vc.py:40
+#| msgid ""
+#| "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing"
 msgid ""
-"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing"
+"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing:"
+"Not present"
 msgstr ""
-"ÐÐÐÐÐÐÑÐÐÐ:ÐÐÐÐÑÐÐÐÐÐÑÐÐÐ:::ÐÑÐÑÐÐ::ÐÐÐÐ ÐÐÐÐÑÐ:ÐÐÐÐÑÐÐÐ:ÐÑÐÐÐ:ÐÐÐÐÑÐÐÐ:"
-"ÐÐÐÐÑÑÐÑÑÑÐ"
+"ÐÐÐÐÐÐÑÐÐÐ:ÐÐÐÐÑÐÐÐÐÐÑÐÐÐ:::ÐÑÐÑÐÐ::ÐÐÐÐ "
+"ÐÐÐÐÑÐ:ÐÐÐÐÑÐÐÐ:ÐÑÐÐÐ:ÐÐÐÐÑÐÐÐ:ÐÐÐÐÑÑÐÑÑÑÐ:ÐÐÑÐ ÐÑÐÑÑÑÐÐ"
 
 #: ../meld/vc/cvs.py:163
 #, python-format
diff --git a/po/sr latin po b/po/sr latin po
index 61cae1c..9138e35 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&k";
 "eywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-06-17 00:26+0000\n"
-"PO-Revision-Date: 2012-08-07 22:43+0200\n"
+"POT-Creation-Date: 2012-09-04 20:32+0000\n"
+"PO-Revision-Date: 2012-09-07 10:27+0200\n"
 "Last-Translator: Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
@@ -65,7 +65,7 @@ msgstr "Obrazac"
 msgid "Add new filter"
 msgstr "Dodajte novi filter"
 
-#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:130
+#: ../data/ui/EditableList.ui.h:6 ../meld/vcview.py:129
 msgid "_Add"
 msgstr "_Dodaj"
 
@@ -73,7 +73,7 @@ msgstr "_Dodaj"
 msgid "Remove selected filter"
 msgstr "Uklonite izabrani filter"
 
-#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:132
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:131
 msgid "_Remove"
 msgstr "_Ukloni"
 
@@ -113,7 +113,7 @@ msgstr "_Odbaci izmene"
 msgid "_Save Selected"
 msgstr "_SaÄuvaj izabrano"
 
-#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:147
+#: ../data/ui/findbar.ui.h:1 ../meld/meldwindow.py:148
 msgid "_Replace"
 msgstr "_Zameni"
 
@@ -158,6 +158,34 @@ msgstr ""
 "Autorska prava &#xA9; 2009-2012 Kaj Viladsen"
 
 #: ../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 slobodan softver; moÅete ga prosleÄivati i/ili menjati pod\n"
+"uslovima Gnuove opÅte javne dozvole koju je objavila ZaduÅbina\n"
+"slobodnog softvera; izdanja 2 te dozvole ili (po vaÅem izboru)\n"
+"bilo kojeg novijeg izdanja.\n"
+"\n"
+"Meld se raspodeljuje u nadi da Äe biti koristan, ali BEZ IKAKVE\n"
+"GARANCIJE; Äak i bez primenjene garancije TRÅIÅNE VREDNOSTI ili\n"
+"PRILAGOÄENOSTI ODREÄENOJ NAMENI. Pogledajte Gnuovu opÅtu javnu\n"
+"dozvolu za viÅe detalja.\n"
+"\n"
+"Treba da ste primili primerak Gnuove opÅte javne licence uz ovaj\n"
+"program; ako niste, pogledajte <http://www.gnu.org/licenses/>"
+
+#: ../data/ui/meldapp.ui.h:9
 msgid "translator-credits"
 msgstr ""
 "Danilo Åegan <danilo prevod org>\n"
@@ -165,46 +193,46 @@ msgstr ""
 "\n"
 "Prevod.org â prevod na srpski jezik."
 
-#: ../data/ui/meldapp.ui.h:5
+#: ../data/ui/meldapp.ui.h:10
 msgid "Choose Files"
 msgstr "Izaberite datoteke"
 
-#: ../data/ui/meldapp.ui.h:6
+#: ../data/ui/meldapp.ui.h:11
 msgid "_Three Way Compare"
 msgstr "PoreÄenje _tri elementa"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:8
+#: ../data/ui/meldapp.ui.h:13
 msgid "Mine"
 msgstr "Moja"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:10
+#: ../data/ui/meldapp.ui.h:15
 msgid "Original"
 msgstr "Izvorna"
 
 #. Refers to version of the file being compared
-#: ../data/ui/meldapp.ui.h:12
+#: ../data/ui/meldapp.ui.h:17
 msgid "Other"
 msgstr "Druga"
 
-#: ../data/ui/meldapp.ui.h:13
+#: ../data/ui/meldapp.ui.h:18
 msgid "_File Comparison"
 msgstr "PoreÄenje _datoteka"
 
-#: ../data/ui/meldapp.ui.h:14
+#: ../data/ui/meldapp.ui.h:19
 msgid "_Directory Comparison"
 msgstr "PoreÄenje _fascikli"
 
-#: ../data/ui/meldapp.ui.h:15
+#: ../data/ui/meldapp.ui.h:20
 msgid "Select VC Directory"
 msgstr "Izaberite CV fasciklu"
 
-#: ../data/ui/meldapp.ui.h:16
+#: ../data/ui/meldapp.ui.h:21
 msgid "Directory"
 msgstr "Fascikla"
 
-#: ../data/ui/meldapp.ui.h:17
+#: ../data/ui/meldapp.ui.h:22
 msgid "_Version Control Browser"
 msgstr "Preglednik kontrole _verzija"
 
@@ -368,47 +396,47 @@ msgstr "Prethodni dnevnici"
 msgid "Log Message"
 msgstr "Poruka dnevnika"
 
-#: ../meld/dirdiff.py:230 ../meld/vcview.py:127
+#: ../meld/dirdiff.py:229 ../meld/vcview.py:126
 msgid "_Compare"
 msgstr "_Uporedi"
 
-#: ../meld/dirdiff.py:230 ../meld/vcview.py:127
+#: ../meld/dirdiff.py:229 ../meld/vcview.py:126
 msgid "Compare selected"
 msgstr "Uporedi izabrano"
 
-#: ../meld/dirdiff.py:231
+#: ../meld/dirdiff.py:230
 msgid "Copy _Left"
 msgstr "UmnoÅi _levo"
 
-#: ../meld/dirdiff.py:231
+#: ../meld/dirdiff.py:230
 msgid "Copy to left"
 msgstr "UmnoÅite levo"
 
-#: ../meld/dirdiff.py:232
+#: ../meld/dirdiff.py:231
 msgid "Copy _Right"
 msgstr "UmnoÅi _desno"
 
-#: ../meld/dirdiff.py:232
+#: ../meld/dirdiff.py:231
 msgid "Copy to right"
 msgstr "UmnoÅite desno"
 
-#: ../meld/dirdiff.py:233
+#: ../meld/dirdiff.py:232
 msgid "Delete selected"
 msgstr "ObriÅi izabrano"
 
-#: ../meld/dirdiff.py:234 ../meld/filediff.py:1078
+#: ../meld/dirdiff.py:233 ../meld/filediff.py:1101
 msgid "Hide"
 msgstr "Sakrij"
 
-#: ../meld/dirdiff.py:234
+#: ../meld/dirdiff.py:233
 msgid "Hide selected"
 msgstr "Sakrij izabrano"
 
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:237
 msgid "Ignore filename case"
 msgstr "Zanemari veliÄinu slova naziva datoteke"
 
-#: ../meld/dirdiff.py:238
+#: ../meld/dirdiff.py:237
 msgid ""
 "Consider differently-cased filenames that are otherwise-identical to be the "
 "same"
@@ -416,73 +444,73 @@ msgstr ""
 "SmatraÄe istim razliÄite veliÄine slova u nazivima datoteka koje su "
 "meÄusobno istovetne"
 
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:238
 msgid "Same"
 msgstr "Isto"
 
-#: ../meld/dirdiff.py:239
+#: ../meld/dirdiff.py:238
 msgid "Show identical"
 msgstr "PrikaÅi istovetne"
 
-#: ../meld/dirdiff.py:240
+#: ../meld/dirdiff.py:239
 msgid "New"
 msgstr "Novi"
 
-#: ../meld/dirdiff.py:240
+#: ../meld/dirdiff.py:239
 msgid "Show new"
 msgstr "PrikaÅi nove"
 
-#: ../meld/dirdiff.py:241
+#: ../meld/dirdiff.py:240
 msgid "Modified"
 msgstr "Izmenjeni"
 
-#: ../meld/dirdiff.py:241 ../meld/vcview.py:140
+#: ../meld/dirdiff.py:240 ../meld/vcview.py:139
 msgid "Show modified"
 msgstr "PrikaÅi izmenjene"
 
-#: ../meld/dirdiff.py:243
+#: ../meld/dirdiff.py:242
 msgid "Filters"
 msgstr "Filteri"
 
-#: ../meld/dirdiff.py:243
+#: ../meld/dirdiff.py:242
 msgid "Set active filters"
 msgstr "Podesite aktivne filtere"
 
-#: ../meld/dirdiff.py:360
+#: ../meld/dirdiff.py:398
 #, python-format
 msgid "Hide %s"
 msgstr "Sakrij â%sâ"
 
-#: ../meld/dirdiff.py:464 ../meld/dirdiff.py:477 ../meld/vcview.py:323
-#: ../meld/vcview.py:347
+#: ../meld/dirdiff.py:502 ../meld/dirdiff.py:515 ../meld/vcview.py:329
+#: ../meld/vcview.py:353
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] pregledam â%sâ"
 
-#: ../meld/dirdiff.py:576
+#: ../meld/dirdiff.py:614
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Gotovo"
 
-#: ../meld/dirdiff.py:580
+#: ../meld/dirdiff.py:618
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "DoÅlo je do viÅe greÅaka za vreme pretraÅivanja ove fascikle"
 
-#: ../meld/dirdiff.py:581
+#: ../meld/dirdiff.py:619
 msgid "Files with invalid encodings found"
 msgstr "PronaÄene su datoteke sa neispravnim kodiranjem"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:583
+#: ../meld/dirdiff.py:621
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Neke datoteke bejahu u neispravnom kodiranju. Nazivi su neÅto kao:"
 
-#: ../meld/dirdiff.py:585
+#: ../meld/dirdiff.py:623
 msgid "Files hidden by case insensitive comparison"
 msgstr "Datoteke skrivene poreÄenjem neosetljivim na veliÄinu slova"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:587
+#: ../meld/dirdiff.py:625
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -490,16 +518,16 @@ msgstr ""
 "Pokrenuli ste poreÄenje nezavisno od veliÄine slova na sistemu datoteka gde "
 "je ona bitna. Neke datoteke nisu vidljive:"
 
-#: ../meld/dirdiff.py:598
+#: ../meld/dirdiff.py:636
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "â%sâ sakriveno od strane â%sâ"
 
-#: ../meld/dirdiff.py:623 ../meld/filediff.py:921 ../meld/filediff.py:1082
+#: ../meld/dirdiff.py:661 ../meld/filediff.py:937 ../meld/filediff.py:1105
 msgid "Hi_de"
 msgstr "_Sakrij"
 
-#: ../meld/dirdiff.py:673
+#: ../meld/dirdiff.py:711
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -508,7 +536,7 @@ msgstr ""
 "â%sâ postoji.\n"
 "Da presnimim?"
 
-#: ../meld/dirdiff.py:680
+#: ../meld/dirdiff.py:718
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -519,7 +547,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:698 ../meld/vcview.py:536
+#: ../meld/dirdiff.py:736 ../meld/vcview.py:542
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -528,7 +556,7 @@ msgstr ""
 "â%sâ je fascikla.\n"
 "Da uklonim rekurzivno?"
 
-#: ../meld/dirdiff.py:705 ../meld/vcview.py:541
+#: ../meld/dirdiff.py:743 ../meld/vcview.py:547
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -539,7 +567,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:739
+#: ../meld/dirdiff.py:826
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -548,7 +576,7 @@ msgstr[1] "%i sekunde"
 msgstr[2] "%i sekunde"
 msgstr[3] "%i sekunda"
 
-#: ../meld/dirdiff.py:740
+#: ../meld/dirdiff.py:827
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -557,7 +585,7 @@ msgstr[1] "%i minuta"
 msgstr[2] "%i minuta"
 msgstr[3] "%i minut"
 
-#: ../meld/dirdiff.py:741
+#: ../meld/dirdiff.py:828
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -566,7 +594,7 @@ msgstr[1] "%i sata"
 msgstr[2] "%i sati"
 msgstr[3] "%i sat"
 
-#: ../meld/dirdiff.py:742
+#: ../meld/dirdiff.py:829
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -575,7 +603,7 @@ msgstr[1] "%i dana"
 msgstr[2] "%i dana"
 msgstr[3] "%i dan"
 
-#: ../meld/dirdiff.py:743
+#: ../meld/dirdiff.py:830
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -584,7 +612,7 @@ msgstr[1] "%i nedelje"
 msgstr[2] "%i nedelja"
 msgstr[3] "%i nedelja"
 
-#: ../meld/dirdiff.py:744
+#: ../meld/dirdiff.py:831
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -593,7 +621,7 @@ msgstr[1] "%i meseca"
 msgstr[2] "%i meseci"
 msgstr[3] "%i mesec"
 
-#: ../meld/dirdiff.py:745
+#: ../meld/dirdiff.py:832
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -602,159 +630,159 @@ msgstr[1] "%i godine"
 msgstr[2] "%i godina"
 msgstr[3] "%i godina"
 
-#: ../meld/filediff.py:204
+#: ../meld/filediff.py:187
 msgid "Format as patch..."
 msgstr "Formatiraj kao ispravku..."
 
-#: ../meld/filediff.py:204
+#: ../meld/filediff.py:187
 msgid "Create a patch using differences between files"
 msgstr "Napravite ispravku koristeÄi razlike izmeÄu datoteka"
 
-#: ../meld/filediff.py:205
+#: ../meld/filediff.py:188
 msgid "Previous conflict"
 msgstr "Prethodni sukob"
 
-#: ../meld/filediff.py:205
+#: ../meld/filediff.py:188
 msgid "Go to the previous conflict"
 msgstr "Idite na prethodni sukob"
 
-#: ../meld/filediff.py:206
+#: ../meld/filediff.py:189
 msgid "Next conflict"
 msgstr "SledeÄi sukob"
 
-#: ../meld/filediff.py:206
+#: ../meld/filediff.py:189
 msgid "Go to the next conflict"
 msgstr "Idite na sledeÄi sukob"
 
-#: ../meld/filediff.py:207
+#: ../meld/filediff.py:190
 msgid "Push to left"
 msgstr "Gurni ulevo"
 
-#: ../meld/filediff.py:207
+#: ../meld/filediff.py:190
 msgid "Push current change to the left"
 msgstr "Gurnite tekuÄu izmenu ulevo"
 
-#: ../meld/filediff.py:208
+#: ../meld/filediff.py:191
 msgid "Push to right"
 msgstr "Gurni udesno"
 
-#: ../meld/filediff.py:208
+#: ../meld/filediff.py:191
 msgid "Push current change to the right"
 msgstr "Gurnite tekuÄu izmenu udesno"
 
 #. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:210
+#: ../meld/filediff.py:193
 msgid "Pull from left"
 msgstr "Ubaci s leva"
 
-#: ../meld/filediff.py:210
+#: ../meld/filediff.py:193
 msgid "Pull change from the left"
 msgstr "Ubacite izmenu s leva"
 
-#: ../meld/filediff.py:211
+#: ../meld/filediff.py:194
 msgid "Pull from right"
 msgstr "Ubaci s desna"
 
-#: ../meld/filediff.py:211
+#: ../meld/filediff.py:194
 msgid "Pull change from the right"
 msgstr "Ubacite izmenu s desna"
 
-#: ../meld/filediff.py:212
+#: ../meld/filediff.py:195
 msgid "Copy above left"
 msgstr "UmnoÅi iznad ulevo"
 
-#: ../meld/filediff.py:212
+#: ../meld/filediff.py:195
 msgid "Copy change above the left chunk"
 msgstr "UmnoÅite izmenu iznad komada ulevo"
 
-#: ../meld/filediff.py:213
+#: ../meld/filediff.py:196
 msgid "Copy below left"
 msgstr "UmnoÅi ispod ulevo"
 
-#: ../meld/filediff.py:213
+#: ../meld/filediff.py:196
 msgid "Copy change below the left chunk"
 msgstr "UmnoÅite izmenu ispod komada ulevo"
 
-#: ../meld/filediff.py:214
+#: ../meld/filediff.py:197
 msgid "Copy above right"
 msgstr "UmnoÅi iznad udesno"
 
-#: ../meld/filediff.py:214
+#: ../meld/filediff.py:197
 msgid "Copy change above the right chunk"
 msgstr "UmnoÅite izmenu iznad komada udesno"
 
-#: ../meld/filediff.py:215
+#: ../meld/filediff.py:198
 msgid "Copy below right"
 msgstr "UmnoÅi ispod udesno"
 
-#: ../meld/filediff.py:215
+#: ../meld/filediff.py:198
 msgid "Copy change below the right chunk"
 msgstr "UmnoÅite izmenu ispod komada udesno"
 
-#: ../meld/filediff.py:216
+#: ../meld/filediff.py:199
 msgid "Delete"
 msgstr "ObriÅi"
 
-#: ../meld/filediff.py:216
+#: ../meld/filediff.py:199
 msgid "Delete change"
 msgstr "ObriÅite izmenu"
 
-#: ../meld/filediff.py:217
+#: ../meld/filediff.py:200
 msgid "Merge all changes from left"
 msgstr "Objedini sve izmene s leva"
 
-#: ../meld/filediff.py:217
+#: ../meld/filediff.py:200
 msgid "Merge all non-conflicting changes from the left"
 msgstr "Objedinite sve nesukobljavajuÄe izmene s leva"
 
-#: ../meld/filediff.py:218
+#: ../meld/filediff.py:201
 msgid "Merge all changes from right"
 msgstr "Objedini sve izmene s desna"
 
-#: ../meld/filediff.py:218
+#: ../meld/filediff.py:201
 msgid "Merge all non-conflicting changes from the right"
 msgstr "Objedinite sve nesukobljavajuÄe izmene s desna"
 
-#: ../meld/filediff.py:219
+#: ../meld/filediff.py:202
 msgid "Merge all non-conflicting"
 msgstr "Objedini sve nesukobljavajuÄe"
 
-#: ../meld/filediff.py:219
+#: ../meld/filediff.py:202
 msgid "Merge all non-conflicting changes from left and right panes"
 msgstr "Objedinite sve nesukobljavajuÄe izmene s leve i desne povrÅi"
 
-#: ../meld/filediff.py:220
+#: ../meld/filediff.py:203
 msgid "Cycle through documents"
 msgstr "KruÅi kroz dokumente"
 
-#: ../meld/filediff.py:220
+#: ../meld/filediff.py:203
 msgid "Move keyboard focus to the next document in this comparison"
 msgstr "Premestite fokus tastature na sledeÄi dokument u ovom poreÄenju"
 
-#: ../meld/filediff.py:224
+#: ../meld/filediff.py:207
 msgid "Lock scrolling"
 msgstr "ZakljuÄaj klizanje"
 
-#: ../meld/filediff.py:225
+#: ../meld/filediff.py:208
 msgid "Lock scrolling of all panes"
 msgstr "ZakljuÄajte klizanje svih povrÅi"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:318
 msgid "INS"
 msgstr "UMET"
 
-#: ../meld/filediff.py:305
+#: ../meld/filediff.py:318
 msgid "OVR"
 msgstr "PREP"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:307
+#: ../meld/filediff.py:320
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Red %i, mesto %i"
 
-#: ../meld/filediff.py:631
+#: ../meld/filediff.py:644
 #, python-format
 msgid ""
 "Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -763,42 +791,42 @@ msgstr ""
 "Filter â%sâ je izmenio broj redova u datoteci. PoreÄenje neÄe biti taÄno. Za "
 "viÅe detalja pogledajte priruÄnik za korisnike."
 
-#: ../meld/filediff.py:909
+#: ../meld/filediff.py:925
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Postavi broj ploÄa"
 
-#: ../meld/filediff.py:915
+#: ../meld/filediff.py:931
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Otvaram datoteke"
 
-#: ../meld/filediff.py:939 ../meld/filediff.py:948 ../meld/filediff.py:960
-#: ../meld/filediff.py:966
+#: ../meld/filediff.py:955 ../meld/filediff.py:965 ../meld/filediff.py:978
+#: ../meld/filediff.py:984
 msgid "Could not read file"
 msgstr "Ne mogu da proÄitam datoteku"
 
-#: ../meld/filediff.py:940
+#: ../meld/filediff.py:956
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Äitam datoteke"
 
-#: ../meld/filediff.py:949
+#: ../meld/filediff.py:966
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "â%sâ izgleda da je izvrÅna datoteka."
 
-#: ../meld/filediff.py:961
+#: ../meld/filediff.py:979
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "â%sâ nije u kodiranjima: â%sâ"
 
-#: ../meld/filediff.py:991 ../meld/filemerge.py:67
+#: ../meld/filediff.py:1010 ../meld/filemerge.py:67
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] SraÄunavam razlike"
 
-#: ../meld/filediff.py:1069
+#: ../meld/filediff.py:1092
 msgid ""
 "Text filters are being used, and may be masking differences between files. "
 "Would you like to compare the unfiltered files?"
@@ -806,15 +834,15 @@ msgstr ""
 "KoriÅÄeni su filteri teksta, a mogu postojati i zamaskirane razlike izmeÄu "
 "datoteka. Da li Åelite da poredite nefiltrirane datoteke?"
 
-#: ../meld/filediff.py:1075
+#: ../meld/filediff.py:1098
 msgid "Files are identical"
 msgstr "Datoteke su istovetne"
 
-#: ../meld/filediff.py:1085
+#: ../meld/filediff.py:1108
 msgid "Show without filters"
 msgstr "Prikazuje bez filtera"
 
-#: ../meld/filediff.py:1274
+#: ../meld/filediff.py:1298
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -823,7 +851,7 @@ msgstr ""
 "â%sâ postoji!\n"
 "Da presnimim?"
 
-#: ../meld/filediff.py:1287
+#: ../meld/filediff.py:1311
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -834,12 +862,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1296
+#: ../meld/filediff.py:1320
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Izaberite naziv za %i. bafer."
 
-#: ../meld/filediff.py:1311
+#: ../meld/filediff.py:1335
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -850,7 +878,7 @@ msgstr ""
 "\n"
 "Koji oblik Åelite da koristite?"
 
-#: ../meld/filediff.py:1327
+#: ../meld/filediff.py:1351
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -859,7 +887,7 @@ msgstr ""
 "â%sâ sadrÅi znakove koji se ne mogu kodirati uz â%sâ\n"
 "Da li Åelite da saÄuvate kao UTF-8?"
 
-#: ../meld/filediff.py:1384
+#: ../meld/filediff.py:1408
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -960,241 +988,241 @@ msgstr "<neimenovan>"
 msgid "untitled"
 msgstr "bezimeni"
 
-#: ../meld/meldwindow.py:131
+#: ../meld/meldwindow.py:132
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:133
 msgid "_New..."
 msgstr "_Novo..."
 
-#: ../meld/meldwindow.py:132
+#: ../meld/meldwindow.py:133
 msgid "Start a new comparison"
 msgstr "ZapoÄnite novo poreÄenje"
 
-#: ../meld/meldwindow.py:133
+#: ../meld/meldwindow.py:134
 msgid "Save the current file"
 msgstr "SaÄuvajte trenutnu datoteku"
 
-#: ../meld/meldwindow.py:135
+#: ../meld/meldwindow.py:136
 msgid "Close the current file"
 msgstr "Zatvorite trenutnu datoteku"
 
-#: ../meld/meldwindow.py:136
+#: ../meld/meldwindow.py:137
 msgid "Quit the program"
 msgstr "Zatvorite program"
 
-#: ../meld/meldwindow.py:138
+#: ../meld/meldwindow.py:139
 msgid "_Edit"
 msgstr "_UreÄivanje"
 
-#: ../meld/meldwindow.py:139
+#: ../meld/meldwindow.py:140
 msgid "Undo the last action"
 msgstr "Opozovite poslednju radnju"
 
-#: ../meld/meldwindow.py:140
+#: ../meld/meldwindow.py:141
 msgid "Redo the last undone action"
 msgstr "Ponovite poslednju opozvanu radnju"
 
-#: ../meld/meldwindow.py:141
+#: ../meld/meldwindow.py:142
 msgid "Cut the selection"
 msgstr "Isecite izbor"
 
-#: ../meld/meldwindow.py:142
+#: ../meld/meldwindow.py:143
 msgid "Copy the selection"
 msgstr "UmnoÅite izbor"
 
-#: ../meld/meldwindow.py:143
+#: ../meld/meldwindow.py:144
 msgid "Paste the clipboard"
 msgstr "Ubacite ostavu"
 
-#: ../meld/meldwindow.py:144
+#: ../meld/meldwindow.py:145
 msgid "Search for text"
 msgstr "TraÅite tekst"
 
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:146
 msgid "Find Ne_xt"
 msgstr "NaÄi s_ledeÄe"
 
-#: ../meld/meldwindow.py:145
+#: ../meld/meldwindow.py:146
 msgid "Search forwards for the same text"
 msgstr "TraÅite unapred isti tekst"
 
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:147
 msgid "Find _Previous"
 msgstr "NaÄi pre_thodno"
 
-#: ../meld/meldwindow.py:146
+#: ../meld/meldwindow.py:147
 msgid "Search backwards for the same text"
 msgstr "TraÅite unazad isti tekst"
 
-#: ../meld/meldwindow.py:147
+#: ../meld/meldwindow.py:148
 msgid "Find and replace text"
 msgstr "PronaÄite i zamenite tekst"
 
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:149
 msgid "Prefere_nces"
 msgstr "Pos_tavke"
 
-#: ../meld/meldwindow.py:148
+#: ../meld/meldwindow.py:149
 msgid "Configure the application"
 msgstr "Podesite program"
 
-#: ../meld/meldwindow.py:150
+#: ../meld/meldwindow.py:151
 msgid "_Changes"
 msgstr "_Izmene"
 
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:152
 msgid "Next change"
 msgstr "SledeÄa izmena"
 
-#: ../meld/meldwindow.py:151
+#: ../meld/meldwindow.py:152
 msgid "Go to the next change"
 msgstr "Idite na sledeÄu izmenu"
 
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:153
 msgid "Previous change"
 msgstr "Prethodna izmena"
 
-#: ../meld/meldwindow.py:152
+#: ../meld/meldwindow.py:153
 msgid "Go to the previous change"
 msgstr "Idite na prethodnu izmenu"
 
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:154
 msgid "Open externally"
 msgstr "Otvori spoljnim"
 
-#: ../meld/meldwindow.py:153
+#: ../meld/meldwindow.py:154
 msgid "Open selected file or directory in the default external application"
 msgstr "Otvorite izabranu datoteku ili fasciklu u osnovnom spoljnom programu"
 
-#: ../meld/meldwindow.py:155
+#: ../meld/meldwindow.py:156
 msgid "_View"
 msgstr "P_regled"
 
-#: ../meld/meldwindow.py:156
+#: ../meld/meldwindow.py:157
 msgid "File status"
 msgstr "Stanje datoteke"
 
-#: ../meld/meldwindow.py:157
+#: ../meld/meldwindow.py:158
 msgid "Version status"
 msgstr "Stanje izdanja"
 
-#: ../meld/meldwindow.py:158
+#: ../meld/meldwindow.py:159
 msgid "File filters"
 msgstr "Filteri datoteke"
 
-#: ../meld/meldwindow.py:159
+#: ../meld/meldwindow.py:160
 msgid "Stop the current action"
 msgstr "Zaustavite trenutnu radnju"
 
-#: ../meld/meldwindow.py:160
+#: ../meld/meldwindow.py:161
 msgid "Refresh the view"
 msgstr "OsveÅite pregled"
 
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:162
 msgid "Reload"
 msgstr "Ponovo uÄitaj"
 
-#: ../meld/meldwindow.py:161
+#: ../meld/meldwindow.py:162
 msgid "Reload the comparison"
 msgstr "Ponovo uÄitajte poreÄenje"
 
-#: ../meld/meldwindow.py:163
+#: ../meld/meldwindow.py:164
 msgid "_Tabs"
 msgstr "_JeziÄci"
 
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:165
 msgid "_Previous Tab"
 msgstr "Pre_thodni jeziÄak"
 
-#: ../meld/meldwindow.py:164
+#: ../meld/meldwindow.py:165
 msgid "Activate previous tab"
 msgstr "Idite na prethodni list"
 
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:166
 msgid "_Next Tab"
 msgstr "Sle_deÄi jeziÄak"
 
-#: ../meld/meldwindow.py:165
+#: ../meld/meldwindow.py:166
 msgid "Activate next tab"
 msgstr "Idite na naredni list"
 
-#: ../meld/meldwindow.py:166
+#: ../meld/meldwindow.py:167
 msgid "Move Tab _Left"
 msgstr "Premesti jeziÄak _levo"
 
-#: ../meld/meldwindow.py:166
+#: ../meld/meldwindow.py:167
 msgid "Move current tab to left"
 msgstr "Premestite trenutni jeziÄak na levo"
 
-#: ../meld/meldwindow.py:167
+#: ../meld/meldwindow.py:168
 msgid "Move Tab _Right"
 msgstr "Premesti jeziÄak _desno"
 
-#: ../meld/meldwindow.py:167
+#: ../meld/meldwindow.py:168
 msgid "Move current tab to right"
 msgstr "Premestite trenutni jeziÄak na desno"
 
-#: ../meld/meldwindow.py:169
+#: ../meld/meldwindow.py:170
 msgid "_Help"
 msgstr "Po_moÄ"
 
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:171
 msgid "_Contents"
 msgstr "_SadrÅaj"
 
-#: ../meld/meldwindow.py:170
+#: ../meld/meldwindow.py:171
 msgid "Open the Meld manual"
 msgstr "Otvorite uputstvo Melda"
 
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:172
 msgid "Report _Bug"
 msgstr "Prijavi _greÅku"
 
-#: ../meld/meldwindow.py:171
+#: ../meld/meldwindow.py:172
 msgid "Report a bug in Meld"
 msgstr "Prijavite greÅku u Meldu"
 
-#: ../meld/meldwindow.py:172
+#: ../meld/meldwindow.py:173
 msgid "About this program"
 msgstr "O ovom programu"
 
-#: ../meld/meldwindow.py:175
+#: ../meld/meldwindow.py:176
 msgid "Full Screen"
 msgstr "Preko celog ekrana"
 
-#: ../meld/meldwindow.py:175
+#: ../meld/meldwindow.py:176
 msgid "View the comparison in full screen"
 msgstr "Pregledajte poreÄenje preko celog ekrana"
 
-#: ../meld/meldwindow.py:176
+#: ../meld/meldwindow.py:177
 msgid "_Toolbar"
 msgstr "_Paleta alata"
 
-#: ../meld/meldwindow.py:176
+#: ../meld/meldwindow.py:177
 msgid "Show or hide the toolbar"
 msgstr "PrikaÅite ili sakrijte paletu alata"
 
-#: ../meld/meldwindow.py:177
+#: ../meld/meldwindow.py:178
 msgid "_Statusbar"
 msgstr "Traka _stanja"
 
-#: ../meld/meldwindow.py:177
+#: ../meld/meldwindow.py:178
 msgid "Show or hide the statusbar"
 msgstr "PrikaÅite ili sakrijte traku stanja"
 
-#: ../meld/meldwindow.py:563
+#: ../meld/meldwindow.py:564
 msgid "Switch to this tab"
 msgstr "Prebacite se na ovaj jeziÄak"
 
 #. exit at first non found directory + file
-#: ../meld/meldwindow.py:664
+#: ../meld/meldwindow.py:665
 msgid "Cannot compare a mixture of files and directories.\n"
 msgstr "Ne mogu da poredim meÅavinu datoteka i fascikli.\n"
 
 #. no common path. empty names get changed to "[None]"
-#: ../meld/misc.py:174
+#: ../meld/misc.py:177
 msgid "[None]"
 msgstr "[niÅta]"
 
@@ -1215,12 +1243,12 @@ msgid "Only available if you have gnome-python-desktop installed"
 msgstr "Dostupno je samo ako ste instalirali âgnome-python-desktopâ"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:233
+#: ../meld/preferences.py:228
 msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 msgstr "Rezerve 1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:235
+#: ../meld/preferences.py:230
 msgid ""
 "OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
 "Desktop.ini\n"
@@ -1229,206 +1257,208 @@ msgstr ""
 "db Desktop.ini\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:237
+#: ../meld/preferences.py:232
 #, python-format
 msgid "Version Control\t1\t%s\n"
 msgstr "Kontrola verzija 1\t%s\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:239
-msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
-msgstr "IzvrÅne\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
+#: ../meld/preferences.py:234
+#| msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
+msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll,exe}\n"
+msgstr "IzvrÅne \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:241
-msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
-msgstr "Medija\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
+#: ../meld/preferences.py:236
+#| msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
+msgid "Media\t0\t*.{jpg,gif,png,bmp,wav,mp3,ogg,flac,avi,mpg,xcf,xpm}"
+msgstr "Medija\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:243
+#: ../meld/preferences.py:238
 msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
 msgstr "CVS kljuÄne reÄi\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:245
+#: ../meld/preferences.py:240
 msgid "C++ comment\t0\t//.*\n"
 msgstr "C++ komentar\t0\t//.*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:247
+#: ../meld/preferences.py:242
 msgid "C comment\t0\t/\\*.*?\\*/\n"
 msgstr "C komentar\t0\t/\\*.*?\\*/\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:249
+#: ../meld/preferences.py:244
 msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
 msgstr "Svi razmaci\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:251
+#: ../meld/preferences.py:246
 msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
 msgstr "PoÄetni razmak\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:253
+#: ../meld/preferences.py:248
 msgid "Script comment\t0\t#.*"
 msgstr "Komentar skripte\t0\t#.*"
 
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:127
 msgid "Co_mmit"
 msgstr "U_gradi"
 
-#: ../meld/vcview.py:128
+#: ../meld/vcview.py:127
 msgid "Commit"
 msgstr "Ugradite"
 
-#: ../meld/vcview.py:129
+#: ../meld/vcview.py:128
 msgid "_Update"
 msgstr "_AÅuriraj"
 
-#: ../meld/vcview.py:129
+#: ../meld/vcview.py:128
 msgid "Update"
 msgstr "AÅurirajte"
 
-#: ../meld/vcview.py:130
+#: ../meld/vcview.py:129
 msgid "Add to VC"
 msgstr "Dodaj u CV"
 
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:130
 msgid "Add _Binary"
 msgstr "Dodaj _binarno"
 
-#: ../meld/vcview.py:131
+#: ../meld/vcview.py:130
 msgid "Add binary to VC"
 msgstr "Dodaj binarno u CV"
 
-#: ../meld/vcview.py:132
+#: ../meld/vcview.py:131
 msgid "Remove from VC"
 msgstr "Ukloni iz CV"
 
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:132
 msgid "_Resolved"
 msgstr "_ReÅeno"
 
-#: ../meld/vcview.py:133
+#: ../meld/vcview.py:132
 msgid "Mark as resolved for VC"
 msgstr "OznaÄava kao reÅeno za CV"
 
-#: ../meld/vcview.py:134
+#: ../meld/vcview.py:133
 msgid "Revert to original"
 msgstr "Vrati na original"
 
-#: ../meld/vcview.py:135
+#: ../meld/vcview.py:134
 msgid "Delete locally"
 msgstr "ObriÅi u lokalu"
 
-#: ../meld/vcview.py:139
+#: ../meld/vcview.py:138
 msgid "_Flatten"
 msgstr "_Izravnaj"
 
-#: ../meld/vcview.py:139
+#: ../meld/vcview.py:138
 msgid "Flatten directories"
 msgstr "Izravnaj fascikle"
 
-#: ../meld/vcview.py:140
+#: ../meld/vcview.py:139
 msgid "_Modified"
 msgstr "Iz_menjen"
 
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:140
 msgid "_Normal"
 msgstr "_ObiÄno"
 
-#: ../meld/vcview.py:141
+#: ../meld/vcview.py:140
 msgid "Show normal"
 msgstr "PrikaÅi obiÄne"
 
-#: ../meld/vcview.py:142
+#: ../meld/vcview.py:141
 msgid "Non _VC"
 msgstr "Ne _CV"
 
-#: ../meld/vcview.py:142
+#: ../meld/vcview.py:141
 msgid "Show unversioned files"
 msgstr "Prikazuje neverzionirane datoteke"
 
-#: ../meld/vcview.py:143
+#: ../meld/vcview.py:142
 msgid "Ignored"
 msgstr "Zanemarene"
 
-#: ../meld/vcview.py:143
+#: ../meld/vcview.py:142
 msgid "Show ignored files"
 msgstr "Prikazuje zanemarene datoteke"
 
-#: ../meld/vcview.py:186 ../meld/vcview.py:319
+#: ../meld/vcview.py:192 ../meld/vcview.py:325
 msgid "Location"
 msgstr "Putanja"
 
-#: ../meld/vcview.py:187
+#: ../meld/vcview.py:193
 msgid "Status"
 msgstr "Stanje"
 
-#: ../meld/vcview.py:188
+#: ../meld/vcview.py:194
 msgid "Rev"
 msgstr "Izd"
 
-#: ../meld/vcview.py:189
+#: ../meld/vcview.py:195
 msgid "Tag"
 msgstr "Oznaka"
 
-#: ../meld/vcview.py:190
+#: ../meld/vcview.py:196
 msgid "Options"
 msgstr "Opcije"
 
-#: ../meld/vcview.py:249
+#: ../meld/vcview.py:255
 msgid "Choose one Version Control"
 msgstr "Izaberite Kontrolu verzije"
 
-#: ../meld/vcview.py:250
+#: ../meld/vcview.py:256
 msgid "Only one Version Control in this directory"
 msgstr "Samo jedna Kontrola verzija u ovom direktorijumu"
 
 #. TRANSLATORS: this is an error message when a version control
 #. application isn't installed or can't be found
-#: ../meld/vcview.py:263
+#: ../meld/vcview.py:269
 #, python-format
 msgid "%s Not Installed"
 msgstr "â%sâ nije instaliran"
 
 #. TRANSLATORS: this is an error message when a version
 #. controlled repository is invalid or corrupted
-#: ../meld/vcview.py:267
+#: ../meld/vcview.py:273
 msgid "Invalid Repository"
 msgstr "Neispravno skladiÅte"
 
-#: ../meld/vcview.py:276
+#: ../meld/vcview.py:282
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:319
+#: ../meld/vcview.py:325
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:363
+#: ../meld/vcview.py:369
 msgid "(Empty)"
 msgstr "(Prazno)"
 
-#: ../meld/vcview.py:401
+#: ../meld/vcview.py:407
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] Pribavljam razlike"
 
-#: ../meld/vcview.py:409
+#: ../meld/vcview.py:415
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] Primenjujem zakrpu"
 
-#: ../meld/vcview.py:511
+#: ../meld/vcview.py:517
 msgid "Select some files first."
 msgstr "Prvo izaberite neke datoteke."
 
-#: ../meld/vcview.py:584
+#: ../meld/vcview.py:590
 #, python-format
 msgid ""
 "\n"
@@ -1516,11 +1546,14 @@ msgstr "Zatvorite jeziÄak"
 
 #. These are the possible states of files. Be sure to get the colons correct.
 #: ../meld/vc/_vc.py:40
+#| msgid ""
+#| "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing"
 msgid ""
-"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing"
+"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing:"
+"Not present"
 msgstr ""
-"Zanemareno:Neverzionirano:::GreÅka::Novo dodato:Izmenjeno:Sukob:Uklonjeno:"
-"NedostajuÄe"
+"Zanemareno:Neverzionirano:::GreÅka::Novo "
+"dodato:Izmenjeno:Sukob:Uklonjeno:NedostajuÄe:Nije prisutno"
 
 #: ../meld/vc/cvs.py:163
 #, python-format
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]