[meld] Updated Serbian translation

From: Miloš Popović <mpopovic src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld] Updated Serbian translation
Date: Sat, 5 Mar 2011 13:11:44 +0000 (UTC)
commit b1c537069aaff985b3233cae13a9f09cb267ae14
Author: Miroslav NikoliÄ? <miroslavnikolic rocketmail com>
Date:   Sat Mar 5 14:12:15 2011 +0100

    Updated Serbian translation

 po/sr.po       | 2008 ++++++++++++++++++++++++++++++++++++--------------------
 po/sr latin po | 2008 ++++++++++++++++++++++++++++++++++++--------------------
 2 files changed, 2608 insertions(+), 1408 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 08a4206..4294812 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -4,152 +4,474 @@
 # This file is distributed under the same license as the meld package.
 #
 # Maintainer: Ð?Ð°Ð½Ð¸Ð»Ð¾ Ð¨ÐµÐ³Ð°Ð½ <dsegan gmx net>
+# Ð?Ð¸Ñ?Ð¾Ñ?Ð»Ð°Ð² Ð?Ð¸ÐºÐ¾Ð»Ð¸Ñ? <miroslavnikolic rocketmail com>, 15.02.2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-03 06:13+0100\n"
-"PO-Revision-Date: 2004-03-03 06:18+0100\n"
-"Last-Translator: Ð?Ð°Ð½Ð¸Ð»Ð¾ Ð¨ÐµÐ³Ð°Ð½ <danilo prevod org>\n"
-"Language-Team: Serbian (sr) <serbiangnome-lista nongnu org>\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"
+"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"
+"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"
 
-#: meld.desktop.in.h:1
-msgid "Compare and merge your files."
-msgstr "Ð?Ð¾Ñ?ÐµÐ´Ð¸Ñ?Ðµ Ð¸ Ñ?Ð¿Ð¾Ñ?Ð¸Ñ?Ðµ Ð²Ð°Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ."
+#: ../bin/meld:96
+msgid "Cannot import: "
+msgstr "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ñ?Ð²ÐµÐ·ÐµÐ¼: "
 
-#: meld.desktop.in.h:2
+#: ../bin/meld:99
+#, c-format
+msgid "Meld requires %s or higher."
+msgstr "Ð?ÐµÐ»Ð´ Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° %s Ð¸Ð»Ð¸ Ð½Ð¾Ð²Ð¸Ñ?Ð¸."
+
+#: ../data/meld.desktop.in.h:1
+msgid "Compare and merge your files"
+msgstr "Ð£Ð¿Ð¾Ñ?ÐµÑ?Ñ?Ñ?Ñ?Ðµ Ð¸ Ñ?Ð¿Ð°Ñ?Ð°Ñ?Ñ?Ðµ Ð²Ð°Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ."
+
+#: ../data/meld.desktop.in.h:2
+msgid "Diff Viewer"
+msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Ñ?Ð°Ð·Ð»Ð¸ÐºÐ°"
+
+#: ../data/meld.desktop.in.h:3 ../data/ui/meldapp.ui.h:5
+msgid "Meld"
+msgstr "Ð?ÐµÐ»Ð´"
+
+#: ../data/meld.desktop.in.h:4
 msgid "Meld Diff Viewer"
 msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? Ñ?Ð°Ð·Ð»Ð¸ÐºÐ° Ð?ÐµÐ»Ð´"
 
-#: cvsview.py:41
+#: ../data/ui/filediff.ui.h:1
+msgid "Save modified files?"
+msgstr "Ð?Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ð¼ Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ?"
+
+#: ../data/ui/filediff.ui.h:2
 msgid ""
-"Ignored:Non CVS:::Error::Newly added:Modified:<b>Conflict</b>:Removed:Missing"
+"Some files have been modified.\n"
+"Which ones would you like to save?"
 msgstr ""
-"Ð?Ð°Ð½ÐµÐ¼Ð°Ñ?ÐµÐ½:Ð?Ðµ-CVS:::Ð?Ñ?ÐµÑ?ÐºÐ°::Ð?Ñ?Ð¸Ð´Ð¾Ð´Ð°Ñ?:Ð?Ð·Ð¼ÐµÑ?ÐµÐ½:<b>Ð¡Ñ?Ð´Ð°Ñ?</b>:Ð£ÐºÐ»Ð¾Ñ?ÐµÐ½:Ð?ÐµÐ´Ð¾Ñ?Ñ?Ð°Ñ?Ðµ"
+"Ð?ÐµÐºÐµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ñ?Ñ? Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½Ðµ.\n"
+"Ð?Ð¾Ñ?Ðµ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ?"
 
-#: cvsview.py:173
-#, python-format
+#: ../data/ui/filediff.ui.h:4
+msgid "_Discard Changes"
+msgstr "_Ð?Ð´Ð±Ð°Ñ?Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ðµ"
+
+#: ../data/ui/filediff.ui.h:5
+msgid "_Save Selected"
+msgstr "_Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾"
+
+#: ../data/ui/findbar.ui.h:1
+msgid "Regular E_xpression"
+msgstr "_Ð ÐµÐ³Ñ?Ð»Ð°Ñ?Ð°Ð½ Ð¸Ð·Ñ?Ð°Ð·"
+
+#: ../data/ui/findbar.ui.h:2
+msgid "Replace _All"
+msgstr "Ð?Ð°Ð¼ÐµÐ½Ð¸ Ñ?_Ð²Ðµ"
+
+#: ../data/ui/findbar.ui.h:3
+msgid "Replace _With"
+msgstr "Ð?Ð°Ð¼ÐµÐ½Ð¸ Ñ?_Ð°"
+
+#: ../data/ui/findbar.ui.h:4
+msgid "Who_le word"
+msgstr "Ð¦Ðµ_Ð»Ñ? Ñ?ÐµÑ?"
+
+#: ../data/ui/findbar.ui.h:5
+msgid "_Match Case"
+msgstr "_Ð£Ð¿Ð¾Ñ?ÐµÐ´Ð¸ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ñ? Ñ?Ð»Ð¾Ð²Ð°"
+
+#: ../data/ui/findbar.ui.h:6
+msgid "_Next"
+msgstr "Ð¡Ð»Ðµ_Ð´ÐµÑ?Ðµ"
+
+#: ../data/ui/findbar.ui.h:7
+msgid "_Previous"
+msgstr "Ð?Ñ?Ðµ_Ñ?Ñ?Ð¾Ð´Ð½Ð¾"
+
+#: ../data/ui/findbar.ui.h:8
+msgid "_Replace"
+msgstr "_Ð?Ð°Ð¼ÐµÐ½Ð¸"
+
+#: ../data/ui/findbar.ui.h:9
+msgid "_Search for"
+msgstr "_Ð?Ð¾Ñ?Ñ?Ð°Ð¶Ð¸"
+
+#: ../data/ui/meldapp.ui.h:1
+msgid "Choose Files"
+msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
+
+#: ../data/ui/meldapp.ui.h:2
 msgid ""
-"Error converting to a regular expression\n"
-"The pattern was '%s'\n"
-"The error was '%s'"
+"Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
+"Copyright &#xA9; 2009-2010 Kai Willadsen"
 msgstr ""
-"Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ñ?ÐµÑ?Ð²Ð°Ñ?Ð°Ñ?Ñ? Ñ? Ñ?ÐµÐ³Ñ?Ð»Ð°Ñ?Ð½Ð¸ Ð¸Ð·Ñ?Ð°Ð·\n"
-"Ð?Ð±Ñ?Ð°Ð·Ð°Ñ? Ñ?Ðµ Ð±Ð¸Ð¾ â??%sâ??\n"
-"Ð?Ñ?ÐµÑ?ÐºÐ° Ñ?Ðµ Ð±Ð¸Ð»Ð° â??%sâ??"
+"Ð?Ñ?Ñ?Ð¾Ñ?Ñ?ÐºÐ° Ð¿Ñ?Ð°Ð²Ð° &#xA9; 2002-2009 Ð¡Ñ?ÐµÑ?ÐµÐ½ Ð?ÐµÐ½ÐµÐ´Ð¸\n"
+"Ð?Ñ?Ñ?Ð¾Ñ?Ñ?ÐºÐ° Ð¿Ñ?Ð°Ð²Ð° &#xA9; 2009-2010 Ð?Ð°Ñ? Ð?Ð¸Ð»Ð°Ð´Ñ?ÐµÐ½"
+
+#: ../data/ui/meldapp.ui.h:4
+msgid "Directory"
+msgstr "Ð?Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼"
+
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:7
+msgid "Mine"
+msgstr "Ð?Ð¾Ñ?Ð°"
+
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:9
+msgid "Original"
+msgstr "Ð?Ð·Ð²Ð¾Ñ?Ð½Ð°"
+
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:11
+msgid "Other"
+msgstr "Ð?Ñ?Ñ?Ð³Ð°"
+
+#: ../data/ui/meldapp.ui.h:12
+msgid "Select VC Directory"
+msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¦Ð? Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼"
+
+#: ../data/ui/meldapp.ui.h:13
+msgid "_Directory Comparison"
+msgstr "Ð?Ð¾Ñ?ÐµÑ?ÐµÑ?Ðµ Ð´Ð¸_Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð°"
+
+#: ../data/ui/meldapp.ui.h:14
+msgid "_File Comparison"
+msgstr "Ð?Ð¾Ñ?ÐµÑ?ÐµÑ?Ðµ Ð´Ð°_Ñ?Ð¾Ñ?ÐµÐºÐ°"
+
+#: ../data/ui/meldapp.ui.h:15
+msgid "_Three Way Compare"
+msgstr "Ð?Ð¾Ñ?ÐµÑ?ÐµÑ?Ðµ Ñ?Ñ?Ð¸ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ?Ð°"
+
+#: ../data/ui/meldapp.ui.h:16
+msgid "_Version Control Browser"
+msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸Ð²Ð°Ñ? ÐºÐ¾Ð½Ñ?Ñ?Ð¾Ð»Ðµ _Ð²ÐµÑ?Ð·Ð¸Ñ?Ð°"
+
+#: ../data/ui/meldapp.ui.h:17
+msgid "translator-credits"
+msgstr ""
+"Ð?Ð°Ð½Ð¸Ð»Ð¾ Ð¨ÐµÐ³Ð°Ð½ <danilo prevod org>\n"
+"\n"
+"Prevod.org â?? Ð¿Ñ?ÐµÐ²Ð¾Ð´ Ð½Ð° Ñ?Ñ?Ð¿Ñ?ÐºÐ¸ Ñ?ÐµÐ·Ð¸Ðº."
 
-#: cvsview.py:354
-msgid "Name"
-msgstr "Ð?Ð¼Ðµ"
+#: ../data/ui/patch-dialog.ui.h:1
+msgid "Copy to Clipboard"
+msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ñ? Ð¾Ñ?Ñ?Ð°Ð²Ñ?"
 
-#: cvsview.py:371
-msgid "Location"
-msgstr "Ð?Ñ?Ñ?Ð°Ñ?Ð°"
+#: ../data/ui/patch-dialog.ui.h:2
+msgid "Create Patch"
+msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð¸Ñ?Ð¿Ñ?Ð°Ð²ÐºÑ?"
 
-#: cvsview.py:372
-msgid "Status"
-msgstr "Ð¡Ñ?Ð°Ñ?Ðµ"
+#: ../data/ui/patch-dialog.ui.h:3
+msgid "Create a patch"
+msgstr "Ð?Ñ?Ð°Ð²Ð¸ Ð¸Ñ?Ð¿Ñ?Ð°Ð²ÐºÑ?"
 
-#: cvsview.py:373
-msgid "Rev"
-msgstr "Ð?Ð·Ð´"
+#: ../data/ui/patch-dialog.ui.h:4
+msgid "Left and middle panes"
+msgstr "Ð?ÐµÐ²Ð° Ð¸ Ñ?Ñ?ÐµÐ´Ñ?Ð° Ð¿Ð¾Ð²Ñ?Ñ?"
 
-#: cvsview.py:374
-msgid "Tag"
-msgstr "Ð?Ð·Ð½Ð°ÐºÐ°"
+#: ../data/ui/patch-dialog.ui.h:5
+msgid "Middle and right panes"
+msgstr "Ð¡Ñ?ÐµÐ´Ñ?Ð° Ð¸ Ð´ÐµÑ?Ð½Ð° Ð¿Ð¾Ð²Ñ?Ñ?"
 
-#: cvsview.py:375
-msgid "Options"
-msgstr "Ð?Ð¿Ñ?Ð¸Ñ?Ðµ"
+#: ../data/ui/patch-dialog.ui.h:6
+msgid "Use differences between:"
+msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ð°Ð·Ð»Ð¸ÐºÐµ Ð¸Ð·Ð¼ÐµÑ?Ñ?:"
 
-#: cvsview.py:412 dirdiff.py:356
-#, python-format
-msgid "[%s] Scanning"
-msgstr "[%s] Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ð¼"
+#: ../data/ui/patch-dialog.ui.h:7
+msgid "_Reverse patch direction"
+msgstr "Ð?Ñ?ÐµÐ¾_ÐºÑ?ÐµÐ½Ð¸ Ñ?Ð¼ÐµÑ? Ð¸Ñ?Ð¿Ñ?Ð°Ð²ÐºÐµ"
 
-#: cvsview.py:439 dirdiff.py:365
-#, python-format
-msgid "[%s] Scanning %s"
-msgstr "[%s] Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ð¼ %s"
+#: ../data/ui/preferences.ui.h:1
+msgid "Display"
+msgstr "<b>Ð?Ñ?Ð¸ÐºÐ°Ð·</b>"
 
-#: cvsview.py:455
-msgid "(Empty)"
-msgstr "(Ð?Ñ?Ð°Ð·Ð½Ð¾)"
+#: ../data/ui/preferences.ui.h:2
+msgid "Do not _split words over two lines"
+msgstr "Ð?ÐµÐ¼Ð¾Ñ? _Ð¿Ð¾Ð´ÐµÐ»Ð¸Ñ?Ð¸ Ñ?ÐµÑ?Ð¸ Ñ? Ð´Ð²Ð° Ñ?ÐµÐ´Ð°"
 
-#: cvsview.py:487
-#, python-format
-msgid "[%s] Fetching differences"
-msgstr "[%s] Ð?Ñ?Ð¸Ð±Ð°Ð²Ñ?Ð°Ð¼ Ñ?Ð°Ð·Ð»Ð¸ÐºÐµ"
+#: ../data/ui/preferences.ui.h:3
+msgid "Edito_r command:"
+msgstr "Ð?Ð°Ñ?ÐµÐ´Ð±Ð° _Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ð°:"
 
-#: cvsview.py:494
-#, python-format
-msgid "[%s] Applying patch"
-msgstr "[%s] Ð?Ñ?Ð¸Ð¼ÐµÑ?Ñ?Ñ?ÐµÐ¼ Ð·Ð°ÐºÑ?Ð¿Ñ?"
+#: ../data/ui/preferences.ui.h:4
+msgid "Editor"
+msgstr "Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?"
 
-#: cvsview.py:498
-msgid "No differences found."
-msgstr "Ð Ð°Ð·Ð»Ð¸ÐºÐµ Ð½Ðµ Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ðµ."
+#: ../data/ui/preferences.ui.h:5
+msgid "Enable text _wrapping"
+msgstr "Ð£ÐºÑ?Ñ?Ñ?Ð¸ _Ð¿Ñ?ÐµÐ»Ð°Ð¼Ð°Ñ?Ðµ Ñ?ÐµÐºÑ?Ñ?Ð°"
 
-#: cvsview.py:564
-msgid "Select some files first."
-msgstr "Ð?Ñ?Ð²Ð¾ Ð¸Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð½ÐµÐºÐµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ."
+#: ../data/ui/preferences.ui.h:6
+msgid "Encoding"
+msgstr "Ð?Ð¾Ð´Ð¸Ñ?Ð°Ñ?Ðµ"
 
-#: cvsview.py:585 dirdiff.py:553
-#, python-format
+#: ../data/ui/preferences.ui.h:7
+msgid "External editor"
+msgstr "Ð¡Ð¿Ð¾Ñ?Ð½Ð¸ Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?"
+
+#: ../data/ui/preferences.ui.h:8
+msgid "File Filters"
+msgstr "Ð¤Ð¸Ð»Ñ?ÐµÑ?Ð¸ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°"
+
+#: ../data/ui/preferences.ui.h:9
+msgid "Font"
+msgstr "<b>Ð¤Ð¾Ð½Ñ?</b>"
+
+#: ../data/ui/preferences.ui.h:10
+msgid "Ignore changes which insert or delete blank lines"
+msgstr "Ð?Ð°Ð½ÐµÐ¼Ð°Ñ?Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ðµ ÐºÐ¾Ñ?Ðµ Ñ?Ð±Ð°Ñ?Ñ?Ñ?Ñ? Ð¸Ð»Ð¸ Ð±Ñ?Ð¸Ñ?Ñ? Ð¿Ñ?Ð°Ð·Ð½Ðµ Ñ?ÐµÐ´Ð¾Ð²Ðµ"
+
+#: ../data/ui/preferences.ui.h:11
+msgid "Ignore symbolic links"
+msgstr "Ð?Ð°Ð½ÐµÐ¼Ð°Ñ?Ð¸ Ñ?Ð¸Ð¼Ð±Ð¾Ð»Ð¸Ñ?ÐºÐµ Ð²ÐµÐ·Ðµ"
+
+#: ../data/ui/preferences.ui.h:12
+msgid "Loading"
+msgstr "Ð£Ñ?Ð¸Ñ?Ð°Ð²Ð°Ð¼"
+
+#: ../data/ui/preferences.ui.h:13
+msgid "Meld Preferences"
+msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ Ð?ÐµÐ»Ð´Ð°"
+
+#: ../data/ui/preferences.ui.h:14
+msgid "Show _line numbers"
+msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ _Ð±Ñ?Ð¾Ñ?ÐµÐ²Ðµ Ð»Ð¸Ð½Ð¸Ñ?Ð°"
+
+#: ../data/ui/preferences.ui.h:15
+msgid "Show w_hitespace"
+msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ _Ñ?Ð°Ð·Ð¼Ð°ÐºÐµ"
+
+#: ../data/ui/preferences.ui.h:16
+msgid "Text Filters"
+msgstr "Ð¤Ð¸Ð»Ñ?ÐµÑ?Ð¸ Ñ?ÐµÐºÑ?Ñ?Ð°"
+
+#: ../data/ui/preferences.ui.h:17
+msgid "Use _default system editor"
+msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ _Ð¾Ñ?Ð½Ð¾Ð²Ð½Ð¸ Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ? Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð°"
+
+#: ../data/ui/preferences.ui.h:18
+msgid "Use s_yntax highlighting"
+msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¸Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ _Ñ?Ð¸Ð½Ñ?Ð°ÐºÑ?Ðµ"
+
+# bug: what encoding is iso8859? it's a registry of encodings, and encoding is eg. iso8859-5
+#: ../data/ui/preferences.ui.h:19
+msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
+msgstr "Ð?Ñ?Ð¸ Ñ?Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ñ?, Ð¿Ñ?Ð¾Ð±Ð°Ñ? Ð¾Ð²Ð° ÐºÐ¾Ð´Ð¸Ñ?Ð°Ñ?Ð° Ñ?ÐµÐ´Ð¾Ð¼. (Ð½Ð¿Ñ?. utf8, iso8859)"
+
+#: ../data/ui/preferences.ui.h:20
 msgid ""
-"'%s' is a directory.\n"
-"Remove recusively?"
+"When performing directory comparisons, you may filter out files and "
+"directories by name. Each pattern is a list of shell style wildcards "
+"separated by spaces."
 msgstr ""
-"â??%sâ?? Ñ?Ðµ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼.\n"
-"Ð?Ð° Ñ?ÐºÐ»Ð¾Ð½Ð¸Ð¼ Ñ?ÐµÐºÑ?Ñ?Ð·Ð¸Ð²Ð½Ð¾?"
+"Ð?Ñ?Ð¸Ð»Ð¸ÐºÐ¾Ð¼ Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?Ð° Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð°, Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð´Ð° Ñ?Ð¸Ð»Ñ?Ñ?Ð¸Ñ?Ð°Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ð¸ "
+"Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ðµ Ð¿Ñ?ÐµÐ¼Ð° Ð¸Ð¼ÐµÐ½Ñ?. Ð¡Ð²Ð°ÐºÐ¸ Ð¾Ð±Ñ?Ð°Ð·Ð°Ñ? Ñ?Ðµ Ñ?Ð¿Ð¸Ñ?Ð°Ðº Ñ?Ð¾ÐºÐµÑ?Ð° Ñ? Ñ?Ñ?Ð¸Ð»Ñ? ÐºÐ¾Ð½Ð·Ð¾Ð»Ðµ "
+"Ñ?Ð°Ð·Ð´Ð²Ð¾Ñ?ÐµÐ½Ð¸Ñ? Ñ?Ð°Ð·Ð¼Ð°ÐºÐ¾Ð¼."
 
-#: cvsview.py:590 dirdiff.py:560
-#, python-format
+#: ../data/ui/preferences.ui.h:21
 msgid ""
-"Error removing %s\n"
-"\n"
-"%s."
+"When performing file comparisons, you may ignore certain types of changes. "
+"Each pattern here is a python regular expression which replaces matching "
+"text with the empty string before comparison is performed. If the expression "
+"contains groups, only the groups are replaced. See the user manual for more "
+"details."
 msgstr ""
-"Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?ÐºÐ»Ð°Ñ?Ð°Ñ?Ñ? â??%sâ??\n"
-"\n"
-"%s."
+"Ð?Ñ?Ð¸Ð»Ð¸ÐºÐ¾Ð¼ Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°, Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð´Ð° Ð·Ð°Ð½ÐµÐ¼Ð°Ñ?Ð¸Ñ?Ðµ Ð¾Ð´Ñ?ÐµÑ?ÐµÐ½Ðµ Ð²Ñ?Ñ?Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½Ð°. "
+"Ð¡Ð²Ð°ÐºÐ¸ Ð¾Ð±Ñ?Ð°Ð·Ð°Ñ? Ñ?Ðµ Ñ?ÐµÐ³Ñ?Ð»Ð°Ñ?Ð°Ð½ Ð¸Ð·Ñ?Ð°Ð· Ð¿Ð°Ñ?Ñ?Ð¾Ð½Ð° ÐºÐ¾Ñ?Ð¸ Ð·Ð°Ð¼ÐµÑ?Ñ?Ñ?Ðµ Ð¿Ð¾Ð´Ñ?Ð´Ð°Ñ?Ð°Ñ?Ñ?Ñ?Ð¸ Ñ?ÐµÐºÑ?Ñ? "
+"Ð¿Ñ?Ð°Ð·Ð½Ð¸Ð¼ Ð½Ð¸Ñ?ÐºÐ°Ð¼Ð° Ð¿Ñ?Ðµ Ð¸Ð·Ð²Ñ?Ñ?Ð°Ð²Ð°Ñ?Ð° Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?Ð°. Ð?ÐºÐ¾ Ð¸Ð·Ñ?Ð°Ð· Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð³Ñ?Ñ?Ð¿Ðµ, Ñ?Ð°Ð¼Ð¾ Ð³Ñ?Ñ?Ð¿Ðµ "
+"Ð±Ð¸Ð²Ð°Ñ?Ñ? Ð·Ð°Ð¼ÐµÑ?ÐµÐ½Ðµ. Ð?Ð° Ð²Ð¸Ñ?Ðµ Ð´ÐµÑ?Ð°Ñ?Ð° Ð¿Ð¾Ð³Ð»ÐµÐ´Ð°Ñ?Ñ?Ðµ Ñ?Ð¿Ñ?Ñ?Ñ?Ñ?Ð²Ð¾ Ð·Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸ÐºÐµ."
 
-#: dirdiff.py:253 dirdiff.py:268
-#, python-format
-msgid "Error converting pattern '%s' to regular expression"
-msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ñ?ÐµÑ?Ð²Ð°Ñ?Ð°Ñ?Ñ? Ð¾Ð±Ñ?Ð°Ñ?Ñ?Ð° â??%sâ?? Ñ? Ñ?ÐµÐ³Ñ?Ð»Ð°Ñ?Ð½Ð¸ Ð¸Ð·Ñ?Ð°Ð·"
+#: ../data/ui/preferences.ui.h:22
+msgid "_Editor font:"
+msgstr "_Ð¤Ð¾Ð½Ñ? Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ð°:"
+
+#: ../data/ui/preferences.ui.h:23
+msgid "_Insert spaces instead of tabs"
+msgstr "_Ð£Ð±Ð°Ñ?Ð¸ Ñ?Ð°Ð·Ð¼Ð°ÐºÐµ Ñ?Ð¼ÐµÑ?Ñ?Ð¾ Ñ?Ð°Ð±Ñ?Ð»Ð°Ñ?Ð¾Ñ?Ð°"
 
-#: dirdiff.py:278
+#: ../data/ui/preferences.ui.h:24
+msgid "_Tab width:"
+msgstr "_Ð¨Ð¸Ñ?Ð¸Ð½Ð° Ñ?Ð°Ð±Ñ?Ð»Ð°Ñ?Ð¾Ñ?Ð°:"
+
+#: ../data/ui/preferences.ui.h:25
+msgid "_Use the system fixed width font"
+msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ð¾Ð¼ Ð¿Ð¾Ñ?Ñ?Ð°Ð²Ñ?ÐµÐ½Ñ? Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ñ? _Ñ?Ð¾Ð½Ñ?Ð°"
+
+#: ../data/ui/vcview.ui.h:1
+msgid "Commit Files"
+msgstr "Ð£Ð³Ñ?Ð°Ð´Ð¸ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
+
+#: ../data/ui/vcview.ui.h:2
+msgid "Compare Options"
+msgstr "Ð?Ð¿Ñ?Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?Ð°"
+
+#: ../data/ui/vcview.ui.h:3
+msgid "Date"
+msgstr "Ð?Ð°Ñ?Ñ?Ð¼"
+
+#: ../data/ui/vcview.ui.h:4
+msgid "Local copy against other remote revision"
+msgstr "Ð?Ð¾ÐºÐ°Ð»Ð½Ð¸ Ð¿Ñ?Ð¸Ð¼ÐµÑ?Ð°Ðº Ð½Ð°Ñ?Ð¿Ñ?Ð°Ð¼ Ð´Ñ?Ñ?Ð³Ðµ Ñ?Ð´Ð°Ñ?ÐµÐ½Ðµ Ñ?ÐµÐ²Ð¸Ð·Ð¸Ñ?Ðµ"
+
+#: ../data/ui/vcview.ui.h:5
+msgid "Local copy against same remote revision"
+msgstr "Ð?Ð¾ÐºÐ°Ð»Ð½Ð¸ Ð¿Ñ?Ð¸Ð¼ÐµÑ?Ð°Ðº Ð½Ð°Ñ?Ð¿Ñ?Ð°Ð¼ Ð¸Ñ?Ñ?Ðµ Ñ?Ð´Ð°Ñ?ÐµÐ½Ðµ Ñ?ÐµÐ²Ð¸Ð·Ð¸Ñ?Ðµ"
+
+#: ../data/ui/vcview.ui.h:6
+msgid "Log Message"
+msgstr "Ð?Ð¾Ñ?Ñ?ÐºÐ° Ð´Ð½ÐµÐ²Ð½Ð¸ÐºÐ°"
+
+#: ../data/ui/vcview.ui.h:7
+msgid "Previous Logs"
+msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ð¸ Ð´Ð½ÐµÐ²Ð½Ð¸Ñ?Ð¸"
+
+#: ../data/ui/vcview.ui.h:8 ../meld/vcview.py:179
+msgid "Tag"
+msgstr "Ð?Ð·Ð½Ð°ÐºÐ°"
+
+#: ../data/ui/vcview.ui.h:9
+msgid "VC Log"
+msgstr "Ð¦Ð? Ð´Ð½ÐµÐ²Ð½Ð¸Ðº"
+
+#: ../meld/dirdiff.py:215 ../meld/vcview.py:118
+msgid "_Compare"
+msgstr "_Ð£Ð¿Ð¾Ñ?ÐµÐ´Ð¸"
+
+#: ../meld/dirdiff.py:215 ../meld/vcview.py:118
+msgid "Compare selected"
+msgstr "Ð£Ð¿Ð¾Ñ?ÐµÐ´Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾"
+
+#: ../meld/dirdiff.py:216
+msgid "Copy _Left"
+msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ _Ð»ÐµÐ²Ð¾"
+
+#: ../meld/dirdiff.py:216
+msgid "Copy to left"
+msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸Ñ?Ðµ Ð»ÐµÐ²Ð¾"
+
+#: ../meld/dirdiff.py:217
+msgid "Copy _Right"
+msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ _Ð´ÐµÑ?Ð½Ð¾"
+
+#: ../meld/dirdiff.py:217
+msgid "Copy to right"
+msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸Ñ?Ðµ Ð´ÐµÑ?Ð½Ð¾"
+
+#: ../meld/dirdiff.py:218
+msgid "Delete selected"
+msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾"
+
+#: ../meld/dirdiff.py:219 ../meld/filediff.py:998
+msgid "Hide"
+msgstr "Ð¡Ð°ÐºÑ?Ð¸Ñ?"
+
+#: ../meld/dirdiff.py:219
+msgid "Hide selected"
+msgstr "Ð¡Ð°ÐºÑ?Ð¸Ñ? Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾"
+
+#: ../meld/dirdiff.py:221 ../meld/filediff.py:264 ../meld/vcview.py:119
+msgid "Open selected"
+msgstr "Ð?Ñ?Ð²Ð¾Ñ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾"
+
+#: ../meld/dirdiff.py:225
+msgid "Case"
+msgstr "Ð?ÐµÐ»Ð¸Ñ?Ð¸Ð½Ð° Ñ?Ð»Ð¾Ð²Ð°"
+
+#: ../meld/dirdiff.py:225
+msgid "Ignore case of entries"
+msgstr "Ð?Ð°Ð½ÐµÐ¼Ð°Ñ?Ð¸ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ñ? Ñ?Ð»Ð¾Ð²Ð° Ñ?Ð½Ð¾Ñ?Ð°"
+
+#: ../meld/dirdiff.py:226
+msgid "Same"
+msgstr "Ð?Ñ?Ñ?Ð¾"
+
+#: ../meld/dirdiff.py:226
+msgid "Show identical"
+msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¸Ñ?Ñ?Ð¾Ð²ÐµÑ?Ð½Ðµ"
+
+#: ../meld/dirdiff.py:227
+msgid "New"
+msgstr "Ð?Ð¾Ð²Ð¸"
+
+#: ../meld/dirdiff.py:227
+msgid "Show new"
+msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð½Ð¾Ð²Ðµ"
+
+#: ../meld/dirdiff.py:228
+msgid "Modified"
+msgstr "Ð?Ð·Ð¼ÐµÑ?ÐµÐ½Ð¸"
+
+#: ../meld/dirdiff.py:228 ../meld/vcview.py:132
+msgid "Show modified"
+msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½Ðµ"
+
+#: ../meld/dirdiff.py:230
+msgid "Filters"
+msgstr "Ð¤Ð¸Ð»Ñ?ÐµÑ?Ð¸"
+
+#: ../meld/dirdiff.py:230
+msgid "Set active filters"
+msgstr "Ð?Ð¾Ð´ÐµÑ?Ð¸Ñ?Ðµ Ð°ÐºÑ?Ð¸Ð²Ð½Ðµ Ñ?Ð¸Ð»Ñ?ÐµÑ?Ðµ"
+
+#: ../meld/dirdiff.py:347
 #, python-format
 msgid "Hide %s"
-msgstr "Ð¡Ð°ÐºÑ?Ð¸Ñ? %s"
+msgstr "Ð¡Ð°ÐºÑ?Ð¸Ñ? â??%sâ??"
 
-#: dirdiff.py:398
+#: ../meld/dirdiff.py:449 ../meld/dirdiff.py:462 ../meld/vcview.py:304
+#: ../meld/vcview.py:332
 #, python-format
-msgid "'%s' hidden by '%s'"
-msgstr "â??%sâ?? Ñ?Ð°ÐºÑ?Ð¸Ð²ÐµÐ½Ð¾ Ð¾Ð´ Ñ?Ñ?Ñ?Ð°Ð½Ðµ â??%sâ??"
+msgid "[%s] Scanning %s"
+msgstr "[%s] Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ð¼ â??%sâ??"
 
-#: dirdiff.py:404
+#: ../meld/dirdiff.py:561
 #, python-format
+msgid "[%s] Done"
+msgstr "[%s] Ð?Ð¾Ñ?Ð¾Ð²Ð¾"
+
+#: ../meld/dirdiff.py:565
+msgid "Multiple errors occurred while scanning this folder"
+msgstr "Ð?Ð¾Ñ?Ð»Ð¾ Ñ?Ðµ Ð´Ð¾ Ð²Ð¸Ñ?Ðµ Ð³Ñ?ÐµÑ?Ð°ÐºÐ° Ð·Ð° Ð²Ñ?ÐµÐ¼Ðµ Ð¿Ñ?ÐµÑ?Ñ?Ð°Ð¶Ð¸Ð²Ð°Ñ?Ð° Ð¾Ð²Ðµ Ñ?Ð°Ñ?Ñ?Ð¸ÐºÐ»Ðµ"
+
+#: ../meld/dirdiff.py:566
+msgid "Files with invalid encodings found"
+msgstr "Ð?Ñ?Ð¾Ð½Ð°Ñ?ÐµÐ½Ðµ Ñ?Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ñ?Ð° Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¸Ð¼ ÐºÐ¾Ð´Ð¸Ñ?Ð°Ñ?ÐµÐ¼"
+
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:568
+msgid "Some files were in an incorrect encoding. The names are something like:"
+msgstr "Ð?ÐµÐºÐµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ð±ÐµÑ?Ð°Ñ?Ñ? Ñ? Ð½ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾Ð¼ ÐºÐ¾Ð´Ð¸Ñ?Ð°Ñ?Ñ?. Ð?Ð¼ÐµÐ½Ð° Ñ?Ñ? Ð½ÐµÑ?Ñ?Ð¾ ÐºÐ°Ð¾:"
+
+#: ../meld/dirdiff.py:570
+msgid "Files hidden by case insensitive comparison"
+msgstr "Ð?Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ñ?ÐºÑ?Ð¸Ð²ÐµÐ½Ðµ Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?ÐµÐ¼ Ð½ÐµÐ¾Ñ?ÐµÑ?Ñ?Ð¸Ð²Ð¸Ð¼ Ð½Ð° Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ñ? Ñ?Ð»Ð¾Ð²Ð°"
+
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:572
 msgid ""
-"You are running a case insensitve comparison on a case sensitive filesystem. "
-"Some files are not visible:\n"
-"%s"
+"You are running a case insensitive comparison on a case sensitive "
+"filesystem. The following files in this folder are hidden:"
 msgstr ""
 "Ð?Ð¾ÐºÑ?ÐµÐ½Ñ?Ð»Ð¸ Ñ?Ñ?Ðµ Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?Ðµ Ð½ÐµÐ·Ð°Ð²Ð¸Ñ?Ð½Ð¾ Ð¾Ð´ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ðµ Ñ?Ð»Ð¾Ð²Ð° Ð½Ð° Ñ?Ð¸Ñ?Ñ?ÐµÐ¼Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð³Ð´Ðµ "
-"Ñ?Ðµ Ð¾Ð½Ð° Ð±Ð¸Ñ?Ð½Ð°. Ð?ÐµÐºÐµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ð½Ð¸Ñ?Ñ? Ð²Ð¸Ð´Ñ?Ð¸Ð²Ðµ:\n"
-"%s"
+"Ñ?Ðµ Ð¾Ð½Ð° Ð±Ð¸Ñ?Ð½Ð°. Ð?ÐµÐºÐµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ð½Ð¸Ñ?Ñ? Ð²Ð¸Ð´Ñ?Ð¸Ð²Ðµ:"
 
-#: dirdiff.py:470
+#: ../meld/dirdiff.py:583
 #, python-format
-msgid "[%s] Done"
-msgstr "[%s] Ð?Ð¾Ñ?Ð¾Ð²Ð¾"
+msgid "'%s' hidden by '%s'"
+msgstr "â??%sâ?? Ñ?Ð°ÐºÑ?Ð¸Ð²ÐµÐ½Ð¾ Ð¾Ð´ Ñ?Ñ?Ñ?Ð°Ð½Ðµ â??%sâ??"
 
-#: dirdiff.py:528
+#: ../meld/dirdiff.py:608 ../meld/filediff.py:875 ../meld/filediff.py:1002
+msgid "Hi_de"
+msgstr "_Ð¡Ð°ÐºÑ?Ð¸Ñ?"
+
+#: ../meld/dirdiff.py:658
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -158,7 +480,7 @@ msgstr ""
 "â??%sâ?? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸.\n"
 "Ð?Ð° Ð¿Ñ?ÐµÑ?Ð½Ð¸Ð¼Ð¸Ð¼?"
 
-#: dirdiff.py:535
+#: ../meld/dirdiff.py:665
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -169,96 +491,287 @@ msgstr ""
 "\n"
 "%s."
 
-# bug: plural-forms
-#. singular,plural
-#: dirdiff.py:570
+#: ../meld/dirdiff.py:683 ../meld/vcview.py:504
+#, python-format
 msgid ""
-"second,seconds:minute,minutes:hour,hours:day,days:week,weeks:month,months:"
-"year,years"
-msgstr "Ñ?ÐµÐºÑ?Ð½Ð´Ñ?,Ñ?ÐµÐºÑ?Ð½Ð´Ð¸:Ð¼Ð¸Ð½Ñ?Ñ?,Ð¼Ð¸Ð½Ñ?Ñ?Ð°:Ñ?Ð°Ñ?,Ñ?Ð°Ñ?Ð°:Ð´Ð°Ð½,Ð´Ð°Ð½Ð°:Ð½ÐµÐ´ÐµÑ?Ñ?,Ð½ÐµÐ´ÐµÑ?Ð°:Ð¼ÐµÑ?ÐµÑ?,Ð¼ÐµÑ?ÐµÑ?Ð¸:Ð³Ð¾Ð´Ð¸Ð½Ñ?,Ð³Ð¾Ð´Ð¸Ð½Ð°"
+"'%s' is a directory.\n"
+"Remove recursively?"
+msgstr ""
+"â??%sâ?? Ñ?Ðµ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼.\n"
+"Ð?Ð° Ñ?ÐºÐ»Ð¾Ð½Ð¸Ð¼ Ñ?ÐµÐºÑ?Ñ?Ð·Ð¸Ð²Ð½Ð¾?"
 
-#: filediff.py:387
+#: ../meld/dirdiff.py:690 ../meld/vcview.py:509
 #, python-format
 msgid ""
-"Regular expression error\n"
-"'%s'"
+"Error removing %s\n"
+"\n"
+"%s."
 msgstr ""
-"Ð?Ñ?ÐµÑ?ÐºÐ° Ñ?Ð° Ñ?ÐµÐ³Ñ?Ð»Ð°Ñ?Ð½Ð¸Ð¼ Ð¸Ð·Ñ?Ð°Ð·Ð¾Ð¼\n"
-"â??%sâ??"
+"Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?ÐºÐ»Ð°Ñ?Ð°Ñ?Ñ? â??%sâ??\n"
+"\n"
+"%s."
 
-#: filediff.py:399
+#: ../meld/dirdiff.py:702
+#, python-format
+msgid "%i second"
+msgid_plural "%i seconds"
+msgstr[0] "%i Ñ?ÐµÐºÑ?Ð½Ð´"
+msgstr[1] "%i Ñ?ÐµÐºÑ?Ð½Ð´Ðµ"
+msgstr[2] "%i Ñ?ÐµÐºÑ?Ð½Ð´Ð¸"
+msgstr[3] "%i Ñ?ÐµÐºÑ?Ð½Ð´Ð°"
+
+#: ../meld/dirdiff.py:703
+#, python-format
+msgid "%i minute"
+msgid_plural "%i minutes"
+msgstr[0] "%i Ð¼Ð¸Ð½Ñ?Ñ?"
+msgstr[1] "%i Ð¼Ð¸Ð½Ñ?Ñ?Ð°"
+msgstr[2] "%i Ð¼Ð¸Ð½Ñ?Ñ?Ð°"
+msgstr[3] "%i Ð¼Ð¸Ð½Ñ?Ñ?"
+
+#: ../meld/dirdiff.py:704
+#, python-format
+msgid "%i hour"
+msgid_plural "%i hours"
+msgstr[0] "%i Ñ?Ð°Ñ?"
+msgstr[1] "%i Ñ?Ð°Ñ?Ð°"
+msgstr[2] "%i Ñ?Ð°Ñ?Ð¸"
+msgstr[3] "%i Ñ?Ð°Ñ?"
+
+#: ../meld/dirdiff.py:705
+#, python-format
+msgid "%i day"
+msgid_plural "%i days"
+msgstr[0] "%i Ð´Ð°Ð½"
+msgstr[1] "%i Ð´Ð°Ð½Ð°"
+msgstr[2] "%i Ð´Ð°Ð½Ð°"
+msgstr[3] "%i Ð´Ð°Ð½"
+
+#: ../meld/dirdiff.py:706
+#, python-format
+msgid "%i week"
+msgid_plural "%i weeks"
+msgstr[0] "%i Ð½ÐµÐ´ÐµÑ?Ð°"
+msgstr[1] "%i Ð½ÐµÐ´ÐµÑ?Ðµ"
+msgstr[2] "%i Ð½ÐµÐ´ÐµÑ?Ð°"
+msgstr[3] "%i Ð½ÐµÐ´ÐµÑ?Ð°"
+
+#: ../meld/dirdiff.py:707
+#, python-format
+msgid "%i month"
+msgid_plural "%i months"
+msgstr[0] "%i Ð¼ÐµÑ?ÐµÑ?"
+msgstr[1] "%i Ð¼ÐµÑ?ÐµÑ?Ð°"
+msgstr[2] "%i Ð¼ÐµÑ?ÐµÑ?Ð¸"
+msgstr[3] "%i Ð¼ÐµÑ?ÐµÑ?"
+
+#: ../meld/dirdiff.py:708
 #, python-format
-msgid "The regular expression '%s' was not found."
-msgstr "Ð ÐµÐ³Ñ?Ð»Ð°Ñ?Ð½Ð¸ Ð¸Ð·Ñ?Ð°Ð· â??%sâ?? Ð½Ð¸Ñ?Ðµ Ð½Ð°Ñ?ÐµÐ½."
+msgid "%i year"
+msgid_plural "%i years"
+msgstr[0] "%i Ð³Ð¾Ð´Ð¸Ð½Ð°"
+msgstr[1] "%i Ð³Ð¾Ð´Ð¸Ð½Ðµ"
+msgstr[2] "%i Ð³Ð¾Ð´Ð¸Ð½Ð°"
+msgstr[3] "%i Ð³Ð¾Ð´Ð¸Ð½Ð°"
+
+#: ../meld/filediff.py:265
+msgid "Format as patch..."
+msgstr "Ð¤Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ð°Ñ? ÐºÐ°Ð¾ Ð¸Ñ?Ð¿Ñ?Ð°Ð²ÐºÑ?..."
+
+#: ../meld/filediff.py:265
+msgid "Create a patch using differences between files"
+msgstr "Ð?Ñ?Ð°Ð²Ð¸ Ð¸Ñ?Ð¿Ñ?Ð°Ð²ÐºÑ? ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ð¸ Ñ?Ð°Ð·Ð»Ð¸ÐºÐµ Ð¸Ð·Ð¼ÐµÑ?Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°"
+
+#: ../meld/filediff.py:266
+msgid "Previous conflict"
+msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ð¸ Ñ?Ñ?ÐºÐ¾Ð±"
+
+#: ../meld/filediff.py:266
+msgid "Go to the previous conflict"
+msgstr "Ð?Ð´Ðµ Ð½Ð° Ð¿Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ð¸ Ñ?Ñ?ÐºÐ¾Ð±"
+
+#: ../meld/filediff.py:267
+msgid "Next conflict"
+msgstr "Ð¡Ð»ÐµÐ´ÐµÑ?Ð¸ Ñ?Ñ?ÐºÐ¾Ð±"
+
+#: ../meld/filediff.py:267
+msgid "Go to the next conflict"
+msgstr "Ð?Ð´Ðµ Ð½Ð° Ñ?Ð»ÐµÐ´ÐµÑ?Ð¸ Ñ?Ñ?ÐºÐ¾Ð±"
+
+#: ../meld/filediff.py:268
+msgid "Push to left"
+msgstr "Ð?Ñ?Ñ?Ð½Ð¸ Ñ?Ð»ÐµÐ²Ð¾"
+
+#: ../meld/filediff.py:268
+msgid "Push current change to the left"
+msgstr "Ð?Ñ?Ñ?Ð° Ñ?ÐµÐºÑ?Ñ?Ñ? Ð¸Ð·Ð¼ÐµÐ½Ñ? Ñ?Ð»ÐµÐ²Ð¾"
+
+#: ../meld/filediff.py:269
+msgid "Push to right"
+msgstr "Ð?Ñ?Ñ?Ð½Ð¸ Ñ?Ð´ÐµÑ?Ð½Ð¾"
+
+#: ../meld/filediff.py:269
+msgid "Push current change to the right"
+msgstr "Ð?Ñ?Ñ?Ð° Ñ?ÐµÐºÑ?Ñ?Ñ? Ð¸Ð·Ð¼ÐµÐ½Ñ? Ñ?Ð´ÐµÑ?Ð½Ð¾"
+
+#. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
+#: ../meld/filediff.py:271
+msgid "Pull from left"
+msgstr "Ð£Ð±Ð°Ñ?Ð¸ Ñ? Ð»ÐµÐ²Ð°"
+
+#: ../meld/filediff.py:271
+msgid "Pull change from the left"
+msgstr "Ð£Ð±Ð°Ñ?Ñ?Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½Ñ? Ñ? Ð»ÐµÐ²Ð°"
+
+#: ../meld/filediff.py:272
+msgid "Pull from right"
+msgstr "Ð£Ð±Ð°Ñ?Ð¸ Ñ? Ð´ÐµÑ?Ð½Ð°"
+
+#: ../meld/filediff.py:272
+msgid "Pull change from the right"
+msgstr "Ð£Ð±Ð°Ñ?Ñ?Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½Ñ? Ñ? Ð»ÐµÐ²Ð°"
+
+#: ../meld/filediff.py:273
+msgid "Copy above left"
+msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ð¸Ð·Ð½Ð°Ð´ Ñ?Ð»ÐµÐ²Ð¾"
+
+#: ../meld/filediff.py:273
+msgid "Copy change above the left chunk"
+msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð° Ð¸Ð·Ð¼ÐµÐ½Ñ? Ð¸Ð·Ð½Ð°Ð´ ÐºÐ¾Ð¼Ð°Ð´Ð° Ñ?Ð»ÐµÐ²Ð¾"
+
+#: ../meld/filediff.py:274
+msgid "Copy below left"
+msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ð¸Ñ?Ð¿Ð¾Ð´ Ñ?Ð»ÐµÐ²Ð¾"
+
+#: ../meld/filediff.py:274
+msgid "Copy change below the left chunk"
+msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð° Ð¸Ð·Ð¼ÐµÐ½Ñ? Ð¸Ñ?Ð¿Ð¾Ð´ ÐºÐ¾Ð¼Ð°Ð´Ð° Ñ?Ð»ÐµÐ²Ð¾"
+
+#: ../meld/filediff.py:275
+msgid "Copy above right"
+msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ð¸Ð·Ð½Ð°Ð´ Ñ?Ð´ÐµÑ?Ð½Ð¾"
+
+#: ../meld/filediff.py:275
+msgid "Copy change above the right chunk"
+msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð° Ð¸Ð·Ð¼ÐµÐ½Ñ? Ð¸Ð·Ð½Ð°Ð´ ÐºÐ¾Ð¼Ð°Ð´Ð° Ñ?Ð»ÐµÐ²Ð¾"
+
+#: ../meld/filediff.py:276
+msgid "Copy below right"
+msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ð¸Ñ?Ð¿Ð¾Ð´ Ñ?Ð´ÐµÑ?Ð½Ð¾"
+
+#: ../meld/filediff.py:276
+msgid "Copy change below the right chunk"
+msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð°Ð²Ð° Ð¸Ð·Ð¼ÐµÐ½Ñ? Ð¸Ñ?Ð¿Ð¾Ð´ ÐºÐ¾Ð¼Ð°Ð´Ð° Ñ?Ð´ÐµÑ?Ð½Ð¾"
+
+#: ../meld/filediff.py:277
+msgid "Delete"
+msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸"
+
+#: ../meld/filediff.py:277
+msgid "Delete change"
+msgstr "Ð?Ñ?Ð¸Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½Ñ?"
+
+#: ../meld/filediff.py:278
+msgid "Merge all changes from left"
+msgstr "Ð?Ð±Ñ?ÐµÐ´Ð¸Ð½Ð¸ Ñ?Ð²Ðµ Ð¸Ð·Ð¼ÐµÐ½Ðµ Ñ? Ð»ÐµÐ²Ð°"
+
+#: ../meld/filediff.py:278
+msgid "Merge all non-conflicting changes from the left"
+msgstr "Ð?Ð±Ñ?ÐµÐ´Ð¸Ñ?Ñ?Ñ?Ðµ Ñ?Ð²Ðµ Ð½ÐµÑ?Ñ?ÐºÐ¾Ð±Ñ?Ð°Ð²Ð°Ñ?Ñ?Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½Ðµ Ñ? Ð»ÐµÐ²Ð°"
+
+#: ../meld/filediff.py:279
+msgid "Merge all changes from right"
+msgstr "Ð?Ð±Ñ?ÐµÐ´Ð¸Ð½Ð¸ Ñ?Ð²Ðµ Ð¸Ð·Ð¼ÐµÐ½Ðµ Ñ? Ð´ÐµÑ?Ð½Ð°"
+
+#: ../meld/filediff.py:279
+msgid "Merge all non-conflicting changes from the right"
+msgstr "Ð?Ð±Ñ?ÐµÐ´Ð¸Ñ?Ñ?Ñ?Ðµ Ñ?Ð²Ðµ Ð½ÐµÑ?Ñ?ÐºÐ¾Ð±Ñ?Ð°Ð²Ð°Ñ?Ñ?Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½Ðµ Ñ? Ð´ÐµÑ?Ð½Ð°"
+
+#: ../meld/filediff.py:280
+msgid "Merge all non-conflicting"
+msgstr "Ð?Ð±Ñ?ÐµÐ´Ð¸Ð½Ð¸ Ñ?Ð²Ðµ Ð½ÐµÑ?Ñ?ÐºÐ¾Ð±Ñ?Ð°Ð²Ð°Ñ?Ñ?Ñ?Ðµ"
+
+#: ../meld/filediff.py:280
+msgid "Merge all non-conflicting changes from left and right panes"
+msgstr "Ð?Ð±Ñ?ÐµÐ´Ð¸Ñ?Ñ?Ñ?Ðµ Ñ?Ð²Ðµ Ð½ÐµÑ?Ñ?ÐºÐ¾Ð±Ñ?Ð°Ð²Ð°Ñ?Ñ?Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½Ðµ Ñ? Ð»ÐµÐ²Ðµ Ð¸ Ð´ÐµÑ?Ð½Ðµ Ð¿Ð¾Ð²Ñ?Ñ?Ð¸"
+
+#: ../meld/filediff.py:284
+msgid "Lock scrolling"
+msgstr "Ð?Ð°ÐºÑ?Ñ?Ñ?Ð°Ñ? ÐºÐ»Ð¸Ð·Ð°Ñ?Ðµ"
+
+#: ../meld/filediff.py:285
+msgid "Lock scrolling of all panes"
+msgstr "Ð?Ð°ÐºÑ?Ñ?Ñ?Ð°Ð²Ð° ÐºÐ»Ð¸Ð·Ð°Ñ?Ðµ Ñ?Ð²Ð¸Ñ? Ð¿Ð¾Ð²Ñ?Ñ?Ð¸"
+
+#. Abbreviations for insert and overwrite that fit in the status bar
+#: ../meld/filediff.py:365
+msgid "INS"
+msgstr "Ð£Ð?Ð¢"
 
-#: filediff.py:401
+#: ../meld/filediff.py:365
+msgid "OVR"
+msgstr "Ð?Ð Ð?"
+
+#. Abbreviation for line, column so that it will fit in the status bar
+#: ../meld/filediff.py:367
 #, python-format
-msgid "The text '%s' was not found."
-msgstr "Ð¢ÐµÐºÑ?Ñ? â??%sâ?? Ð½Ð¸Ñ?Ðµ Ð½Ð°Ñ?ÐµÐ½."
+msgid "Ln %i, Col %i"
+msgstr "Ð ÐµÐ´ %i, Ð¼ÐµÑ?Ñ?Ð¾ %i"
 
-#: filediff.py:440
+#: ../meld/filediff.py:570
+#, python-format
+msgid ""
+"Filter '%s' changed the number of lines in the file. Comparison will be "
+"incorrect. See the user manual for more details."
+msgstr ""
+"Ð¤Ð¸Ð»Ñ?ÐµÑ? â??%sâ?? Ñ?Ðµ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ð¾ Ð±Ñ?Ð¾Ñ? Ñ?ÐµÐ´Ð¾Ð²Ð° Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÑ?Ð¸. Ð?Ð¾Ñ?ÐµÑ?ÐµÑ?Ðµ Ð½ÐµÑ?Ðµ Ð±Ð¸Ñ?Ð¸ Ñ?Ð°Ñ?Ð½Ð¾. Ð?Ð° "
+"Ð²Ð¸Ñ?Ðµ Ð´ÐµÑ?Ð°Ñ?Ð° Ð¿Ð¾Ð³Ð»ÐµÐ´Ð°Ñ?Ñ?Ðµ Ð¿Ñ?Ð¸Ñ?Ñ?Ñ?Ð½Ð¸Ðº Ð·Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ð½Ð¸ÐºÐµ."
+
+#. TRANSLATORS: this is the name of a new file which has not yet been saved
+#: ../meld/filediff.py:673
+msgid "<unnamed>"
+msgstr "<Ð½ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½>"
+
+#: ../meld/filediff.py:863
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Ð?Ð¾Ñ?Ñ?Ð°Ð²Ð¸ Ð±Ñ?Ð¾Ñ? Ð¿Ð»Ð¾Ñ?Ð°"
 
-#: filediff.py:447
+#: ../meld/filediff.py:869
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Ð?Ñ?Ð²Ð°Ñ?Ð°Ð¼ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
 
-#: filediff.py:463
-#, python-format
-msgid ""
-"Could not open '%s' for reading.\n"
-"\n"
-"The error was:\n"
-"%s"
-msgstr ""
-"Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ð¼ â??%sâ?? Ñ?Ð°Ð´Ð¸ Ñ?Ð¸Ñ?Ð°Ñ?Ð°.\n"
-"\n"
-"Ð?Ñ?ÐµÑ?ÐºÐ° Ð±ÐµÑ?Ðµ:\n"
-"%s"
+#: ../meld/filediff.py:893 ../meld/filediff.py:902 ../meld/filediff.py:914
+#: ../meld/filediff.py:920
+msgid "Could not read file"
+msgstr "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð¿Ñ?Ð¾Ñ?Ð¸Ñ?Ð°Ð¼ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
 
-#: filediff.py:467
+#: ../meld/filediff.py:894
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Ð§Ð¸Ñ?Ð°Ð¼ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
 
-#: filediff.py:482
+#: ../meld/filediff.py:903
 #, python-format
-msgid ""
-"Could not read from '%s'.\n"
-"\n"
-"I tried encodings %s."
-msgstr ""
-"Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ñ?Ð¸Ñ?Ð°Ð¼ Ð¸Ð· â??%sâ??.\n"
-"\n"
-"Ð?Ð¾ÐºÑ?Ñ?Ð°Ñ? ÐºÐ¾Ð´Ð¸Ñ?Ð°Ñ?Ð° %s."
+msgid "%s appears to be a binary file."
+msgstr "â??%sâ?? Ð¸Ð·Ð³Ð»ÐµÐ´Ð° Ð´Ð° Ñ?Ðµ Ð¸Ð·Ð²Ñ?Ñ?Ð½Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°."
 
-#: filediff.py:487
+#: ../meld/filediff.py:915
 #, python-format
-msgid ""
-"Could not read from '%s'.\n"
-"\n"
-"The error was:\n"
-"%s"
-msgstr ""
-"Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ñ?Ð¸Ñ?Ð°Ð¼ Ð¸Ð· â??%sâ??.\n"
-"\n"
-"Ð?Ñ?ÐµÑ?ÐºÐ° Ð±ÐµÑ?Ðµ:\n"
-"%s."
+msgid "%s is not in encodings: %s"
+msgstr "â??%sâ?? Ð½Ð¸Ñ?Ðµ Ñ? ÐºÐ¾Ð´Ð¸Ñ?Ð°Ñ?Ð¸Ð¼Ð°: â??%sâ??"
 
-#: filediff.py:507
+#: ../meld/filediff.py:945 ../meld/filemerge.py:67
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] Ð¡Ñ?Ð°Ñ?Ñ?Ð½Ð°Ð²Ð°Ð¼ Ñ?Ð°Ð·Ð»Ð¸ÐºÐµ"
 
-#: filediff.py:599
-#, python-format
-msgid "Choose a name for buffer %i."
-msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¸Ð¼Ðµ Ð·Ð° %i. Ð±Ð°Ñ?ÐµÑ?."
+#: ../meld/filediff.py:996
+msgid "Files are identical"
+msgstr "Ð?Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ñ?Ñ? Ð¸Ñ?Ñ?Ð¾Ð²ÐµÑ?Ð½Ðµ"
 
-#: filediff.py:610
+#: ../meld/filediff.py:1150
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -267,7 +780,23 @@ msgstr ""
 "â??%sâ?? Ð¿Ð¾Ñ?Ñ?Ð¾Ñ?Ð¸!\n"
 "Ð?Ð° Ð¿Ñ?ÐµÑ?Ð½Ð¸Ð¼Ð¸Ð¼?"
 
-#: filediff.py:624
+#: ../meld/filediff.py:1163
+#, python-format
+msgid ""
+"Error writing to %s\n"
+"\n"
+"%s."
+msgstr ""
+"Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¿Ð¸Ñ?Ñ? Ñ? â??%sâ??\n"
+"\n"
+"%s."
+
+#: ../meld/filediff.py:1172
+#, python-format
+msgid "Choose a name for buffer %i."
+msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¸Ð¼Ðµ Ð·Ð° %i. Ð±Ð°Ñ?ÐµÑ?."
+
+#: ../meld/filediff.py:1187
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -278,732 +807,809 @@ msgstr ""
 "\n"
 "Ð?Ð¾Ñ?Ð¸ Ð¾Ð±Ð»Ð¸Ðº Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ?"
 
-#: filediff.py:641
+#: ../meld/filediff.py:1203
 #, python-format
 msgid ""
-"Error writing to %s\n"
-"\n"
-"%s."
+"'%s' contains characters not encodable with '%s'\n"
+"Would you like to save as UTF-8?"
 msgstr ""
-"Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ñ?Ð¿Ð¸Ñ?Ñ? Ñ? â??%sâ??\n"
-"\n"
-"%s."
+"â??%sâ?? Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ð·Ð½Ð°ÐºÐ¾Ð²Ðµ ÐºÐ¾Ñ?Ð¸ Ñ?Ðµ Ð½Ðµ Ð¼Ð¾Ð³Ñ? ÐºÐ¾Ð´Ð¸Ñ?Ð°Ñ?Ð¸ Ñ?Ð· â??%sâ??\n"
+"Ð?Ð° Ð»Ð¸ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ ÐºÐ°Ð¾ â??UTF-8â???"
 
-#: filediff.py:700
+#: ../meld/filediff.py:1262
 #, python-format
 msgid ""
-"Refreshing will discard changes in:\n"
+"Reloading will discard changes in:\n"
 "%s\n"
 "\n"
 "You cannot undo this operation."
 msgstr ""
-"Ð?Ñ?Ð²ÐµÐ¶Ð°Ð²Ð°Ñ?Ðµ Ñ?Ðµ Ð·Ð°Ð½ÐµÐ¼Ð°Ñ?Ð¸Ñ?Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ðµ Ñ?:\n"
+"Ð?Ñ?Ð²ÐµÐ¶Ð°Ð²Ð°Ñ?Ðµ Ñ?Ðµ Ð¾Ð´Ð±Ð°Ñ?Ð¸Ñ?Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ðµ Ñ?:\n"
 "%s\n"
 "\n"
 "Ð?Ð²Ñ? Ð¾Ð¿ÐµÑ?Ð°Ñ?Ð¸Ñ?Ñ? Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ?Ðµ Ð¾Ð¿Ð¾Ð·Ð²Ð°Ñ?Ð¸."
 
-#: meld:50
-#, c-format
-msgid "Meld requires python%s or higher."
-msgstr "Ð?ÐµÐ»Ð´ Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° Ð¿Ð¸Ñ?Ð¾Ð½ %s Ð¸Ð»Ð¸ Ð½Ð¾Ð²Ð¸Ñ?Ð¸."
-
-#: meld:60
-msgid "Meld requires a recent version of pygtk."
-msgstr "Ð?ÐµÐ»Ð´ Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° Ñ?ÐºÐ¾Ñ?Ð¾ Ð¸Ð·Ð´Ð°Ñ?Ðµ Ð?Ð¸Ð?Ñ?Ðº-Ð°."
-
-#: meld:61
-#, c-format
-msgid "pygtk-%s or higher is recommended."
-msgstr "Ð?Ñ?ÐµÐ¿Ð¾Ñ?Ñ?Ñ?Ñ?Ñ?Ðµ Ñ?Ðµ Ð?Ð¸Ð?Ñ?Ðº %s Ð¸Ð»Ð¸ Ð½Ð¾Ð²Ð¸Ñ?Ð¸."
+#: ../meld/filemerge.py:82
+#, python-format
+msgid "[%s] Merging files"
+msgstr "[%s] Ð?Ð±Ñ?ÐµÐ´Ð¸Ñ?Ñ?Ñ?ÐµÐ¼ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
 
-#: meld:71
-#, c-format
-msgid "Meld works best with pygtk-%s or higher. (found %s)"
-msgstr "Ð?ÐµÐ»Ð´ Ð½Ð°Ñ?Ð±Ð¾Ñ?Ðµ Ñ?Ð°Ð´Ð¸ Ñ?Ð· Ð?Ð¸Ð?Ñ?Ðº %s Ð¸Ð»Ð¸ Ð½Ð¾Ð²Ð¸Ñ?Ð¸. (Ð½Ð°Ñ?Ð¾Ñ? %s)"
+#: ../meld/meldapp.py:149
+msgid "wrong number of arguments supplied to --diff"
+msgstr "Ð¿Ð¾Ð³Ñ?ÐµÑ?Ð°Ð½ Ð±Ñ?Ð¾Ñ? Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ð°Ñ?Ð° Ð¿Ñ?Ð¸Ð´Ð¾Ð´Ð°Ñ? Ñ?Ð· â??--diffâ??"
 
-#: meld:72
-msgid ""
-"Due to incompatible API changes some functions may not operate as expected."
-msgstr ""
-"Ð?Ð±Ð¾Ð³ Ð½ÐµÑ?Ð°Ð³Ð»Ð°Ñ?Ð½Ð¸Ñ? Ð¸Ð·Ð¼ÐµÐ½Ð° Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼ÐµÑ?Ñ?ÐºÐµ Ñ?Ð¿Ñ?ÐµÐ³Ðµ, Ð½ÐµÐºÐµ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ñ?Ðµ Ð¼Ð¾Ð¶Ð´Ð° Ð½ÐµÑ?Ðµ Ñ?Ð°Ð´Ð¸Ñ?Ð¸ "
-"ÐºÐ°ÐºÐ¾ Ñ?Ñ?ÐµÐ±Ð°."
+#: ../meld/meldapp.py:153
+msgid "Start with an empty window"
+msgstr "Ð?Ñ?Ð²Ð°Ñ?Ð° Ñ?ÐµÐ´Ð°Ð½ Ð¿Ñ?Ð°Ð·Ð°Ð½ Ð¿Ñ?Ð¾Ð·Ð¾Ñ?"
 
-#: meldapp.py:54
-#, python-format
-msgid "Browse %s"
-msgstr "Ð?Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ? %s"
+# bug: string composition is bad i18n, and will make l10n hard
+#: ../meld/meldapp.py:154 ../meld/meldapp.py:155 ../meld/meldapp.py:157
+msgid "file"
+msgstr "Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°"
 
-#: meldapp.py:600
-msgid "Original File"
-msgstr "Ð?Ð·Ð²Ð¾Ñ?Ð½Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°"
+#: ../meld/meldapp.py:154 ../meld/meldapp.py:156 ../meld/meldapp.py:157
+msgid "dir"
+msgstr "Ð´Ð¸Ñ?"
 
-#: meldapp.py:600
-msgid "Modified File"
-msgstr "Ð?Ð·Ð¼ÐµÑ?ÐµÐ½Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°"
+#: ../meld/meldapp.py:154
+msgid "Start a version control comparison"
+msgstr "Ð?Ð¾ÐºÑ?ÐµÑ?Ðµ Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?Ðµ ÐºÐ¾Ð½Ñ?Ñ?Ð¾Ð»Ðµ Ð²ÐµÑ?Ð·Ð¸Ñ?Ðµ"
 
-#: meldapp.py:603
-msgid "Other Changes"
-msgstr "Ð?Ñ?Ñ?Ð°Ð»Ðµ Ð¸Ð·Ð¼ÐµÐ½Ðµ"
+#: ../meld/meldapp.py:155
+msgid "Start a 2- or 3-way file comparison"
+msgstr "Ð?Ð¾ÐºÑ?ÐµÑ?Ðµ Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?Ðµ 2 Ð¸Ð»Ð¸ 3 ÐµÐ»ÐµÐ¼ÐµÐ½Ñ?Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°"
 
-#: meldapp.py:603
-msgid "Common Ancestor"
-msgstr "Ð?Ð°Ñ?ÐµÐ´Ð½Ð¸Ñ?ÐºÐ¸ Ð¿Ñ?ÐµÐ´Ð°Ðº"
+#: ../meld/meldapp.py:156
+msgid "Start a 2- or 3-way directory comparison"
+msgstr "Ð?Ð¾ÐºÑ?ÐµÑ?Ðµ Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?Ðµ 2 Ð¸Ð»Ð¸ 3 ÐµÐ»ÐµÐ¼ÐµÐ½Ñ?Ð° Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð°"
 
-#: meldapp.py:603
-msgid "Local Changes"
-msgstr "Ð?Ð¾ÐºÐ°Ð»Ð½Ðµ Ð¸Ð·Ð¼ÐµÐ½Ðµ"
+#: ../meld/meldapp.py:157
+msgid "Start a comparison between file and dir/file"
+msgstr "Ð?Ð¾ÐºÑ?ÐµÑ?Ðµ Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?Ðµ Ð¸Ð·Ð¼ÐµÑ?Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ð¸ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð°/Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
 
-#: meldapp.py:606 meldapp.py:609
-msgid "Original Directory"
-msgstr "Ð?Ð·Ð²Ð¾Ñ?Ð½Ð¸ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼"
+#: ../meld/meldapp.py:163
+msgid "Meld is a file and directory comparison tool."
+msgstr "Ð?ÐµÐ»Ð´ Ñ?Ðµ Ð°Ð»Ð°Ñ? Ð·Ð° Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð¸ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð°."
 
-#: meldapp.py:606 meldapp.py:609
-msgid "Modified Directory"
-msgstr "Ð?Ð·Ð¼ÐµÑ?ÐµÐ½ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼"
+#: ../meld/meldapp.py:166
+msgid "Set label to use instead of file name"
+msgstr "Ð?Ð¾Ð´ÐµÑ?Ð°Ð²Ð° Ð¾Ð·Ð½Ð°ÐºÑ? Ð·Ð° ÐºÐ¾Ñ?Ð¸Ñ?Ñ?ÐµÑ?Ðµ Ñ?Ð¼ÐµÑ?Ñ?Ð¾ Ð¸Ð¼ÐµÐ½Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
 
-#: meldapp.py:609
-msgid "Other Directory"
-msgstr "Ð?Ñ?Ñ?Ð°Ð»Ð¸ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð¸"
+#: ../meld/meldapp.py:168
+msgid "Automatically compare all differing files on startup"
+msgstr "Ð?Ñ?Ñ?Ð¾Ð¼Ð°Ñ?Ñ?ÐºÐ¸ Ð¿Ð¾Ñ?ÐµÐ´Ð¸ Ñ?Ð²Ðµ Ñ?Ð°Ð·Ð»Ð¸ÐºÑ?Ñ?Ñ?Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ð¿Ñ?Ð¸Ð»Ð¸ÐºÐ¾Ð¼ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ð°"
 
-#: meldapp.py:612
-msgid "Root CVS Directory"
-msgstr "Ð?Ð¾Ñ?ÐµÐ½Ð¸ CVS Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼"
+#: ../meld/meldapp.py:171
+msgid "Set the target file for saving a merge result"
+msgstr "Ð?Ð¾Ð´ÐµÑ?Ð°Ð²Ð° Ñ?Ð¸Ñ?Ð½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ? Ð·Ð° Ñ?Ñ?Ð²Ð°Ñ?Ðµ Ñ?ÐµÐ·Ñ?Ð»Ñ?Ð°Ñ?Ð° Ñ?Ñ?Ð°Ð¿Ð°Ñ?Ð°"
 
-#. ###############################################################################
-#.
-#. usage
-#.
-#. ###############################################################################
-#: meldapp.py:800
-msgid ""
-"Meld is a file and directory comparison tool. Usage:\n"
-"\n"
-"    meld                        Start with no windows open\n"
-"    meld <dir>                  Start with CVS browser in 'dir'\n"
-"    meld <file>                 Start with CVS diff of 'file'\n"
-"    meld <file> <file> [file]   Start with 2 or 3 way file comparison\n"
-"    meld <dir>  <dir>  [dir]    Start with 2 or 3 way directory comparison\n"
-"\n"
-"For more information choose help -> contents.\n"
-"Report bugs at http://bugzilla.gnome.org/buglist.cgi?product=meld\n";
-"stevek gnome org\n"
+#: ../meld/meldapp.py:174
+msgid "Creates a diff tab for up to 3 supplied files or directories."
 msgstr ""
-"Ð?ÐµÐ»Ð´ Ñ?Ðµ Ð°Ð»Ð°Ñ? Ð·Ð° Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð¸ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð°. Ð£Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð°:\n"
-"\n"
-"    meld                        Ð?Ð¾ÐºÑ?ÐµÐ½Ð¸ Ð±ÐµÐ· Ð¾Ñ?Ð²Ð¾Ñ?ÐµÐ½Ð¸Ñ? Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð°\n"
-"    meld <Ð´Ð¸Ñ?>                  Ð?Ð¾ÐºÑ?ÐµÐ½Ð¸ Ñ?Ð° CVS Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ?ÐµÐ¼ Ñ? â??Ð´Ð¸Ñ?â??\n"
-"    meld <Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°>             Ð?Ð¾ÐºÑ?ÐµÐ½Ð¸ CVS Ñ?Ð°Ð·Ð»Ð¸ÐºÐµ Ð·Ð° â??Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°â??\n"
-"    meld <Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°> <Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°> [Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°]\n"
-"                                Ð?Ð¾ÐºÑ?ÐµÐ½Ð¸ Ð´Ð²Ð¾- Ð¸Ð»Ð¸ Ñ?Ñ?Ð¾Ñ?Ð¼ÐµÑ?Ð½Ð¾ Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°\n"
-"    meld <Ð´Ð¸Ñ?>  <Ð´Ð¸Ñ?>  [Ð´Ð¸Ñ?]    Ð?Ð¾ÐºÑ?ÐµÐ½Ð¸ Ð´Ð²Ð¾- Ð¸Ð»Ð¸ Ñ?Ñ?Ð¾Ñ?Ð¼ÐµÑ?Ð½Ð¾ Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?Ðµ \n"
-"                                Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð°\n"
-"\n"
-"Ð?Ð° Ð²Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° Ð¸Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¿Ð¾Ð¼Ð¾Ñ? -> Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ?.\n"
-"Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð³Ñ?ÐµÑ?ÐºÐµ Ð½Ð° http://bugzilla.gnome.org/buglist.cgi?product=meld\n";
-"http://mail.gnome.org/mailman/listinfo/meld-list\n";
+"Ð?Ñ?Ð°Ð²Ð¸ Ñ?ÐµÐ·Ð¸Ñ?Ð°Ðº Ñ?Ð°Ð·Ð»Ð¸ÐºÐ° Ð·Ð° Ð½Ð°Ñ?Ð²Ð¸Ñ?Ðµ Ð´Ð¾ 3 Ð¿Ñ?Ð¸Ð´Ð¾Ð´Ð°Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ð¸Ð»Ð¸ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð°."
 
-#: meldapp.py:813
+#: ../meld/meldapp.py:177
 #, python-format
-msgid ""
-"Meld %s\n"
-"Written by Stephen Kennedy <stevek gnome org>"
-msgstr ""
-"Ð?ÐµÐ»Ð´ %s\n"
-"Ð?Ð°Ð¿Ð¸Ñ?Ð°Ð¾ Ð¡Ñ?Ð¸Ñ?ÐµÐ½ Ð?ÐµÐ½ÐµÐ´Ð¸ (Stephen Kennedy) <stevek gnome org>"
+msgid "too many arguments (wanted 0-4, got %d)"
+msgstr "Ð¿Ñ?ÐµÐ²Ð¸Ñ?Ðµ Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ð°Ñ?Ð° (Ñ?Ñ?Ð°Ð¶ÐµÐ½Ð¾ Ñ?Ðµ 0-4, Ð´Ð¾Ð±Ð¸Ñ? %d)"
 
-#: meldapp.py:860
-#, python-format
-msgid "`%s' is not a directory or file, cannot open cvs view"
-msgstr ""
-"â??%sâ?? Ð½Ðµ Ð¿Ñ?ÐµÐ´Ñ?Ñ?Ð°Ð²Ñ?Ð° Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼ Ð½Ð¸ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?, Ð½Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ð¼ CVS Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
+#: ../meld/melddoc.py:51 ../meld/melddoc.py:52
+msgid "untitled"
+msgstr "Ð±ÐµÐ·Ð¸Ð¼ÐµÐ½Ð¸"
 
-#: meldapp.py:866
-msgid "Cannot open "
-msgstr "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ð¼ "
+#. no common path. empty names get changed to "[None]"
+#: ../meld/misc.py:174
+msgid "[None]"
+msgstr "[Ð½Ð¸Ñ?Ñ?Ð°]"
 
-#: meldapp.py:883
-msgid "Cannot compare a mixture of files and directories.\n"
-msgstr "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð¿Ð¾Ñ?ÐµÐ´Ð¸Ð¼ Ð¼ÐµÑ?Ð°Ð²Ð¸Ð½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð¸ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð°.\n"
+#: ../meld/patchdialog.py:122
+msgid "Save Patch As..."
+msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð¸Ñ?Ð¿Ñ?Ð°Ð²ÐºÑ? ÐºÐ°Ð¾..."
 
-# bug: string composition is bad i18n, and will make l10n hard
-#: meldapp.py:885
-msgid "file"
-msgstr "Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
+#: ../meld/preferences.py:37
+msgid "label"
+msgstr "Ð¾Ð·Ð½Ð°ÐºÐ°"
+
+#: ../meld/preferences.py:37
+msgid "pattern"
+msgstr "Ð¾Ð±Ñ?Ð°Ð·Ð°Ñ?"
 
-#: meldapp.py:885
-msgid "folder"
-msgstr "Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼"
+#: ../meld/preferences.py:105
+msgid "Only available if you have gnome-python-desktop installed"
+msgstr "Ð?Ð¾Ñ?Ñ?Ñ?Ð¿Ð½Ð¾ Ñ?Ðµ Ñ?Ð°Ð¼Ð¾ Ð°ÐºÐ¾ Ñ?Ñ?Ðµ Ð¸Ð½Ñ?Ñ?Ð°Ð»Ð¸Ñ?Ð°Ð»Ð¸ â??gnome-python-desktopâ??"
 
-#: meldapp.py:888
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:232
+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
 #, python-format
-msgid "Wrong number of arguments (Got %i)"
-msgstr "Ð?Ð¾Ð³Ñ?ÐµÑ?Ð°Ð½ Ð±Ñ?Ð¾Ñ? Ð°Ñ?Ð³Ñ?Ð¼ÐµÐ½Ð°Ñ?Ð° (Ð¿Ñ?Ð¸Ð¼Ð¸Ñ? %i)"
+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
+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
+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
+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
+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
+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
+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
+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
+msgid "Script comment\t0\t#.*"
+msgstr "Ð?Ð¾Ð¼ÐµÐ½Ñ?Ð°Ñ? Ñ?ÐºÑ?Ð¸Ð¿Ñ?Ðµ\t0\t#.*"
+
+#: ../meld/vcview.py:120
+msgid "Co_mmit"
+msgstr "Ð£_Ð³Ñ?Ð°Ð´Ð¸"
 
-#: melddoc.py:45
-msgid "untitled"
-msgstr "Ð±ÐµÐ·Ð¸Ð¼ÐµÐ½Ð¸"
+#: ../meld/vcview.py:120
+msgid "Commit"
+msgstr "Ð£Ð³Ñ?Ð°Ð´Ð¸"
 
-#. no common path. empty names get changed to "[None]"
-#: misc.py:121
-msgid "[None]"
-msgstr "[Ð½Ð¸Ñ?Ñ?Ð°]"
+#: ../meld/vcview.py:121
+msgid "_Update"
+msgstr "_Ð?Ð¾Ð¿Ñ?Ð½Ð¸"
+
+#: ../meld/vcview.py:121
+msgid "Update"
+msgstr "Ð?Ð¾Ð¿Ñ?Ð½Ð¸"
+
+#: ../meld/vcview.py:122
+msgid "_Add"
+msgstr "_Ð?Ð¾Ð´Ð°Ñ?"
 
-#: glade2/cvsview.glade.h:1 glade2/filediff.glade.h:1 glade2/dirdiff.glade.h:1
-#: glade2/meldapp.glade.h:3
-msgid "*"
-msgstr "*"
+#: ../meld/vcview.py:122
+msgid "Add to VC"
+msgstr "Ð?Ð¾Ð´Ð°Ñ? Ñ? Ð¦Ð?"
 
-#: glade2/cvsview.glade.h:2
+#: ../meld/vcview.py:123
 msgid "Add _Binary"
 msgstr "Ð?Ð¾Ð´Ð°Ñ? _Ð±Ð¸Ð½Ð°Ñ?Ð½Ð¾"
 
-#: glade2/cvsview.glade.h:3
-msgid "Add to CVS"
-msgstr "Ð?Ð¾Ð´Ð°Ñ? Ñ? CVS"
+#: ../meld/vcview.py:123
+msgid "Add binary to VC"
+msgstr "Ð?Ð¾Ð´Ð°Ñ? Ð±Ð¸Ð½Ð°Ñ?Ð½Ð¾ Ñ? Ð¦Ð?"
 
-#: glade2/cvsview.glade.h:4
-msgid "CVS Log"
-msgstr "CVS Ð´Ð½ÐµÐ²Ð½Ð¸Ðº"
+#: ../meld/vcview.py:124
+msgid "_Remove"
+msgstr "Ð£_ÐºÐ»Ð¾Ð½Ð¸"
 
-#: glade2/cvsview.glade.h:5
-msgid "Commit"
-msgstr "Ð£Ð³Ñ?Ð°Ð´Ð¸"
+#: ../meld/vcview.py:124
+msgid "Remove from VC"
+msgstr "Ð£ÐºÐ»Ð¾Ð½Ð¸ Ð¸Ð· Ð¦Ð?"
 
-#: glade2/cvsview.glade.h:6
-msgid "Commit Files"
-msgstr "Ð£Ð³Ñ?Ð°Ð´Ð¸ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
+#: ../meld/vcview.py:125
+msgid "_Resolved"
+msgstr "_Ð ÐµÑ?ÐµÐ½Ð¾"
 
-#: glade2/cvsview.glade.h:7
+#: ../meld/vcview.py:125
+msgid "Mark as resolved for VC"
+msgstr "Ð?Ð·Ð½Ð°Ñ?Ð°Ð²Ð° ÐºÐ°Ð¾ Ñ?ÐµÑ?ÐµÐ½Ð¾ Ð·Ð° Ð¦Ð?"
+
+#: ../meld/vcview.py:126
+msgid "Revert to original"
+msgstr "Ð?Ñ?Ð°Ñ?Ð¸ Ð½Ð° Ð¾Ñ?Ð¸Ð³Ð¸Ð½Ð°Ð»"
+
+#: ../meld/vcview.py:127
 msgid "Delete locally"
 msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ñ? Ð»Ð¾ÐºÐ°Ð»Ñ?"
 
-#: glade2/cvsview.glade.h:8
-msgid "Diff selected"
-msgstr "Ð?Ð·Ð°Ð±Ñ?Ð°Ð½Ðµ Ñ?Ð°Ð·Ð»Ð¸ÐºÐµ"
+#: ../meld/vcview.py:131
+msgid "_Flatten"
+msgstr "_Ð?Ð·Ñ?Ð°Ð²Ð½Ð°Ñ?"
 
-#: glade2/cvsview.glade.h:9
+#: ../meld/vcview.py:131
 msgid "Flatten directories"
 msgstr "Ð?Ð·Ñ?Ð°Ð²Ð½Ð°Ñ? Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ðµ"
 
-#: glade2/cvsview.glade.h:10
+#: ../meld/vcview.py:132
+msgid "_Modified"
+msgstr "Ð?Ð·_Ð¼ÐµÑ?ÐµÐ½"
+
+#: ../meld/vcview.py:133
+msgid "_Normal"
+msgstr "_Ð?Ð±Ð¸Ñ?Ð½Ð¾"
+
+#: ../meld/vcview.py:133
+msgid "Show normal"
+msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¾Ð±Ð¸Ñ?Ð½Ðµ"
+
+#: ../meld/vcview.py:134
+msgid "Non _VC"
+msgstr "Ð?Ðµ _Ð¦Ð?"
+
+#: ../meld/vcview.py:134
+msgid "Show unversioned files"
+msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð½ÐµÐ²ÐµÑ?Ð·Ð¸Ð¾Ð½Ð¸Ñ?Ð°Ð½Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
+
+#: ../meld/vcview.py:135
 msgid "Ignored"
 msgstr "Ð?Ð°Ð½ÐµÐ¼Ð°Ñ?ÐµÐ½"
 
-#: glade2/cvsview.glade.h:11
-msgid "Log Message"
-msgstr "Ð?Ð¾Ñ?Ñ?ÐºÐ° Ð·Ð° Ð´Ð½ÐµÐ²Ð½Ð¸Ðº"
-
-#: glade2/cvsview.glade.h:12
-msgid "Non _CVS"
-msgstr "Ð?Ðµ-_CVS"
+#: ../meld/vcview.py:135
+msgid "Show ignored files"
+msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·Ñ?Ñ?Ðµ Ð·Ð°Ð½ÐµÐ¼Ð°Ñ?ÐµÐ½Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
 
-#: glade2/cvsview.glade.h:13
-msgid "Previous Logs"
-msgstr "Ð?Ñ?ÐµÑ?Ñ?Ð¾Ð´Ð½Ð¸ Ð´Ð½ÐµÐ²Ð½Ð¸Ñ?Ð¸"
+#: ../meld/vcview.py:156
+msgid "Name"
+msgstr "Ð?Ð¼Ðµ"
 
-#: glade2/cvsview.glade.h:14
-msgid "Remove _Locally"
-msgstr "Ð£ÐºÐ»Ð¾Ð½Ð¸ Ñ? _Ð»Ð¾ÐºÐ°Ð»Ñ?"
+#: ../meld/vcview.py:176 ../meld/vcview.py:300
+msgid "Location"
+msgstr "Ð?Ñ?Ñ?Ð°Ñ?Ð°"
 
-#: glade2/cvsview.glade.h:15
-msgid "Remove from CVS"
-msgstr "Ð£ÐºÐ»Ð¾Ð½Ð¸ Ð¸Ð· CVS-Ð°"
+#: ../meld/vcview.py:177
+msgid "Status"
+msgstr "Ð¡Ñ?Ð°Ñ?Ðµ"
 
-#: glade2/cvsview.glade.h:16 glade2/dirdiff.glade.h:21
-msgid "Show modified"
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½Ðµ"
+#: ../meld/vcview.py:178
+msgid "Rev"
+msgstr "Ð?Ð·Ð´"
 
-#: glade2/cvsview.glade.h:17
-msgid "Show non-CVS"
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð½Ðµ-CVS"
+#: ../meld/vcview.py:180
+msgid "Options"
+msgstr "Ð?Ð¿Ñ?Ð¸Ñ?Ðµ"
 
-#: glade2/cvsview.glade.h:18
-msgid "Update"
-msgstr "Ð?Ð¾Ð¿Ñ?Ð½Ð¸"
+#: ../meld/vcview.py:232
+msgid "Choose one Version Control"
+msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð?Ð¾Ð½Ñ?Ñ?Ð¾Ð»Ñ? Ð²ÐµÑ?Ð·Ð¸Ñ?Ðµ"
 
-#: glade2/cvsview.glade.h:19
-msgid "_Add"
-msgstr "_Ð?Ð¾Ð´Ð°Ñ?"
+#: ../meld/vcview.py:233
+msgid "Only one Version Control in this directory"
+msgstr "Ð¡Ð°Ð¼Ð¾ Ñ?ÐµÐ´Ð½Ð° Ð?Ð¾Ð½Ñ?Ñ?Ð¾Ð»Ð° Ð²ÐµÑ?Ð·Ð¸Ñ?Ð° Ñ? Ð¾Ð²Ð¾Ð¼ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ñ?"
 
-#: glade2/cvsview.glade.h:20
-msgid "_Commit"
-msgstr "Ð£_Ð³Ñ?Ð°Ð´Ð¸"
+#. TRANSLATORS: this is an error message when a version control
+#. application isn't installed or can't be found
+#: ../meld/vcview.py:246
+#, python-format
+msgid "%s Not Installed"
+msgstr "â??%sâ?? Ð½Ð¸Ñ?Ðµ Ð¸Ð½Ñ?Ñ?Ð°Ð»Ð¸Ñ?Ð°Ð½"
 
-#: glade2/cvsview.glade.h:21 glade2/meldapp.glade.h:75
-msgid "_Diff"
-msgstr "_Ð Ð°Ð·Ð»Ð¸ÐºÐµ"
+#. TRANSLATORS: this is an error message when a version
+#. controlled repository is invalid or corrupted
+#: ../meld/vcview.py:250
+msgid "Invalid Repository"
+msgstr "Ð?ÐµÐ¸Ñ?Ð¿Ñ?Ð°Ð²Ð½Ð¾ Ñ?ÐºÐ»Ð°Ð´Ð¸Ñ?Ñ?Ðµ"
 
-#: glade2/cvsview.glade.h:22
-msgid "_Edit"
-msgstr "_Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ðµ"
+#: ../meld/vcview.py:259
+#, python-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: glade2/cvsview.glade.h:23
-msgid "_Flatten"
-msgstr "_Ð?Ð·Ñ?Ð°Ð²Ð½Ð°Ñ?"
+#. TRANSLATORS: This is the location of the directory the user is diffing
+#: ../meld/vcview.py:300
+#, python-format
+msgid "%s: %s"
+msgstr "%s: %s"
 
-#: glade2/cvsview.glade.h:24
-msgid "_Modified"
-msgstr "Ð?Ð·_Ð¼ÐµÑ?ÐµÐ½"
+#: ../meld/vcview.py:348
+msgid "(Empty)"
+msgstr "(Ð?Ñ?Ð°Ð·Ð½Ð¾)"
 
-#: glade2/cvsview.glade.h:25
-msgid "_Normal"
-msgstr "_Ð?Ð±Ð¸Ñ?Ð½Ð¾"
+#: ../meld/vcview.py:386
+#, python-format
+msgid "[%s] Fetching differences"
+msgstr "[%s] Ð?Ñ?Ð¸Ð±Ð°Ð²Ñ?Ð°Ð¼ Ñ?Ð°Ð·Ð»Ð¸ÐºÐµ"
 
-#: glade2/cvsview.glade.h:26
-msgid "_Remove"
-msgstr "Ð£_ÐºÐ»Ð¾Ð½Ð¸"
+#: ../meld/vcview.py:394
+#, python-format
+msgid "[%s] Applying patch"
+msgstr "[%s] Ð?Ñ?Ð¸Ð¼ÐµÑ?Ñ?Ñ?ÐµÐ¼ Ð·Ð°ÐºÑ?Ð¿Ñ?"
 
-#: glade2/cvsview.glade.h:27
-msgid "_Update"
-msgstr "_Ð?Ð¾Ð¿Ñ?Ð½Ð¸"
+#: ../meld/vcview.py:479
+msgid "Select some files first."
+msgstr "Ð?Ñ?Ð²Ð¾ Ð¸Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð½ÐµÐºÐµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ."
 
-#: glade2/filediff.glade.h:2
+#: ../meld/vcview.py:552
+#, python-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Some files have been modified.\n"
-"Which ones would you like to save?</span>"
+"\n"
+"                    Invoking 'patch' failed.\n"
+"                    \n"
+"                    Maybe you don't have 'GNU patch' installed,\n"
+"                    or you use an untested version of %s.\n"
+"                    \n"
+"                    Please send email bug report to:\n"
+"                    meld-list gnome org\n"
+"                    \n"
+"                    Containing the following information:\n"
+"                    \n"
+"                    - meld version: '%s'\n"
+"                    - source control software type: '%s'\n"
+"                    - source control software version: 'X.Y.Z'\n"
+"                    - the output of '%s somefile.txt'\n"
+"                    - patch command: '%s'\n"
+"                    (no need to actually run it, just provide\n"
+"                    the command line) \n"
+"                    \n"
+"                    Replace 'X.Y.Z' by the actual version for the\n"
+"                    source control software you use.\n"
+"                    "
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Ð?ÐµÐºÐµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ñ?Ñ? Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½Ðµ.\n"
-"Ð?Ð¾Ñ?Ðµ Ð¶ÐµÐ»Ð¸Ñ?Ðµ Ð´Ð° Ñ?Ð°Ñ?Ñ?Ð²Ð°Ñ?Ðµ?</span>"
+"\n"
+"                    Ð?Ñ?Ð¸Ð·Ð¸Ð²Ð°Ñ?Ðµ â??patchâ?? Ð½Ð¸Ñ?Ðµ Ñ?Ñ?Ð¿ÐµÐ»Ð¾.\n"
+"                    \n"
+"                    Ð?Ð¾Ð¶Ð´Ð° Ð½Ð¸Ñ?Ñ?Ðµ Ð¸Ð½Ñ?Ñ?Ð°Ð»Ð¸Ñ?Ð°Ð»Ð¸ â??GNU patchâ??,\n"
+"                    Ð¸Ð»Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ Ð½ÐµÐ¿Ñ?Ð¾Ð²ÐµÑ?ÐµÐ½Ñ? Ð²ÐµÑ?Ð·Ð¸Ñ?Ñ? â??%sâ??.\n"
+"                    \n"
+"                    Ð?Ð¾Ð»Ð¸Ð¼ Ð¿Ð¾Ñ?Ð°Ñ?Ð¸Ñ?Ðµ Ð¸Ð·Ð²ÐµÑ?Ñ?Ð°Ñ? Ð¾ Ð³Ñ?ÐµÑ?Ñ?Ð¸ Ð½Ð°:\n"
+"                    meld-list gnome org\n"
+"                    \n"
+"                    Ð?Ð¾Ñ?Ð¸ Ñ?Ð°Ð´Ñ?Ð¶Ð¸ Ñ?Ð»ÐµÐ´ÐµÑ?Ðµ Ð¸Ð½Ñ?Ð¾Ñ?Ð¼Ð°Ñ?Ð¸Ñ?Ðµ:\n"
+"                    \n"
+"                    - Ð²ÐµÑ?Ð·Ð¸Ñ?Ð° Ð¼ÐµÐ»Ð´Ð°: â??%sâ??\n"
+"                    - Ð²Ñ?Ñ?Ñ?Ñ? Ñ?Ð¾Ñ?Ñ?Ð²ÐµÑ?Ð° ÐºÐ¾Ð½Ñ?Ñ?Ð¾Ð»Ðµ Ð¸Ð·Ð²Ð¾Ñ?Ð°: â??%sâ??\n"
+"                    - Ð²ÐµÑ?Ð·Ð¸Ñ?Ñ? Ñ?Ð¾Ñ?Ñ?Ð²ÐµÑ?Ð° ÐºÐ¾Ð½Ñ?Ñ?Ð¾Ð»Ðµ Ð¸Ð·Ð²Ð¾Ñ?Ð°: â??X.Y.Zâ??\n"
+"                    - Ð¸Ñ?Ð¿Ð¸Ñ? â??%s Ð½ÐµÐºÐ°Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°.txtâ??\n"
+"                    - Ð½Ð°Ñ?ÐµÐ´Ð±Ñ? Ð·Ð° Ð¿Ð°Ñ?: â??%sâ??\n"
+"                    (Ð½Ð¸Ñ?Ðµ Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð½Ð¾ Ñ?Ñ?Ð²Ð°Ñ?Ð½Ð¾ Ð¿Ð¾ÐºÑ?ÐµÑ?Ð°Ñ?Ðµ, Ñ?Ð°Ð¼Ð¾\n"
+"                    Ð¾Ð±ÐµÐ·Ð±ÐµÐ´Ð¸Ñ?Ðµ Ð»Ð¸Ð½Ð¸Ñ?Ñ? Ð½Ð°Ñ?ÐµÐ´Ð±Ðµ) \n"
+"                    \n"
+"                    Ð?Ð°Ð¼ÐµÐ½Ð¸Ñ?Ðµ â??X.Y.Zâ?? Ñ?Ñ?ÐµÐ½Ñ?Ñ?Ð½Ð¾Ð¼ Ð²ÐµÑ?Ð·Ð¸Ñ?Ð¾Ð¼\n"
+"                    Ñ?Ð¾Ñ?Ñ?Ð²ÐµÑ?Ð° ÐºÐ¾Ð½Ñ?Ñ?Ð¾Ð»Ðµ Ð¸Ð·Ð²Ð¾Ñ?Ð° ÐºÐ¾Ñ?Ð¸ ÐºÐ¾Ñ?Ð¸Ñ?Ñ?Ð¸Ñ?Ðµ.\n"
+"                    "
+
+#: ../meld/ui/findbar.py:120
+#, python-format
+msgid ""
+"Regular expression error\n"
+"'%s'"
+msgstr ""
+"Ð?Ñ?ÐµÑ?ÐºÐ° Ñ?Ð° Ñ?ÐµÐ³Ñ?Ð»Ð°Ñ?Ð½Ð¸Ð¼ Ð¸Ð·Ñ?Ð°Ð·Ð¾Ð¼\n"
+"â??%sâ??"
 
-#: glade2/filediff.glade.h:4
-msgid "Copy All _Left"
-msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ñ?Ð²Ðµ _Ð»ÐµÐ²Ð¾"
+#: ../meld/ui/historyentry.py:293
+msgid "_Browse..."
+msgstr "Ð?Ñ?Ðµ_Ñ?Ñ?Ð°Ð¶Ð¸..."
 
-#: glade2/filediff.glade.h:5
-msgid "Copy All _Right"
-msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ñ?Ð²Ðµ _Ð´ÐµÑ?Ð½Ð¾"
+#: ../meld/ui/historyentry.py:301
+msgid "Path"
+msgstr "Ð?Ñ?Ñ?Ð°Ñ?Ð°"
 
-#: glade2/filediff.glade.h:6 glade2/dirdiff.glade.h:10
-msgid "Edit"
-msgstr "Ð£Ñ?ÐµÐ´Ð¸"
+#: ../meld/ui/historyentry.py:302
+msgid "Path to file"
+msgstr "Ð?Ñ?Ñ?Ð°Ñ?Ð° Ð´Ð¾ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
 
-#: glade2/filediff.glade.h:7
-msgid "Find"
-msgstr "Ð?Ñ?Ð¾Ð½Ð°Ñ?Ð¸"
+#: ../meld/ui/historyentry.py:303
+msgid "Pop up a file selector to choose a file"
+msgstr "Ð?Ð·Ð±Ð°Ñ?Ñ?Ñ?Ðµ Ð±Ð¸Ñ?Ð°Ñ?Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð·Ð° Ð¸Ð·Ð±Ð¾Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
 
-#: glade2/filediff.glade.h:8
-msgid "Match _entire word only"
-msgstr "Ð?Ð¾ÐºÐ»Ð°Ð¿Ð°Ñ?Ðµ Ñ?Ð°Ð¼Ð¾ _Ñ?ÐµÐ»Ð¸Ñ? Ñ?ÐµÑ?Ð¸"
+#: ../meld/ui/historyentry.py:441
+msgid "Select directory"
+msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼"
 
-#: glade2/filediff.glade.h:9
-msgid "Regular e_xpression"
-msgstr "_Ð ÐµÐ³Ñ?Ð»Ð°Ñ?Ð½Ð¸ Ð¸Ð·Ñ?Ð°Ð·"
+#: ../meld/ui/historyentry.py:445
+msgid "Select file"
+msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
 
-#: glade2/filediff.glade.h:10
-msgid "Save modified files?"
-msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð¸Ð·Ð¼ÐµÑ?ÐµÐ½Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ?"
+#: ../meld/ui/notebooklabel.py:60
+msgid "Close tab"
+msgstr "Ð?Ð°Ñ?Ð²Ð¾Ñ?Ð¸ Ñ?ÐµÐ·Ð¸Ñ?Ð°Ðº"
 
-#: glade2/filediff.glade.h:11
-msgid "Search for:"
-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"
+msgstr ""
+"Ð?Ð°Ð½ÐµÐ¼Ð°Ñ?ÐµÐ½Ð¾:Ð?ÐµÐ²ÐµÑ?Ð·Ð¸Ð¾Ð½Ð¸Ñ?Ð°Ð½Ð¾:::Ð?Ñ?ÐµÑ?ÐºÐ°::Ð?Ð¾Ð²Ð¾ Ð´Ð¾Ð´Ð°Ñ?Ð¾:Ð?Ð·Ð¼ÐµÑ?ÐµÐ½Ð¾:Ð¡Ñ?ÐºÐ¾Ð±:Ð£ÐºÐ»Ð¾Ñ?ÐµÐ½Ð¾:"
+"Ð?ÐµÐ´Ð¾Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ðµ"
 
-#: glade2/filediff.glade.h:12
-msgid "_Match case"
-msgstr "_Ð?Ñ?Ñ?Ð° Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ð° Ñ?Ð»Ð¾Ð²Ð°"
+#: ../meld/vc/cvs.py:163
+#, python-format
+msgid ""
+"Error converting to a regular expression\n"
+"The pattern was '%s'\n"
+"The error was '%s'"
+msgstr ""
+"Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ñ?ÐµÑ?Ð²Ð°Ñ?Ð°Ñ?Ñ? Ñ? Ñ?ÐµÐ³Ñ?Ð»Ð°Ñ?Ð½Ð¸ Ð¸Ð·Ñ?Ð°Ð·\n"
+"Ð?Ð±Ñ?Ð°Ð·Ð°Ñ? Ñ?Ðµ Ð±Ð¸Ð¾ â??%sâ??\n"
+"Ð?Ñ?ÐµÑ?ÐºÐ° Ñ?Ðµ Ð±Ð¸Ð»Ð° â??%sâ??"
 
-#: glade2/filediff.glade.h:13
-msgid "_Wrap around"
-msgstr "Ð£ _ÐºÑ?Ñ?Ð³"
+#~ msgid "[%s] Scanning"
+#~ msgstr "[%s] Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ð¼"
 
-#: glade2/dirdiff.glade.h:2
-msgid "Case"
-msgstr "Ð?ÐµÐ»Ð¸Ñ?Ð¸Ð½Ð° Ñ?Ð»Ð¾Ð²Ð°"
+#~ msgid "Error converting pattern '%s' to regular expression"
+#~ msgstr "Ð?Ñ?ÐµÑ?ÐºÐ° Ð¿Ñ?Ð¸ Ð¿Ñ?ÐµÑ?Ð²Ð°Ñ?Ð°Ñ?Ñ? Ð¾Ð±Ñ?Ð°Ñ?Ñ?Ð° â??%sâ?? Ñ? Ñ?ÐµÐ³Ñ?Ð»Ð°Ñ?Ð½Ð¸ Ð¸Ð·Ñ?Ð°Ð·"
 
-#: glade2/dirdiff.glade.h:3
-msgid "Copy Left"
-msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ð»ÐµÐ²Ð¾"
+# bug: plural-forms
+#~ msgid ""
+#~ "second,seconds:minute,minutes:hour,hours:day,days:week,weeks:month,months:"
+#~ "year,years"
+#~ msgstr ""
+#~ "Ñ?ÐµÐºÑ?Ð½Ð´Ñ?,Ñ?ÐµÐºÑ?Ð½Ð´Ð¸:Ð¼Ð¸Ð½Ñ?Ñ?,Ð¼Ð¸Ð½Ñ?Ñ?Ð°:Ñ?Ð°Ñ?,Ñ?Ð°Ñ?Ð°:Ð´Ð°Ð½,Ð´Ð°Ð½Ð°:Ð½ÐµÐ´ÐµÑ?Ñ?,Ð½ÐµÐ´ÐµÑ?Ð°:Ð¼ÐµÑ?ÐµÑ?,Ð¼ÐµÑ?ÐµÑ?Ð¸:"
+#~ "Ð³Ð¾Ð´Ð¸Ð½Ñ?,Ð³Ð¾Ð´Ð¸Ð½Ð°"
 
-#: glade2/dirdiff.glade.h:4
-msgid "Copy Right"
-msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ð´ÐµÑ?Ð½Ð¾"
+#~ msgid "The regular expression '%s' was not found."
+#~ msgstr "Ð ÐµÐ³Ñ?Ð»Ð°Ñ?Ð½Ð¸ Ð¸Ð·Ñ?Ð°Ð· â??%sâ?? Ð½Ð¸Ñ?Ðµ Ð½Ð°Ñ?ÐµÐ½."
 
-#: glade2/dirdiff.glade.h:5
-msgid "Copy left"
-msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ð»ÐµÐ²Ð¾"
+#~ msgid "The text '%s' was not found."
+#~ msgstr "Ð¢ÐµÐºÑ?Ñ? â??%sâ?? Ð½Ð¸Ñ?Ðµ Ð½Ð°Ñ?ÐµÐ½."
 
-#: glade2/dirdiff.glade.h:6
-msgid "Copy right"
-msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ð´ÐµÑ?Ð½Ð¾"
+#~ msgid ""
+#~ "Could not open '%s' for reading.\n"
+#~ "\n"
+#~ "The error was:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ð¼ â??%sâ?? Ñ?Ð°Ð´Ð¸ Ñ?Ð¸Ñ?Ð°Ñ?Ð°.\n"
+#~ "\n"
+#~ "Ð?Ñ?ÐµÑ?ÐºÐ° Ð±ÐµÑ?Ðµ:\n"
+#~ "%s"
 
-#: glade2/dirdiff.glade.h:7
-msgid "Delete selected"
-msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾"
+#~ msgid ""
+#~ "Could not read from '%s'.\n"
+#~ "\n"
+#~ "I tried encodings %s."
+#~ msgstr ""
+#~ "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ñ?Ð¸Ñ?Ð°Ð¼ Ð¸Ð· â??%sâ??.\n"
+#~ "\n"
+#~ "Ð?Ð¾ÐºÑ?Ñ?Ð°Ñ? ÐºÐ¾Ð´Ð¸Ñ?Ð°Ñ?Ð° %s."
 
-#: glade2/dirdiff.glade.h:8
-msgid "Diff"
-msgstr "Ð Ð°Ð·Ð»Ð¸ÐºÐµ"
+#~ msgid ""
+#~ "Could not read from '%s'.\n"
+#~ "\n"
+#~ "The error was:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ñ?Ð¸Ñ?Ð°Ð¼ Ð¸Ð· â??%sâ??.\n"
+#~ "\n"
+#~ "Ð?Ñ?ÐµÑ?ÐºÐ° Ð±ÐµÑ?Ðµ:\n"
+#~ "%s."
 
-#: glade2/dirdiff.glade.h:9
-msgid "Diff selection"
-msgstr "Ð Ð°Ð·Ð»Ð¸ÐºÐµ Ð·Ð° Ð¸Ð·Ð±Ð¾Ñ?"
+#~ msgid "Meld requires a recent version of pygtk."
+#~ msgstr "Ð?ÐµÐ»Ð´ Ð·Ð°Ñ?Ñ?ÐµÐ²Ð° Ñ?ÐºÐ¾Ñ?Ð¾ Ð¸Ð·Ð´Ð°Ñ?Ðµ Ð?Ð¸Ð?Ñ?Ðº-Ð°."
 
-#: glade2/dirdiff.glade.h:11
-msgid "Hide selected"
-msgstr "Ð¡Ð°ÐºÑ?Ð¸Ñ? Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾"
+#~ msgid "pygtk-%s or higher is recommended."
+#~ msgstr "Ð?Ñ?ÐµÐ¿Ð¾Ñ?Ñ?Ñ?Ñ?Ñ?Ðµ Ñ?Ðµ Ð?Ð¸Ð?Ñ?Ðº %s Ð¸Ð»Ð¸ Ð½Ð¾Ð²Ð¸Ñ?Ð¸."
 
-#: glade2/dirdiff.glade.h:12
-msgid "Hide..."
-msgstr "Ð¡Ð°ÐºÑ?Ð¸Ñ?..."
+#~ msgid "Meld works best with pygtk-%s or higher. (found %s)"
+#~ msgstr "Ð?ÐµÐ»Ð´ Ð½Ð°Ñ?Ð±Ð¾Ñ?Ðµ Ñ?Ð°Ð´Ð¸ Ñ?Ð· Ð?Ð¸Ð?Ñ?Ðº %s Ð¸Ð»Ð¸ Ð½Ð¾Ð²Ð¸Ñ?Ð¸. (Ð½Ð°Ñ?Ð¾Ñ? %s)"
 
-#: glade2/dirdiff.glade.h:13
-msgid "Ignore case of entries"
-msgstr "Ð?Ð°Ð½ÐµÐ¼Ð°Ñ?Ð¸ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ñ? Ñ?Ð»Ð¾Ð²Ð° Ñ?Ð½Ð¾Ñ?Ð°"
+#~ msgid ""
+#~ "Due to incompatible API changes some functions may not operate as "
+#~ "expected."
+#~ msgstr ""
+#~ "Ð?Ð±Ð¾Ð³ Ð½ÐµÑ?Ð°Ð³Ð»Ð°Ñ?Ð½Ð¸Ñ? Ð¸Ð·Ð¼ÐµÐ½Ð° Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼ÐµÑ?Ñ?ÐºÐµ Ñ?Ð¿Ñ?ÐµÐ³Ðµ, Ð½ÐµÐºÐµ Ñ?Ñ?Ð½ÐºÑ?Ð¸Ñ?Ðµ Ð¼Ð¾Ð¶Ð´Ð° Ð½ÐµÑ?Ðµ "
+#~ "Ñ?Ð°Ð´Ð¸Ñ?Ð¸ ÐºÐ°ÐºÐ¾ Ñ?Ñ?ÐµÐ±Ð°."
 
-#: glade2/dirdiff.glade.h:14
-msgid "Launch _Comparison"
-msgstr "Ð?Ð¾ÐºÑ?ÐµÐ½Ð¸ Ð¿Ð¾_Ñ?ÐµÑ?ÐµÑ?Ðµ"
+#~ msgid "Modified File"
+#~ msgstr "Ð?Ð·Ð¼ÐµÑ?ÐµÐ½Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°"
 
-#: glade2/dirdiff.glade.h:15
-msgid "Left"
-msgstr "Ð?ÐµÐ²Ð¾"
+#~ msgid "Other Changes"
+#~ msgstr "Ð?Ñ?Ñ?Ð°Ð»Ðµ Ð¸Ð·Ð¼ÐµÐ½Ðµ"
 
-#: glade2/dirdiff.glade.h:16
-msgid "Modified"
-msgstr "Ð?Ð·Ð¼ÐµÑ?ÐµÐ½"
+#~ msgid "Common Ancestor"
+#~ msgstr "Ð?Ð°Ñ?ÐµÐ´Ð½Ð¸Ñ?ÐºÐ¸ Ð¿Ñ?ÐµÐ´Ð°Ðº"
 
-#: glade2/dirdiff.glade.h:17
-msgid "New"
-msgstr "Ð?Ð¾Ð²Ð¸"
+#~ msgid "Original Directory"
+#~ msgstr "Ð?Ð·Ð²Ð¾Ñ?Ð½Ð¸ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼"
 
-#: glade2/dirdiff.glade.h:18
-msgid "Right"
-msgstr "Ð?ÐµÑ?Ð½Ð¾"
+#~ msgid "Modified Directory"
+#~ msgstr "Ð?Ð·Ð¼ÐµÑ?ÐµÐ½ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼"
 
-#: glade2/dirdiff.glade.h:19
-msgid "Same"
-msgstr "Ð?Ñ?Ñ?Ð¾"
+#~ msgid ""
+#~ "Meld is a file and directory comparison tool. Usage:\n"
+#~ "\n"
+#~ "    meld                        Start with no windows open\n"
+#~ "    meld <dir>                  Start with CVS browser in 'dir'\n"
+#~ "    meld <file>                 Start with CVS diff of 'file'\n"
+#~ "    meld <file> <file> [file]   Start with 2 or 3 way file comparison\n"
+#~ "    meld <dir>  <dir>  [dir]    Start with 2 or 3 way directory "
+#~ "comparison\n"
+#~ "\n"
+#~ "For more information choose help -> contents.\n"
+#~ "Report bugs at http://bugzilla.gnome.org/buglist.cgi?product=meld\n";
+#~ "stevek gnome org\n"
+#~ msgstr ""
+#~ "Ð?ÐµÐ»Ð´ Ñ?Ðµ Ð°Ð»Ð°Ñ? Ð·Ð° Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð¸ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð°. Ð£Ð¿Ð¾Ñ?Ñ?ÐµÐ±Ð°:\n"
+#~ "\n"
+#~ "    meld                        Ð?Ð¾ÐºÑ?ÐµÐ½Ð¸ Ð±ÐµÐ· Ð¾Ñ?Ð²Ð¾Ñ?ÐµÐ½Ð¸Ñ? Ð¿Ñ?Ð¾Ð·Ð¾Ñ?Ð°\n"
+#~ "    meld <Ð´Ð¸Ñ?>                  Ð?Ð¾ÐºÑ?ÐµÐ½Ð¸ Ñ?Ð° CVS Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´Ð°Ñ?ÐµÐ¼ Ñ? â??Ð´Ð¸Ñ?â??\n"
+#~ "    meld <Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°>             Ð?Ð¾ÐºÑ?ÐµÐ½Ð¸ CVS Ñ?Ð°Ð·Ð»Ð¸ÐºÐµ Ð·Ð° â??Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°â??\n"
+#~ "    meld <Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°> <Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°> [Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°]\n"
+#~ "                                Ð?Ð¾ÐºÑ?ÐµÐ½Ð¸ Ð´Ð²Ð¾- Ð¸Ð»Ð¸ Ñ?Ñ?Ð¾Ñ?Ð¼ÐµÑ?Ð½Ð¾ Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?Ðµ "
+#~ "Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°\n"
+#~ "    meld <Ð´Ð¸Ñ?>  <Ð´Ð¸Ñ?>  [Ð´Ð¸Ñ?]    Ð?Ð¾ÐºÑ?ÐµÐ½Ð¸ Ð´Ð²Ð¾- Ð¸Ð»Ð¸ Ñ?Ñ?Ð¾Ñ?Ð¼ÐµÑ?Ð½Ð¾ Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?Ðµ \n"
+#~ "                                Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð°\n"
+#~ "\n"
+#~ "Ð?Ð° Ð²Ð¸Ñ?Ðµ Ð¿Ð¾Ð´Ð°Ñ?Ð°ÐºÐ° Ð¸Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ Ð¿Ð¾Ð¼Ð¾Ñ? -> Ñ?Ð°Ð´Ñ?Ð¶Ð°Ñ?.\n"
+#~ "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð¸Ñ?Ðµ Ð³Ñ?ÐµÑ?ÐºÐµ Ð½Ð° http://bugzilla.gnome.org/buglist.cgi?product=meld\n";
+#~ "http://mail.gnome.org/mailman/listinfo/meld-list\n";
 
-#: glade2/dirdiff.glade.h:20
-msgid "Show identical"
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð¸Ñ?Ñ?Ð¾Ð²ÐµÑ?Ð½Ðµ"
+#~ msgid ""
+#~ "Meld %s\n"
+#~ "Written by Stephen Kennedy <stevek gnome org>"
+#~ msgstr ""
+#~ "Ð?ÐµÐ»Ð´ %s\n"
+#~ "Ð?Ð°Ð¿Ð¸Ñ?Ð°Ð¾ Ð¡Ñ?Ð¸Ñ?ÐµÐ½ Ð?ÐµÐ½ÐµÐ´Ð¸ (Stephen Kennedy) <stevek gnome org>"
 
-#: glade2/dirdiff.glade.h:22
-msgid "Show new"
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð½Ð¾Ð²Ðµ"
+#~ msgid "`%s' is not a directory or file, cannot open cvs view"
+#~ msgstr ""
+#~ "â??%sâ?? Ð½Ðµ Ð¿Ñ?ÐµÐ´Ñ?Ñ?Ð°Ð²Ñ?Ð° Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼ Ð½Ð¸ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?, Ð½Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð¾Ñ?Ð²Ð¾Ñ?Ð¸Ð¼ CVS "
+#~ "Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
 
-#: glade2/dirdiff.glade.h:23
-msgid "_Delete Selected"
-msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ _Ð¸Ð·Ð°Ð±Ñ?Ð°Ð½Ð¾"
+#~ msgid "Cannot compare a mixture of files and directories.\n"
+#~ msgstr "Ð?Ðµ Ð¼Ð¾Ð³Ñ? Ð´Ð° Ð¿Ð¾Ñ?ÐµÐ´Ð¸Ð¼ Ð¼ÐµÑ?Ð°Ð²Ð¸Ð½Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ° Ð¸ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ð°.\n"
 
-# bug: plural-forms
-#: glade2/meldapp.glade.h:1
-msgid " spaces."
-msgstr " Ñ?Ð°Ð·Ð¼Ð°ÐºÐ°."
+#~ msgid "folder"
+#~ msgstr "Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼"
 
-#: glade2/meldapp.glade.h:2
-msgid "(gnome-default-editor)"
-msgstr "(Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸-Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?-Ð³Ð½Ð¾Ð¼Ð°)"
+#~ msgid "*"
+#~ msgstr "*"
 
-#: glade2/meldapp.glade.h:4
-msgid "<b>Drawing Style</b>"
-msgstr "<b>Ð¡Ñ?Ð¸Ð» Ð¸Ñ?Ñ?Ñ?Ñ?Ð°Ð²Ð°Ñ?Ð°</b>"
+#~ msgid "Remove _Locally"
+#~ msgstr "Ð£ÐºÐ»Ð¾Ð½Ð¸ Ñ? _Ð»Ð¾ÐºÐ°Ð»Ñ?"
 
-#: glade2/meldapp.glade.h:5
-msgid "<b>Edit Menu</b>"
-msgstr "<b>Ð?ÐµÐ½Ð¸ Ð·Ð° Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ðµ</b>"
+#~ msgid "Show non-CVS"
+#~ msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð¶Ð¸ Ð½Ðµ-CVS"
 
-#: glade2/meldapp.glade.h:6
-msgid "<b>Font</b>"
-msgstr "<b>Ð¤Ð¾Ð½Ñ?</b>"
+#~ msgid "_Commit"
+#~ msgstr "Ð£_Ð³Ñ?Ð°Ð´Ð¸"
 
-#: glade2/meldapp.glade.h:7
-msgid "<b>Global options</b>"
-msgstr "<b>Ð?Ð¿Ñ?Ñ?Ðµ Ð¾Ð¿Ñ?Ð¸Ñ?Ðµ</b>"
+#~ msgid "_Diff"
+#~ msgstr "_Ð Ð°Ð·Ð»Ð¸ÐºÐµ"
 
-#: glade2/meldapp.glade.h:8
-msgid "<b>Loading</b>"
-msgstr "<b>Ð£Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ðµ</b>"
+#~ msgid "_Edit"
+#~ msgstr "_Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ðµ"
 
-#: glade2/meldapp.glade.h:9
-msgid "<b>Misc</b>"
-msgstr "<b>Ð Ð°Ð·Ð½Ð¾</b>"
+#~ msgid "Copy All _Left"
+#~ msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ñ?Ð²Ðµ _Ð»ÐµÐ²Ð¾"
 
-#: glade2/meldapp.glade.h:10
-msgid "<b>Saving</b>"
-msgstr "<b>Ð§Ñ?Ð²Ð°Ñ?Ðµ</b>"
+#~ msgid "Copy All _Right"
+#~ msgstr "Ð£Ð¼Ð½Ð¾Ð¶Ð¸ Ñ?Ð²Ðµ _Ð´ÐµÑ?Ð½Ð¾"
 
-#: glade2/meldapp.glade.h:11
-msgid "<b>Toolbar Appearance</b>"
-msgstr "<b>Ð?Ð·Ð³Ð»ÐµÐ´ Ð°Ð»Ð°Ñ?ÐºÐ¸</b>"
+#~ msgid "Edit"
+#~ msgstr "Ð£Ñ?ÐµÐ´Ð¸"
 
-#: glade2/meldapp.glade.h:12
-msgid "<b>Update Options</b>"
-msgstr "<b>Ð?Ð¿Ñ?Ð¸Ñ?Ðµ Ð´Ð¾Ð¿Ñ?Ñ?Ð°Ð²Ð°Ñ?Ð°</b>"
+#~ msgid "Find"
+#~ msgstr "Ð?Ñ?Ð¾Ð½Ð°Ñ?Ð¸"
 
-#: glade2/meldapp.glade.h:13
-msgid "<b>Whitespace</b>"
-msgstr "<b>Ð?ÐµÐ»Ð¸Ð½Ðµ</b>"
+#~ msgid "Match _entire word only"
+#~ msgstr "Ð?Ð¾ÐºÐ»Ð°Ð¿Ð°Ñ?Ðµ Ñ?Ð°Ð¼Ð¾ _Ñ?ÐµÐ»Ð¸Ñ? Ñ?ÐµÑ?Ð¸"
 
-#: glade2/meldapp.glade.h:14
-msgid "<span weight=\"bold\" size=\"x-large\">Binary Files</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Ð?Ð¸Ð½Ð°Ñ?Ð½Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ</span>"
+#~ msgid "_Wrap around"
+#~ msgstr "Ð£ _ÐºÑ?Ñ?Ð³"
 
-#: glade2/meldapp.glade.h:15
-msgid "<span weight=\"bold\" size=\"x-large\">CVS</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">CVS</span>"
+#~ msgid "Diff"
+#~ msgstr "Ð Ð°Ð·Ð»Ð¸ÐºÐµ"
 
-#: glade2/meldapp.glade.h:16
-msgid "<span weight=\"bold\" size=\"x-large\">Diff</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Ð Ð°Ð·Ð»Ð¸ÐºÐµ</span>"
+#~ msgid "Hide..."
+#~ msgstr "Ð¡Ð°ÐºÑ?Ð¸Ñ?..."
 
-#: glade2/meldapp.glade.h:17
-msgid "<span weight=\"bold\" size=\"x-large\">Display</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Ð?Ñ?Ð¸ÐºÐ°Ð·</span>"
+#~ msgid "Left"
+#~ msgstr "Ð?ÐµÐ²Ð¾"
 
-#: glade2/meldapp.glade.h:18
-msgid "<span weight=\"bold\" size=\"x-large\">Editor</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?</span>"
+#~ msgid "Right"
+#~ msgstr "Ð?ÐµÑ?Ð½Ð¾"
 
-#: glade2/meldapp.glade.h:19
-msgid "<span weight=\"bold\" size=\"x-large\">Encoding</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Ð?Ð¾Ð´Ð¸Ñ?Ð°Ñ?Ðµ</span>"
+# bug: plural-forms
+#~ msgid " spaces."
+#~ msgstr " Ñ?Ð°Ð·Ð¼Ð°ÐºÐ°."
 
-#: glade2/meldapp.glade.h:20
-msgid "<span weight=\"bold\" size=\"x-large\">File Filters</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Ð¤Ð¸Ð»Ñ?ÐµÑ?Ð¸ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°</span>"
+#~ msgid "(gnome-default-editor)"
+#~ msgstr "(Ð¿Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸-Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?-Ð³Ð½Ð¾Ð¼Ð°)"
 
-#: glade2/meldapp.glade.h:21
-msgid "<span weight=\"bold\" size=\"x-large\">Text Filters</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Ð¤Ð¸Ð»Ñ?ÐµÑ?Ð¸ Ñ?ÐµÐºÑ?Ñ?Ð°</span>"
+#~ msgid "<b>Drawing Style</b>"
+#~ msgstr "<b>Ð¡Ñ?Ð¸Ð» Ð¸Ñ?Ñ?Ñ?Ñ?Ð°Ð²Ð°Ñ?Ð°</b>"
 
-#: glade2/meldapp.glade.h:22
-msgid "Automatically supply missing newline at end of file."
-msgstr "Ð¡Ð°Ð¼ Ð´Ð¾Ð´Ð°Ñ? Ð½ÐµÐ´Ð¾Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð¸ Ð½Ð¾Ð²Ð¸-Ñ?ÐµÐ´ Ð½Ð° ÐºÑ?Ð°Ñ?Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ."
+#~ msgid "<b>Edit Menu</b>"
+#~ msgstr "<b>Ð?ÐµÐ½Ð¸ Ð·Ð° Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ðµ</b>"
 
-#: glade2/meldapp.glade.h:23
-msgid "Binary files do not have text filters applied to them when comparing."
-msgstr "Ð?Ð° Ð±Ð¸Ð½Ð°Ñ?Ð½Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ñ?Ðµ Ð½Ðµ Ð¿Ñ?Ð¸Ð¼ÐµÑ?Ñ?Ñ?Ñ? Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð¸ Ñ?ÐµÐºÑ?Ñ?Ð° Ð¿Ñ?Ð¸ Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?Ñ?."
+#~ msgid "<b>Font</b>"
+#~ msgstr "<b>Ð¤Ð¾Ð½Ñ?</b>"
 
-#: glade2/meldapp.glade.h:24
-msgid "CVS"
-msgstr "CVS"
+#~ msgid "<b>Global options</b>"
+#~ msgstr "<b>Ð?Ð¿Ñ?Ñ?Ðµ Ð¾Ð¿Ñ?Ð¸Ñ?Ðµ</b>"
 
-#: glade2/meldapp.glade.h:25
-msgid "CVS binary"
-msgstr "CVS Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼"
+#~ msgid "<b>Loading</b>"
+#~ msgstr "<b>Ð£Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ðµ</b>"
 
-#: glade2/meldapp.glade.h:26
-msgid "CVS view"
-msgstr "CVS Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
+#~ msgid "<b>Misc</b>"
+#~ msgstr "<b>Ð Ð°Ð·Ð½Ð¾</b>"
 
-#: glade2/meldapp.glade.h:27
-msgid "Choose Files"
-msgstr "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
+#~ msgid "<b>Saving</b>"
+#~ msgstr "<b>Ð§Ñ?Ð²Ð°Ñ?Ðµ</b>"
 
-#: glade2/meldapp.glade.h:28
-msgid ""
-"Choose how the central bar of the diff viewer is drawn. You may wish to "
-"choose a simpler mode if you find scrolling is slow."
-msgstr ""
-"Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ ÐºÐ°ÐºÐ¾ Ñ?Ðµ Ð¸Ñ?Ñ?Ñ?Ñ?Ð°Ð²Ð° Ñ?ÐµÐ½Ñ?Ñ?Ð°Ð»Ð½Ð° Ñ?Ñ?Ð°ÐºÐ° Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ð° Ñ?Ð°Ð·Ð»Ð¸ÐºÐ°. Ð?Ð¾Ð¶ÐµÑ?Ðµ "
-"Ð¶ÐµÐ»ÐµÑ?Ð¸ Ð´Ð° Ð¸Ð·Ð°Ð±ÐµÑ?ÐµÑ?Ðµ Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð°Ð²Ð½Ð¸Ñ?Ð¸ Ð½Ð°Ñ?Ð¸Ð½ Ð°ÐºÐ¾ Ñ?Ðµ ÐºÐ»Ð¸Ð·Ð°Ñ?Ðµ Ñ?Ð¿Ð¾Ñ?Ð¾."
+#~ msgid "<b>Toolbar Appearance</b>"
+#~ msgstr "<b>Ð?Ð·Ð³Ð»ÐµÐ´ Ð°Ð»Ð°Ñ?ÐºÐ¸</b>"
 
-#: glade2/meldapp.glade.h:29
-msgid "Copyright (C) 2002 Stephen Kennedy"
-msgstr "Ð¡Ð²Ð° Ð¿Ñ?Ð°Ð²Ð° Ð·Ð°Ð´Ñ?Ð¶Ð°Ð½Ð° Â© 2002 Ð¡Ñ?Ð¸Ñ?ÐµÐ½ Ð?ÐµÐ½ÐµÐ´Ð¸ (Stephen Kennedy)"
+#~ msgid "<b>Update Options</b>"
+#~ msgstr "<b>Ð?Ð¿Ñ?Ð¸Ñ?Ðµ Ð´Ð¾Ð¿Ñ?Ñ?Ð°Ð²Ð°Ñ?Ð°</b>"
 
-#: glade2/meldapp.glade.h:30
-msgid "Create missing directories (-d)"
-msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð½ÐµÐ´Ð¾Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ðµ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ðµ (-d)"
+#~ msgid "<b>Whitespace</b>"
+#~ msgstr "<b>Ð?ÐµÐ»Ð¸Ð½Ðµ</b>"
 
-#: glade2/meldapp.glade.h:31
-msgid "Curved : Filled Curves"
-msgstr "Ð?Ñ?Ð¸Ð²Ð° : Ð¸Ñ?Ð¿Ñ?Ñ?ÐµÐ½Ðµ ÐºÑ?Ð¸Ð²Ðµ"
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Binary Files</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Ð?Ð¸Ð½Ð°Ñ?Ð½Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ</span>"
 
-#: glade2/meldapp.glade.h:32
-msgid "Custom command"
-msgstr "Ð?Ñ?Ð¾Ð¸Ð·Ð²Ð¾Ñ?Ð½Ð° Ð½Ð°Ñ?ÐµÐ´Ð±Ð°"
+#~ msgid "<span weight=\"bold\" size=\"x-large\">CVS</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">CVS</span>"
 
-#: glade2/meldapp.glade.h:33
-msgid "Display"
-msgstr "Ð?Ñ?Ð¸ÐºÐ°Ð·"
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Diff</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Ð Ð°Ð·Ð»Ð¸ÐºÐµ</span>"
 
-#: glade2/meldapp.glade.h:34
-msgid "Edit menu popup invokes"
-msgstr "Ð?Ñ?ÐºÐ°Ñ?Ñ?Ñ?Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ? Ð¼ÐµÐ½Ð¸Ñ?Ð° Ð·Ð° Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ðµ Ð¿Ð¾ÐºÑ?ÐµÑ?Ðµ"
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Display</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Ð?Ñ?Ð¸ÐºÐ°Ð·</span>"
 
-#: glade2/meldapp.glade.h:35
-msgid "Editor"
-msgstr "Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?"
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Editor</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Ð£Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?</span>"
 
-#: glade2/meldapp.glade.h:36
-msgid "Encoding"
-msgstr "Ð?Ð¾Ð´Ð¸Ñ?Ð°Ñ?Ðµ"
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Encoding</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Ð?Ð¾Ð´Ð¸Ñ?Ð°Ñ?Ðµ</span>"
 
-#: glade2/meldapp.glade.h:37
-msgid "File Filters"
-msgstr "Ð¤Ð¸Ð»Ñ?ÐµÑ?Ð¸ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°"
+#~ msgid "<span weight=\"bold\" size=\"x-large\">File Filters</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Ð¤Ð¸Ð»Ñ?ÐµÑ?Ð¸ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°</span>"
 
-#: glade2/meldapp.glade.h:38
-msgid "Gnome Default"
-msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾ Ñ? Ð?Ð½Ð¾Ð¼Ñ?"
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Text Filters</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Ð¤Ð¸Ð»Ñ?ÐµÑ?Ð¸ Ñ?ÐµÐºÑ?Ñ?Ð°</span>"
 
-#: glade2/meldapp.glade.h:39
-msgid "Gnome default editor"
-msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¸ Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ? Ñ? Ð?Ð½Ð¾Ð¼Ñ?"
+#~ msgid "Automatically supply missing newline at end of file."
+#~ msgstr "Ð¡Ð°Ð¼ Ð´Ð¾Ð´Ð°Ñ? Ð½ÐµÐ´Ð¾Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ð¸ Ð½Ð¾Ð²Ð¸-Ñ?ÐµÐ´ Ð½Ð° ÐºÑ?Ð°Ñ?Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ."
 
-#: glade2/meldapp.glade.h:40
-msgid "Icons Only"
-msgstr "Ð¡Ð°Ð¼Ð¾ Ñ?Ð»Ð¸ÐºÐµ"
+#~ msgid ""
+#~ "Binary files do not have text filters applied to them when comparing."
+#~ msgstr "Ð?Ð° Ð±Ð¸Ð½Ð°Ñ?Ð½Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ñ?Ðµ Ð½Ðµ Ð¿Ñ?Ð¸Ð¼ÐµÑ?Ñ?Ñ?Ñ? Ñ?Ð¸Ð»Ñ?ÐµÑ?Ð¸ Ñ?ÐµÐºÑ?Ñ?Ð° Ð¿Ñ?Ð¸ Ð¿Ð¾Ñ?ÐµÑ?ÐµÑ?Ñ?."
 
-#: glade2/meldapp.glade.h:41
-msgid "Ignore .cvsrc (-f)"
-msgstr "Ð?Ð°Ð½ÐµÐ¼Ð°Ñ?Ð¸ .cvsrc (-f)"
+#~ msgid "CVS"
+#~ msgstr "CVS"
 
-#: glade2/meldapp.glade.h:42
-msgid "Ignore changes in amount of white space"
-msgstr "Ð?Ð°Ð½ÐµÐ¼Ð°Ñ?Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ðµ ÐºÐ¾Ð»Ð¸Ñ?Ð¸Ð½Ðµ Ð±ÐµÐ»Ð¸Ð½Ð°"
+#~ msgid "CVS binary"
+#~ msgstr "CVS Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼"
 
-#: glade2/meldapp.glade.h:43
-msgid ""
-"Ignore changes in case; consider upper and lower-case letters equivalent"
-msgstr "Ð?Ð°Ð½ÐµÐ¼Ð°Ñ?Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ðµ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ðµ Ñ?Ð»Ð¾Ð²Ð°; Ñ?Ð¼Ð°Ñ?Ñ?Ð°Ñ? Ð²ÐµÐ»Ð¸ÐºÐ° Ð¸ Ð¼Ð°Ð»Ð° Ñ?Ð»Ð¾Ð²Ð° Ñ?ÐµÐ´Ð½Ð°ÐºÐ¸Ð¼"
+#~ msgid "CVS view"
+#~ msgstr "CVS Ð¿Ñ?ÐµÐ³Ð»ÐµÐ´"
 
-#: glade2/meldapp.glade.h:44
-msgid "Ignore changes that just insert or delete blank lines"
-msgstr "Ð?Ð°Ð½ÐµÐ¼Ð°Ñ?Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ðµ ÐºÐ¾Ñ?Ðµ Ñ?ÐµÐ´Ð¸Ð½Ð¾ Ñ?Ð±Ð°Ñ?Ñ?Ñ?Ñ? Ð¸Ð»Ð¸ Ð±Ñ?Ð¸Ñ?Ñ? Ð¿Ñ?Ð°Ð·Ð½Ðµ Ñ?ÐµÐ´Ð¾Ð²Ðµ"
+#~ msgid ""
+#~ "Choose how the central bar of the diff viewer is drawn. You may wish to "
+#~ "choose a simpler mode if you find scrolling is slow."
+#~ msgstr ""
+#~ "Ð?Ð·Ð°Ð±ÐµÑ?Ð¸Ñ?Ðµ ÐºÐ°ÐºÐ¾ Ñ?Ðµ Ð¸Ñ?Ñ?Ñ?Ñ?Ð°Ð²Ð° Ñ?ÐµÐ½Ñ?Ñ?Ð°Ð»Ð½Ð° Ñ?Ñ?Ð°ÐºÐ° Ð¿Ñ?Ð¸ÐºÐ°Ð·Ð¸Ð²Ð°Ñ?Ð° Ñ?Ð°Ð·Ð»Ð¸ÐºÐ°. Ð?Ð¾Ð¶ÐµÑ?Ðµ "
+#~ "Ð¶ÐµÐ»ÐµÑ?Ð¸ Ð´Ð° Ð¸Ð·Ð°Ð±ÐµÑ?ÐµÑ?Ðµ Ñ?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð°Ð²Ð½Ð¸Ñ?Ð¸ Ð½Ð°Ñ?Ð¸Ð½ Ð°ÐºÐ¾ Ñ?Ðµ ÐºÐ»Ð¸Ð·Ð°Ñ?Ðµ Ñ?Ð¿Ð¾Ñ?Ð¾."
 
-#: glade2/meldapp.glade.h:45
-msgid "Internal editor"
-msgstr "Ð£Ð½Ñ?Ñ?Ñ?Ð°Ñ?Ñ?Ð¸ Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?"
+#~ msgid "Copyright (C) 2002 Stephen Kennedy"
+#~ msgstr "Ð¡Ð²Ð° Ð¿Ñ?Ð°Ð²Ð° Ð·Ð°Ð´Ñ?Ð¶Ð°Ð½Ð° Â© 2002 Ð¡Ñ?Ð¸Ñ?ÐµÐ½ Ð?ÐµÐ½ÐµÐ´Ð¸ (Stephen Kennedy)"
 
-#: glade2/meldapp.glade.h:46
-msgid "Locate CVS binary : Meld"
-msgstr "Ð?Ñ?Ð¾Ð½Ð°Ñ?Ð¸ CVS Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼ : Ð?ÐµÐ»Ð´"
+#~ msgid "Create missing directories (-d)"
+#~ msgstr "Ð?Ð°Ð¿Ñ?Ð°Ð²Ð¸ Ð½ÐµÐ´Ð¾Ñ?Ñ?Ð°Ñ?Ñ?Ñ?Ðµ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ðµ (-d)"
 
-#: glade2/meldapp.glade.h:47
-msgid "Meld"
-msgstr "Ð?ÐµÐ»Ð´"
+#~ msgid "Curved : Filled Curves"
+#~ msgstr "Ð?Ñ?Ð¸Ð²Ð° : Ð¸Ñ?Ð¿Ñ?Ñ?ÐµÐ½Ðµ ÐºÑ?Ð¸Ð²Ðµ"
 
-#: glade2/meldapp.glade.h:48
-msgid "Preferences : Meld"
-msgstr "Ð?Ð¾Ñ?Ñ?Ð°Ð²ÐºÐµ: Ð?ÐµÐ»Ð´"
+#~ msgid "Edit menu popup invokes"
+#~ msgstr "Ð?Ñ?ÐºÐ°Ñ?Ñ?Ñ?Ð¸ Ð¿Ñ?Ð¾Ð·Ð¾Ñ? Ð¼ÐµÐ½Ð¸Ñ?Ð° Ð·Ð° Ñ?Ñ?ÐµÑ?Ð¸Ð²Ð°Ñ?Ðµ Ð¿Ð¾ÐºÑ?ÐµÑ?Ðµ"
 
-#: glade2/meldapp.glade.h:49
-msgid "Prune empty directories (-P)"
-msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð¿Ñ?Ð°Ð·Ð½Ðµ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ðµ (-P)"
+#~ msgid "Gnome Default"
+#~ msgstr "Ð?Ð¾Ð´Ñ?Ð°Ð·Ñ?Ð¼ÐµÐ²Ð°Ð½Ð¾ Ñ? Ð?Ð½Ð¾Ð¼Ñ?"
 
-#: glade2/meldapp.glade.h:50
-msgid "Quiet mode (-q)"
-msgstr "Ð¢Ð¸Ñ?Ð¸ Ñ?ÐµÐ¶Ð¸Ð¼ (-q)"
+#~ msgid "Icons Only"
+#~ msgstr "Ð¡Ð°Ð¼Ð¾ Ñ?Ð»Ð¸ÐºÐµ"
 
-#: glade2/meldapp.glade.h:51
-msgid "Report _Bug"
-msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð¸ _Ð³Ñ?ÐµÑ?ÐºÑ?"
+#~ msgid "Ignore .cvsrc (-f)"
+#~ msgstr "Ð?Ð°Ð½ÐµÐ¼Ð°Ñ?Ð¸ .cvsrc (-f)"
 
-#: glade2/meldapp.glade.h:52
-msgid "Save File 1"
-msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? 1. Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
+#~ msgid "Ignore changes in amount of white space"
+#~ msgstr "Ð?Ð°Ð½ÐµÐ¼Ð°Ñ?Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ðµ ÐºÐ¾Ð»Ð¸Ñ?Ð¸Ð½Ðµ Ð±ÐµÐ»Ð¸Ð½Ð°"
 
-#: glade2/meldapp.glade.h:53
-msgid "Save File 2"
-msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? 2. Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
+#~ msgid ""
+#~ "Ignore changes in case; consider upper and lower-case letters equivalent"
+#~ msgstr ""
+#~ "Ð?Ð°Ð½ÐµÐ¼Ð°Ñ?Ð¸ Ð¸Ð·Ð¼ÐµÐ½Ðµ Ð²ÐµÐ»Ð¸Ñ?Ð¸Ð½Ðµ Ñ?Ð»Ð¾Ð²Ð°; Ñ?Ð¼Ð°Ñ?Ñ?Ð°Ñ? Ð²ÐµÐ»Ð¸ÐºÐ° Ð¸ Ð¼Ð°Ð»Ð° Ñ?Ð»Ð¾Ð²Ð° Ñ?ÐµÐ´Ð½Ð°ÐºÐ¸Ð¼"
 
-#: glade2/meldapp.glade.h:54
-msgid "Save File 3"
-msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? 3. Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
+#~ msgid "Locate CVS binary : Meld"
+#~ msgstr "Ð?Ñ?Ð¾Ð½Ð°Ñ?Ð¸ CVS Ð¿Ñ?Ð¾Ð³Ñ?Ð°Ð¼ : Ð?ÐµÐ»Ð´"
 
-#: glade2/meldapp.glade.h:55
-msgid "Save in UTF-8 encoding"
-msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ñ?Ð° Ð£Ð¢Ð¤-8 ÐºÐ¾Ð´Ð¸Ñ?Ð°Ñ?ÐµÐ¼"
+#~ msgid "Prune empty directories (-P)"
+#~ msgstr "Ð?Ð±Ñ?Ð¸Ñ?Ð¸ Ð¿Ñ?Ð°Ð·Ð½Ðµ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼Ðµ (-P)"
 
-#: glade2/meldapp.glade.h:56
-msgid "Save in the files original encoding"
-msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ñ?Ð° Ð¸Ð·Ð²Ð¾Ñ?Ð½Ð¸Ð¼ ÐºÐ¾Ð´Ð¸Ñ?Ð°Ñ?ÐµÐ¼"
+#~ msgid "Quiet mode (-q)"
+#~ msgstr "Ð¢Ð¸Ñ?Ð¸ Ñ?ÐµÐ¶Ð¸Ð¼ (-q)"
 
-#: glade2/meldapp.glade.h:57
-msgid "Simple : Lines only"
-msgstr "Ð?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð°Ð²Ð½Ð¾ : Ñ?Ð°Ð¼Ð¾ Ð»Ð¸Ð½Ð¸Ñ?Ðµ"
+#~ msgid "Report _Bug"
+#~ msgstr "Ð?Ñ?Ð¸Ñ?Ð°Ð²Ð¸ _Ð³Ñ?ÐµÑ?ÐºÑ?"
 
-# bug: missing colon ":", s/quadilaterals/quadrilaterals/
-#: glade2/meldapp.glade.h:58
-msgid "Solid   Filled Quadilaterals"
-msgstr "Ð?Ñ?Ð¿Ñ?Ñ?ÐµÐ½Ð¾ : Ð¸Ñ?Ð¿Ñ?Ñ?ÐµÐ½Ð¸ Ð¿Ñ?Ð°Ð²Ð¾Ñ?Ð³Ð°Ð¾Ð½Ð¸Ñ?Ð¸"
+#~ msgid "Save File 1"
+#~ msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? 1. Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
 
-#: glade2/meldapp.glade.h:59
-msgid "Tabs equivalent to "
-msgstr "Ð¢Ð°Ð±Ñ?Ð»Ð°Ñ?Ð¾Ñ?Ð¸ Ñ?Ñ? Ð¸Ñ?Ñ?Ð¾Ð²ÐµÑ?Ð½Ð¸ Ñ?Ð° "
+#~ msgid "Save File 2"
+#~ msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? 2. Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
 
-#: glade2/meldapp.glade.h:60
-msgid "Text Beside Icons"
-msgstr "Ð¢ÐµÐºÑ?Ñ? Ð¿Ð¾Ñ?ÐµÐ´ Ð¸ÐºÐ¾Ð½Ð°"
+#~ msgid "Save File 3"
+#~ msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? 3. Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÑ?"
 
-#: glade2/meldapp.glade.h:61
-msgid "Text Filters"
-msgstr "Ð¤Ð¸Ð»Ñ?ÐµÑ?Ð¸ Ñ?ÐµÐºÑ?Ñ?Ð°"
+#~ msgid "Save in UTF-8 encoding"
+#~ msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ñ?Ð° Ð£Ð¢Ð¤-8 ÐºÐ¾Ð´Ð¸Ñ?Ð°Ñ?ÐµÐ¼"
 
-#: glade2/meldapp.glade.h:62
-msgid "Text Only"
-msgstr "Ð¡Ð°Ð¼Ð¾ Ñ?ÐµÐºÑ?Ñ?"
+#~ msgid "Save in the files original encoding"
+#~ msgstr "Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ? Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ Ñ?Ð° Ð¸Ð·Ð²Ð¾Ñ?Ð½Ð¸Ð¼ ÐºÐ¾Ð´Ð¸Ñ?Ð°Ñ?ÐµÐ¼"
 
-#: glade2/meldapp.glade.h:63
-msgid "Text Under Icons"
-msgstr "Ð¢ÐµÐºÑ?Ñ? Ð¸Ñ?Ð¿Ð¾Ð´ Ð¸ÐºÐ¾Ð½Ð°"
+#~ msgid "Simple : Lines only"
+#~ msgstr "Ð?ÐµÐ´Ð½Ð¾Ñ?Ñ?Ð°Ð²Ð½Ð¾ : Ñ?Ð°Ð¼Ð¾ Ð»Ð¸Ð½Ð¸Ñ?Ðµ"
 
-#: glade2/meldapp.glade.h:64
-msgid "Three way directory"
-msgstr "Ð¢Ñ?Ð¾Ñ?Ð¼ÐµÑ?Ð½Ð¸ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼"
+# bug: missing colon ":", s/quadilaterals/quadrilaterals/
+#~ msgid "Solid   Filled Quadilaterals"
+#~ msgstr "Ð?Ñ?Ð¿Ñ?Ñ?ÐµÐ½Ð¾ : Ð¸Ñ?Ð¿Ñ?Ñ?ÐµÐ½Ð¸ Ð¿Ñ?Ð°Ð²Ð¾Ñ?Ð³Ð°Ð¾Ð½Ð¸Ñ?Ð¸"
 
-#: glade2/meldapp.glade.h:65
-msgid "Three way file"
-msgstr "Ð¢Ñ?Ð¾Ñ?Ð¼ÐµÑ?Ð½Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°"
+#~ msgid "Tabs equivalent to "
+#~ msgstr "Ð¢Ð°Ð±Ñ?Ð»Ð°Ñ?Ð¾Ñ?Ð¸ Ñ?Ñ? Ð¸Ñ?Ñ?Ð¾Ð²ÐµÑ?Ð½Ð¸ Ñ?Ð° "
 
-#: glade2/meldapp.glade.h:66
-msgid "Two way directory"
-msgstr "Ð?Ð²Ð¾Ñ?Ð¼ÐµÑ?Ð½Ð¸ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼"
+#~ msgid "Text Beside Icons"
+#~ msgstr "Ð¢ÐµÐºÑ?Ñ? Ð¿Ð¾Ñ?ÐµÐ´ Ð¸ÐºÐ¾Ð½Ð°"
 
-#: glade2/meldapp.glade.h:67
-msgid "Two way file"
-msgstr "Ð?Ð²Ð¾Ñ?Ð¼ÐµÑ?Ð½Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°"
+#~ msgid "Text Only"
+#~ msgstr "Ð¡Ð°Ð¼Ð¾ Ñ?ÐµÐºÑ?Ñ?"
 
-#: glade2/meldapp.glade.h:68
-msgid "Use Compression (-z)"
-msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ð°Ð¶Ð¸Ð¼Ð°Ñ?Ðµ (-z)"
+#~ msgid "Text Under Icons"
+#~ msgstr "Ð¢ÐµÐºÑ?Ñ? Ð¸Ñ?Ð¿Ð¾Ð´ Ð¸ÐºÐ¾Ð½Ð°"
 
-#: glade2/meldapp.glade.h:69
-msgid "Use GNOME monospace font."
-msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð?Ð½Ð¾Ð¼Ð¾Ð² Ñ?Ð¾Ð½Ñ? Ñ?Ñ?Ð²Ñ?Ñ?ÐµÐ½Ðµ Ñ?Ð¸Ñ?Ð¸Ð½Ðµ."
+#~ msgid "Two way directory"
+#~ msgstr "Ð?Ð²Ð¾Ñ?Ð¼ÐµÑ?Ð½Ð¸ Ð´Ð¸Ñ?ÐµÐºÑ?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¼"
 
-#: glade2/meldapp.glade.h:70
-msgid "Use custom font."
-msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¿Ð¾Ñ?ÐµÐ±Ð°Ð½ Ñ?Ð¾Ð½Ñ?."
+#~ msgid "Two way file"
+#~ msgstr "Ð?Ð²Ð¾Ñ?Ð¼ÐµÑ?Ð½Ð° Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐ°"
 
-# bug: what encoding is iso8859? it's a registry of encodings, and encoding is eg. iso8859-5
-#: glade2/meldapp.glade.h:71
-msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
-msgstr "Ð?Ñ?Ð¸ Ñ?Ñ?Ð¸Ñ?Ð°Ð²Ð°Ñ?Ñ?, Ð¿Ñ?Ð¾Ð±Ð°Ñ? Ð¾Ð²Ð° ÐºÐ¾Ð´Ð¸Ñ?Ð°Ñ?Ð° Ñ?ÐµÐ´Ð¾Ð¼. (Ð½Ð¿Ñ?. utf8, iso8859)"
+#~ msgid "Use Compression (-z)"
+#~ msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ñ?Ð°Ð¶Ð¸Ð¼Ð°Ñ?Ðµ (-z)"
+
+#~ msgid "Use GNOME monospace font."
+#~ msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð?Ð½Ð¾Ð¼Ð¾Ð² Ñ?Ð¾Ð½Ñ? Ñ?Ñ?Ð²Ñ?Ñ?ÐµÐ½Ðµ Ñ?Ð¸Ñ?Ð¸Ð½Ðµ."
+
+#~ msgid "Use custom font."
+#~ msgstr "Ð?Ð¾Ñ?Ð¸Ñ?Ñ?Ð¸ Ð¿Ð¾Ñ?ÐµÐ±Ð°Ð½ Ñ?Ð¾Ð½Ñ?."
 
-#: glade2/meldapp.glade.h:72
-msgid "Whitespace is significant"
-msgstr "Ð?ÐµÐ»Ð¸Ð½Ðµ Ñ?Ñ? Ð±Ð¸Ñ?Ð½Ðµ"
+#~ msgid "Whitespace is significant"
+#~ msgstr "Ð?ÐµÐ»Ð¸Ð½Ðµ Ñ?Ñ? Ð±Ð¸Ñ?Ð½Ðµ"
 
-#: glade2/meldapp.glade.h:73
-msgid "_Binary Files"
-msgstr "_Ð?Ð¸Ð½Ð°Ñ?Ð½Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
+#~ msgid "_Binary Files"
+#~ msgstr "_Ð?Ð¸Ð½Ð°Ñ?Ð½Ðµ Ð´Ð°Ñ?Ð¾Ñ?ÐµÐºÐµ"
 
-#: glade2/meldapp.glade.h:74
-msgid "_Contents"
-msgstr "_Ð¡Ð°Ð´Ñ?Ð¶Ð°Ñ?"
+#~ msgid "_Contents"
+#~ msgstr "_Ð¡Ð°Ð´Ñ?Ð¶Ð°Ñ?"
 
-#: glade2/meldapp.glade.h:76
-msgid "_Logo"
-msgstr "_Ð?Ð¾Ð³Ð¾Ñ?Ð¸Ð¿"
+#~ msgid "_Logo"
+#~ msgstr "_Ð?Ð¾Ð³Ð¾Ñ?Ð¸Ð¿"
 
-#: glade2/meldapp.glade.h:77
-msgid "_New..."
-msgstr "_Ð?Ð¾Ð²Ð¸..."
+#~ msgid "_New..."
+#~ msgstr "_Ð?Ð¾Ð²Ð¸..."
 
-#: glade2/meldapp.glade.h:78
-msgid "_Save"
-msgstr "_Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ?"
+#~ msgid "_Save"
+#~ msgstr "_Ð¡Ð°Ñ?Ñ?Ð²Ð°Ñ?"
 
-#: glade2/meldapp.glade.h:79
-msgid "http://meld.sourceforge.net";
-msgstr "http://meld.sourceforge.net";
+#~ msgid "http://meld.sourceforge.net";
+#~ msgstr "http://meld.sourceforge.net";
 
-#: glade2/meldapp.glade.h:80
-msgid "utf8 iso8859"
-msgstr "utf8 iso8859-5 iso8859-2 iso8859"
+#~ msgid "utf8 iso8859"
+#~ msgstr "utf8 iso8859-5 iso8859-2 iso8859"
 
 #~ msgid "window1"
 #~ msgstr "Ð¿Ñ?Ð¾Ð·Ð¾Ñ?1"
@@ -1013,9 +1619,3 @@ msgstr "utf8 iso8859-5 iso8859-2 iso8859"
 
 #~ msgid "_View"
 #~ msgstr "Ð?_Ñ?ÐµÐ³Ð»ÐµÐ´"
-
-#~ msgid "translator_credits"
-#~ msgstr ""
-#~ "Ð?Ð°Ð½Ð¸Ð»Ð¾ Ð¨ÐµÐ³Ð°Ð½ <danilo prevod org>\n"
-#~ "\n"
-#~ "Prevod.org â?? Ð¿Ñ?ÐµÐ²Ð¾Ð´ Ð½Ð° Ñ?Ñ?Ð¿Ñ?ÐºÐ¸ Ñ?ÐµÐ·Ð¸Ðº."
diff --git a/po/sr latin po b/po/sr latin po
index bbd279b..9aecf71 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -4,152 +4,474 @@
 # 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.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: meld\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-03 06:13+0100\n"
-"PO-Revision-Date: 2004-03-03 06:18+0100\n"
-"Last-Translator: Danilo Å egan <danilo prevod org>\n"
-"Language-Team: Serbian (sr) <serbiangnome-lista nongnu org>\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"
+"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"
+"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"
 
-#: meld.desktop.in.h:1
-msgid "Compare and merge your files."
-msgstr "Poredite i spojite vaÅ¡e datoteke."
+#: ../bin/meld:96
+msgid "Cannot import: "
+msgstr "Ne mogu da uvezem: "
 
-#: meld.desktop.in.h:2
+#: ../bin/meld:99
+#, c-format
+msgid "Meld requires %s or higher."
+msgstr "Meld zahteva %s ili noviji."
+
+#: ../data/meld.desktop.in.h:1
+msgid "Compare and merge your files"
+msgstr "UporeÄ?ujte i spajajte vaÅ¡e datoteke."
+
+#: ../data/meld.desktop.in.h:2
+msgid "Diff Viewer"
+msgstr "PregledaÄ? razlika"
+
+#: ../data/meld.desktop.in.h:3 ../data/ui/meldapp.ui.h:5
+msgid "Meld"
+msgstr "Meld"
+
+#: ../data/meld.desktop.in.h:4
 msgid "Meld Diff Viewer"
 msgstr "PregledaÄ? razlika Meld"
 
-#: cvsview.py:41
+#: ../data/ui/filediff.ui.h:1
+msgid "Save modified files?"
+msgstr "Da saÄ?uvam izmenjene datoteke?"
+
+#: ../data/ui/filediff.ui.h:2
 msgid ""
-"Ignored:Non CVS:::Error::Newly added:Modified:<b>Conflict</b>:Removed:Missing"
+"Some files have been modified.\n"
+"Which ones would you like to save?"
 msgstr ""
-"Zanemaren:Ne-CVS:::GreÅ¡ka::Pridodat:Izmenjen:<b>Sudar</b>:Uklonjen:Nedostaje"
+"Neke datoteke su izmenjene.\n"
+"Koje Å¾elite da saÄ?uvate?"
 
-#: cvsview.py:173
-#, python-format
+#: ../data/ui/filediff.ui.h:4
+msgid "_Discard Changes"
+msgstr "_Odbaci izmene"
+
+#: ../data/ui/filediff.ui.h:5
+msgid "_Save Selected"
+msgstr "_SaÄ?uvaj izabrano"
+
+#: ../data/ui/findbar.ui.h:1
+msgid "Regular E_xpression"
+msgstr "_Regularan izraz"
+
+#: ../data/ui/findbar.ui.h:2
+msgid "Replace _All"
+msgstr "Zameni s_ve"
+
+#: ../data/ui/findbar.ui.h:3
+msgid "Replace _With"
+msgstr "Zameni s_a"
+
+#: ../data/ui/findbar.ui.h:4
+msgid "Who_le word"
+msgstr "Ce_lu reÄ?"
+
+#: ../data/ui/findbar.ui.h:5
+msgid "_Match Case"
+msgstr "_Uporedi veliÄ?inu slova"
+
+#: ../data/ui/findbar.ui.h:6
+msgid "_Next"
+msgstr "Sle_deÄ?e"
+
+#: ../data/ui/findbar.ui.h:7
+msgid "_Previous"
+msgstr "Pre_thodno"
+
+#: ../data/ui/findbar.ui.h:8
+msgid "_Replace"
+msgstr "_Zameni"
+
+#: ../data/ui/findbar.ui.h:9
+msgid "_Search for"
+msgstr "_PotraÅ¾i"
+
+#: ../data/ui/meldapp.ui.h:1
+msgid "Choose Files"
+msgstr "Izaberite datoteke"
+
+#: ../data/ui/meldapp.ui.h:2
 msgid ""
-"Error converting to a regular expression\n"
-"The pattern was '%s'\n"
-"The error was '%s'"
+"Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
+"Copyright &#xA9; 2009-2010 Kai Willadsen"
 msgstr ""
-"GreÅ¡ka pri pretvaranju u regularni izraz\n"
-"Obrazac je bio â??%sâ??\n"
-"GreÅ¡ka je bila â??%sâ??"
+"Autorska prava &#xA9; 2002-2009 Stefen Kenedi\n"
+"Autorska prava &#xA9; 2009-2010 Kaj Viladsen"
+
+#: ../data/ui/meldapp.ui.h:4
+msgid "Directory"
+msgstr "Direktorijum"
+
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:7
+msgid "Mine"
+msgstr "Moja"
+
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:9
+msgid "Original"
+msgstr "Izvorna"
+
+#. Refers to version of the file being compared
+#: ../data/ui/meldapp.ui.h:11
+msgid "Other"
+msgstr "Druga"
+
+#: ../data/ui/meldapp.ui.h:12
+msgid "Select VC Directory"
+msgstr "Izaberite CV direktorijum"
+
+#: ../data/ui/meldapp.ui.h:13
+msgid "_Directory Comparison"
+msgstr "PoreÄ?enje di_rektorijuma"
+
+#: ../data/ui/meldapp.ui.h:14
+msgid "_File Comparison"
+msgstr "PoreÄ?enje da_toteka"
+
+#: ../data/ui/meldapp.ui.h:15
+msgid "_Three Way Compare"
+msgstr "PoreÄ?enje tri elementa"
+
+#: ../data/ui/meldapp.ui.h:16
+msgid "_Version Control Browser"
+msgstr "PretraÅ¾ivaÄ? kontrole _verzija"
+
+#: ../data/ui/meldapp.ui.h:17
+msgid "translator-credits"
+msgstr ""
+"Danilo Å egan <danilo prevod org>\n"
+"\n"
+"Prevod.org â?? prevod na srpski jezik."
 
-#: cvsview.py:354
-msgid "Name"
-msgstr "Ime"
+#: ../data/ui/patch-dialog.ui.h:1
+msgid "Copy to Clipboard"
+msgstr "UmnoÅ¾i u ostavu"
 
-#: cvsview.py:371
-msgid "Location"
-msgstr "Putanja"
+#: ../data/ui/patch-dialog.ui.h:2
+msgid "Create Patch"
+msgstr "Napravi ispravku"
 
-#: cvsview.py:372
-msgid "Status"
-msgstr "Stanje"
+#: ../data/ui/patch-dialog.ui.h:3
+msgid "Create a patch"
+msgstr "Pravi ispravku"
 
-#: cvsview.py:373
-msgid "Rev"
-msgstr "Izd"
+#: ../data/ui/patch-dialog.ui.h:4
+msgid "Left and middle panes"
+msgstr "Leva i srednja povrÅ¡"
 
-#: cvsview.py:374
-msgid "Tag"
-msgstr "Oznaka"
+#: ../data/ui/patch-dialog.ui.h:5
+msgid "Middle and right panes"
+msgstr "Srednja i desna povrÅ¡"
 
-#: cvsview.py:375
-msgid "Options"
-msgstr "Opcije"
+#: ../data/ui/patch-dialog.ui.h:6
+msgid "Use differences between:"
+msgstr "Koristi razlike izmeÄ?u:"
 
-#: cvsview.py:412 dirdiff.py:356
-#, python-format
-msgid "[%s] Scanning"
-msgstr "[%s] pregledam"
+#: ../data/ui/patch-dialog.ui.h:7
+msgid "_Reverse patch direction"
+msgstr "Preo_kreni smer ispravke"
 
-#: cvsview.py:439 dirdiff.py:365
-#, python-format
-msgid "[%s] Scanning %s"
-msgstr "[%s] pregledam %s"
+#: ../data/ui/preferences.ui.h:1
+msgid "Display"
+msgstr "<b>Prikaz</b>"
 
-#: cvsview.py:455
-msgid "(Empty)"
-msgstr "(Prazno)"
+#: ../data/ui/preferences.ui.h:2
+msgid "Do not _split words over two lines"
+msgstr "Nemoj _podeliti reÄ?i u dva reda"
 
-#: cvsview.py:487
-#, python-format
-msgid "[%s] Fetching differences"
-msgstr "[%s] Pribavljam razlike"
+#: ../data/ui/preferences.ui.h:3
+msgid "Edito_r command:"
+msgstr "Naredba _ureÄ?ivaÄ?a:"
 
-#: cvsview.py:494
-#, python-format
-msgid "[%s] Applying patch"
-msgstr "[%s] Primenjujem zakrpu"
+#: ../data/ui/preferences.ui.h:4
+msgid "Editor"
+msgstr "UreÄ?ivaÄ?"
 
-#: cvsview.py:498
-msgid "No differences found."
-msgstr "Razlike ne postoje."
+#: ../data/ui/preferences.ui.h:5
+msgid "Enable text _wrapping"
+msgstr "UkljuÄ?i _prelamanje teksta"
 
-#: cvsview.py:564
-msgid "Select some files first."
-msgstr "Prvo izaberite neke datoteke."
+#: ../data/ui/preferences.ui.h:6
+msgid "Encoding"
+msgstr "Kodiranje"
 
-#: cvsview.py:585 dirdiff.py:553
-#, python-format
+#: ../data/ui/preferences.ui.h:7
+msgid "External editor"
+msgstr "Spoljni ureÄ?ivaÄ?"
+
+#: ../data/ui/preferences.ui.h:8
+msgid "File Filters"
+msgstr "Filteri datoteka"
+
+#: ../data/ui/preferences.ui.h:9
+msgid "Font"
+msgstr "<b>Font</b>"
+
+#: ../data/ui/preferences.ui.h:10
+msgid "Ignore changes which insert or delete blank lines"
+msgstr "Zanemari izmene koje ubacuju ili briÅ¡u prazne redove"
+
+#: ../data/ui/preferences.ui.h:11
+msgid "Ignore symbolic links"
+msgstr "Zanemari simboliÄ?ke veze"
+
+#: ../data/ui/preferences.ui.h:12
+msgid "Loading"
+msgstr "UÄ?itavam"
+
+#: ../data/ui/preferences.ui.h:13
+msgid "Meld Preferences"
+msgstr "Postavke Melda"
+
+#: ../data/ui/preferences.ui.h:14
+msgid "Show _line numbers"
+msgstr "PrikaÅ¾i _brojeve linija"
+
+#: ../data/ui/preferences.ui.h:15
+msgid "Show w_hitespace"
+msgstr "PrikaÅ¾i _razmake"
+
+#: ../data/ui/preferences.ui.h:16
+msgid "Text Filters"
+msgstr "Filteri teksta"
+
+#: ../data/ui/preferences.ui.h:17
+msgid "Use _default system editor"
+msgstr "Koristi _osnovni ureÄ?ivaÄ? sistema"
+
+#: ../data/ui/preferences.ui.h:18
+msgid "Use s_yntax highlighting"
+msgstr "Koristi isticanje _sintakse"
+
+# bug: what encoding is iso8859? it's a registry of encodings, and encoding is eg. iso8859-5
+#: ../data/ui/preferences.ui.h:19
+msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
+msgstr "Pri uÄ?itavanju, probaj ova kodiranja redom. (npr. utf8, iso8859)"
+
+#: ../data/ui/preferences.ui.h:20
 msgid ""
-"'%s' is a directory.\n"
-"Remove recusively?"
+"When performing directory comparisons, you may filter out files and "
+"directories by name. Each pattern is a list of shell style wildcards "
+"separated by spaces."
 msgstr ""
-"â??%sâ?? je direktorijum.\n"
-"Da uklonim rekurzivno?"
+"Prilikom poreÄ?enja direktorijuma, moÅ¾ete da filtrirate datoteke i "
+"direktorijume prema imenu. Svaki obrazac je spisak dÅ¾okera u stilu konzole "
+"razdvojenih razmakom."
 
-#: cvsview.py:590 dirdiff.py:560
-#, python-format
+#: ../data/ui/preferences.ui.h:21
 msgid ""
-"Error removing %s\n"
-"\n"
-"%s."
+"When performing file comparisons, you may ignore certain types of changes. "
+"Each pattern here is a python regular expression which replaces matching "
+"text with the empty string before comparison is performed. If the expression "
+"contains groups, only the groups are replaced. See the user manual for more "
+"details."
 msgstr ""
-"GreÅ¡ka pri uklanjanju â??%sâ??\n"
-"\n"
-"%s."
+"Prilikom poreÄ?enja datoteka, moÅ¾ete da zanemarite odreÄ?ene vrste izmena. "
+"Svaki obrazac je regularan izraz pajtona koji zamenjuje podudarajuÄ?i tekst "
+"praznim niskama pre izvrÅ¡avanja poreÄ?enja. Ako izraz sadrÅ¾i grupe, samo grupe "
+"bivaju zamenjene. Za viÅ¡e detalja pogledajte uputstvo za korisnike."
 
-#: dirdiff.py:253 dirdiff.py:268
-#, python-format
-msgid "Error converting pattern '%s' to regular expression"
-msgstr "GreÅ¡ka pri pretvaranju obrasca â??%sâ?? u regularni izraz"
+#: ../data/ui/preferences.ui.h:22
+msgid "_Editor font:"
+msgstr "_Font ureÄ?ivaÄ?a:"
+
+#: ../data/ui/preferences.ui.h:23
+msgid "_Insert spaces instead of tabs"
+msgstr "_Ubaci razmake umesto tabulatora"
 
-#: dirdiff.py:278
+#: ../data/ui/preferences.ui.h:24
+msgid "_Tab width:"
+msgstr "_Å irina tabulatora:"
+
+#: ../data/ui/preferences.ui.h:25
+msgid "_Use the system fixed width font"
+msgstr "Koristi sistemom postavljenu veliÄ?inu _fonta"
+
+#: ../data/ui/vcview.ui.h:1
+msgid "Commit Files"
+msgstr "Ugradi datoteke"
+
+#: ../data/ui/vcview.ui.h:2
+msgid "Compare Options"
+msgstr "Opcije poreÄ?enja"
+
+#: ../data/ui/vcview.ui.h:3
+msgid "Date"
+msgstr "Datum"
+
+#: ../data/ui/vcview.ui.h:4
+msgid "Local copy against other remote revision"
+msgstr "Lokalni primerak naspram druge udaljene revizije"
+
+#: ../data/ui/vcview.ui.h:5
+msgid "Local copy against same remote revision"
+msgstr "Lokalni primerak naspram iste udaljene revizije"
+
+#: ../data/ui/vcview.ui.h:6
+msgid "Log Message"
+msgstr "Poruka dnevnika"
+
+#: ../data/ui/vcview.ui.h:7
+msgid "Previous Logs"
+msgstr "Prethodni dnevnici"
+
+#: ../data/ui/vcview.ui.h:8 ../meld/vcview.py:179
+msgid "Tag"
+msgstr "Oznaka"
+
+#: ../data/ui/vcview.ui.h:9
+msgid "VC Log"
+msgstr "CV dnevnik"
+
+#: ../meld/dirdiff.py:215 ../meld/vcview.py:118
+msgid "_Compare"
+msgstr "_Uporedi"
+
+#: ../meld/dirdiff.py:215 ../meld/vcview.py:118
+msgid "Compare selected"
+msgstr "Uporedi izabrano"
+
+#: ../meld/dirdiff.py:216
+msgid "Copy _Left"
+msgstr "UmnoÅ¾i _levo"
+
+#: ../meld/dirdiff.py:216
+msgid "Copy to left"
+msgstr "UmnoÅ¾ite levo"
+
+#: ../meld/dirdiff.py:217
+msgid "Copy _Right"
+msgstr "UmnoÅ¾i _desno"
+
+#: ../meld/dirdiff.py:217
+msgid "Copy to right"
+msgstr "UmnoÅ¾ite desno"
+
+#: ../meld/dirdiff.py:218
+msgid "Delete selected"
+msgstr "ObriÅ¡i izabrano"
+
+#: ../meld/dirdiff.py:219 ../meld/filediff.py:998
+msgid "Hide"
+msgstr "Sakrij"
+
+#: ../meld/dirdiff.py:219
+msgid "Hide selected"
+msgstr "Sakrij izabrano"
+
+#: ../meld/dirdiff.py:221 ../meld/filediff.py:264 ../meld/vcview.py:119
+msgid "Open selected"
+msgstr "Otvori izabrano"
+
+#: ../meld/dirdiff.py:225
+msgid "Case"
+msgstr "VeliÄ?ina slova"
+
+#: ../meld/dirdiff.py:225
+msgid "Ignore case of entries"
+msgstr "Zanemari veliÄ?inu slova unosa"
+
+#: ../meld/dirdiff.py:226
+msgid "Same"
+msgstr "Isto"
+
+#: ../meld/dirdiff.py:226
+msgid "Show identical"
+msgstr "PrikaÅ¾i istovetne"
+
+#: ../meld/dirdiff.py:227
+msgid "New"
+msgstr "Novi"
+
+#: ../meld/dirdiff.py:227
+msgid "Show new"
+msgstr "PrikaÅ¾i nove"
+
+#: ../meld/dirdiff.py:228
+msgid "Modified"
+msgstr "Izmenjeni"
+
+#: ../meld/dirdiff.py:228 ../meld/vcview.py:132
+msgid "Show modified"
+msgstr "PrikaÅ¾i izmenjene"
+
+#: ../meld/dirdiff.py:230
+msgid "Filters"
+msgstr "Filteri"
+
+#: ../meld/dirdiff.py:230
+msgid "Set active filters"
+msgstr "Podesite aktivne filtere"
+
+#: ../meld/dirdiff.py:347
 #, python-format
 msgid "Hide %s"
-msgstr "Sakrij %s"
+msgstr "Sakrij â??%sâ??"
 
-#: dirdiff.py:398
+#: ../meld/dirdiff.py:449 ../meld/dirdiff.py:462 ../meld/vcview.py:304
+#: ../meld/vcview.py:332
 #, python-format
-msgid "'%s' hidden by '%s'"
-msgstr "â??%sâ?? sakriveno od strane â??%sâ??"
+msgid "[%s] Scanning %s"
+msgstr "[%s] pregledam â??%sâ??"
 
-#: dirdiff.py:404
+#: ../meld/dirdiff.py:561
 #, python-format
+msgid "[%s] Done"
+msgstr "[%s] Gotovo"
+
+#: ../meld/dirdiff.py:565
+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
+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
+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
+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
 msgid ""
-"You are running a case insensitve comparison on a case sensitive filesystem. "
-"Some files are not visible:\n"
-"%s"
+"You are running a case insensitive comparison on a case sensitive "
+"filesystem. The following files in this folder are hidden:"
 msgstr ""
 "Pokrenuli ste poreÄ?enje nezavisno od veliÄ?ine slova na sistemu datoteka gde "
-"je ona bitna. Neke datoteke nisu vidljive:\n"
-"%s"
+"je ona bitna. Neke datoteke nisu vidljive:"
 
-#: dirdiff.py:470
+#: ../meld/dirdiff.py:583
 #, python-format
-msgid "[%s] Done"
-msgstr "[%s] Gotovo"
+msgid "'%s' hidden by '%s'"
+msgstr "â??%sâ?? sakriveno od strane â??%sâ??"
 
-#: dirdiff.py:528
+#: ../meld/dirdiff.py:608 ../meld/filediff.py:875 ../meld/filediff.py:1002
+msgid "Hi_de"
+msgstr "_Sakrij"
+
+#: ../meld/dirdiff.py:658
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -158,7 +480,7 @@ msgstr ""
 "â??%sâ?? postoji.\n"
 "Da presnimim?"
 
-#: dirdiff.py:535
+#: ../meld/dirdiff.py:665
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
@@ -169,96 +491,287 @@ msgstr ""
 "\n"
 "%s."
 
-# bug: plural-forms
-#. singular,plural
-#: dirdiff.py:570
+#: ../meld/dirdiff.py:683 ../meld/vcview.py:504
+#, python-format
 msgid ""
-"second,seconds:minute,minutes:hour,hours:day,days:week,weeks:month,months:"
-"year,years"
-msgstr "sekundu,sekundi:minut,minuta:Ä?as,Ä?asa:dan,dana:nedelju,nedelja:mesec,meseci:godinu,godina"
+"'%s' is a directory.\n"
+"Remove recursively?"
+msgstr ""
+"â??%sâ?? je direktorijum.\n"
+"Da uklonim rekurzivno?"
 
-#: filediff.py:387
+#: ../meld/dirdiff.py:690 ../meld/vcview.py:509
 #, python-format
 msgid ""
-"Regular expression error\n"
-"'%s'"
+"Error removing %s\n"
+"\n"
+"%s."
 msgstr ""
-"GreÅ¡ka sa regularnim izrazom\n"
-"â??%sâ??"
+"GreÅ¡ka pri uklanjanju â??%sâ??\n"
+"\n"
+"%s."
 
-#: filediff.py:399
+#: ../meld/dirdiff.py:702
+#, python-format
+msgid "%i second"
+msgid_plural "%i seconds"
+msgstr[0] "%i sekund"
+msgstr[1] "%i sekunde"
+msgstr[2] "%i sekundi"
+msgstr[3] "%i sekunda"
+
+#: ../meld/dirdiff.py:703
+#, python-format
+msgid "%i minute"
+msgid_plural "%i minutes"
+msgstr[0] "%i minut"
+msgstr[1] "%i minuta"
+msgstr[2] "%i minuta"
+msgstr[3] "%i minut"
+
+#: ../meld/dirdiff.py:704
+#, python-format
+msgid "%i hour"
+msgid_plural "%i hours"
+msgstr[0] "%i sat"
+msgstr[1] "%i sata"
+msgstr[2] "%i sati"
+msgstr[3] "%i sat"
+
+#: ../meld/dirdiff.py:705
+#, python-format
+msgid "%i day"
+msgid_plural "%i days"
+msgstr[0] "%i dan"
+msgstr[1] "%i dana"
+msgstr[2] "%i dana"
+msgstr[3] "%i dan"
+
+#: ../meld/dirdiff.py:706
+#, python-format
+msgid "%i week"
+msgid_plural "%i weeks"
+msgstr[0] "%i nedelja"
+msgstr[1] "%i nedelje"
+msgstr[2] "%i nedelja"
+msgstr[3] "%i nedelja"
+
+#: ../meld/dirdiff.py:707
+#, python-format
+msgid "%i month"
+msgid_plural "%i months"
+msgstr[0] "%i mesec"
+msgstr[1] "%i meseca"
+msgstr[2] "%i meseci"
+msgstr[3] "%i mesec"
+
+#: ../meld/dirdiff.py:708
 #, python-format
-msgid "The regular expression '%s' was not found."
-msgstr "Regularni izraz â??%sâ?? nije naÄ?en."
+msgid "%i year"
+msgid_plural "%i years"
+msgstr[0] "%i godina"
+msgstr[1] "%i godine"
+msgstr[2] "%i godina"
+msgstr[3] "%i godina"
+
+#: ../meld/filediff.py:265
+msgid "Format as patch..."
+msgstr "Formatiraj kao ispravku..."
+
+#: ../meld/filediff.py:265
+msgid "Create a patch using differences between files"
+msgstr "Pravi ispravku koristeÄ?i razlike izmeÄ?u datoteka"
+
+#: ../meld/filediff.py:266
+msgid "Previous conflict"
+msgstr "Prethodni sukob"
+
+#: ../meld/filediff.py:266
+msgid "Go to the previous conflict"
+msgstr "Ide na prethodni sukob"
+
+#: ../meld/filediff.py:267
+msgid "Next conflict"
+msgstr "SledeÄ?i sukob"
+
+#: ../meld/filediff.py:267
+msgid "Go to the next conflict"
+msgstr "Ide na sledeÄ?i sukob"
+
+#: ../meld/filediff.py:268
+msgid "Push to left"
+msgstr "Gurni ulevo"
+
+#: ../meld/filediff.py:268
+msgid "Push current change to the left"
+msgstr "Gura tekuÄ?u izmenu ulevo"
+
+#: ../meld/filediff.py:269
+msgid "Push to right"
+msgstr "Gurni udesno"
+
+#: ../meld/filediff.py:269
+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
+msgid "Pull from left"
+msgstr "Ubaci s leva"
+
+#: ../meld/filediff.py:271
+msgid "Pull change from the left"
+msgstr "Ubacuje izmenu s leva"
+
+#: ../meld/filediff.py:272
+msgid "Pull from right"
+msgstr "Ubaci s desna"
+
+#: ../meld/filediff.py:272
+msgid "Pull change from the right"
+msgstr "Ubacuje izmenu s leva"
+
+#: ../meld/filediff.py:273
+msgid "Copy above left"
+msgstr "UmnoÅ¾i iznad ulevo"
+
+#: ../meld/filediff.py:273
+msgid "Copy change above the left chunk"
+msgstr "UmnoÅ¾ava izmenu iznad komada ulevo"
+
+#: ../meld/filediff.py:274
+msgid "Copy below left"
+msgstr "UmnoÅ¾i ispod ulevo"
+
+#: ../meld/filediff.py:274
+msgid "Copy change below the left chunk"
+msgstr "UmnoÅ¾ava izmenu ispod komada ulevo"
+
+#: ../meld/filediff.py:275
+msgid "Copy above right"
+msgstr "UmnoÅ¾i iznad udesno"
+
+#: ../meld/filediff.py:275
+msgid "Copy change above the right chunk"
+msgstr "UmnoÅ¾ava izmenu iznad komada ulevo"
+
+#: ../meld/filediff.py:276
+msgid "Copy below right"
+msgstr "UmnoÅ¾i ispod udesno"
+
+#: ../meld/filediff.py:276
+msgid "Copy change below the right chunk"
+msgstr "UmnoÅ¾ava izmenu ispod komada udesno"
+
+#: ../meld/filediff.py:277
+msgid "Delete"
+msgstr "ObriÅ¡i"
+
+#: ../meld/filediff.py:277
+msgid "Delete change"
+msgstr "BriÅ¡e izmenu"
+
+#: ../meld/filediff.py:278
+msgid "Merge all changes from left"
+msgstr "Objedini sve izmene s leva"
+
+#: ../meld/filediff.py:278
+msgid "Merge all non-conflicting changes from the left"
+msgstr "Objedinjuje sve nesukobljavajuÄ?e izmene s leva"
+
+#: ../meld/filediff.py:279
+msgid "Merge all changes from right"
+msgstr "Objedini sve izmene s desna"
+
+#: ../meld/filediff.py:279
+msgid "Merge all non-conflicting changes from the right"
+msgstr "Objedinjuje sve nesukobljavajuÄ?e izmene s desna"
+
+#: ../meld/filediff.py:280
+msgid "Merge all non-conflicting"
+msgstr "Objedini sve nesukobljavajuÄ?e"
+
+#: ../meld/filediff.py:280
+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
+msgid "Lock scrolling"
+msgstr "ZakljuÄ?aj klizanje"
+
+#: ../meld/filediff.py:285
+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
+msgid "INS"
+msgstr "UMT"
 
-#: filediff.py:401
+#: ../meld/filediff.py:365
+msgid "OVR"
+msgstr "PRP"
+
+#. Abbreviation for line, column so that it will fit in the status bar
+#: ../meld/filediff.py:367
 #, python-format
-msgid "The text '%s' was not found."
-msgstr "Tekst â??%sâ?? nije naÄ?en."
+msgid "Ln %i, Col %i"
+msgstr "Red %i, mesto %i"
 
-#: filediff.py:440
+#: ../meld/filediff.py:570
+#, python-format
+msgid ""
+"Filter '%s' changed the number of lines in the file. Comparison will be "
+"incorrect. See the user manual for more details."
+msgstr ""
+"Filter â??%sâ?? je izmenio broj redova u datoteci. PoreÄ?enje neÄ?e biti taÄ?no. Za "
+"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
+msgid "<unnamed>"
+msgstr "<neimenovan>"
+
+#: ../meld/filediff.py:863
 #, python-format
 msgid "[%s] Set num panes"
 msgstr "[%s] Postavi broj ploÄ?a"
 
-#: filediff.py:447
+#: ../meld/filediff.py:869
 #, python-format
 msgid "[%s] Opening files"
 msgstr "[%s] Otvaram datoteke"
 
-#: filediff.py:463
-#, python-format
-msgid ""
-"Could not open '%s' for reading.\n"
-"\n"
-"The error was:\n"
-"%s"
-msgstr ""
-"Ne mogu da otvorim â??%sâ?? radi Ä?itanja.\n"
-"\n"
-"GreÅ¡ka beÅ¡e:\n"
-"%s"
+#: ../meld/filediff.py:893 ../meld/filediff.py:902 ../meld/filediff.py:914
+#: ../meld/filediff.py:920
+msgid "Could not read file"
+msgstr "Ne mogu da proÄ?itam datoteku"
 
-#: filediff.py:467
+#: ../meld/filediff.py:894
 #, python-format
 msgid "[%s] Reading files"
 msgstr "[%s] Ä?itam datoteke"
 
-#: filediff.py:482
+#: ../meld/filediff.py:903
 #, python-format
-msgid ""
-"Could not read from '%s'.\n"
-"\n"
-"I tried encodings %s."
-msgstr ""
-"Ne mogu da Ä?itam iz â??%sâ??.\n"
-"\n"
-"PokuÅ¡ah kodiranja %s."
+msgid "%s appears to be a binary file."
+msgstr "â??%sâ?? izgleda da je izvrÅ¡na datoteka."
 
-#: filediff.py:487
+#: ../meld/filediff.py:915
 #, python-format
-msgid ""
-"Could not read from '%s'.\n"
-"\n"
-"The error was:\n"
-"%s"
-msgstr ""
-"Ne mogu da Ä?itam iz â??%sâ??.\n"
-"\n"
-"GreÅ¡ka beÅ¡e:\n"
-"%s."
+msgid "%s is not in encodings: %s"
+msgstr "â??%sâ?? nije u kodiranjima: â??%sâ??"
 
-#: filediff.py:507
+#: ../meld/filediff.py:945 ../meld/filemerge.py:67
 #, python-format
 msgid "[%s] Computing differences"
 msgstr "[%s] SraÄ?unavam razlike"
 
-#: filediff.py:599
-#, python-format
-msgid "Choose a name for buffer %i."
-msgstr "Izaberite ime za %i. bafer."
+#: ../meld/filediff.py:996
+msgid "Files are identical"
+msgstr "Datoteke su istovetne"
 
-#: filediff.py:610
+#: ../meld/filediff.py:1150
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -267,7 +780,23 @@ msgstr ""
 "â??%sâ?? postoji!\n"
 "Da presnimim?"
 
-#: filediff.py:624
+#: ../meld/filediff.py:1163
+#, python-format
+msgid ""
+"Error writing to %s\n"
+"\n"
+"%s."
+msgstr ""
+"GreÅ¡ka pri upisu u â??%sâ??\n"
+"\n"
+"%s."
+
+#: ../meld/filediff.py:1172
+#, python-format
+msgid "Choose a name for buffer %i."
+msgstr "Izaberite ime za %i. bafer."
+
+#: ../meld/filediff.py:1187
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -278,732 +807,809 @@ msgstr ""
 "\n"
 "Koji oblik Å¾elite da koristite?"
 
-#: filediff.py:641
+#: ../meld/filediff.py:1203
 #, python-format
 msgid ""
-"Error writing to %s\n"
-"\n"
-"%s."
+"'%s' contains characters not encodable with '%s'\n"
+"Would you like to save as UTF-8?"
 msgstr ""
-"GreÅ¡ka pri upisu u â??%sâ??\n"
-"\n"
-"%s."
+"â??%sâ?? sadrÅ¾i znakove koji se ne mogu kodirati uz â??%sâ??\n"
+"Da li Å¾elite da saÄ?uvate kao â??UTF-8â???"
 
-#: filediff.py:700
+#: ../meld/filediff.py:1262
 #, python-format
 msgid ""
-"Refreshing will discard changes in:\n"
+"Reloading will discard changes in:\n"
 "%s\n"
 "\n"
 "You cannot undo this operation."
 msgstr ""
-"OsveÅ¾avanje Ä?e zanemariti izmene u:\n"
+"OsveÅ¾avanje Ä?e odbaciti izmene u:\n"
 "%s\n"
 "\n"
 "Ovu operaciju ne moÅ¾ete opozvati."
 
-#: meld:50
-#, c-format
-msgid "Meld requires python%s or higher."
-msgstr "Meld zahteva piton %s ili noviji."
-
-#: meld:60
-msgid "Meld requires a recent version of pygtk."
-msgstr "Meld zahteva skoro izdanje PiGtk-a."
-
-#: meld:61
-#, c-format
-msgid "pygtk-%s or higher is recommended."
-msgstr "PreporuÄ?uje se PiGtk %s ili noviji."
+#: ../meld/filemerge.py:82
+#, python-format
+msgid "[%s] Merging files"
+msgstr "[%s] Objedinjujem datoteke"
 
-#: meld:71
-#, c-format
-msgid "Meld works best with pygtk-%s or higher. (found %s)"
-msgstr "Meld najbolje radi uz PiGtk %s ili noviji. (naÄ?oh %s)"
+#: ../meld/meldapp.py:149
+msgid "wrong number of arguments supplied to --diff"
+msgstr "pogreÅ¡an broj argumenata pridodat uz â??--diffâ??"
 
-#: meld:72
-msgid ""
-"Due to incompatible API changes some functions may not operate as expected."
-msgstr ""
-"Zbog nesaglasnih izmena programerske sprege, neke funkcije moÅ¾da neÄ?e raditi "
-"kako treba."
+#: ../meld/meldapp.py:153
+msgid "Start with an empty window"
+msgstr "Otvara jedan prazan prozor"
 
-#: meldapp.py:54
-#, python-format
-msgid "Browse %s"
-msgstr "Pregledaj %s"
+# bug: string composition is bad i18n, and will make l10n hard
+#: ../meld/meldapp.py:154 ../meld/meldapp.py:155 ../meld/meldapp.py:157
+msgid "file"
+msgstr "datoteka"
 
-#: meldapp.py:600
-msgid "Original File"
-msgstr "Izvorna datoteka"
+#: ../meld/meldapp.py:154 ../meld/meldapp.py:156 ../meld/meldapp.py:157
+msgid "dir"
+msgstr "dir"
 
-#: meldapp.py:600
-msgid "Modified File"
-msgstr "Izmenjena datoteka"
+#: ../meld/meldapp.py:154
+msgid "Start a version control comparison"
+msgstr "PokreÄ?e poreÄ?enje kontrole verzije"
 
-#: meldapp.py:603
-msgid "Other Changes"
-msgstr "Ostale izmene"
+#: ../meld/meldapp.py:155
+msgid "Start a 2- or 3-way file comparison"
+msgstr "PokreÄ?e poreÄ?enje 2 ili 3 elementa datoteka"
 
-#: meldapp.py:603
-msgid "Common Ancestor"
-msgstr "ZajedniÄ?ki predak"
+#: ../meld/meldapp.py:156
+msgid "Start a 2- or 3-way directory comparison"
+msgstr "PokreÄ?e poreÄ?enje 2 ili 3 elementa direktorijuma"
 
-#: meldapp.py:603
-msgid "Local Changes"
-msgstr "Lokalne izmene"
+#: ../meld/meldapp.py:157
+msgid "Start a comparison between file and dir/file"
+msgstr "PokreÄ?e poreÄ?enje izmeÄ?u datoteke i direktorijuma/datoteke"
 
-#: meldapp.py:606 meldapp.py:609
-msgid "Original Directory"
-msgstr "Izvorni direktorijum"
+#: ../meld/meldapp.py:163
+msgid "Meld is a file and directory comparison tool."
+msgstr "Meld je alat za poreÄ?enje datoteka i direktorijuma."
 
-#: meldapp.py:606 meldapp.py:609
-msgid "Modified Directory"
-msgstr "Izmenjen direktorijum"
+#: ../meld/meldapp.py:166
+msgid "Set label to use instead of file name"
+msgstr "PodeÅ¡ava oznaku za koriÅ¡Ä?enje umesto imena datoteke"
 
-#: meldapp.py:609
-msgid "Other Directory"
-msgstr "Ostali direktorijumi"
+#: ../meld/meldapp.py:168
+msgid "Automatically compare all differing files on startup"
+msgstr "Automatski poredi sve razlikujuÄ?e datoteke prilikom pokretanja"
 
-#: meldapp.py:612
-msgid "Root CVS Directory"
-msgstr "Koreni CVS direktorijum"
+#: ../meld/meldapp.py:171
+msgid "Set the target file for saving a merge result"
+msgstr "PodeÅ¡ava ciljnu datoteku za Ä?uvanje rezultata stapanja"
 
-#. ###############################################################################
-#.
-#. usage
-#.
-#. ###############################################################################
-#: meldapp.py:800
-msgid ""
-"Meld is a file and directory comparison tool. Usage:\n"
-"\n"
-"    meld                        Start with no windows open\n"
-"    meld <dir>                  Start with CVS browser in 'dir'\n"
-"    meld <file>                 Start with CVS diff of 'file'\n"
-"    meld <file> <file> [file]   Start with 2 or 3 way file comparison\n"
-"    meld <dir>  <dir>  [dir]    Start with 2 or 3 way directory comparison\n"
-"\n"
-"For more information choose help -> contents.\n"
-"Report bugs at http://bugzilla.gnome.org/buglist.cgi?product=meld\n";
-"stevek gnome org\n"
+#: ../meld/meldapp.py:174
+msgid "Creates a diff tab for up to 3 supplied files or directories."
 msgstr ""
-"Meld je alat za poreÄ?enje datoteka i direktorijuma. Upotreba:\n"
-"\n"
-"    meld                        Pokreni bez otvorenih prozora\n"
-"    meld <dir>                  Pokreni sa CVS pregledaÄ?em u â??dirâ??\n"
-"    meld <datoteka>             Pokreni CVS razlike za â??datotekaâ??\n"
-"    meld <datoteka> <datoteka> [datoteka]\n"
-"                                Pokreni dvo- ili trosmerno poreÄ?enje datoteka\n"
-"    meld <dir>  <dir>  [dir]    Pokreni dvo- ili trosmerno poreÄ?enje \n"
-"                                direktorijuma\n"
-"\n"
-"Za viÅ¡e podataka izaberite pomoÄ? -> sadrÅ¾aj.\n"
-"Prijavite greÅ¡ke na http://bugzilla.gnome.org/buglist.cgi?product=meld\n";
-"http://mail.gnome.org/mailman/listinfo/meld-list\n";
+"Pravi jeziÄ?ak razlika za najviÅ¡e do 3 pridodate datoteke ili direktorijuma."
 
-#: meldapp.py:813
+#: ../meld/meldapp.py:177
 #, python-format
-msgid ""
-"Meld %s\n"
-"Written by Stephen Kennedy <stevek gnome org>"
-msgstr ""
-"Meld %s\n"
-"Napisao Stifen Kenedi (Stephen Kennedy) <stevek gnome org>"
+msgid "too many arguments (wanted 0-4, got %d)"
+msgstr "previÅ¡e argumenata (traÅ¾eno je 0-4, dobih %d)"
 
-#: meldapp.py:860
-#, python-format
-msgid "`%s' is not a directory or file, cannot open cvs view"
-msgstr ""
-"â??%sâ?? ne predstavlja direktorijum ni datoteku, ne mogu da otvorim CVS pregled"
+#: ../meld/melddoc.py:51 ../meld/melddoc.py:52
+msgid "untitled"
+msgstr "bezimeni"
 
-#: meldapp.py:866
-msgid "Cannot open "
-msgstr "Ne mogu da otvorim "
+#. no common path. empty names get changed to "[None]"
+#: ../meld/misc.py:174
+msgid "[None]"
+msgstr "[niÅ¡ta]"
 
-#: meldapp.py:883
-msgid "Cannot compare a mixture of files and directories.\n"
-msgstr "Ne mogu da poredim meÅ¡avinu datoteka i direktorijuma.\n"
+#: ../meld/patchdialog.py:122
+msgid "Save Patch As..."
+msgstr "SaÄ?uvaj ispravku kao..."
 
-# bug: string composition is bad i18n, and will make l10n hard
-#: meldapp.py:885
-msgid "file"
-msgstr "datoteku"
+#: ../meld/preferences.py:37
+msgid "label"
+msgstr "oznaka"
+
+#: ../meld/preferences.py:37
+msgid "pattern"
+msgstr "obrazac"
 
-#: meldapp.py:885
-msgid "folder"
-msgstr "direktorijum"
+#: ../meld/preferences.py:105
+msgid "Only available if you have gnome-python-desktop installed"
+msgstr "Dostupno je samo ako ste instalirali â??gnome-python-desktopâ??"
 
-#: meldapp.py:888
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:232
+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
 #, python-format
-msgid "Wrong number of arguments (Got %i)"
-msgstr "PogreÅ¡an broj argumenata (primih %i)"
+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
+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
+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
+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
+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
+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
+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
+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
+msgid "Script comment\t0\t#.*"
+msgstr "Komentar skripte\t0\t#.*"
+
+#: ../meld/vcview.py:120
+msgid "Co_mmit"
+msgstr "U_gradi"
 
-#: melddoc.py:45
-msgid "untitled"
-msgstr "bezimeni"
+#: ../meld/vcview.py:120
+msgid "Commit"
+msgstr "Ugradi"
 
-#. no common path. empty names get changed to "[None]"
-#: misc.py:121
-msgid "[None]"
-msgstr "[niÅ¡ta]"
+#: ../meld/vcview.py:121
+msgid "_Update"
+msgstr "_Dopuni"
+
+#: ../meld/vcview.py:121
+msgid "Update"
+msgstr "Dopuni"
+
+#: ../meld/vcview.py:122
+msgid "_Add"
+msgstr "_Dodaj"
 
-#: glade2/cvsview.glade.h:1 glade2/filediff.glade.h:1 glade2/dirdiff.glade.h:1
-#: glade2/meldapp.glade.h:3
-msgid "*"
-msgstr "*"
+#: ../meld/vcview.py:122
+msgid "Add to VC"
+msgstr "Dodaj u CV"
 
-#: glade2/cvsview.glade.h:2
+#: ../meld/vcview.py:123
 msgid "Add _Binary"
 msgstr "Dodaj _binarno"
 
-#: glade2/cvsview.glade.h:3
-msgid "Add to CVS"
-msgstr "Dodaj u CVS"
+#: ../meld/vcview.py:123
+msgid "Add binary to VC"
+msgstr "Dodaj binarno u CV"
 
-#: glade2/cvsview.glade.h:4
-msgid "CVS Log"
-msgstr "CVS dnevnik"
+#: ../meld/vcview.py:124
+msgid "_Remove"
+msgstr "U_kloni"
 
-#: glade2/cvsview.glade.h:5
-msgid "Commit"
-msgstr "Ugradi"
+#: ../meld/vcview.py:124
+msgid "Remove from VC"
+msgstr "Ukloni iz CV"
 
-#: glade2/cvsview.glade.h:6
-msgid "Commit Files"
-msgstr "Ugradi datoteke"
+#: ../meld/vcview.py:125
+msgid "_Resolved"
+msgstr "_ReÅ¡eno"
 
-#: glade2/cvsview.glade.h:7
+#: ../meld/vcview.py:125
+msgid "Mark as resolved for VC"
+msgstr "OznaÄ?ava kao reÅ¡eno za CV"
+
+#: ../meld/vcview.py:126
+msgid "Revert to original"
+msgstr "Vrati na original"
+
+#: ../meld/vcview.py:127
 msgid "Delete locally"
 msgstr "ObriÅ¡i u lokalu"
 
-#: glade2/cvsview.glade.h:8
-msgid "Diff selected"
-msgstr "Izabrane razlike"
+#: ../meld/vcview.py:131
+msgid "_Flatten"
+msgstr "_Izravnaj"
 
-#: glade2/cvsview.glade.h:9
+#: ../meld/vcview.py:131
 msgid "Flatten directories"
 msgstr "Izravnaj direktorijume"
 
-#: glade2/cvsview.glade.h:10
+#: ../meld/vcview.py:132
+msgid "_Modified"
+msgstr "Iz_menjen"
+
+#: ../meld/vcview.py:133
+msgid "_Normal"
+msgstr "_ObiÄ?no"
+
+#: ../meld/vcview.py:133
+msgid "Show normal"
+msgstr "PrikaÅ¾i obiÄ?ne"
+
+#: ../meld/vcview.py:134
+msgid "Non _VC"
+msgstr "Ne _CV"
+
+#: ../meld/vcview.py:134
+msgid "Show unversioned files"
+msgstr "Prikazuje neverzionirane datoteke"
+
+#: ../meld/vcview.py:135
 msgid "Ignored"
 msgstr "Zanemaren"
 
-#: glade2/cvsview.glade.h:11
-msgid "Log Message"
-msgstr "Poruka za dnevnik"
-
-#: glade2/cvsview.glade.h:12
-msgid "Non _CVS"
-msgstr "Ne-_CVS"
+#: ../meld/vcview.py:135
+msgid "Show ignored files"
+msgstr "Prikazuje zanemarene datoteke"
 
-#: glade2/cvsview.glade.h:13
-msgid "Previous Logs"
-msgstr "Prethodni dnevnici"
+#: ../meld/vcview.py:156
+msgid "Name"
+msgstr "Ime"
 
-#: glade2/cvsview.glade.h:14
-msgid "Remove _Locally"
-msgstr "Ukloni u _lokalu"
+#: ../meld/vcview.py:176 ../meld/vcview.py:300
+msgid "Location"
+msgstr "Putanja"
 
-#: glade2/cvsview.glade.h:15
-msgid "Remove from CVS"
-msgstr "Ukloni iz CVS-a"
+#: ../meld/vcview.py:177
+msgid "Status"
+msgstr "Stanje"
 
-#: glade2/cvsview.glade.h:16 glade2/dirdiff.glade.h:21
-msgid "Show modified"
-msgstr "PrikaÅ¾i izmenjene"
+#: ../meld/vcview.py:178
+msgid "Rev"
+msgstr "Izd"
 
-#: glade2/cvsview.glade.h:17
-msgid "Show non-CVS"
-msgstr "PrikaÅ¾i ne-CVS"
+#: ../meld/vcview.py:180
+msgid "Options"
+msgstr "Opcije"
 
-#: glade2/cvsview.glade.h:18
-msgid "Update"
-msgstr "Dopuni"
+#: ../meld/vcview.py:232
+msgid "Choose one Version Control"
+msgstr "Izaberite Kontrolu verzije"
 
-#: glade2/cvsview.glade.h:19
-msgid "_Add"
-msgstr "_Dodaj"
+#: ../meld/vcview.py:233
+msgid "Only one Version Control in this directory"
+msgstr "Samo jedna Kontrola verzija u ovom direktorijumu"
 
-#: glade2/cvsview.glade.h:20
-msgid "_Commit"
-msgstr "U_gradi"
+#. TRANSLATORS: this is an error message when a version control
+#. application isn't installed or can't be found
+#: ../meld/vcview.py:246
+#, python-format
+msgid "%s Not Installed"
+msgstr "â??%sâ?? nije instaliran"
 
-#: glade2/cvsview.glade.h:21 glade2/meldapp.glade.h:75
-msgid "_Diff"
-msgstr "_Razlike"
+#. TRANSLATORS: this is an error message when a version
+#. controlled repository is invalid or corrupted
+#: ../meld/vcview.py:250
+msgid "Invalid Repository"
+msgstr "Neispravno skladiÅ¡te"
 
-#: glade2/cvsview.glade.h:22
-msgid "_Edit"
-msgstr "_UreÄ?ivanje"
+#: ../meld/vcview.py:259
+#, python-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: glade2/cvsview.glade.h:23
-msgid "_Flatten"
-msgstr "_Izravnaj"
+#. TRANSLATORS: This is the location of the directory the user is diffing
+#: ../meld/vcview.py:300
+#, python-format
+msgid "%s: %s"
+msgstr "%s: %s"
 
-#: glade2/cvsview.glade.h:24
-msgid "_Modified"
-msgstr "Iz_menjen"
+#: ../meld/vcview.py:348
+msgid "(Empty)"
+msgstr "(Prazno)"
 
-#: glade2/cvsview.glade.h:25
-msgid "_Normal"
-msgstr "_ObiÄ?no"
+#: ../meld/vcview.py:386
+#, python-format
+msgid "[%s] Fetching differences"
+msgstr "[%s] Pribavljam razlike"
 
-#: glade2/cvsview.glade.h:26
-msgid "_Remove"
-msgstr "U_kloni"
+#: ../meld/vcview.py:394
+#, python-format
+msgid "[%s] Applying patch"
+msgstr "[%s] Primenjujem zakrpu"
 
-#: glade2/cvsview.glade.h:27
-msgid "_Update"
-msgstr "_Dopuni"
+#: ../meld/vcview.py:479
+msgid "Select some files first."
+msgstr "Prvo izaberite neke datoteke."
 
-#: glade2/filediff.glade.h:2
+#: ../meld/vcview.py:552
+#, python-format
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Some files have been modified.\n"
-"Which ones would you like to save?</span>"
+"\n"
+"                    Invoking 'patch' failed.\n"
+"                    \n"
+"                    Maybe you don't have 'GNU patch' installed,\n"
+"                    or you use an untested version of %s.\n"
+"                    \n"
+"                    Please send email bug report to:\n"
+"                    meld-list gnome org\n"
+"                    \n"
+"                    Containing the following information:\n"
+"                    \n"
+"                    - meld version: '%s'\n"
+"                    - source control software type: '%s'\n"
+"                    - source control software version: 'X.Y.Z'\n"
+"                    - the output of '%s somefile.txt'\n"
+"                    - patch command: '%s'\n"
+"                    (no need to actually run it, just provide\n"
+"                    the command line) \n"
+"                    \n"
+"                    Replace 'X.Y.Z' by the actual version for the\n"
+"                    source control software you use.\n"
+"                    "
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Neke datoteke su izmenjene.\n"
-"Koje Å¾elite da saÄ?uvate?</span>"
+"\n"
+"                    Prizivanje â??patchâ?? nije uspelo.\n"
+"                    \n"
+"                    MoÅ¾da niste instalirali â??GNU patchâ??,\n"
+"                    ili koristite neproverenu verziju â??%sâ??.\n"
+"                    \n"
+"                    Molim poÅ¡aljite izveÅ¡taj o greÅ¡ci na:\n"
+"                    meld-list gnome org\n"
+"                    \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"
+"                    (nije potrebno stvarno pokretanje, samo\n"
+"                    obezbedite liniju naredbe) \n"
+"                    \n"
+"                    Zamenite â??X.Y.Zâ?? trenutnom verzijom\n"
+"                    softvera kontrole izvora koji koristite.\n"
+"                    "
+
+#: ../meld/ui/findbar.py:120
+#, python-format
+msgid ""
+"Regular expression error\n"
+"'%s'"
+msgstr ""
+"GreÅ¡ka sa regularnim izrazom\n"
+"â??%sâ??"
 
-#: glade2/filediff.glade.h:4
-msgid "Copy All _Left"
-msgstr "UmnoÅ¾i sve _levo"
+#: ../meld/ui/historyentry.py:293
+msgid "_Browse..."
+msgstr "Pre_traÅ¾i..."
 
-#: glade2/filediff.glade.h:5
-msgid "Copy All _Right"
-msgstr "UmnoÅ¾i sve _desno"
+#: ../meld/ui/historyentry.py:301
+msgid "Path"
+msgstr "Putanja"
 
-#: glade2/filediff.glade.h:6 glade2/dirdiff.glade.h:10
-msgid "Edit"
-msgstr "Uredi"
+#: ../meld/ui/historyentry.py:302
+msgid "Path to file"
+msgstr "Putanja do datoteke"
 
-#: glade2/filediff.glade.h:7
-msgid "Find"
-msgstr "PronaÄ?i"
+#: ../meld/ui/historyentry.py:303
+msgid "Pop up a file selector to choose a file"
+msgstr "Izbacuje biraÄ?a datoteka za izbor datoteke"
 
-#: glade2/filediff.glade.h:8
-msgid "Match _entire word only"
-msgstr "Poklapanje samo _celih reÄ?i"
+#: ../meld/ui/historyentry.py:441
+msgid "Select directory"
+msgstr "Izaberite direktorijum"
 
-#: glade2/filediff.glade.h:9
-msgid "Regular e_xpression"
-msgstr "_Regularni izraz"
+#: ../meld/ui/historyentry.py:445
+msgid "Select file"
+msgstr "Izaberite datoteku"
 
-#: glade2/filediff.glade.h:10
-msgid "Save modified files?"
-msgstr "SaÄ?uvaj izmenjene datoteke?"
+#: ../meld/ui/notebooklabel.py:60
+msgid "Close tab"
+msgstr "Zatvori jeziÄ?ak"
 
-#: glade2/filediff.glade.h:11
-msgid "Search for:"
-msgstr "TraÅ¾i:"
+#. 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"
+msgstr ""
+"Zanemareno:Neverzionirano:::GreÅ¡ka::Novo dodato:Izmenjeno:Sukob:Uklonjeno:"
+"NedostajuÄ?e"
 
-#: glade2/filediff.glade.h:12
-msgid "_Match case"
-msgstr "_Ista veliÄ?ina slova"
+#: ../meld/vc/cvs.py:163
+#, python-format
+msgid ""
+"Error converting to a regular expression\n"
+"The pattern was '%s'\n"
+"The error was '%s'"
+msgstr ""
+"GreÅ¡ka pri pretvaranju u regularni izraz\n"
+"Obrazac je bio â??%sâ??\n"
+"GreÅ¡ka je bila â??%sâ??"
 
-#: glade2/filediff.glade.h:13
-msgid "_Wrap around"
-msgstr "U _krug"
+#~ msgid "[%s] Scanning"
+#~ msgstr "[%s] pregledam"
 
-#: glade2/dirdiff.glade.h:2
-msgid "Case"
-msgstr "VeliÄ?ina slova"
+#~ msgid "Error converting pattern '%s' to regular expression"
+#~ msgstr "GreÅ¡ka pri pretvaranju obrasca â??%sâ?? u regularni izraz"
 
-#: glade2/dirdiff.glade.h:3
-msgid "Copy Left"
-msgstr "UmnoÅ¾i levo"
+# bug: plural-forms
+#~ msgid ""
+#~ "second,seconds:minute,minutes:hour,hours:day,days:week,weeks:month,months:"
+#~ "year,years"
+#~ msgstr ""
+#~ "sekundu,sekundi:minut,minuta:Ä?as,Ä?asa:dan,dana:nedelju,nedelja:mesec,meseci:"
+#~ "godinu,godina"
 
-#: glade2/dirdiff.glade.h:4
-msgid "Copy Right"
-msgstr "UmnoÅ¾i desno"
+#~ msgid "The regular expression '%s' was not found."
+#~ msgstr "Regularni izraz â??%sâ?? nije naÄ?en."
 
-#: glade2/dirdiff.glade.h:5
-msgid "Copy left"
-msgstr "UmnoÅ¾i levo"
+#~ msgid "The text '%s' was not found."
+#~ msgstr "Tekst â??%sâ?? nije naÄ?en."
 
-#: glade2/dirdiff.glade.h:6
-msgid "Copy right"
-msgstr "UmnoÅ¾i desno"
+#~ msgid ""
+#~ "Could not open '%s' for reading.\n"
+#~ "\n"
+#~ "The error was:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne mogu da otvorim â??%sâ?? radi Ä?itanja.\n"
+#~ "\n"
+#~ "GreÅ¡ka beÅ¡e:\n"
+#~ "%s"
 
-#: glade2/dirdiff.glade.h:7
-msgid "Delete selected"
-msgstr "ObriÅ¡i izabrano"
+#~ msgid ""
+#~ "Could not read from '%s'.\n"
+#~ "\n"
+#~ "I tried encodings %s."
+#~ msgstr ""
+#~ "Ne mogu da Ä?itam iz â??%sâ??.\n"
+#~ "\n"
+#~ "PokuÅ¡ah kodiranja %s."
 
-#: glade2/dirdiff.glade.h:8
-msgid "Diff"
-msgstr "Razlike"
+#~ msgid ""
+#~ "Could not read from '%s'.\n"
+#~ "\n"
+#~ "The error was:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ne mogu da Ä?itam iz â??%sâ??.\n"
+#~ "\n"
+#~ "GreÅ¡ka beÅ¡e:\n"
+#~ "%s."
 
-#: glade2/dirdiff.glade.h:9
-msgid "Diff selection"
-msgstr "Razlike za izbor"
+#~ msgid "Meld requires a recent version of pygtk."
+#~ msgstr "Meld zahteva skoro izdanje PiGtk-a."
 
-#: glade2/dirdiff.glade.h:11
-msgid "Hide selected"
-msgstr "Sakrij izabrano"
+#~ msgid "pygtk-%s or higher is recommended."
+#~ msgstr "PreporuÄ?uje se PiGtk %s ili noviji."
 
-#: glade2/dirdiff.glade.h:12
-msgid "Hide..."
-msgstr "Sakrij..."
+#~ msgid "Meld works best with pygtk-%s or higher. (found %s)"
+#~ msgstr "Meld najbolje radi uz PiGtk %s ili noviji. (naÄ?oh %s)"
 
-#: glade2/dirdiff.glade.h:13
-msgid "Ignore case of entries"
-msgstr "Zanemari veliÄ?inu slova unosa"
+#~ msgid ""
+#~ "Due to incompatible API changes some functions may not operate as "
+#~ "expected."
+#~ msgstr ""
+#~ "Zbog nesaglasnih izmena programerske sprege, neke funkcije moÅ¾da neÄ?e "
+#~ "raditi kako treba."
 
-#: glade2/dirdiff.glade.h:14
-msgid "Launch _Comparison"
-msgstr "Pokreni po_reÄ?enje"
+#~ msgid "Modified File"
+#~ msgstr "Izmenjena datoteka"
 
-#: glade2/dirdiff.glade.h:15
-msgid "Left"
-msgstr "Levo"
+#~ msgid "Other Changes"
+#~ msgstr "Ostale izmene"
 
-#: glade2/dirdiff.glade.h:16
-msgid "Modified"
-msgstr "Izmenjen"
+#~ msgid "Common Ancestor"
+#~ msgstr "ZajedniÄ?ki predak"
 
-#: glade2/dirdiff.glade.h:17
-msgid "New"
-msgstr "Novi"
+#~ msgid "Original Directory"
+#~ msgstr "Izvorni direktorijum"
 
-#: glade2/dirdiff.glade.h:18
-msgid "Right"
-msgstr "Desno"
+#~ msgid "Modified Directory"
+#~ msgstr "Izmenjen direktorijum"
 
-#: glade2/dirdiff.glade.h:19
-msgid "Same"
-msgstr "Isto"
+#~ msgid ""
+#~ "Meld is a file and directory comparison tool. Usage:\n"
+#~ "\n"
+#~ "    meld                        Start with no windows open\n"
+#~ "    meld <dir>                  Start with CVS browser in 'dir'\n"
+#~ "    meld <file>                 Start with CVS diff of 'file'\n"
+#~ "    meld <file> <file> [file]   Start with 2 or 3 way file comparison\n"
+#~ "    meld <dir>  <dir>  [dir]    Start with 2 or 3 way directory "
+#~ "comparison\n"
+#~ "\n"
+#~ "For more information choose help -> contents.\n"
+#~ "Report bugs at http://bugzilla.gnome.org/buglist.cgi?product=meld\n";
+#~ "stevek gnome org\n"
+#~ msgstr ""
+#~ "Meld je alat za poreÄ?enje datoteka i direktorijuma. Upotreba:\n"
+#~ "\n"
+#~ "    meld                        Pokreni bez otvorenih prozora\n"
+#~ "    meld <dir>                  Pokreni sa CVS pregledaÄ?em u â??dirâ??\n"
+#~ "    meld <datoteka>             Pokreni CVS razlike za â??datotekaâ??\n"
+#~ "    meld <datoteka> <datoteka> [datoteka]\n"
+#~ "                                Pokreni dvo- ili trosmerno poreÄ?enje "
+#~ "datoteka\n"
+#~ "    meld <dir>  <dir>  [dir]    Pokreni dvo- ili trosmerno poreÄ?enje \n"
+#~ "                                direktorijuma\n"
+#~ "\n"
+#~ "Za viÅ¡e podataka izaberite pomoÄ? -> sadrÅ¾aj.\n"
+#~ "Prijavite greÅ¡ke na http://bugzilla.gnome.org/buglist.cgi?product=meld\n";
+#~ "http://mail.gnome.org/mailman/listinfo/meld-list\n";
 
-#: glade2/dirdiff.glade.h:20
-msgid "Show identical"
-msgstr "PrikaÅ¾i istovetne"
+#~ msgid ""
+#~ "Meld %s\n"
+#~ "Written by Stephen Kennedy <stevek gnome org>"
+#~ msgstr ""
+#~ "Meld %s\n"
+#~ "Napisao Stifen Kenedi (Stephen Kennedy) <stevek gnome org>"
 
-#: glade2/dirdiff.glade.h:22
-msgid "Show new"
-msgstr "PrikaÅ¾i nove"
+#~ msgid "`%s' is not a directory or file, cannot open cvs view"
+#~ msgstr ""
+#~ "â??%sâ?? ne predstavlja direktorijum ni datoteku, ne mogu da otvorim CVS "
+#~ "pregled"
 
-#: glade2/dirdiff.glade.h:23
-msgid "_Delete Selected"
-msgstr "ObriÅ¡i _izabrano"
+#~ msgid "Cannot compare a mixture of files and directories.\n"
+#~ msgstr "Ne mogu da poredim meÅ¡avinu datoteka i direktorijuma.\n"
 
-# bug: plural-forms
-#: glade2/meldapp.glade.h:1
-msgid " spaces."
-msgstr " razmaka."
+#~ msgid "folder"
+#~ msgstr "direktorijum"
 
-#: glade2/meldapp.glade.h:2
-msgid "(gnome-default-editor)"
-msgstr "(podrazumevani-ureÄ?ivaÄ?-gnoma)"
+#~ msgid "*"
+#~ msgstr "*"
 
-#: glade2/meldapp.glade.h:4
-msgid "<b>Drawing Style</b>"
-msgstr "<b>Stil iscrtavanja</b>"
+#~ msgid "Remove _Locally"
+#~ msgstr "Ukloni u _lokalu"
 
-#: glade2/meldapp.glade.h:5
-msgid "<b>Edit Menu</b>"
-msgstr "<b>Meni za ureÄ?ivanje</b>"
+#~ msgid "Show non-CVS"
+#~ msgstr "PrikaÅ¾i ne-CVS"
 
-#: glade2/meldapp.glade.h:6
-msgid "<b>Font</b>"
-msgstr "<b>Font</b>"
+#~ msgid "_Commit"
+#~ msgstr "U_gradi"
 
-#: glade2/meldapp.glade.h:7
-msgid "<b>Global options</b>"
-msgstr "<b>OpÅ¡te opcije</b>"
+#~ msgid "_Diff"
+#~ msgstr "_Razlike"
 
-#: glade2/meldapp.glade.h:8
-msgid "<b>Loading</b>"
-msgstr "<b>UÄ?itavanje</b>"
+#~ msgid "_Edit"
+#~ msgstr "_UreÄ?ivanje"
 
-#: glade2/meldapp.glade.h:9
-msgid "<b>Misc</b>"
-msgstr "<b>Razno</b>"
+#~ msgid "Copy All _Left"
+#~ msgstr "UmnoÅ¾i sve _levo"
 
-#: glade2/meldapp.glade.h:10
-msgid "<b>Saving</b>"
-msgstr "<b>Ä?uvanje</b>"
+#~ msgid "Copy All _Right"
+#~ msgstr "UmnoÅ¾i sve _desno"
 
-#: glade2/meldapp.glade.h:11
-msgid "<b>Toolbar Appearance</b>"
-msgstr "<b>Izgled alatki</b>"
+#~ msgid "Edit"
+#~ msgstr "Uredi"
 
-#: glade2/meldapp.glade.h:12
-msgid "<b>Update Options</b>"
-msgstr "<b>Opcije dopunjavanja</b>"
+#~ msgid "Find"
+#~ msgstr "PronaÄ?i"
 
-#: glade2/meldapp.glade.h:13
-msgid "<b>Whitespace</b>"
-msgstr "<b>Beline</b>"
+#~ msgid "Match _entire word only"
+#~ msgstr "Poklapanje samo _celih reÄ?i"
 
-#: glade2/meldapp.glade.h:14
-msgid "<span weight=\"bold\" size=\"x-large\">Binary Files</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Binarne datoteke</span>"
+#~ msgid "_Wrap around"
+#~ msgstr "U _krug"
 
-#: glade2/meldapp.glade.h:15
-msgid "<span weight=\"bold\" size=\"x-large\">CVS</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">CVS</span>"
+#~ msgid "Diff"
+#~ msgstr "Razlike"
 
-#: glade2/meldapp.glade.h:16
-msgid "<span weight=\"bold\" size=\"x-large\">Diff</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Razlike</span>"
+#~ msgid "Hide..."
+#~ msgstr "Sakrij..."
 
-#: glade2/meldapp.glade.h:17
-msgid "<span weight=\"bold\" size=\"x-large\">Display</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Prikaz</span>"
+#~ msgid "Left"
+#~ msgstr "Levo"
 
-#: glade2/meldapp.glade.h:18
-msgid "<span weight=\"bold\" size=\"x-large\">Editor</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">UreÄ?ivaÄ?</span>"
+#~ msgid "Right"
+#~ msgstr "Desno"
 
-#: glade2/meldapp.glade.h:19
-msgid "<span weight=\"bold\" size=\"x-large\">Encoding</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Kodiranje</span>"
+# bug: plural-forms
+#~ msgid " spaces."
+#~ msgstr " razmaka."
 
-#: glade2/meldapp.glade.h:20
-msgid "<span weight=\"bold\" size=\"x-large\">File Filters</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Filteri datoteka</span>"
+#~ msgid "(gnome-default-editor)"
+#~ msgstr "(podrazumevani-ureÄ?ivaÄ?-gnoma)"
 
-#: glade2/meldapp.glade.h:21
-msgid "<span weight=\"bold\" size=\"x-large\">Text Filters</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">Filteri teksta</span>"
+#~ msgid "<b>Drawing Style</b>"
+#~ msgstr "<b>Stil iscrtavanja</b>"
 
-#: glade2/meldapp.glade.h:22
-msgid "Automatically supply missing newline at end of file."
-msgstr "Sam dodaj nedostajuÄ?i novi-red na kraju datoteke."
+#~ msgid "<b>Edit Menu</b>"
+#~ msgstr "<b>Meni za ureÄ?ivanje</b>"
 
-#: glade2/meldapp.glade.h:23
-msgid "Binary files do not have text filters applied to them when comparing."
-msgstr "Na binarne datoteke se ne primenjuju filteri teksta pri poreÄ?enju."
+#~ msgid "<b>Font</b>"
+#~ msgstr "<b>Font</b>"
 
-#: glade2/meldapp.glade.h:24
-msgid "CVS"
-msgstr "CVS"
+#~ msgid "<b>Global options</b>"
+#~ msgstr "<b>OpÅ¡te opcije</b>"
 
-#: glade2/meldapp.glade.h:25
-msgid "CVS binary"
-msgstr "CVS program"
+#~ msgid "<b>Loading</b>"
+#~ msgstr "<b>UÄ?itavanje</b>"
 
-#: glade2/meldapp.glade.h:26
-msgid "CVS view"
-msgstr "CVS pregled"
+#~ msgid "<b>Misc</b>"
+#~ msgstr "<b>Razno</b>"
 
-#: glade2/meldapp.glade.h:27
-msgid "Choose Files"
-msgstr "Izaberi datoteke"
+#~ msgid "<b>Saving</b>"
+#~ msgstr "<b>Ä?uvanje</b>"
 
-#: glade2/meldapp.glade.h:28
-msgid ""
-"Choose how the central bar of the diff viewer is drawn. You may wish to "
-"choose a simpler mode if you find scrolling is slow."
-msgstr ""
-"Izaberite kako se iscrtava centralna traka prikazivanja razlika. MoÅ¾ete "
-"Å¾eleti da izaberete jednostavniji naÄ?in ako je klizanje sporo."
+#~ msgid "<b>Toolbar Appearance</b>"
+#~ msgstr "<b>Izgled alatki</b>"
 
-#: glade2/meldapp.glade.h:29
-msgid "Copyright (C) 2002 Stephen Kennedy"
-msgstr "Sva prava zadrÅ¾ana Â© 2002 Stifen Kenedi (Stephen Kennedy)"
+#~ msgid "<b>Update Options</b>"
+#~ msgstr "<b>Opcije dopunjavanja</b>"
 
-#: glade2/meldapp.glade.h:30
-msgid "Create missing directories (-d)"
-msgstr "Napravi nedostajuÄ?e direktorijume (-d)"
+#~ msgid "<b>Whitespace</b>"
+#~ msgstr "<b>Beline</b>"
 
-#: glade2/meldapp.glade.h:31
-msgid "Curved : Filled Curves"
-msgstr "Kriva : ispunjene krive"
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Binary Files</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Binarne datoteke</span>"
 
-#: glade2/meldapp.glade.h:32
-msgid "Custom command"
-msgstr "Proizvoljna naredba"
+#~ msgid "<span weight=\"bold\" size=\"x-large\">CVS</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">CVS</span>"
 
-#: glade2/meldapp.glade.h:33
-msgid "Display"
-msgstr "Prikaz"
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Diff</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Razlike</span>"
 
-#: glade2/meldapp.glade.h:34
-msgid "Edit menu popup invokes"
-msgstr "IskaÄ?uÄ?i prozor menija za ureÄ?ivanje pokreÄ?e"
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Display</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Prikaz</span>"
 
-#: glade2/meldapp.glade.h:35
-msgid "Editor"
-msgstr "UreÄ?ivaÄ?"
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Editor</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">UreÄ?ivaÄ?</span>"
 
-#: glade2/meldapp.glade.h:36
-msgid "Encoding"
-msgstr "Kodiranje"
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Encoding</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Kodiranje</span>"
 
-#: glade2/meldapp.glade.h:37
-msgid "File Filters"
-msgstr "Filteri datoteka"
+#~ msgid "<span weight=\"bold\" size=\"x-large\">File Filters</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Filteri datoteka</span>"
 
-#: glade2/meldapp.glade.h:38
-msgid "Gnome Default"
-msgstr "Podrazumevano u Gnomu"
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Text Filters</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Filteri teksta</span>"
 
-#: glade2/meldapp.glade.h:39
-msgid "Gnome default editor"
-msgstr "Podrazumevani ureÄ?ivaÄ? u Gnomu"
+#~ msgid "Automatically supply missing newline at end of file."
+#~ msgstr "Sam dodaj nedostajuÄ?i novi-red na kraju datoteke."
 
-#: glade2/meldapp.glade.h:40
-msgid "Icons Only"
-msgstr "Samo slike"
+#~ msgid ""
+#~ "Binary files do not have text filters applied to them when comparing."
+#~ msgstr "Na binarne datoteke se ne primenjuju filteri teksta pri poreÄ?enju."
 
-#: glade2/meldapp.glade.h:41
-msgid "Ignore .cvsrc (-f)"
-msgstr "Zanemari .cvsrc (-f)"
+#~ msgid "CVS"
+#~ msgstr "CVS"
 
-#: glade2/meldapp.glade.h:42
-msgid "Ignore changes in amount of white space"
-msgstr "Zanemari izmene koliÄ?ine belina"
+#~ msgid "CVS binary"
+#~ msgstr "CVS program"
 
-#: glade2/meldapp.glade.h:43
-msgid ""
-"Ignore changes in case; consider upper and lower-case letters equivalent"
-msgstr "Zanemari izmene veliÄ?ine slova; smatraj velika i mala slova jednakim"
+#~ msgid "CVS view"
+#~ msgstr "CVS pregled"
 
-#: glade2/meldapp.glade.h:44
-msgid "Ignore changes that just insert or delete blank lines"
-msgstr "Zanemari izmene koje jedino ubacuju ili briÅ¡u prazne redove"
+#~ msgid ""
+#~ "Choose how the central bar of the diff viewer is drawn. You may wish to "
+#~ "choose a simpler mode if you find scrolling is slow."
+#~ msgstr ""
+#~ "Izaberite kako se iscrtava centralna traka prikazivanja razlika. MoÅ¾ete "
+#~ "Å¾eleti da izaberete jednostavniji naÄ?in ako je klizanje sporo."
 
-#: glade2/meldapp.glade.h:45
-msgid "Internal editor"
-msgstr "UnutraÅ¡nji ureÄ?ivaÄ?"
+#~ msgid "Copyright (C) 2002 Stephen Kennedy"
+#~ msgstr "Sva prava zadrÅ¾ana Â© 2002 Stifen Kenedi (Stephen Kennedy)"
 
-#: glade2/meldapp.glade.h:46
-msgid "Locate CVS binary : Meld"
-msgstr "PronaÄ?i CVS program : Meld"
+#~ msgid "Create missing directories (-d)"
+#~ msgstr "Napravi nedostajuÄ?e direktorijume (-d)"
 
-#: glade2/meldapp.glade.h:47
-msgid "Meld"
-msgstr "Meld"
+#~ msgid "Curved : Filled Curves"
+#~ msgstr "Kriva : ispunjene krive"
 
-#: glade2/meldapp.glade.h:48
-msgid "Preferences : Meld"
-msgstr "Postavke: Meld"
+#~ msgid "Edit menu popup invokes"
+#~ msgstr "IskaÄ?uÄ?i prozor menija za ureÄ?ivanje pokreÄ?e"
 
-#: glade2/meldapp.glade.h:49
-msgid "Prune empty directories (-P)"
-msgstr "ObriÅ¡i prazne direktorijume (-P)"
+#~ msgid "Gnome Default"
+#~ msgstr "Podrazumevano u Gnomu"
 
-#: glade2/meldapp.glade.h:50
-msgid "Quiet mode (-q)"
-msgstr "Tihi reÅ¾im (-q)"
+#~ msgid "Icons Only"
+#~ msgstr "Samo slike"
 
-#: glade2/meldapp.glade.h:51
-msgid "Report _Bug"
-msgstr "Prijavi _greÅ¡ku"
+#~ msgid "Ignore .cvsrc (-f)"
+#~ msgstr "Zanemari .cvsrc (-f)"
 
-#: glade2/meldapp.glade.h:52
-msgid "Save File 1"
-msgstr "SaÄ?uvaj 1. datoteku"
+#~ msgid "Ignore changes in amount of white space"
+#~ msgstr "Zanemari izmene koliÄ?ine belina"
 
-#: glade2/meldapp.glade.h:53
-msgid "Save File 2"
-msgstr "SaÄ?uvaj 2. datoteku"
+#~ msgid ""
+#~ "Ignore changes in case; consider upper and lower-case letters equivalent"
+#~ msgstr ""
+#~ "Zanemari izmene veliÄ?ine slova; smatraj velika i mala slova jednakim"
 
-#: glade2/meldapp.glade.h:54
-msgid "Save File 3"
-msgstr "SaÄ?uvaj 3. datoteku"
+#~ msgid "Locate CVS binary : Meld"
+#~ msgstr "PronaÄ?i CVS program : Meld"
 
-#: glade2/meldapp.glade.h:55
-msgid "Save in UTF-8 encoding"
-msgstr "SaÄ?uvaj sa UTF-8 kodiranjem"
+#~ msgid "Prune empty directories (-P)"
+#~ msgstr "ObriÅ¡i prazne direktorijume (-P)"
 
-#: glade2/meldapp.glade.h:56
-msgid "Save in the files original encoding"
-msgstr "SaÄ?uvaj datoteke sa izvornim kodiranjem"
+#~ msgid "Quiet mode (-q)"
+#~ msgstr "Tihi reÅ¾im (-q)"
 
-#: glade2/meldapp.glade.h:57
-msgid "Simple : Lines only"
-msgstr "Jednostavno : samo linije"
+#~ msgid "Report _Bug"
+#~ msgstr "Prijavi _greÅ¡ku"
 
-# bug: missing colon ":", s/quadilaterals/quadrilaterals/
-#: glade2/meldapp.glade.h:58
-msgid "Solid   Filled Quadilaterals"
-msgstr "Ispunjeno : ispunjeni pravougaonici"
+#~ msgid "Save File 1"
+#~ msgstr "SaÄ?uvaj 1. datoteku"
 
-#: glade2/meldapp.glade.h:59
-msgid "Tabs equivalent to "
-msgstr "Tabulatori su istovetni sa "
+#~ msgid "Save File 2"
+#~ msgstr "SaÄ?uvaj 2. datoteku"
 
-#: glade2/meldapp.glade.h:60
-msgid "Text Beside Icons"
-msgstr "Tekst pored ikona"
+#~ msgid "Save File 3"
+#~ msgstr "SaÄ?uvaj 3. datoteku"
 
-#: glade2/meldapp.glade.h:61
-msgid "Text Filters"
-msgstr "Filteri teksta"
+#~ msgid "Save in UTF-8 encoding"
+#~ msgstr "SaÄ?uvaj sa UTF-8 kodiranjem"
 
-#: glade2/meldapp.glade.h:62
-msgid "Text Only"
-msgstr "Samo tekst"
+#~ msgid "Save in the files original encoding"
+#~ msgstr "SaÄ?uvaj datoteke sa izvornim kodiranjem"
 
-#: glade2/meldapp.glade.h:63
-msgid "Text Under Icons"
-msgstr "Tekst ispod ikona"
+#~ msgid "Simple : Lines only"
+#~ msgstr "Jednostavno : samo linije"
 
-#: glade2/meldapp.glade.h:64
-msgid "Three way directory"
-msgstr "Trosmerni direktorijum"
+# bug: missing colon ":", s/quadilaterals/quadrilaterals/
+#~ msgid "Solid   Filled Quadilaterals"
+#~ msgstr "Ispunjeno : ispunjeni pravougaonici"
 
-#: glade2/meldapp.glade.h:65
-msgid "Three way file"
-msgstr "Trosmerna datoteka"
+#~ msgid "Tabs equivalent to "
+#~ msgstr "Tabulatori su istovetni sa "
 
-#: glade2/meldapp.glade.h:66
-msgid "Two way directory"
-msgstr "Dvosmerni direktorijum"
+#~ msgid "Text Beside Icons"
+#~ msgstr "Tekst pored ikona"
 
-#: glade2/meldapp.glade.h:67
-msgid "Two way file"
-msgstr "Dvosmerna datoteka"
+#~ msgid "Text Only"
+#~ msgstr "Samo tekst"
 
-#: glade2/meldapp.glade.h:68
-msgid "Use Compression (-z)"
-msgstr "Koristi saÅ¾imanje (-z)"
+#~ msgid "Text Under Icons"
+#~ msgstr "Tekst ispod ikona"
 
-#: glade2/meldapp.glade.h:69
-msgid "Use GNOME monospace font."
-msgstr "Koristi Gnomov font utvrÄ?ene Å¡irine."
+#~ msgid "Two way directory"
+#~ msgstr "Dvosmerni direktorijum"
 
-#: glade2/meldapp.glade.h:70
-msgid "Use custom font."
-msgstr "Koristi poseban font."
+#~ msgid "Two way file"
+#~ msgstr "Dvosmerna datoteka"
 
-# bug: what encoding is iso8859? it's a registry of encodings, and encoding is eg. iso8859-5
-#: glade2/meldapp.glade.h:71
-msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
-msgstr "Pri uÄ?itavanju, probaj ova kodiranja redom. (npr. utf8, iso8859)"
+#~ msgid "Use Compression (-z)"
+#~ msgstr "Koristi saÅ¾imanje (-z)"
+
+#~ msgid "Use GNOME monospace font."
+#~ msgstr "Koristi Gnomov font utvrÄ?ene Å¡irine."
+
+#~ msgid "Use custom font."
+#~ msgstr "Koristi poseban font."
 
-#: glade2/meldapp.glade.h:72
-msgid "Whitespace is significant"
-msgstr "Beline su bitne"
+#~ msgid "Whitespace is significant"
+#~ msgstr "Beline su bitne"
 
-#: glade2/meldapp.glade.h:73
-msgid "_Binary Files"
-msgstr "_Binarne datoteke"
+#~ msgid "_Binary Files"
+#~ msgstr "_Binarne datoteke"
 
-#: glade2/meldapp.glade.h:74
-msgid "_Contents"
-msgstr "_SadrÅ¾aj"
+#~ msgid "_Contents"
+#~ msgstr "_SadrÅ¾aj"
 
-#: glade2/meldapp.glade.h:76
-msgid "_Logo"
-msgstr "_Logotip"
+#~ msgid "_Logo"
+#~ msgstr "_Logotip"
 
-#: glade2/meldapp.glade.h:77
-msgid "_New..."
-msgstr "_Novi..."
+#~ msgid "_New..."
+#~ msgstr "_Novi..."
 
-#: glade2/meldapp.glade.h:78
-msgid "_Save"
-msgstr "_SaÄ?uvaj"
+#~ msgid "_Save"
+#~ msgstr "_SaÄ?uvaj"
 
-#: glade2/meldapp.glade.h:79
-msgid "http://meld.sourceforge.net";
-msgstr "http://meld.sourceforge.net";
+#~ msgid "http://meld.sourceforge.net";
+#~ msgstr "http://meld.sourceforge.net";
 
-#: glade2/meldapp.glade.h:80
-msgid "utf8 iso8859"
-msgstr "utf8 iso8859-5 iso8859-2 iso8859"
+#~ msgid "utf8 iso8859"
+#~ msgstr "utf8 iso8859-5 iso8859-2 iso8859"
 
 #~ msgid "window1"
 #~ msgstr "prozor1"
@@ -1013,9 +1619,3 @@ msgstr "utf8 iso8859-5 iso8859-2 iso8859"
 
 #~ msgid "_View"
 #~ msgstr "P_regled"
-
-#~ msgid "translator_credits"
-#~ msgstr ""
-#~ "Danilo Å egan <danilo prevod org>\n"
-#~ "\n"
-#~ "Prevod.org â?? prevod na srpski jezik."
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]