[meld] Updated Serbian translation

From: Miloš Popović <mpopovic src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] Updated Serbian translation
Date: Sun, 15 May 2011 22:07:17 +0000 (UTC)
commit 37141a66f00519803cbb098bc36dbe6c850243f6
Author: Ð?Ð¸Ñ?Ð¾Ñ?Ð»Ð°Ð² Ð?Ð¸ÐºÐ¾Ð»Ð¸Ñ? <miroslavnikolic rocketmail com>
Date:   Mon May 16 00:09:00 2011 +0200

    Updated Serbian translation

 po/sr.po       |  592 ++++++++++++++++++++++++++++++++++++++++----------------
 po/sr latin po |  592 ++++++++++++++++++++++++++++++++++++++++----------------
 2 files changed, 850 insertions(+), 334 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 4294812..4e428f6 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,25 +1,24 @@
 # Serbian translation of meld
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004.
-#
 # This file is distributed under the same license as the meld package.
-#
 # Maintainer: Ð?Ð°Ð½Ð¸Ð»Ð¾ Ð¨ÐµÐ³Ð°Ð½ <dsegan gmx net>
-# Ð?Ð¸Ñ?Ð¾Ñ?Ð»Ð°Ð² Ð?Ð¸ÐºÐ¾Ð»Ð¸Ñ? <miroslavnikolic rocketmail com>, 15.02.2011.
-#
+# Ð?Ð¸Ñ?Ð¾Ñ?Ð»Ð°Ð² Ð?Ð¸ÐºÐ¾Ð»Ð¸Ñ? <miroslavnikolic rocketmail com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=meld&component=general\n"
-"POT-Creation-Date: 2011-03-01 16:01+0000\n"
-"PO-Revision-Date: 2011-02-15 16:18+0100\n"
+"product=meld&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-05-07 22:45+0000\n"
+"PO-Revision-Date: 2011-05-15 18:32+0200\n"
 "Last-Translator: Ð?Ð¸Ñ?Ð¾Ñ?Ð»Ð°Ð² Ð?Ð¸ÐºÐ¾Ð»Ð¸Ñ? <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: Serbian (sr)\n"
 "Plural-Forms: nplurals=4;    plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n"
 "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\\n\n"
+"X-Generator: Virtaal 0.5.2\n"
 
 #: ../bin/meld:96
 msgid "Cannot import: "
@@ -46,6 +45,54 @@ msgstr "Ð?ÐµÐ»Ð´"
 msgid "Meld Diff Viewer"
 msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Ñ?Ð°Ð·Ð»Ð¸ÐºÐ° Ð?ÐµÐ»Ð´"
 
+#: ../data/ui/EditableList.ui.h:1
+msgid "Active"
+msgstr "Ð?ÐºÑ?Ð¸Ð²Ð°Ð½"
+
+#: ../data/ui/EditableList.ui.h:2
+msgid "Add new filter"
+msgstr "Ð?Ð¾Ð´Ð°Ñ?Ñ?Ðµ Ð½Ð¾Ð²Ð¸ Ñ?Ð¸Ð»Ñ?ÐµÑ?"
+
+#: ../data/ui/EditableList.ui.h:3
+msgid "Editable List"
+msgstr "Ð¡Ð¿Ð¸Ñ?Ð°Ðº Ð·Ð° Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ðµ"
+
+#: ../data/ui/EditableList.ui.h:4
+msgid "Move _Down"
+msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸ _Ð´Ð¾Ð»Ðµ"
+
+#: ../data/ui/EditableList.ui.h:5
+msgid "Move _Up"
+msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸ _Ð³Ð¾Ñ?Ðµ"
+
+#: ../data/ui/EditableList.ui.h:6
+msgid "Move item down"
+msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð° Ñ?Ñ?Ð°Ð²ÐºÑ? Ð½Ð°Ð´Ð¾Ð»Ðµ"
+
+#: ../data/ui/EditableList.ui.h:7
+msgid "Move item up"
+msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð° Ñ?Ñ?Ð°Ð²ÐºÑ? Ð½Ð°Ð³Ð¾Ñ?Ðµ"
+
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:157
+msgid "Name"
+msgstr "Ð?Ð¼Ðµ"
+
+#: ../data/ui/EditableList.ui.h:9
+msgid "Pattern"
+msgstr "Ð?Ð±Ñ?Ð°Ð·Ð°Ñ?"
+
+#: ../data/ui/EditableList.ui.h:10
+msgid "Remove selected filter"
+msgstr "Ð£ÐºÐ»Ð°Ñ?Ð° Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¸ Ñ?Ð¸Ð»Ñ?ÐµÑ?"
+
+#: ../data/ui/EditableList.ui.h:11 ../meld/vcview.py:122
+msgid "_Add"
+msgstr "_Ð?Ð¾Ð´Ð°Ñ?"
+
+#: ../data/ui/EditableList.ui.h:12 ../meld/vcview.py:124
+msgid "_Remove"
+msgstr "Ð£_ÐºÐ»Ð¾Ð½Ð¸"
+
 #: ../data/ui/filediff.ui.h:1
 msgid "Save modified files?"
 msgstr "Ð?Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ð¼ Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ?"
@@ -94,7 +141,7 @@ msgstr "Ð¡Ð»Ðµ_Ð´ÐµÑ?Ðµ"
 msgid "_Previous"
 msgstr "Ð?Ñ?Ðµ_Ñ?Ñ?Ð¾Ð´Ð½Ð¾"
 
-#: ../data/ui/findbar.ui.h:8
+#: ../data/ui/findbar.ui.h:8 ../meld/meldwindow.py:141
 msgid "_Replace"
 msgstr "_Ð?Ð°Ð¼ÐµÐ½Ð¸"
 
@@ -332,7 +379,7 @@ msgstr "Ð?Ð¾Ñ?Ñ?ÐºÐ° Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐ°"
 msgid "Previous Logs"
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ð¸ Ð´Ð½ÐµÐ²Ð½Ð¸Ñ?Ð¸"
 
-#: ../data/ui/vcview.ui.h:8 ../meld/vcview.py:179
+#: ../data/ui/vcview.ui.h:8 ../meld/vcview.py:180
 msgid "Tag"
 msgstr "Ð?Ð·Ð½Ð°ÐºÐ°"
 
@@ -340,121 +387,121 @@ msgstr "Ð?Ð·Ð½Ð°ÐºÐ°"
 msgid "VC Log"
 msgstr "Ð¦Ð? Ð´Ð½ÐµÐ²Ð½Ð¸Ðº"
 
-#: ../meld/dirdiff.py:215 ../meld/vcview.py:118
+#: ../meld/dirdiff.py:227 ../meld/vcview.py:118
 msgid "_Compare"
 msgstr "_Ð£Ð¿Ð¾Ñ?ÐµÐ´Ð¸"
 
-#: ../meld/dirdiff.py:215 ../meld/vcview.py:118
+#: ../meld/dirdiff.py:227 ../meld/vcview.py:118
 msgid "Compare selected"
 msgstr "Ð£Ð¿Ð¾Ñ?ÐµÐ´Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾"
 
-#: ../meld/dirdiff.py:216
+#: ../meld/dirdiff.py:228
 msgid "Copy _Left"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ _Ð»ÐµÐ²Ð¾"
 
-#: ../meld/dirdiff.py:216
+#: ../meld/dirdiff.py:228
 msgid "Copy to left"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸Ñ?Ðµ Ð»ÐµÐ²Ð¾"
 
-#: ../meld/dirdiff.py:217
+#: ../meld/dirdiff.py:229
 msgid "Copy _Right"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ _Ð´ÐµÑ?Ð½Ð¾"
 
-#: ../meld/dirdiff.py:217
+#: ../meld/dirdiff.py:229
 msgid "Copy to right"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸Ñ?Ðµ Ð´ÐµÑ?Ð½Ð¾"
 
-#: ../meld/dirdiff.py:218
+#: ../meld/dirdiff.py:230
 msgid "Delete selected"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾"
 
-#: ../meld/dirdiff.py:219 ../meld/filediff.py:998
+#: ../meld/dirdiff.py:231 ../meld/filediff.py:1017
 msgid "Hide"
 msgstr "Ð¡Ð°ÐºÑ?Ð¸Ñ?"
 
-#: ../meld/dirdiff.py:219
+#: ../meld/dirdiff.py:231
 msgid "Hide selected"
 msgstr "Ð¡Ð°ÐºÑ?Ð¸Ñ? Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾"
 
-#: ../meld/dirdiff.py:221 ../meld/filediff.py:264 ../meld/vcview.py:119
+#: ../meld/dirdiff.py:233 ../meld/filediff.py:267 ../meld/vcview.py:119
 msgid "Open selected"
 msgstr "Ð?Ñ?Ð²Ð¾Ñ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾"
 
-#: ../meld/dirdiff.py:225
+#: ../meld/dirdiff.py:237
 msgid "Case"
 msgstr "Ð?ÐµÐ»Ð¸Ñ?Ð¸Ð½Ð° Ñ?Ð»Ð¾Ð²Ð°"
 
-#: ../meld/dirdiff.py:225
+#: ../meld/dirdiff.py:237
 msgid "Ignore case of entries"
 msgstr "Ð?Ð°Ð½ÐµÐ¼Ð°Ñ?Ð¸ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ñ? Ñ?Ð»Ð¾Ð²Ð° Ñ?Ð½Ð¾Ñ?Ð°"
 
-#: ../meld/dirdiff.py:226
+#: ../meld/dirdiff.py:238
 msgid "Same"
 msgstr "Ð?Ñ?Ñ?Ð¾"
 
-#: ../meld/dirdiff.py:226
+#: ../meld/dirdiff.py:238
 msgid "Show identical"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¸Ñ?Ñ?Ð¾Ð²ÐµÑ?Ð½Ðµ"
 
-#: ../meld/dirdiff.py:227
+#: ../meld/dirdiff.py:239
 msgid "New"
 msgstr "Ð?Ð¾Ð²Ð¸"
 
-#: ../meld/dirdiff.py:227
+#: ../meld/dirdiff.py:239
 msgid "Show new"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð½Ð¾Ð²Ðµ"
 
-#: ../meld/dirdiff.py:228
+#: ../meld/dirdiff.py:240
 msgid "Modified"
 msgstr "Ð?Ð·Ð¼ÐµÑ?ÐµÐ½Ð¸"
 
-#: ../meld/dirdiff.py:228 ../meld/vcview.py:132
+#: ../meld/dirdiff.py:240 ../meld/vcview.py:132
 msgid "Show modified"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½Ðµ"
 
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:242
 msgid "Filters"
 msgstr "Ð¤Ð¸Ð»Ñ?ÐµÑ?Ð¸"
 
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:242
 msgid "Set active filters"
 msgstr "Ð?Ð¾Ð´ÐµÑ?Ð¸Ñ?Ðµ Ð°ÐºÑ?Ð¸Ð²Ð½Ðµ Ñ?Ð¸Ð»Ñ?ÐµÑ?Ðµ"
 
-#: ../meld/dirdiff.py:347
+#: ../meld/dirdiff.py:359
 #, python-format
 msgid "Hide %s"
 msgstr "Ð¡Ð°ÐºÑ?Ð¸Ñ? â??%sâ??"
 
-#: ../meld/dirdiff.py:449 ../meld/dirdiff.py:462 ../meld/vcview.py:304
-#: ../meld/vcview.py:332
+#: ../meld/dirdiff.py:462 ../meld/dirdiff.py:475 ../meld/vcview.py:305
+#: ../meld/vcview.py:333
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ð¼ â??%sâ??"
 
-#: ../meld/dirdiff.py:561
+#: ../meld/dirdiff.py:574
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Ð?Ð¾Ñ?Ð¾Ð²Ð¾"
 
-#: ../meld/dirdiff.py:565
+#: ../meld/dirdiff.py:578
 msgid "Multiple errors occurred while scanning this folder"
 msgstr "Ð?Ð¾Ñ?Ð»Ð¾ Ñ?Ðµ Ð´Ð¾ Ð²Ð¸Ñ?Ðµ Ð³Ñ?ÐµÑ?Ð°ÐºÐ° Ð·Ð° Ð²Ñ?ÐµÐ¼Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸Ð²Ð°Ñ?Ð° Ð¾Ð²Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
 
-#: ../meld/dirdiff.py:566
+#: ../meld/dirdiff.py:579
 msgid "Files with invalid encodings found"
 msgstr "Ð?Ñ?Ð¾Ð½Ð°Ñ?ÐµÐ½Ðµ Ñ?Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ñ?Ð° Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¸Ð¼ ÐºÐ¾Ð´Ð¸Ñ?Ð°Ñ?ÐµÐ¼"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:568
+#: ../meld/dirdiff.py:581
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Ð?ÐµÐºÐµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ð±ÐµÑ?Ð°Ñ?Ñ? Ñ? Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾Ð¼ ÐºÐ¾Ð´Ð¸Ñ?Ð°Ñ?Ñ?. Ð?Ð¼ÐµÐ½Ð° Ñ?Ñ? Ð½ÐµÑ?Ñ?Ð¾ ÐºÐ°Ð¾:"
 
-#: ../meld/dirdiff.py:570
+#: ../meld/dirdiff.py:583
 msgid "Files hidden by case insensitive comparison"
 msgstr "Ð?Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ñ?ÐºÑ?Ð¸Ð²ÐµÐ½Ðµ Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?ÐµÐ¼ Ð½ÐµÐ¾Ñ?ÐµÑ?Ñ?Ð¸Ð²Ð¸Ð¼ Ð½Ð° Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ñ? Ñ?Ð»Ð¾Ð²Ð°"
 
 #. TRANSLATORS: This is followed by a list of files
-#: ../meld/dirdiff.py:572
+#: ../meld/dirdiff.py:585
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -462,16 +509,16 @@ msgstr ""
 "Ð?Ð¾ÐºÑ?ÐµÐ½Ñ?Ð»Ð¸ Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?Ðµ Ð½ÐµÐ·Ð°Ð²Ð¸Ñ?Ð½Ð¾ Ð¾Ð´ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ðµ Ñ?Ð»Ð¾Ð²Ð° Ð½Ð° Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð³Ð´Ðµ "
 "Ñ?Ðµ Ð¾Ð½Ð° Ð±Ð¸Ñ?Ð½Ð°. Ð?ÐµÐºÐµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ð½Ð¸Ñ?Ñ? Ð²Ð¸Ð´Ñ?Ð¸Ð²Ðµ:"
 
-#: ../meld/dirdiff.py:583
+#: ../meld/dirdiff.py:596
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "â??%sâ?? Ñ?Ð°ÐºÑ?Ð¸Ð²ÐµÐ½Ð¾ Ð¾Ð´ Ñ?Ñ?Ñ?Ð°Ð½Ðµ â??%sâ??"
 
-#: ../meld/dirdiff.py:608 ../meld/filediff.py:875 ../meld/filediff.py:1002
+#: ../meld/dirdiff.py:621 ../meld/filediff.py:882 ../meld/filediff.py:1021
 msgid "Hi_de"
 msgstr "_Ð¡Ð°ÐºÑ?Ð¸Ñ?"
 
-#: ../meld/dirdiff.py:658
+#: ../meld/dirdiff.py:671
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -480,7 +527,7 @@ msgstr ""
 "â??%sâ?? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸.\n"
 "Ð?Ð° Ð¿Ñ?ÐµÑ?Ð½Ð¸Ð¼Ð¸Ð¼?"
 
-#: ../meld/dirdiff.py:665
+#: ../meld/dirdiff.py:678
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -491,7 +538,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:683 ../meld/vcview.py:504
+#: ../meld/dirdiff.py:696 ../meld/vcview.py:505
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -500,7 +547,7 @@ msgstr ""
 "â??%sâ?? Ñ?Ðµ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼.\n"
 "Ð?Ð° Ñ?ÐºÐ»Ð¾Ð½Ð¸Ð¼ Ñ?ÐµÐºÑ?Ñ?Ð·Ð¸Ð²Ð½Ð¾?"
 
-#: ../meld/dirdiff.py:690 ../meld/vcview.py:509
+#: ../meld/dirdiff.py:703 ../meld/vcview.py:510
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -511,7 +558,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:702
+#: ../meld/dirdiff.py:715
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -520,7 +567,7 @@ msgstr[1] "%i Ñ?ÐµÐºÑ?Ð½Ð´Ðµ"
 msgstr[2] "%i Ñ?ÐµÐºÑ?Ð½Ð´Ð¸"
 msgstr[3] "%i Ñ?ÐµÐºÑ?Ð½Ð´Ð°"
 
-#: ../meld/dirdiff.py:703
+#: ../meld/dirdiff.py:716
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -529,7 +576,7 @@ msgstr[1] "%i Ð¼Ð¸Ð½Ñ?Ñ?Ð°"
 msgstr[2] "%i Ð¼Ð¸Ð½Ñ?Ñ?Ð°"
 msgstr[3] "%i Ð¼Ð¸Ð½Ñ?Ñ?"
 
-#: ../meld/dirdiff.py:704
+#: ../meld/dirdiff.py:717
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -538,7 +585,7 @@ msgstr[1] "%i Ñ?Ð°Ñ?Ð°"
 msgstr[2] "%i Ñ?Ð°Ñ?Ð¸"
 msgstr[3] "%i Ñ?Ð°Ñ?"
 
-#: ../meld/dirdiff.py:705
+#: ../meld/dirdiff.py:718
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -547,7 +594,7 @@ msgstr[1] "%i Ð´Ð°Ð½Ð°"
 msgstr[2] "%i Ð´Ð°Ð½Ð°"
 msgstr[3] "%i Ð´Ð°Ð½"
 
-#: ../meld/dirdiff.py:706
+#: ../meld/dirdiff.py:719
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -556,7 +603,7 @@ msgstr[1] "%i Ð½ÐµÐ´ÐµÑ?Ðµ"
 msgstr[2] "%i Ð½ÐµÐ´ÐµÑ?Ð°"
 msgstr[3] "%i Ð½ÐµÐ´ÐµÑ?Ð°"
 
-#: ../meld/dirdiff.py:707
+#: ../meld/dirdiff.py:720
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -565,7 +612,7 @@ msgstr[1] "%i Ð¼ÐµÑ?ÐµÑ?Ð°"
 msgstr[2] "%i Ð¼ÐµÑ?ÐµÑ?Ð¸"
 msgstr[3] "%i Ð¼ÐµÑ?ÐµÑ?"
 
-#: ../meld/dirdiff.py:708
+#: ../meld/dirdiff.py:721
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -574,151 +621,151 @@ msgstr[1] "%i Ð³Ð¾Ð´Ð¸Ð½Ðµ"
 msgstr[2] "%i Ð³Ð¾Ð´Ð¸Ð½Ð°"
 msgstr[3] "%i Ð³Ð¾Ð´Ð¸Ð½Ð°"
 
-#: ../meld/filediff.py:265
+#: ../meld/filediff.py:268
 msgid "Format as patch..."
 msgstr "Ð¤Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ð°Ñ? ÐºÐ°Ð¾ Ð¸Ñ?Ð¿Ñ?Ð°Ð²ÐºÑ?..."
 
-#: ../meld/filediff.py:265
+#: ../meld/filediff.py:268
 msgid "Create a patch using differences between files"
 msgstr "Ð?Ñ?Ð°Ð²Ð¸ Ð¸Ñ?Ð¿Ñ?Ð°Ð²ÐºÑ? ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ð¸ Ñ?Ð°Ð·Ð»Ð¸ÐºÐµ Ð¸Ð·Ð¼ÐµÑ?Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°"
 
-#: ../meld/filediff.py:266
+#: ../meld/filediff.py:269
 msgid "Previous conflict"
 msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ð¸ Ñ?Ñ?ÐºÐ¾Ð±"
 
-#: ../meld/filediff.py:266
+#: ../meld/filediff.py:269
 msgid "Go to the previous conflict"
 msgstr "Ð?Ð´Ðµ Ð½Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ð¸ Ñ?Ñ?ÐºÐ¾Ð±"
 
-#: ../meld/filediff.py:267
+#: ../meld/filediff.py:270
 msgid "Next conflict"
 msgstr "Ð¡Ð»ÐµÐ´ÐµÑ?Ð¸ Ñ?Ñ?ÐºÐ¾Ð±"
 
-#: ../meld/filediff.py:267
+#: ../meld/filediff.py:270
 msgid "Go to the next conflict"
 msgstr "Ð?Ð´Ðµ Ð½Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ñ?Ñ?ÐºÐ¾Ð±"
 
-#: ../meld/filediff.py:268
+#: ../meld/filediff.py:271
 msgid "Push to left"
 msgstr "Ð?Ñ?Ñ?Ð½Ð¸ Ñ?Ð»ÐµÐ²Ð¾"
 
-#: ../meld/filediff.py:268
+#: ../meld/filediff.py:271
 msgid "Push current change to the left"
 msgstr "Ð?Ñ?Ñ?Ð° Ñ?ÐµÐºÑ?Ñ?Ñ? Ð¸Ð·Ð¼ÐµÐ½Ñ? Ñ?Ð»ÐµÐ²Ð¾"
 
-#: ../meld/filediff.py:269
+#: ../meld/filediff.py:272
 msgid "Push to right"
 msgstr "Ð?Ñ?Ñ?Ð½Ð¸ Ñ?Ð´ÐµÑ?Ð½Ð¾"
 
-#: ../meld/filediff.py:269
+#: ../meld/filediff.py:272
 msgid "Push current change to the right"
 msgstr "Ð?Ñ?Ñ?Ð° Ñ?ÐµÐºÑ?Ñ?Ñ? Ð¸Ð·Ð¼ÐµÐ½Ñ? Ñ?Ð´ÐµÑ?Ð½Ð¾"
 
 #. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:271
+#: ../meld/filediff.py:274
 msgid "Pull from left"
 msgstr "Ð£Ð±Ð°Ñ?Ð¸ Ñ? Ð»ÐµÐ²Ð°"
 
-#: ../meld/filediff.py:271
+#: ../meld/filediff.py:274
 msgid "Pull change from the left"
 msgstr "Ð£Ð±Ð°Ñ?Ñ?Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½Ñ? Ñ? Ð»ÐµÐ²Ð°"
 
-#: ../meld/filediff.py:272
+#: ../meld/filediff.py:275
 msgid "Pull from right"
 msgstr "Ð£Ð±Ð°Ñ?Ð¸ Ñ? Ð´ÐµÑ?Ð½Ð°"
 
-#: ../meld/filediff.py:272
+#: ../meld/filediff.py:275
 msgid "Pull change from the right"
 msgstr "Ð£Ð±Ð°Ñ?Ñ?Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½Ñ? Ñ? Ð»ÐµÐ²Ð°"
 
-#: ../meld/filediff.py:273
+#: ../meld/filediff.py:276
 msgid "Copy above left"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ð¸Ð·Ð½Ð°Ð´ Ñ?Ð»ÐµÐ²Ð¾"
 
-#: ../meld/filediff.py:273
+#: ../meld/filediff.py:276
 msgid "Copy change above the left chunk"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð° Ð¸Ð·Ð¼ÐµÐ½Ñ? Ð¸Ð·Ð½Ð°Ð´ ÐºÐ¾Ð¼Ð°Ð´Ð° Ñ?Ð»ÐµÐ²Ð¾"
 
-#: ../meld/filediff.py:274
+#: ../meld/filediff.py:277
 msgid "Copy below left"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ð¸Ñ?Ð¿Ð¾Ð´ Ñ?Ð»ÐµÐ²Ð¾"
 
-#: ../meld/filediff.py:274
+#: ../meld/filediff.py:277
 msgid "Copy change below the left chunk"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð° Ð¸Ð·Ð¼ÐµÐ½Ñ? Ð¸Ñ?Ð¿Ð¾Ð´ ÐºÐ¾Ð¼Ð°Ð´Ð° Ñ?Ð»ÐµÐ²Ð¾"
 
-#: ../meld/filediff.py:275
+#: ../meld/filediff.py:278
 msgid "Copy above right"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ð¸Ð·Ð½Ð°Ð´ Ñ?Ð´ÐµÑ?Ð½Ð¾"
 
-#: ../meld/filediff.py:275
+#: ../meld/filediff.py:278
 msgid "Copy change above the right chunk"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð° Ð¸Ð·Ð¼ÐµÐ½Ñ? Ð¸Ð·Ð½Ð°Ð´ ÐºÐ¾Ð¼Ð°Ð´Ð° Ñ?Ð»ÐµÐ²Ð¾"
 
-#: ../meld/filediff.py:276
+#: ../meld/filediff.py:279
 msgid "Copy below right"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ð¸Ñ?Ð¿Ð¾Ð´ Ñ?Ð´ÐµÑ?Ð½Ð¾"
 
-#: ../meld/filediff.py:276
+#: ../meld/filediff.py:279
 msgid "Copy change below the right chunk"
 msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð° Ð¸Ð·Ð¼ÐµÐ½Ñ? Ð¸Ñ?Ð¿Ð¾Ð´ ÐºÐ¾Ð¼Ð°Ð´Ð° Ñ?Ð´ÐµÑ?Ð½Ð¾"
 
-#: ../meld/filediff.py:277
+#: ../meld/filediff.py:280
 msgid "Delete"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸"
 
-#: ../meld/filediff.py:277
+#: ../meld/filediff.py:280
 msgid "Delete change"
 msgstr "Ð?Ñ?Ð¸Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½Ñ?"
 
-#: ../meld/filediff.py:278
+#: ../meld/filediff.py:281
 msgid "Merge all changes from left"
 msgstr "Ð?Ð±Ñ?ÐµÐ´Ð¸Ð½Ð¸ Ñ?Ð²Ðµ Ð¸Ð·Ð¼ÐµÐ½Ðµ Ñ? Ð»ÐµÐ²Ð°"
 
-#: ../meld/filediff.py:278
+#: ../meld/filediff.py:281
 msgid "Merge all non-conflicting changes from the left"
 msgstr "Ð?Ð±Ñ?ÐµÐ´Ð¸Ñ?Ñ?Ñ?Ðµ Ñ?Ð²Ðµ Ð½ÐµÑ?Ñ?ÐºÐ¾Ð±Ñ?Ð°Ð²Ð°Ñ?Ñ?Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½Ðµ Ñ? Ð»ÐµÐ²Ð°"
 
-#: ../meld/filediff.py:279
+#: ../meld/filediff.py:282
 msgid "Merge all changes from right"
 msgstr "Ð?Ð±Ñ?ÐµÐ´Ð¸Ð½Ð¸ Ñ?Ð²Ðµ Ð¸Ð·Ð¼ÐµÐ½Ðµ Ñ? Ð´ÐµÑ?Ð½Ð°"
 
-#: ../meld/filediff.py:279
+#: ../meld/filediff.py:282
 msgid "Merge all non-conflicting changes from the right"
 msgstr "Ð?Ð±Ñ?ÐµÐ´Ð¸Ñ?Ñ?Ñ?Ðµ Ñ?Ð²Ðµ Ð½ÐµÑ?Ñ?ÐºÐ¾Ð±Ñ?Ð°Ð²Ð°Ñ?Ñ?Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½Ðµ Ñ? Ð´ÐµÑ?Ð½Ð°"
 
-#: ../meld/filediff.py:280
+#: ../meld/filediff.py:283
 msgid "Merge all non-conflicting"
 msgstr "Ð?Ð±Ñ?ÐµÐ´Ð¸Ð½Ð¸ Ñ?Ð²Ðµ Ð½ÐµÑ?Ñ?ÐºÐ¾Ð±Ñ?Ð°Ð²Ð°Ñ?Ñ?Ñ?Ðµ"
 
-#: ../meld/filediff.py:280
+#: ../meld/filediff.py:283
 msgid "Merge all non-conflicting changes from left and right panes"
 msgstr "Ð?Ð±Ñ?ÐµÐ´Ð¸Ñ?Ñ?Ñ?Ðµ Ñ?Ð²Ðµ Ð½ÐµÑ?Ñ?ÐºÐ¾Ð±Ñ?Ð°Ð²Ð°Ñ?Ñ?Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½Ðµ Ñ? Ð»ÐµÐ²Ðµ Ð¸ Ð´ÐµÑ?Ð½Ðµ Ð¿Ð¾Ð²Ñ?Ñ?Ð¸"
 
-#: ../meld/filediff.py:284
+#: ../meld/filediff.py:287
 msgid "Lock scrolling"
 msgstr "Ð?Ð°ÐºÑ?Ñ?Ñ?Ð°Ñ? ÐºÐ»Ð¸Ð·Ð°Ñ?Ðµ"
 
-#: ../meld/filediff.py:285
+#: ../meld/filediff.py:288
 msgid "Lock scrolling of all panes"
 msgstr "Ð?Ð°ÐºÑ?Ñ?Ñ?Ð°Ð²Ð° ÐºÐ»Ð¸Ð·Ð°Ñ?Ðµ Ñ?Ð²Ð¸Ñ? Ð¿Ð¾Ð²Ñ?Ñ?Ð¸"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:365
+#: ../meld/filediff.py:380
 msgid "INS"
 msgstr "Ð£Ð?Ð¢"
 
-#: ../meld/filediff.py:365
+#: ../meld/filediff.py:380
 msgid "OVR"
 msgstr "Ð?Ð Ð?"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:367
+#: ../meld/filediff.py:382
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Ð ÐµÐ´ %i, Ð¼ÐµÑ?Ñ?Ð¾ %i"
 
-#: ../meld/filediff.py:570
+#: ../meld/filediff.py:594
 #, python-format
 msgid ""
 "Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -728,50 +775,62 @@ msgstr ""
 "Ð²Ð¸Ñ?Ðµ Ð´ÐµÑ?Ð°Ñ?Ð° Ð¿Ð¾Ð³Ð»ÐµÐ´Ð°Ñ?Ñ?Ðµ Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð½Ð¸Ðº Ð·Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸ÐºÐµ."
 
 #. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:673
+#: ../meld/filediff.py:681
 msgid "<unnamed>"
 msgstr "<Ð½ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½>"
 
-#: ../meld/filediff.py:863
+#: ../meld/filediff.py:870
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Ð?Ð¾Ñ?Ñ?Ð°Ð²Ð¸ Ð±Ñ?Ð¾Ñ? Ð¿Ð»Ð¾Ñ?Ð°"
 
-#: ../meld/filediff.py:869
+#: ../meld/filediff.py:876
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Ð?Ñ?Ð²Ð°Ñ?Ð°Ð¼ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
 
-#: ../meld/filediff.py:893 ../meld/filediff.py:902 ../meld/filediff.py:914
-#: ../meld/filediff.py:920
+#: ../meld/filediff.py:900 ../meld/filediff.py:909 ../meld/filediff.py:921
+#: ../meld/filediff.py:927
 msgid "Could not read file"
 msgstr "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð¼ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
 
-#: ../meld/filediff.py:894
+#: ../meld/filediff.py:901
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Ð§Ð¸Ñ?Ð°Ð¼ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
 
-#: ../meld/filediff.py:903
+#: ../meld/filediff.py:910
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "â??%sâ?? Ð¸Ð·Ð³Ð»ÐµÐ´Ð° Ð´Ð° Ñ?Ðµ Ð¸Ð·Ð²Ñ?Ñ?Ð½Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°."
 
-#: ../meld/filediff.py:915
+#: ../meld/filediff.py:922
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "â??%sâ?? Ð½Ð¸Ñ?Ðµ Ñ? ÐºÐ¾Ð´Ð¸Ñ?Ð°Ñ?Ð¸Ð¼Ð°: â??%sâ??"
 
-#: ../meld/filediff.py:945 ../meld/filemerge.py:67
+#: ../meld/filediff.py:952 ../meld/filemerge.py:67
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Ð¡Ñ?Ð°Ñ?Ñ?Ð½Ð°Ð²Ð°Ð¼ Ñ?Ð°Ð·Ð»Ð¸ÐºÐµ"
 
-#: ../meld/filediff.py:996
+#: ../meld/filediff.py:1008
+msgid ""
+"Text filters are being used, and may be masking differences between files. "
+"Would you like to compare the unfiltered files?"
+msgstr ""
+"Ð?Ð¾Ñ?Ð¸Ñ?Ñ?ÐµÐ½Ð¸ Ñ?Ñ? Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð¸ Ñ?ÐµÐºÑ?Ñ?Ð°, Ð° Ð¼Ð¾Ð³Ñ? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð°Ñ?Ð¸ Ð¸ Ð·Ð°Ð¼Ð°Ñ?ÐºÐ¸Ñ?Ð°Ð½Ðµ Ñ?Ð°Ð·Ð»Ð¸ÐºÐµ Ð¸Ð·Ð¼ÐµÑ?Ñ? "
+"Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°. Ð?Ð° Ð»Ð¸ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ð¿Ð¾Ñ?ÐµÐ´Ð¸Ñ?Ðµ Ð½ÐµÑ?Ð¸Ð»Ñ?Ñ?Ð¸Ñ?Ð°Ð½Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ?"
+
+#: ../meld/filediff.py:1014
 msgid "Files are identical"
 msgstr "Ð?Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ñ?Ñ? Ð¸Ñ?Ñ?Ð¾Ð²ÐµÑ?Ð½Ðµ"
 
-#: ../meld/filediff.py:1150
+#: ../meld/filediff.py:1024
+msgid "Show without filters"
+msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð±ÐµÐ· Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð°"
+
+#: ../meld/filediff.py:1178
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -780,7 +839,7 @@ msgstr ""
 "â??%sâ?? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸!\n"
 "Ð?Ð° Ð¿Ñ?ÐµÑ?Ð½Ð¸Ð¼Ð¸Ð¼?"
 
-#: ../meld/filediff.py:1163
+#: ../meld/filediff.py:1191
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -791,12 +850,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1172
+#: ../meld/filediff.py:1200
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¸Ð¼Ðµ Ð·Ð° %i. Ð±Ð°Ñ?ÐµÑ?."
 
-#: ../meld/filediff.py:1187
+#: ../meld/filediff.py:1215
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -807,7 +866,7 @@ msgstr ""
 "\n"
 "Ð?Ð¾Ñ?Ð¸ Ð¾Ð±Ð»Ð¸Ðº Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ?"
 
-#: ../meld/filediff.py:1203
+#: ../meld/filediff.py:1231
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -816,7 +875,7 @@ msgstr ""
 "â??%sâ?? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð·Ð½Ð°ÐºÐ¾Ð²Ðµ ÐºÐ¾Ñ?Ð¸ Ñ?Ðµ Ð½Ðµ Ð¼Ð¾Ð³Ñ? ÐºÐ¾Ð´Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ð· â??%sâ??\n"
 "Ð?Ð° Ð»Ð¸ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ ÐºÐ°Ð¾ â??UTF-8â???"
 
-#: ../meld/filediff.py:1262
+#: ../meld/filediff.py:1290
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -879,16 +938,20 @@ msgstr "Ð?Ð¾Ð´ÐµÑ?Ð°Ð²Ð° Ð¾Ð·Ð½Ð°ÐºÑ? Ð·Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ Ñ?Ð¼ÐµÑ?Ñ?Ð¾ Ð¸Ð¼
 msgid "Automatically compare all differing files on startup"
 msgstr "Ð?Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸ Ð¿Ð¾Ñ?ÐµÐ´Ð¸ Ñ?Ð²Ðµ Ñ?Ð°Ð·Ð»Ð¸ÐºÑ?Ñ?Ñ?Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ð¿Ñ?Ð¸Ð»Ð¸ÐºÐ¾Ð¼ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ð°"
 
-#: ../meld/meldapp.py:171
+#: ../meld/meldapp.py:170
+msgid "Ignored for compatibility"
+msgstr "Ð?Ð°Ð½ÐµÐ¼Ð°Ñ?ÐµÐ½Ð¾ Ð·Ð±Ð¾Ð³ ÐºÐ¾Ð¼Ð¿Ð°Ñ?Ð¸Ð±Ð¸Ð»Ð½Ð¾Ñ?Ñ?Ð¸"
+
+#: ../meld/meldapp.py:173
 msgid "Set the target file for saving a merge result"
 msgstr "Ð?Ð¾Ð´ÐµÑ?Ð°Ð²Ð° Ñ?Ð¸Ñ?Ð½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? Ð·Ð° Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ñ?ÐµÐ·Ñ?Ð»Ñ?Ð°Ñ?Ð° Ñ?Ñ?Ð°Ð¿Ð°Ñ?Ð°"
 
-#: ../meld/meldapp.py:174
+#: ../meld/meldapp.py:176
 msgid "Creates a diff tab for up to 3 supplied files or directories."
 msgstr ""
 "Ð?Ñ?Ð°Ð²Ð¸ Ñ?ÐµÐ·Ð¸Ñ?Ð°Ðº Ñ?Ð°Ð·Ð»Ð¸ÐºÐ° Ð·Ð° Ð½Ð°Ñ?Ð²Ð¸Ñ?Ðµ Ð´Ð¾ 3 Ð¿Ñ?Ð¸Ð´Ð¾Ð´Ð°Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ð¸Ð»Ð¸ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð°."
 
-#: ../meld/meldapp.py:177
+#: ../meld/meldapp.py:179
 #, python-format
 msgid "too many arguments (wanted 0-4, got %d)"
 msgstr "Ð¿Ñ?ÐµÐ²Ð¸Ñ?Ðµ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ð°Ñ?Ð° (Ñ?Ñ?Ð°Ð¶ÐµÐ½Ð¾ Ñ?Ðµ 0-4, Ð´Ð¾Ð±Ð¸Ñ? %d)"
@@ -897,6 +960,231 @@ msgstr "Ð¿Ñ?ÐµÐ²Ð¸Ñ?Ðµ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ð°Ñ?Ð° (Ñ?Ñ?Ð°Ð¶ÐµÐ½Ð¾ Ñ?Ðµ 0-4, Ð´Ð¾Ð±Ð¸Ñ?
 msgid "untitled"
 msgstr "Ð±ÐµÐ·Ð¸Ð¼ÐµÐ½Ð¸"
 
+#: ../meld/meldwindow.py:125
+msgid "_File"
+msgstr "_Ð?Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°"
+
+#: ../meld/meldwindow.py:126
+msgid "_New..."
+msgstr "_Ð?Ð¾Ð²Ð¸..."
+
+#: ../meld/meldwindow.py:126
+msgid "Start a new comparison"
+msgstr "Ð?Ð°Ð¿Ð¾Ñ?Ð¸Ñ?Ðµ Ð½Ð¾Ð²Ð¾ Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?Ðµ"
+
+#: ../meld/meldwindow.py:127
+msgid "Save the current file"
+msgstr "Ð§Ñ?Ð²Ð° Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
+
+#: ../meld/meldwindow.py:129
+msgid "Close the current file"
+msgstr "Ð?Ð°Ñ?Ð²Ð°Ñ?Ð° Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
+
+#: ../meld/meldwindow.py:130
+msgid "Quit the program"
+msgstr "Ð?Ð°Ñ?Ð²Ð°Ñ?Ð° Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼"
+
+#: ../meld/meldwindow.py:132
+msgid "_Edit"
+msgstr "_Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ðµ"
+
+#: ../meld/meldwindow.py:133
+msgid "Undo the last action"
+msgstr "Ð?Ð¿Ð¾Ð·Ð¸Ð²Ð° Ð¿Ð¾Ñ?Ð»ÐµÐ´Ñ?Ñ? Ñ?Ð°Ð´Ñ?Ñ?"
+
+#: ../meld/meldwindow.py:134
+msgid "Redo the last undone action"
+msgstr "Ð?Ð¾Ð½Ð°Ð²Ñ?Ð° Ð¿Ð¾Ñ?Ð»ÐµÐ´Ñ?Ñ? Ð¾Ð¿Ð¾Ð·Ð²Ð°Ð½Ñ? Ñ?Ð°Ð´Ñ?Ñ?"
+
+#: ../meld/meldwindow.py:135
+msgid "Cut the selection"
+msgstr "Ð?Ñ?ÐµÑ?Ð° Ð¸Ð·Ð±Ð¾Ñ?"
+
+#: ../meld/meldwindow.py:136
+msgid "Copy the selection"
+msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð° Ð¸Ð·Ð±Ð¾Ñ?"
+
+#: ../meld/meldwindow.py:137
+msgid "Paste the clipboard"
+msgstr "Ð£Ð±Ð°Ñ?Ð¸ Ð¾Ñ?Ñ?Ð°Ð²Ñ?"
+
+#: ../meld/meldwindow.py:138
+msgid "Search for text"
+msgstr "Ð¢Ñ?Ð°Ð¶Ð¸ Ñ?ÐµÐºÑ?Ñ?"
+
+#: ../meld/meldwindow.py:139
+msgid "Find Ne_xt"
+msgstr "Ð?Ð°Ñ?Ð¸ Ñ?_ÐµÐ´ÐµÑ?Ðµ"
+
+#: ../meld/meldwindow.py:139
+msgid "Search forwards for the same text"
+msgstr "Ð¢Ñ?Ð°Ð¶Ð¸ Ñ?Ð½Ð°Ð¿Ñ?ÐµÐ´ Ð¸Ñ?Ñ?Ð¸ Ñ?ÐµÐºÑ?Ñ?"
+
+#: ../meld/meldwindow.py:140
+msgid "Find _Previous"
+msgstr "Ð?Ð°Ñ?Ð¸ Ð¿Ñ?Ðµ_Ñ?Ñ?Ð¾Ð´Ð½Ð¾"
+
+#: ../meld/meldwindow.py:140
+msgid "Search backwards for the same text"
+msgstr "Ð¢Ñ?Ð°Ð¶Ð¸ Ñ?Ð½Ð°Ð·Ð°Ð´ Ð¸Ñ?Ñ?Ð¸ Ñ?ÐµÐºÑ?Ñ?"
+
+#: ../meld/meldwindow.py:141
+msgid "Find and replace text"
+msgstr "Ð?Ñ?Ð¾Ð½Ð°Ð»Ð°Ð·Ð¸ Ð¸ Ð·Ð°Ð¼ÐµÑ?Ñ?Ñ?Ðµ Ñ?ÐµÐºÑ?Ñ?"
+
+#: ../meld/meldwindow.py:142
+msgid "Prefere_nces"
+msgstr "_Ð?Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ"
+
+#: ../meld/meldwindow.py:142
+msgid "Configure the application"
+msgstr "Ð?Ð¾Ð´ÐµÑ?Ð¸Ñ?Ðµ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼"
+
+#: ../meld/meldwindow.py:144
+msgid "_Changes"
+msgstr "_Ð?Ð·Ð¼ÐµÐ½Ðµ"
+
+#: ../meld/meldwindow.py:145
+msgid "Next change"
+msgstr "Ð¡Ð»ÐµÐ´ÐµÑ?Ð° Ð¸Ð·Ð¼ÐµÐ½Ð°"
+
+#: ../meld/meldwindow.py:145
+msgid "Go to the next change"
+msgstr "Ð?Ð´Ðµ Ð½Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ñ? Ð¸Ð·Ð¼ÐµÐ½Ñ?"
+
+#: ../meld/meldwindow.py:146
+msgid "Previous change"
+msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ð° Ð¸Ð·Ð¼ÐµÐ½Ð°"
+
+#: ../meld/meldwindow.py:146
+msgid "Go to the previous change"
+msgstr "Ð?Ð´Ðµ Ð½Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ñ? Ð¸Ð·Ð¼ÐµÐ½Ñ?"
+
+#: ../meld/meldwindow.py:148
+msgid "_View"
+msgstr "Ð?_Ñ?ÐµÐ³Ð»ÐµÐ´"
+
+#: ../meld/meldwindow.py:149
+msgid "File status"
+msgstr "Ð¡Ñ?Ð°Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
+
+#: ../meld/meldwindow.py:150
+msgid "Version status"
+msgstr "Ð¡Ñ?Ð°Ñ?Ðµ Ð¸Ð·Ð´Ð°Ñ?Ð°"
+
+#: ../meld/meldwindow.py:151
+msgid "File filters"
+msgstr "Ð¤Ð¸Ð»Ñ?ÐµÑ?Ð¸ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
+
+#: ../meld/meldwindow.py:152
+msgid "Stop the current action"
+msgstr "Ð?Ð°Ñ?Ñ?Ñ?Ð°Ð²Ñ?Ð° Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ñ? Ñ?Ð°Ð´Ñ?Ñ?"
+
+#: ../meld/meldwindow.py:153
+msgid "Refresh the view"
+msgstr "Ð?Ñ?Ð²ÐµÐ¶Ð°Ð²Ð° Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
+
+#: ../meld/meldwindow.py:154
+msgid "Reload"
+msgstr "Ð?Ð¾Ð½Ð¾Ð²Ð¾ Ñ?Ñ?Ð¸Ñ?Ð°Ñ?"
+
+#: ../meld/meldwindow.py:154
+msgid "Reload the comparison"
+msgstr "Ð?Ð¾Ð½Ð¾Ð²Ð¾ Ñ?Ñ?Ð¸Ñ?Ð°Ð²Ð° Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?Ðµ"
+
+#: ../meld/meldwindow.py:156
+msgid "_Tabs"
+msgstr "_Ð?ÐµÐ·Ð¸Ñ?Ð°Ðº"
+
+#: ../meld/meldwindow.py:157
+msgid "_Previous Tab"
+msgstr "Ð?Ñ?Ðµ_Ñ?Ñ?Ð¾Ð´Ð½Ð¸ Ñ?ÐµÐ·Ð¸Ñ?Ð°Ðº"
+
+#: ../meld/meldwindow.py:157
+msgid "Activate previous tab"
+msgstr "Ð?ÐºÑ?Ð¸Ð²Ð¸Ñ?Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ð¸ Ñ?ÐµÐ·Ð¸Ñ?Ð°Ðº"
+
+#: ../meld/meldwindow.py:158
+msgid "_Next Tab"
+msgstr "Ð¡Ð»Ðµ_Ð´ÐµÑ?Ð¸ Ñ?ÐµÐ·Ð¸Ñ?Ð°Ðº"
+
+#: ../meld/meldwindow.py:158
+msgid "Activate next tab"
+msgstr "Ð?ÐºÑ?Ð¸Ð²Ð¸Ñ?Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ñ?ÐµÐ·Ð¸Ñ?Ð°Ðº"
+
+#: ../meld/meldwindow.py:159
+msgid "Move Tab _Left"
+msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸ Ñ?ÐµÐ·Ð¸Ñ?Ð°Ðº Ñ?_Ð»ÐµÐ²Ð¾"
+
+#: ../meld/meldwindow.py:159
+msgid "Move current tab to left"
+msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð° Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¸ Ñ?ÐµÐ·Ð¸Ñ?Ð°Ðº Ð½Ð° Ð»ÐµÐ²Ð¾"
+
+#: ../meld/meldwindow.py:160
+msgid "Move Tab _Right"
+msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð¸ Ñ?ÐµÐ·Ð¸Ñ?Ð°Ðº Ñ?_Ð´ÐµÑ?Ð½Ð¾"
+
+#: ../meld/meldwindow.py:160
+msgid "Move current tab to right"
+msgstr "Ð?Ñ?ÐµÐ¼ÐµÑ?Ñ?Ð° Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¸ Ñ?ÐµÐ·Ð¸Ñ?Ð°Ðº Ð½Ð° Ð´ÐµÑ?Ð½Ð¾"
+
+#: ../meld/meldwindow.py:162
+msgid "_Help"
+msgstr "Ð?Ð¾Ð¼Ð¾_Ñ?"
+
+#: ../meld/meldwindow.py:163
+msgid "_Contents"
+msgstr "_Ð¡Ð°Ð´Ñ?Ð¶Ð°Ñ?"
+
+#: ../meld/meldwindow.py:163
+msgid "Open the Meld manual"
+msgstr "Ð?Ñ?Ð²Ð¾Ñ?Ð¸Ñ?Ðµ Ñ?Ð¿Ñ?Ñ?Ñ?Ñ?Ð²Ð¾ Ð?ÐµÐ»Ð´Ð°"
+
+#: ../meld/meldwindow.py:164
+msgid "Report _Bug"
+msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð¸ _Ð³Ñ?ÐµÑ?ÐºÑ?"
+
+#: ../meld/meldwindow.py:164
+msgid "Report a bug in Meld"
+msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð³Ñ?ÐµÑ?ÐºÑ? Ñ? Ð?ÐµÐ»Ð´Ñ?"
+
+#: ../meld/meldwindow.py:165
+msgid "About this program"
+msgstr "Ð? Ð¾Ð²Ð¾Ð¼ Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼Ñ?"
+
+#: ../meld/meldwindow.py:168
+msgid "Full Screen"
+msgstr "Ð¦ÐµÐ¾ ÐµÐºÑ?Ð°Ð½"
+
+#: ../meld/meldwindow.py:168
+msgid "View the comparison in full screen"
+msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?Ðµ Ð¿Ñ?ÐµÐºÐ¾ Ñ?ÐµÐ»Ð¾Ð³ ÐµÐºÑ?Ð°Ð½Ð°"
+
+#: ../meld/meldwindow.py:169
+msgid "_Toolbar"
+msgstr "Ð?Ð¸Ð½Ð¸Ñ?Ð° _Ð°Ð»Ð°Ñ?Ð°"
+
+#: ../meld/meldwindow.py:169
+msgid "Show or hide the toolbar"
+msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¸Ð»Ð¸ Ñ?ÐºÑ?Ð¸Ð²Ð° Ð»Ð¸Ð½Ð¸Ñ?Ñ? Ð°Ð»Ð°Ñ?Ð°"
+
+#: ../meld/meldwindow.py:170
+msgid "_Statusbar"
+msgstr "Ð?Ð¸Ð½Ð¸Ñ?Ð° _Ñ?Ñ?Ð°Ñ?Ð°"
+
+#: ../meld/meldwindow.py:170
+msgid "Show or hide the statusbar"
+msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð¸Ð»Ð¸ Ñ?ÐºÑ?Ð¸Ð²Ð° Ð»Ð¸Ð½Ð¸Ñ?Ñ? Ñ?Ñ?Ð°Ñ?Ð°"
+
+#: ../meld/meldwindow.py:534
+msgid "Switch to this tab"
+msgstr "Ð?Ñ?ÐµÐ±Ð°Ñ?Ñ?Ñ?Ðµ Ñ?Ðµ Ð½Ð° Ð¾Ð²Ð°Ñ? Ñ?ÐµÐ·Ð¸Ñ?Ð°Ðº"
+
+#. exit at first non found directory + file
+#: ../meld/meldwindow.py:625
+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
 msgid "[None]"
@@ -919,53 +1207,53 @@ 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:232
+#: ../meld/preferences.py:233
 msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 msgstr "Ð ÐµÐ·ÐµÑ?Ð²Ð½Ðµ ÐºÐ¾Ð¿Ð¸Ñ?Ðµ\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:234
+#: ../meld/preferences.py:235
 #, python-format
 msgid "Version Control\t1\t%s\n"
 msgstr "Ð?Ð¾Ð½Ñ?Ñ?Ð¾Ð»Ð° Ð²ÐµÑ?Ð·Ð¸Ñ?Ð°\t1\t%s\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:236
+#: ../meld/preferences.py:237
 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"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:238
+#: ../meld/preferences.py:239
 msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
 msgstr "Ð?ÐµÐ´Ð¸Ñ?Ð°\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:240
+#: ../meld/preferences.py:241
 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:242
+#: ../meld/preferences.py:243
 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:244
+#: ../meld/preferences.py:245
 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:246
+#: ../meld/preferences.py:247
 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:248
+#: ../meld/preferences.py:249
 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:250
+#: ../meld/preferences.py:251
 msgid "Script comment\t0\t#.*"
 msgstr "Ð?Ð¾Ð¼ÐµÐ½Ñ?Ð°Ñ? Ñ?ÐºÑ?Ð¸Ð¿Ñ?Ðµ\t0\t#.*"
 
@@ -986,10 +1274,6 @@ msgid "Update"
 msgstr "Ð?Ð¾Ð¿Ñ?Ð½Ð¸"
 
 #: ../meld/vcview.py:122
-msgid "_Add"
-msgstr "_Ð?Ð¾Ð´Ð°Ñ?"
-
-#: ../meld/vcview.py:122
 msgid "Add to VC"
 msgstr "Ð?Ð¾Ð´Ð°Ñ? Ñ? Ð¦Ð?"
 
@@ -1002,10 +1286,6 @@ msgid "Add binary to VC"
 msgstr "Ð?Ð¾Ð´Ð°Ñ? Ð±Ð¸Ð½Ð°Ñ?Ð½Ð¾ Ñ? Ð¦Ð?"
 
 #: ../meld/vcview.py:124
-msgid "_Remove"
-msgstr "Ð£_ÐºÐ»Ð¾Ð½Ð¸"
-
-#: ../meld/vcview.py:124
 msgid "Remove from VC"
 msgstr "Ð£ÐºÐ»Ð¾Ð½Ð¸ Ð¸Ð· Ð¦Ð?"
 
@@ -1061,77 +1341,73 @@ msgstr "Ð?Ð°Ð½ÐµÐ¼Ð°Ñ?ÐµÐ½"
 msgid "Show ignored files"
 msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð·Ð°Ð½ÐµÐ¼Ð°Ñ?ÐµÐ½Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
 
-#: ../meld/vcview.py:156
-msgid "Name"
-msgstr "Ð?Ð¼Ðµ"
-
-#: ../meld/vcview.py:176 ../meld/vcview.py:300
+#: ../meld/vcview.py:177 ../meld/vcview.py:301
 msgid "Location"
 msgstr "Ð?Ñ?Ñ?Ð°Ñ?Ð°"
 
-#: ../meld/vcview.py:177
+#: ../meld/vcview.py:178
 msgid "Status"
 msgstr "Ð¡Ñ?Ð°Ñ?Ðµ"
 
-#: ../meld/vcview.py:178
+#: ../meld/vcview.py:179
 msgid "Rev"
 msgstr "Ð?Ð·Ð´"
 
-#: ../meld/vcview.py:180
+#: ../meld/vcview.py:181
 msgid "Options"
 msgstr "Ð?Ð¿Ñ?Ð¸Ñ?Ðµ"
 
-#: ../meld/vcview.py:232
+#: ../meld/vcview.py:233
 msgid "Choose one Version Control"
 msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð?Ð¾Ð½Ñ?Ñ?Ð¾Ð»Ñ? Ð²ÐµÑ?Ð·Ð¸Ñ?Ðµ"
 
-#: ../meld/vcview.py:233
+#: ../meld/vcview.py:234
 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:246
+#: ../meld/vcview.py:247
 #, 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:250
+#: ../meld/vcview.py:251
 msgid "Invalid Repository"
 msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ñ?ÐºÐ»Ð°Ð´Ð¸Ñ?Ñ?Ðµ"
 
-#: ../meld/vcview.py:259
+#: ../meld/vcview.py:260
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:300
+#: ../meld/vcview.py:301
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:348
+#: ../meld/vcview.py:349
 msgid "(Empty)"
 msgstr "(Ð?Ñ?Ð°Ð·Ð½Ð¾)"
 
-#: ../meld/vcview.py:386
+#: ../meld/vcview.py:387
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] Ð?Ñ?Ð¸Ð±Ð°Ð²Ñ?Ð°Ð¼ Ñ?Ð°Ð·Ð»Ð¸ÐºÐµ"
 
-#: ../meld/vcview.py:394
+#: ../meld/vcview.py:395
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] Ð?Ñ?Ð¸Ð¼ÐµÑ?Ñ?Ñ?ÐµÐ¼ Ð·Ð°ÐºÑ?Ð¿Ñ?"
 
-#: ../meld/vcview.py:479
+#: ../meld/vcview.py:480
 msgid "Select some files first."
 msgstr "Ð?Ñ?Ð²Ð¾ Ð¸Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð½ÐµÐºÐµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ."
 
-#: ../meld/vcview.py:552
+#: ../meld/vcview.py:553
 #, python-format
 msgid ""
 "\n"
@@ -1168,11 +1444,11 @@ msgstr ""
 "                    \n"
 "                    Ð?Ð¾Ñ?Ð¸ Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ðµ:\n"
 "                    \n"
-"                    - Ð²ÐµÑ?Ð·Ð¸Ñ?Ð° Ð¼ÐµÐ»Ð´Ð°: â??%sâ??\n"
-"                    - Ð²Ñ?Ñ?Ñ?Ñ? Ñ?Ð¾Ñ?Ñ?Ð²ÐµÑ?Ð° ÐºÐ¾Ð½Ñ?Ñ?Ð¾Ð»Ðµ Ð¸Ð·Ð²Ð¾Ñ?Ð°: â??%sâ??\n"
-"                    - Ð²ÐµÑ?Ð·Ð¸Ñ?Ñ? Ñ?Ð¾Ñ?Ñ?Ð²ÐµÑ?Ð° ÐºÐ¾Ð½Ñ?Ñ?Ð¾Ð»Ðµ Ð¸Ð·Ð²Ð¾Ñ?Ð°: â??X.Y.Zâ??\n"
-"                    - Ð¸Ñ?Ð¿Ð¸Ñ? â??%s Ð½ÐµÐºÐ°Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°.txtâ??\n"
-"                    - Ð½Ð°Ñ?ÐµÐ´Ð±Ñ? Ð·Ð° Ð¿Ð°Ñ?: â??%sâ??\n"
+"                    â?? Ð²ÐµÑ?Ð·Ð¸Ñ?Ð° Ð¼ÐµÐ»Ð´Ð°: â??%sâ??\n"
+"                    â?? Ð²Ñ?Ñ?Ñ?Ð° Ñ?Ð¾Ñ?Ñ?Ð²ÐµÑ?Ð° ÐºÐ¾Ð½Ñ?Ñ?Ð¾Ð»Ðµ Ð¸Ð·Ð²Ð¾Ñ?Ð°: â??%sâ??\n"
+"                    â?? Ð²ÐµÑ?Ð·Ð¸Ñ?Ð° Ñ?Ð¾Ñ?Ñ?Ð²ÐµÑ?Ð° ÐºÐ¾Ð½Ñ?Ñ?Ð¾Ð»Ðµ Ð¸Ð·Ð²Ð¾Ñ?Ð°: â??X.Y.Zâ??\n"
+"                    â?? Ð¸Ñ?Ð¿Ð¸Ñ? â??%s Ð½ÐµÐºÐ°Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°.txtâ??\n"
+"                    â?? Ð½Ð°Ñ?ÐµÐ´Ð±Ð° Ð·Ð° Ð¿Ð°Ñ?: â??%sâ??\n"
 "                    (Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð¾ Ñ?Ñ?Ð²Ð°Ñ?Ð½Ð¾ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ðµ, Ñ?Ð°Ð¼Ð¾\n"
 "                    Ð¾Ð±ÐµÐ·Ð±ÐµÐ´Ð¸Ñ?Ðµ Ð»Ð¸Ð½Ð¸Ñ?Ñ? Ð½Ð°Ñ?ÐµÐ´Ð±Ðµ) \n"
 "                    \n"
@@ -1180,7 +1456,7 @@ msgstr ""
 "                    Ñ?Ð¾Ñ?Ñ?Ð²ÐµÑ?Ð° ÐºÐ¾Ð½Ñ?Ñ?Ð¾Ð»Ðµ Ð¸Ð·Ð²Ð¾Ñ?Ð° ÐºÐ¾Ñ?Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ.\n"
 "                    "
 
-#: ../meld/ui/findbar.py:120
+#: ../meld/ui/findbar.py:127
 #, python-format
 msgid ""
 "Regular expression error\n"
@@ -1359,9 +1635,6 @@ msgstr ""
 #~ "â??%sâ?? Ð½Ðµ Ð¿Ñ?ÐµÐ´Ñ?Ñ?Ð°Ð²Ñ?Ð° Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼ Ð½Ð¸ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?, Ð½Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ð¼ CVS "
 #~ "Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
 
-#~ msgid "Cannot compare a mixture of files and directories.\n"
-#~ msgstr "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð¿Ð¾Ñ?ÐµÐ´Ð¸Ð¼ Ð¼ÐµÑ?Ð°Ð²Ð¸Ð½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð¸ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð°.\n"
-
 #~ msgid "folder"
 #~ msgstr "Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼"
 
@@ -1380,9 +1653,6 @@ msgstr ""
 #~ msgid "_Diff"
 #~ msgstr "_Ð Ð°Ð·Ð»Ð¸ÐºÐµ"
 
-#~ msgid "_Edit"
-#~ msgstr "_Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ðµ"
-
 #~ msgid "Copy All _Left"
 #~ msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ñ?Ð²Ðµ _Ð»ÐµÐ²Ð¾"
 
@@ -1535,9 +1805,6 @@ msgstr ""
 #~ msgid "Quiet mode (-q)"
 #~ msgstr "Ð¢Ð¸Ñ?Ð¸ Ñ?ÐµÐ¶Ð¸Ð¼ (-q)"
 
-#~ msgid "Report _Bug"
-#~ msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð¸ _Ð³Ñ?ÐµÑ?ÐºÑ?"
-
 #~ msgid "Save File 1"
 #~ msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? 1. Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
 
@@ -1593,15 +1860,9 @@ msgstr ""
 #~ msgid "_Binary Files"
 #~ msgstr "_Ð?Ð¸Ð½Ð°Ñ?Ð½Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
 
-#~ msgid "_Contents"
-#~ msgstr "_Ð¡Ð°Ð´Ñ?Ð¶Ð°Ñ?"
-
 #~ msgid "_Logo"
 #~ msgstr "_Ð?Ð¾Ð³Ð¾Ñ?Ð¸Ð¿"
 
-#~ msgid "_New..."
-#~ msgstr "_Ð?Ð¾Ð²Ð¸..."
-
 #~ msgid "_Save"
 #~ msgstr "_Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ?"
 
@@ -1616,6 +1877,3 @@ msgstr ""
 
 #~ msgid "Recurse"
 #~ msgstr "Ð ÐµÐºÑ?Ñ?Ð·Ð¸Ð²Ð½Ð¾"
-
-#~ msgid "_View"
-#~ msgstr "Ð?_Ñ?ÐµÐ³Ð»ÐµÐ´"
diff --git a/po/sr latin po b/po/sr latin po
index 9aecf71..a04188e 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -1,25 +1,24 @@
 # Serbian translation of meld
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2003, 2004.
-#
 # This file is distributed under the same license as the meld package.
-#
 # Maintainer: Danilo Å egan <dsegan gmx net>
-# Miroslav NikoliÄ? <miroslavnikolic rocketmail com>, 15.02.2011.
-#
+# Miroslav NikoliÄ? <miroslavnikolic rocketmail com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=meld&component=general\n"
-"POT-Creation-Date: 2011-03-01 16:01+0000\n"
-"PO-Revision-Date: 2011-02-15 16:18+0100\n"
+"product=meld&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-05-07 22:45+0000\n"
+"PO-Revision-Date: 2011-05-15 18:32+0200\n"
 "Last-Translator: Miroslav NikoliÄ? <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: Serbian (sr)\n"
 "Plural-Forms: nplurals=4;    plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n"
 "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\\n\n"
+"X-Generator: Virtaal 0.5.2\n"
 
 #: ../bin/meld:96
 msgid "Cannot import: "
@@ -46,6 +45,54 @@ msgstr "Meld"
 msgid "Meld Diff Viewer"
 msgstr "PregledaÄ? razlika Meld"
 
+#: ../data/ui/EditableList.ui.h:1
+msgid "Active"
+msgstr "Aktivan"
+
+#: ../data/ui/EditableList.ui.h:2
+msgid "Add new filter"
+msgstr "Dodajte novi filter"
+
+#: ../data/ui/EditableList.ui.h:3
+msgid "Editable List"
+msgstr "Spisak za ureÄ?ivanje"
+
+#: ../data/ui/EditableList.ui.h:4
+msgid "Move _Down"
+msgstr "Premesti _dole"
+
+#: ../data/ui/EditableList.ui.h:5
+msgid "Move _Up"
+msgstr "Premesti _gore"
+
+#: ../data/ui/EditableList.ui.h:6
+msgid "Move item down"
+msgstr "PremeÅ¡ta stavku nadole"
+
+#: ../data/ui/EditableList.ui.h:7
+msgid "Move item up"
+msgstr "PremeÅ¡ta stavku nagore"
+
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:157
+msgid "Name"
+msgstr "Ime"
+
+#: ../data/ui/EditableList.ui.h:9
+msgid "Pattern"
+msgstr "Obrazac"
+
+#: ../data/ui/EditableList.ui.h:10
+msgid "Remove selected filter"
+msgstr "Uklanja izabrani filter"
+
+#: ../data/ui/EditableList.ui.h:11 ../meld/vcview.py:122
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: ../data/ui/EditableList.ui.h:12 ../meld/vcview.py:124
+msgid "_Remove"
+msgstr "U_kloni"
+
 #: ../data/ui/filediff.ui.h:1
 msgid "Save modified files?"
 msgstr "Da saÄ?uvam izmenjene datoteke?"
@@ -94,7 +141,7 @@ msgstr "Sle_deÄ?e"
 msgid "_Previous"
 msgstr "Pre_thodno"
 
-#: ../data/ui/findbar.ui.h:8
+#: ../data/ui/findbar.ui.h:8 ../meld/meldwindow.py:141
 msgid "_Replace"
 msgstr "_Zameni"
 
@@ -332,7 +379,7 @@ msgstr "Poruka dnevnika"
 msgid "Previous Logs"
 msgstr "Prethodni dnevnici"
 
-#: ../data/ui/vcview.ui.h:8 ../meld/vcview.py:179
+#: ../data/ui/vcview.ui.h:8 ../meld/vcview.py:180
 msgid "Tag"
 msgstr "Oznaka"
 
@@ -340,121 +387,121 @@ msgstr "Oznaka"
 msgid "VC Log"
 msgstr "CV dnevnik"
 
-#: ../meld/dirdiff.py:215 ../meld/vcview.py:118
+#: ../meld/dirdiff.py:227 ../meld/vcview.py:118
 msgid "_Compare"
 msgstr "_Uporedi"
 
-#: ../meld/dirdiff.py:215 ../meld/vcview.py:118
+#: ../meld/dirdiff.py:227 ../meld/vcview.py:118
 msgid "Compare selected"
 msgstr "Uporedi izabrano"
 
-#: ../meld/dirdiff.py:216
+#: ../meld/dirdiff.py:228
 msgid "Copy _Left"
 msgstr "UmnoÅ¾i _levo"
 
-#: ../meld/dirdiff.py:216
+#: ../meld/dirdiff.py:228
 msgid "Copy to left"
 msgstr "UmnoÅ¾ite levo"
 
-#: ../meld/dirdiff.py:217
+#: ../meld/dirdiff.py:229
 msgid "Copy _Right"
 msgstr "UmnoÅ¾i _desno"
 
-#: ../meld/dirdiff.py:217
+#: ../meld/dirdiff.py:229
 msgid "Copy to right"
 msgstr "UmnoÅ¾ite desno"
 
-#: ../meld/dirdiff.py:218
+#: ../meld/dirdiff.py:230
 msgid "Delete selected"
 msgstr "ObriÅ¡i izabrano"
 
-#: ../meld/dirdiff.py:219 ../meld/filediff.py:998
+#: ../meld/dirdiff.py:231 ../meld/filediff.py:1017
 msgid "Hide"
 msgstr "Sakrij"
 
-#: ../meld/dirdiff.py:219
+#: ../meld/dirdiff.py:231
 msgid "Hide selected"
 msgstr "Sakrij izabrano"
 
-#: ../meld/dirdiff.py:221 ../meld/filediff.py:264 ../meld/vcview.py:119
+#: ../meld/dirdiff.py:233 ../meld/filediff.py:267 ../meld/vcview.py:119
 msgid "Open selected"
 msgstr "Otvori izabrano"
 
-#: ../meld/dirdiff.py:225
+#: ../meld/dirdiff.py:237
 msgid "Case"
 msgstr "VeliÄ?ina slova"
 
-#: ../meld/dirdiff.py:225
+#: ../meld/dirdiff.py:237
 msgid "Ignore case of entries"
 msgstr "Zanemari veliÄ?inu slova unosa"
 
-#: ../meld/dirdiff.py:226
+#: ../meld/dirdiff.py:238
 msgid "Same"
 msgstr "Isto"
 
-#: ../meld/dirdiff.py:226
+#: ../meld/dirdiff.py:238
 msgid "Show identical"
 msgstr "PrikaÅ¾i istovetne"
 
-#: ../meld/dirdiff.py:227
+#: ../meld/dirdiff.py:239
 msgid "New"
 msgstr "Novi"
 
-#: ../meld/dirdiff.py:227
+#: ../meld/dirdiff.py:239
 msgid "Show new"
 msgstr "PrikaÅ¾i nove"
 
-#: ../meld/dirdiff.py:228
+#: ../meld/dirdiff.py:240
 msgid "Modified"
 msgstr "Izmenjeni"
 
-#: ../meld/dirdiff.py:228 ../meld/vcview.py:132
+#: ../meld/dirdiff.py:240 ../meld/vcview.py:132
 msgid "Show modified"
 msgstr "PrikaÅ¾i izmenjene"
 
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:242
 msgid "Filters"
 msgstr "Filteri"
 
-#: ../meld/dirdiff.py:230
+#: ../meld/dirdiff.py:242
 msgid "Set active filters"
 msgstr "Podesite aktivne filtere"
 
-#: ../meld/dirdiff.py:347
+#: ../meld/dirdiff.py:359
 #, python-format
 msgid "Hide %s"
 msgstr "Sakrij â??%sâ??"
 
-#: ../meld/dirdiff.py:449 ../meld/dirdiff.py:462 ../meld/vcview.py:304
-#: ../meld/vcview.py:332
+#: ../meld/dirdiff.py:462 ../meld/dirdiff.py:475 ../meld/vcview.py:305
+#: ../meld/vcview.py:333
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] pregledam â??%sâ??"
 
-#: ../meld/dirdiff.py:561
+#: ../meld/dirdiff.py:574
 #, python-format
 msgid "[%s] Done"
 msgstr "[%s] Gotovo"
 
-#: ../meld/dirdiff.py:565
+#: ../meld/dirdiff.py:578
 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:566
+#: ../meld/dirdiff.py:579
 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:568
+#: ../meld/dirdiff.py:581
 msgid "Some files were in an incorrect encoding. The names are something like:"
 msgstr "Neke datoteke bejahu u neispravnom kodiranju. Imena su neÅ¡to kao:"
 
-#: ../meld/dirdiff.py:570
+#: ../meld/dirdiff.py:583
 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:572
+#: ../meld/dirdiff.py:585
 msgid ""
 "You are running a case insensitive comparison on a case sensitive "
 "filesystem. The following files in this folder are hidden:"
@@ -462,16 +509,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:583
+#: ../meld/dirdiff.py:596
 #, python-format
 msgid "'%s' hidden by '%s'"
 msgstr "â??%sâ?? sakriveno od strane â??%sâ??"
 
-#: ../meld/dirdiff.py:608 ../meld/filediff.py:875 ../meld/filediff.py:1002
+#: ../meld/dirdiff.py:621 ../meld/filediff.py:882 ../meld/filediff.py:1021
 msgid "Hi_de"
 msgstr "_Sakrij"
 
-#: ../meld/dirdiff.py:658
+#: ../meld/dirdiff.py:671
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -480,7 +527,7 @@ msgstr ""
 "â??%sâ?? postoji.\n"
 "Da presnimim?"
 
-#: ../meld/dirdiff.py:665
+#: ../meld/dirdiff.py:678
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -491,7 +538,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:683 ../meld/vcview.py:504
+#: ../meld/dirdiff.py:696 ../meld/vcview.py:505
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
@@ -500,7 +547,7 @@ msgstr ""
 "â??%sâ?? je direktorijum.\n"
 "Da uklonim rekurzivno?"
 
-#: ../meld/dirdiff.py:690 ../meld/vcview.py:509
+#: ../meld/dirdiff.py:703 ../meld/vcview.py:510
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -511,7 +558,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/dirdiff.py:702
+#: ../meld/dirdiff.py:715
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -520,7 +567,7 @@ msgstr[1] "%i sekunde"
 msgstr[2] "%i sekundi"
 msgstr[3] "%i sekunda"
 
-#: ../meld/dirdiff.py:703
+#: ../meld/dirdiff.py:716
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -529,7 +576,7 @@ msgstr[1] "%i minuta"
 msgstr[2] "%i minuta"
 msgstr[3] "%i minut"
 
-#: ../meld/dirdiff.py:704
+#: ../meld/dirdiff.py:717
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -538,7 +585,7 @@ msgstr[1] "%i sata"
 msgstr[2] "%i sati"
 msgstr[3] "%i sat"
 
-#: ../meld/dirdiff.py:705
+#: ../meld/dirdiff.py:718
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -547,7 +594,7 @@ msgstr[1] "%i dana"
 msgstr[2] "%i dana"
 msgstr[3] "%i dan"
 
-#: ../meld/dirdiff.py:706
+#: ../meld/dirdiff.py:719
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -556,7 +603,7 @@ msgstr[1] "%i nedelje"
 msgstr[2] "%i nedelja"
 msgstr[3] "%i nedelja"
 
-#: ../meld/dirdiff.py:707
+#: ../meld/dirdiff.py:720
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -565,7 +612,7 @@ msgstr[1] "%i meseca"
 msgstr[2] "%i meseci"
 msgstr[3] "%i mesec"
 
-#: ../meld/dirdiff.py:708
+#: ../meld/dirdiff.py:721
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -574,151 +621,151 @@ msgstr[1] "%i godine"
 msgstr[2] "%i godina"
 msgstr[3] "%i godina"
 
-#: ../meld/filediff.py:265
+#: ../meld/filediff.py:268
 msgid "Format as patch..."
 msgstr "Formatiraj kao ispravku..."
 
-#: ../meld/filediff.py:265
+#: ../meld/filediff.py:268
 msgid "Create a patch using differences between files"
 msgstr "Pravi ispravku koristeÄ?i razlike izmeÄ?u datoteka"
 
-#: ../meld/filediff.py:266
+#: ../meld/filediff.py:269
 msgid "Previous conflict"
 msgstr "Prethodni sukob"
 
-#: ../meld/filediff.py:266
+#: ../meld/filediff.py:269
 msgid "Go to the previous conflict"
 msgstr "Ide na prethodni sukob"
 
-#: ../meld/filediff.py:267
+#: ../meld/filediff.py:270
 msgid "Next conflict"
 msgstr "SledeÄ?i sukob"
 
-#: ../meld/filediff.py:267
+#: ../meld/filediff.py:270
 msgid "Go to the next conflict"
 msgstr "Ide na sledeÄ?i sukob"
 
-#: ../meld/filediff.py:268
+#: ../meld/filediff.py:271
 msgid "Push to left"
 msgstr "Gurni ulevo"
 
-#: ../meld/filediff.py:268
+#: ../meld/filediff.py:271
 msgid "Push current change to the left"
 msgstr "Gura tekuÄ?u izmenu ulevo"
 
-#: ../meld/filediff.py:269
+#: ../meld/filediff.py:272
 msgid "Push to right"
 msgstr "Gurni udesno"
 
-#: ../meld/filediff.py:269
+#: ../meld/filediff.py:272
 msgid "Push current change to the right"
 msgstr "Gura tekuÄ?u izmenu udesno"
 
 #. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
-#: ../meld/filediff.py:271
+#: ../meld/filediff.py:274
 msgid "Pull from left"
 msgstr "Ubaci s leva"
 
-#: ../meld/filediff.py:271
+#: ../meld/filediff.py:274
 msgid "Pull change from the left"
 msgstr "Ubacuje izmenu s leva"
 
-#: ../meld/filediff.py:272
+#: ../meld/filediff.py:275
 msgid "Pull from right"
 msgstr "Ubaci s desna"
 
-#: ../meld/filediff.py:272
+#: ../meld/filediff.py:275
 msgid "Pull change from the right"
 msgstr "Ubacuje izmenu s leva"
 
-#: ../meld/filediff.py:273
+#: ../meld/filediff.py:276
 msgid "Copy above left"
 msgstr "UmnoÅ¾i iznad ulevo"
 
-#: ../meld/filediff.py:273
+#: ../meld/filediff.py:276
 msgid "Copy change above the left chunk"
 msgstr "UmnoÅ¾ava izmenu iznad komada ulevo"
 
-#: ../meld/filediff.py:274
+#: ../meld/filediff.py:277
 msgid "Copy below left"
 msgstr "UmnoÅ¾i ispod ulevo"
 
-#: ../meld/filediff.py:274
+#: ../meld/filediff.py:277
 msgid "Copy change below the left chunk"
 msgstr "UmnoÅ¾ava izmenu ispod komada ulevo"
 
-#: ../meld/filediff.py:275
+#: ../meld/filediff.py:278
 msgid "Copy above right"
 msgstr "UmnoÅ¾i iznad udesno"
 
-#: ../meld/filediff.py:275
+#: ../meld/filediff.py:278
 msgid "Copy change above the right chunk"
 msgstr "UmnoÅ¾ava izmenu iznad komada ulevo"
 
-#: ../meld/filediff.py:276
+#: ../meld/filediff.py:279
 msgid "Copy below right"
 msgstr "UmnoÅ¾i ispod udesno"
 
-#: ../meld/filediff.py:276
+#: ../meld/filediff.py:279
 msgid "Copy change below the right chunk"
 msgstr "UmnoÅ¾ava izmenu ispod komada udesno"
 
-#: ../meld/filediff.py:277
+#: ../meld/filediff.py:280
 msgid "Delete"
 msgstr "ObriÅ¡i"
 
-#: ../meld/filediff.py:277
+#: ../meld/filediff.py:280
 msgid "Delete change"
 msgstr "BriÅ¡e izmenu"
 
-#: ../meld/filediff.py:278
+#: ../meld/filediff.py:281
 msgid "Merge all changes from left"
 msgstr "Objedini sve izmene s leva"
 
-#: ../meld/filediff.py:278
+#: ../meld/filediff.py:281
 msgid "Merge all non-conflicting changes from the left"
 msgstr "Objedinjuje sve nesukobljavajuÄ?e izmene s leva"
 
-#: ../meld/filediff.py:279
+#: ../meld/filediff.py:282
 msgid "Merge all changes from right"
 msgstr "Objedini sve izmene s desna"
 
-#: ../meld/filediff.py:279
+#: ../meld/filediff.py:282
 msgid "Merge all non-conflicting changes from the right"
 msgstr "Objedinjuje sve nesukobljavajuÄ?e izmene s desna"
 
-#: ../meld/filediff.py:280
+#: ../meld/filediff.py:283
 msgid "Merge all non-conflicting"
 msgstr "Objedini sve nesukobljavajuÄ?e"
 
-#: ../meld/filediff.py:280
+#: ../meld/filediff.py:283
 msgid "Merge all non-conflicting changes from left and right panes"
 msgstr "Objedinjuje sve nesukobljavajuÄ?e izmene s leve i desne povrÅ¡i"
 
-#: ../meld/filediff.py:284
+#: ../meld/filediff.py:287
 msgid "Lock scrolling"
 msgstr "ZakljuÄ?aj klizanje"
 
-#: ../meld/filediff.py:285
+#: ../meld/filediff.py:288
 msgid "Lock scrolling of all panes"
 msgstr "ZakljuÄ?ava klizanje svih povrÅ¡i"
 
 #. Abbreviations for insert and overwrite that fit in the status bar
-#: ../meld/filediff.py:365
+#: ../meld/filediff.py:380
 msgid "INS"
 msgstr "UMT"
 
-#: ../meld/filediff.py:365
+#: ../meld/filediff.py:380
 msgid "OVR"
 msgstr "PRP"
 
 #. Abbreviation for line, column so that it will fit in the status bar
-#: ../meld/filediff.py:367
+#: ../meld/filediff.py:382
 #, python-format
 msgid "Ln %i, Col %i"
 msgstr "Red %i, mesto %i"
 
-#: ../meld/filediff.py:570
+#: ../meld/filediff.py:594
 #, python-format
 msgid ""
 "Filter '%s' changed the number of lines in the file. Comparison will be "
@@ -728,50 +775,62 @@ msgstr ""
 "viÅ¡e detalja pogledajte priruÄ?nik za korisnike."
 
 #. TRANSLATORS: this is the name of a new file which has not yet been saved
-#: ../meld/filediff.py:673
+#: ../meld/filediff.py:681
 msgid "<unnamed>"
 msgstr "<neimenovan>"
 
-#: ../meld/filediff.py:863
+#: ../meld/filediff.py:870
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Postavi broj ploÄ?a"
 
-#: ../meld/filediff.py:869
+#: ../meld/filediff.py:876
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Otvaram datoteke"
 
-#: ../meld/filediff.py:893 ../meld/filediff.py:902 ../meld/filediff.py:914
-#: ../meld/filediff.py:920
+#: ../meld/filediff.py:900 ../meld/filediff.py:909 ../meld/filediff.py:921
+#: ../meld/filediff.py:927
 msgid "Could not read file"
 msgstr "Ne mogu da proÄ?itam datoteku"
 
-#: ../meld/filediff.py:894
+#: ../meld/filediff.py:901
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Ä?itam datoteke"
 
-#: ../meld/filediff.py:903
+#: ../meld/filediff.py:910
 #, python-format
 msgid "%s appears to be a binary file."
 msgstr "â??%sâ?? izgleda da je izvrÅ¡na datoteka."
 
-#: ../meld/filediff.py:915
+#: ../meld/filediff.py:922
 #, python-format
 msgid "%s is not in encodings: %s"
 msgstr "â??%sâ?? nije u kodiranjima: â??%sâ??"
 
-#: ../meld/filediff.py:945 ../meld/filemerge.py:67
+#: ../meld/filediff.py:952 ../meld/filemerge.py:67
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] SraÄ?unavam razlike"
 
-#: ../meld/filediff.py:996
+#: ../meld/filediff.py:1008
+msgid ""
+"Text filters are being used, and may be masking differences between files. "
+"Would you like to compare the unfiltered files?"
+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:1014
 msgid "Files are identical"
 msgstr "Datoteke su istovetne"
 
-#: ../meld/filediff.py:1150
+#: ../meld/filediff.py:1024
+msgid "Show without filters"
+msgstr "Prikazuje bez filtera"
+
+#: ../meld/filediff.py:1178
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -780,7 +839,7 @@ msgstr ""
 "â??%sâ?? postoji!\n"
 "Da presnimim?"
 
-#: ../meld/filediff.py:1163
+#: ../meld/filediff.py:1191
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -791,12 +850,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../meld/filediff.py:1172
+#: ../meld/filediff.py:1200
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "Izaberite ime za %i. bafer."
 
-#: ../meld/filediff.py:1187
+#: ../meld/filediff.py:1215
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -807,7 +866,7 @@ msgstr ""
 "\n"
 "Koji oblik Å¾elite da koristite?"
 
-#: ../meld/filediff.py:1203
+#: ../meld/filediff.py:1231
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -816,7 +875,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:1262
+#: ../meld/filediff.py:1290
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -879,16 +938,20 @@ msgstr "PodeÅ¡ava oznaku za koriÅ¡Ä?enje umesto imena datoteke"
 msgid "Automatically compare all differing files on startup"
 msgstr "Automatski poredi sve razlikujuÄ?e datoteke prilikom pokretanja"
 
-#: ../meld/meldapp.py:171
+#: ../meld/meldapp.py:170
+msgid "Ignored for compatibility"
+msgstr "Zanemareno zbog kompatibilnosti"
+
+#: ../meld/meldapp.py:173
 msgid "Set the target file for saving a merge result"
 msgstr "PodeÅ¡ava ciljnu datoteku za Ä?uvanje rezultata stapanja"
 
-#: ../meld/meldapp.py:174
+#: ../meld/meldapp.py:176
 msgid "Creates a diff tab for up to 3 supplied files or directories."
 msgstr ""
 "Pravi jeziÄ?ak razlika za najviÅ¡e do 3 pridodate datoteke ili direktorijuma."
 
-#: ../meld/meldapp.py:177
+#: ../meld/meldapp.py:179
 #, python-format
 msgid "too many arguments (wanted 0-4, got %d)"
 msgstr "previÅ¡e argumenata (traÅ¾eno je 0-4, dobih %d)"
@@ -897,6 +960,231 @@ msgstr "previÅ¡e argumenata (traÅ¾eno je 0-4, dobih %d)"
 msgid "untitled"
 msgstr "bezimeni"
 
+#: ../meld/meldwindow.py:125
+msgid "_File"
+msgstr "_Datoteka"
+
+#: ../meld/meldwindow.py:126
+msgid "_New..."
+msgstr "_Novi..."
+
+#: ../meld/meldwindow.py:126
+msgid "Start a new comparison"
+msgstr "ZapoÄ?inje novo poreÄ?enje"
+
+#: ../meld/meldwindow.py:127
+msgid "Save the current file"
+msgstr "Ä?uva trenutnu datoteku"
+
+#: ../meld/meldwindow.py:129
+msgid "Close the current file"
+msgstr "Zatvara trenutnu datoteku"
+
+#: ../meld/meldwindow.py:130
+msgid "Quit the program"
+msgstr "Zatvara program"
+
+#: ../meld/meldwindow.py:132
+msgid "_Edit"
+msgstr "_UreÄ?ivanje"
+
+#: ../meld/meldwindow.py:133
+msgid "Undo the last action"
+msgstr "Opoziva poslednju radnju"
+
+#: ../meld/meldwindow.py:134
+msgid "Redo the last undone action"
+msgstr "Ponavlja poslednju opozvanu radnju"
+
+#: ../meld/meldwindow.py:135
+msgid "Cut the selection"
+msgstr "Iseca izbor"
+
+#: ../meld/meldwindow.py:136
+msgid "Copy the selection"
+msgstr "UmnoÅ¾ava izbor"
+
+#: ../meld/meldwindow.py:137
+msgid "Paste the clipboard"
+msgstr "Ubaci ostavu"
+
+#: ../meld/meldwindow.py:138
+msgid "Search for text"
+msgstr "TraÅ¾i tekst"
+
+#: ../meld/meldwindow.py:139
+msgid "Find Ne_xt"
+msgstr "NaÄ?i s_edeÄ?e"
+
+#: ../meld/meldwindow.py:139
+msgid "Search forwards for the same text"
+msgstr "TraÅ¾i unapred isti tekst"
+
+#: ../meld/meldwindow.py:140
+msgid "Find _Previous"
+msgstr "NaÄ?i pre_thodno"
+
+#: ../meld/meldwindow.py:140
+msgid "Search backwards for the same text"
+msgstr "TraÅ¾i unazad isti tekst"
+
+#: ../meld/meldwindow.py:141
+msgid "Find and replace text"
+msgstr "Pronalazi i zamenjuje tekst"
+
+#: ../meld/meldwindow.py:142
+msgid "Prefere_nces"
+msgstr "_Postavke"
+
+#: ../meld/meldwindow.py:142
+msgid "Configure the application"
+msgstr "Podesite program"
+
+#: ../meld/meldwindow.py:144
+msgid "_Changes"
+msgstr "_Izmene"
+
+#: ../meld/meldwindow.py:145
+msgid "Next change"
+msgstr "SledeÄ?a izmena"
+
+#: ../meld/meldwindow.py:145
+msgid "Go to the next change"
+msgstr "Ide na sledeÄ?u izmenu"
+
+#: ../meld/meldwindow.py:146
+msgid "Previous change"
+msgstr "Prethodna izmena"
+
+#: ../meld/meldwindow.py:146
+msgid "Go to the previous change"
+msgstr "Ide na prethodnu izmenu"
+
+#: ../meld/meldwindow.py:148
+msgid "_View"
+msgstr "P_regled"
+
+#: ../meld/meldwindow.py:149
+msgid "File status"
+msgstr "Stanje datoteke"
+
+#: ../meld/meldwindow.py:150
+msgid "Version status"
+msgstr "Stanje izdanja"
+
+#: ../meld/meldwindow.py:151
+msgid "File filters"
+msgstr "Filteri datoteke"
+
+#: ../meld/meldwindow.py:152
+msgid "Stop the current action"
+msgstr "Zaustavlja trenutnu radnju"
+
+#: ../meld/meldwindow.py:153
+msgid "Refresh the view"
+msgstr "OsveÅ¾ava pregled"
+
+#: ../meld/meldwindow.py:154
+msgid "Reload"
+msgstr "Ponovo uÄ?itaj"
+
+#: ../meld/meldwindow.py:154
+msgid "Reload the comparison"
+msgstr "Ponovo uÄ?itava poreÄ?enje"
+
+#: ../meld/meldwindow.py:156
+msgid "_Tabs"
+msgstr "_JeziÄ?ak"
+
+#: ../meld/meldwindow.py:157
+msgid "_Previous Tab"
+msgstr "Pre_thodni jeziÄ?ak"
+
+#: ../meld/meldwindow.py:157
+msgid "Activate previous tab"
+msgstr "Aktivira prethodni jeziÄ?ak"
+
+#: ../meld/meldwindow.py:158
+msgid "_Next Tab"
+msgstr "Sle_deÄ?i jeziÄ?ak"
+
+#: ../meld/meldwindow.py:158
+msgid "Activate next tab"
+msgstr "Aktivira sledeÄ?i jeziÄ?ak"
+
+#: ../meld/meldwindow.py:159
+msgid "Move Tab _Left"
+msgstr "Premesti jeziÄ?ak u_levo"
+
+#: ../meld/meldwindow.py:159
+msgid "Move current tab to left"
+msgstr "PremeÅ¡ta trenutni jeziÄ?ak na levo"
+
+#: ../meld/meldwindow.py:160
+msgid "Move Tab _Right"
+msgstr "Premesti jeziÄ?ak u_desno"
+
+#: ../meld/meldwindow.py:160
+msgid "Move current tab to right"
+msgstr "PremeÅ¡ta trenutni jeziÄ?ak na desno"
+
+#: ../meld/meldwindow.py:162
+msgid "_Help"
+msgstr "Pomo_Ä?"
+
+#: ../meld/meldwindow.py:163
+msgid "_Contents"
+msgstr "_SadrÅ¾aj"
+
+#: ../meld/meldwindow.py:163
+msgid "Open the Meld manual"
+msgstr "Otvorite uputstvo Melda"
+
+#: ../meld/meldwindow.py:164
+msgid "Report _Bug"
+msgstr "Prijavi _greÅ¡ku"
+
+#: ../meld/meldwindow.py:164
+msgid "Report a bug in Meld"
+msgstr "Prijavite greÅ¡ku u Meldu"
+
+#: ../meld/meldwindow.py:165
+msgid "About this program"
+msgstr "O ovom programu"
+
+#: ../meld/meldwindow.py:168
+msgid "Full Screen"
+msgstr "Ceo ekran"
+
+#: ../meld/meldwindow.py:168
+msgid "View the comparison in full screen"
+msgstr "Pregledajte poreÄ?enje preko celog ekrana"
+
+#: ../meld/meldwindow.py:169
+msgid "_Toolbar"
+msgstr "Linija _alata"
+
+#: ../meld/meldwindow.py:169
+msgid "Show or hide the toolbar"
+msgstr "Prikazuje ili skriva liniju alata"
+
+#: ../meld/meldwindow.py:170
+msgid "_Statusbar"
+msgstr "Linija _stanja"
+
+#: ../meld/meldwindow.py:170
+msgid "Show or hide the statusbar"
+msgstr "Prikazuje ili skriva liniju stanja"
+
+#: ../meld/meldwindow.py:534
+msgid "Switch to this tab"
+msgstr "Prebacuje se na ovaj jeziÄ?ak"
+
+#. exit at first non found directory + file
+#: ../meld/meldwindow.py:625
+msgid "Cannot compare a mixture of files and directories.\n"
+msgstr "Ne mogu da poredim meÅ¡avinu datoteka i direktorijuma.\n"
+
 #. no common path. empty names get changed to "[None]"
 #: ../meld/misc.py:174
 msgid "[None]"
@@ -919,53 +1207,53 @@ 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:232
+#: ../meld/preferences.py:233
 msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
 msgstr "Rezervne 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:234
+#: ../meld/preferences.py:235
 #, python-format
 msgid "Version Control\t1\t%s\n"
 msgstr "Kontrola verzija\t1\t%s\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:236
+#: ../meld/preferences.py:237
 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"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:238
+#: ../meld/preferences.py:239
 msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
 msgstr "Medija\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meld/preferences.py:240
+#: ../meld/preferences.py:241
 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:242
+#: ../meld/preferences.py:243
 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:244
+#: ../meld/preferences.py:245
 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:246
+#: ../meld/preferences.py:247
 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:248
+#: ../meld/preferences.py:249
 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:250
+#: ../meld/preferences.py:251
 msgid "Script comment\t0\t#.*"
 msgstr "Komentar skripte\t0\t#.*"
 
@@ -986,10 +1274,6 @@ msgid "Update"
 msgstr "Dopuni"
 
 #: ../meld/vcview.py:122
-msgid "_Add"
-msgstr "_Dodaj"
-
-#: ../meld/vcview.py:122
 msgid "Add to VC"
 msgstr "Dodaj u CV"
 
@@ -1002,10 +1286,6 @@ msgid "Add binary to VC"
 msgstr "Dodaj binarno u CV"
 
 #: ../meld/vcview.py:124
-msgid "_Remove"
-msgstr "U_kloni"
-
-#: ../meld/vcview.py:124
 msgid "Remove from VC"
 msgstr "Ukloni iz CV"
 
@@ -1061,77 +1341,73 @@ msgstr "Zanemaren"
 msgid "Show ignored files"
 msgstr "Prikazuje zanemarene datoteke"
 
-#: ../meld/vcview.py:156
-msgid "Name"
-msgstr "Ime"
-
-#: ../meld/vcview.py:176 ../meld/vcview.py:300
+#: ../meld/vcview.py:177 ../meld/vcview.py:301
 msgid "Location"
 msgstr "Putanja"
 
-#: ../meld/vcview.py:177
+#: ../meld/vcview.py:178
 msgid "Status"
 msgstr "Stanje"
 
-#: ../meld/vcview.py:178
+#: ../meld/vcview.py:179
 msgid "Rev"
 msgstr "Izd"
 
-#: ../meld/vcview.py:180
+#: ../meld/vcview.py:181
 msgid "Options"
 msgstr "Opcije"
 
-#: ../meld/vcview.py:232
+#: ../meld/vcview.py:233
 msgid "Choose one Version Control"
 msgstr "Izaberite Kontrolu verzije"
 
-#: ../meld/vcview.py:233
+#: ../meld/vcview.py:234
 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:246
+#: ../meld/vcview.py:247
 #, 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:250
+#: ../meld/vcview.py:251
 msgid "Invalid Repository"
 msgstr "Neispravno skladiÅ¡te"
 
-#: ../meld/vcview.py:259
+#: ../meld/vcview.py:260
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. TRANSLATORS: This is the location of the directory the user is diffing
-#: ../meld/vcview.py:300
+#: ../meld/vcview.py:301
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../meld/vcview.py:348
+#: ../meld/vcview.py:349
 msgid "(Empty)"
 msgstr "(Prazno)"
 
-#: ../meld/vcview.py:386
+#: ../meld/vcview.py:387
 #, python-format
 msgid "[%s] Fetching differences"
 msgstr "[%s] Pribavljam razlike"
 
-#: ../meld/vcview.py:394
+#: ../meld/vcview.py:395
 #, python-format
 msgid "[%s] Applying patch"
 msgstr "[%s] Primenjujem zakrpu"
 
-#: ../meld/vcview.py:479
+#: ../meld/vcview.py:480
 msgid "Select some files first."
 msgstr "Prvo izaberite neke datoteke."
 
-#: ../meld/vcview.py:552
+#: ../meld/vcview.py:553
 #, python-format
 msgid ""
 "\n"
@@ -1168,11 +1444,11 @@ msgstr ""
 "                    \n"
 "                    Koji sadrÅ¾i sledeÄ?e informacije:\n"
 "                    \n"
-"                    - verzija melda: â??%sâ??\n"
-"                    - vrstu softvera kontrole izvora: â??%sâ??\n"
-"                    - verziju softvera kontrole izvora: â??X.Y.Zâ??\n"
-"                    - ispis â??%s nekadatoteka.txtâ??\n"
-"                    - naredbu za paÄ?: â??%sâ??\n"
+"                    â?? verzija melda: â??%sâ??\n"
+"                    â?? vrsta softvera kontrole izvora: â??%sâ??\n"
+"                    â?? verzija softvera kontrole izvora: â??X.Y.Zâ??\n"
+"                    â?? ispis â??%s nekadatoteka.txtâ??\n"
+"                    â?? naredba za paÄ?: â??%sâ??\n"
 "                    (nije potrebno stvarno pokretanje, samo\n"
 "                    obezbedite liniju naredbe) \n"
 "                    \n"
@@ -1180,7 +1456,7 @@ msgstr ""
 "                    softvera kontrole izvora koji koristite.\n"
 "                    "
 
-#: ../meld/ui/findbar.py:120
+#: ../meld/ui/findbar.py:127
 #, python-format
 msgid ""
 "Regular expression error\n"
@@ -1359,9 +1635,6 @@ msgstr ""
 #~ "â??%sâ?? ne predstavlja direktorijum ni datoteku, ne mogu da otvorim CVS "
 #~ "pregled"
 
-#~ msgid "Cannot compare a mixture of files and directories.\n"
-#~ msgstr "Ne mogu da poredim meÅ¡avinu datoteka i direktorijuma.\n"
-
 #~ msgid "folder"
 #~ msgstr "direktorijum"
 
@@ -1380,9 +1653,6 @@ msgstr ""
 #~ msgid "_Diff"
 #~ msgstr "_Razlike"
 
-#~ msgid "_Edit"
-#~ msgstr "_UreÄ?ivanje"
-
 #~ msgid "Copy All _Left"
 #~ msgstr "UmnoÅ¾i sve _levo"
 
@@ -1535,9 +1805,6 @@ msgstr ""
 #~ msgid "Quiet mode (-q)"
 #~ msgstr "Tihi reÅ¾im (-q)"
 
-#~ msgid "Report _Bug"
-#~ msgstr "Prijavi _greÅ¡ku"
-
 #~ msgid "Save File 1"
 #~ msgstr "SaÄ?uvaj 1. datoteku"
 
@@ -1593,15 +1860,9 @@ msgstr ""
 #~ msgid "_Binary Files"
 #~ msgstr "_Binarne datoteke"
 
-#~ msgid "_Contents"
-#~ msgstr "_SadrÅ¾aj"
-
 #~ msgid "_Logo"
 #~ msgstr "_Logotip"
 
-#~ msgid "_New..."
-#~ msgstr "_Novi..."
-
 #~ msgid "_Save"
 #~ msgstr "_SaÄ?uvaj"
 
@@ -1616,6 +1877,3 @@ msgstr ""
 
 #~ msgid "Recurse"
 #~ msgstr "Rekurzivno"
-
-#~ msgid "_View"
-#~ msgstr "P_regled"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]