GNOME.org
 

[meld] Updated Russian translation

commit f8ec49175f4767c8ed3bdbc955c9e8a63c36e3a8
Author: Yuri Myasoedov <omerta13 yandex ru>
Date:   Thu Aug 4 20:12:55 2011 +0400

    Updated Russian translation

 po/ru.po | 2071 ++++++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 1219 insertions(+), 852 deletions(-)
---
diff --git a/po/ru.po b/po/ru.po
index e134031..d817b5c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,60 +1,531 @@
 # Russian translation for meld
-# 
+#
 # Alexey Rusakov <ktirf altlinux org>, 2006
 # Yuriy Penkin <yuriy penkin gmail com>, 2008
-
 msgid ""
 msgstr ""
-"Project-Id-Version: Meld trunk\n"
-"Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\n"
-"POT-Creation-Date: 2008-05-22 03:45+0000\n"
-"PO-Revision-Date: 2008-05-22 20:54+0300\n"
-"Last-Translator: Yuriy Penkin <yuriy penkin gmail com>\n"
+"Project-Id-Version: Meld 1.4.0\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=meld&keywords=I18N+L10N&component=general\n";
+"POT-Creation-Date: 2011-07-24 04:25+0000\n"
+"PO-Revision-Date: 2011-08-04 20:12+0300\n"
+"Last-Translator: Yuri Myasoedov <omerta13 yandex ru>\n"
 "Language-Team: Russian <gnome-cyr gnome org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Poedit-Language: Russian\n"
+"X-Poedit-Country: RUSSIAN FEDERATION\n"
 
-#: ../dirdiff.py:252
-#: ../dirdiff.py:267
-#, python-format
-msgid "Error converting pattern '%s' to regular expression"
-msgstr "ÐÑÐÐÐÐ ÐÑÐ ÐÑÐÐÐÑÐÐÐÐÐÐÐÐ ÑÐÐÐÐÐÐ Â%s РÑÐÐÑÐÑÑÐÐÐ ÐÑÑÐÐÐÐÐÐ"
+#: ../bin/meld:96
+msgid "Cannot import: "
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÐÑÑÐÑÐÐÐÑÑ:"
+
+#: ../bin/meld:99
+#, c-format
+msgid "Meld requires %s or higher."
+msgstr "Meld ÑÑÐÐÑÐÑ %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 "Meld"
+
+#: ../data/meld.desktop.in.h:4
+msgid "Meld Diff Viewer"
+msgstr "Meld â ÐÑÐÑÐÐÑÑ ÑÐÐÐÐÑÐÐ"
+
+#: ../data/ui/EditableList.ui.h:1
+msgid "Active"
+msgstr "ÐÐÑÐÐÐÐ"
+
+#: ../data/ui/EditableList.ui.h:2
+#| msgid "File filters"
+msgid "Add new filter"
+msgstr "ÐÐÐÐÐÐÑÑ ÐÐÐÑÐ ÑÐÐÑÑÑ"
+
+#: ../data/ui/EditableList.ui.h:3
+#| msgid "Edit files with:"
+msgid "Editable List"
+msgstr "ÐÐÐÐÐÑÐÐÑÐ ÑÐÐÑÐÐ"
+
+#: ../data/ui/EditableList.ui.h:4
+#| msgid "_Down"
+msgid "Move _Down"
+msgstr "ÐÐÑÐÐÐÑÑÐÑÑ Ð_ÐÐÐ"
+
+#: ../data/ui/EditableList.ui.h:5
+msgid "Move _Up"
+msgstr "ÐÐÑÐÐÐÑÑÐÑÑ Ð_ÐÐÑÑ"
+
+#: ../data/ui/EditableList.ui.h:6
+msgid "Move item down"
+msgstr "ÐÐÑÐÐÐÑÑÐÑÑ ÑÐÐÐÐÐÑ ÐÐÐÐ"
+
+#: ../data/ui/EditableList.ui.h:7
+msgid "Move item up"
+msgstr "ÐÐÑÐÐÐÑÑÐÑÑ ÑÐÐÐÐÐÑ ÐÐÐÑÑ"
+
+#: ../data/ui/EditableList.ui.h:8
+#: ../meld/vcview.py:157
+msgid "Name"
+msgstr "ÐÐÑ"
+
+#: ../data/ui/EditableList.ui.h:9
+msgid "Pattern"
+msgstr "ÐÐÐÐÐÐ"
+
+#: ../data/ui/EditableList.ui.h:10
+#| msgid "Select file"
+msgid "Remove selected filter"
+msgstr "ÐÐÐÐÐÑÑ ÐÑÐÑÐÐÐÑÐ ÑÐÐÑÑÑ"
+
+#: ../data/ui/EditableList.ui.h:11
+#: ../meld/vcview.py:122
+msgid "_Add"
+msgstr "_ÐÐÐÐÐÐÑÑ"
+
+#: ../data/ui/EditableList.ui.h:12
+#: ../meld/vcview.py:124
+msgid "_Remove"
+msgstr "_ÐÐÐÐÐÑÑ"
+
+#: ../data/ui/filediff.ui.h:1
+msgid "Save modified files?"
+msgstr "ÐÐÑÑÐÐÐÑÑ ÐÐÐÐÐÑÐÐÑÐ ÑÐÐÐÑ?"
+
+#: ../data/ui/filediff.ui.h:2
+msgid ""
+"Some files have been modified.\n"
+"Which ones would you like to save?"
+msgstr ""
+"ÐÐÐÐÑÐÑÑÐ ÑÐÐÐÑ ÐÑÐÐ ÐÐÐÐÐÐÐÑ.\n"
+"ÐÐÐÐÐ ÑÐÐÐÑ ÐÐÐÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐÑÑ?"
+
+#: ../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
+#: ../meld/meldwindow.py:141
+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 ""
+"Copyright &#xA9; 2002-2009 Stephen Kennedy\n"
+"Copyright &#xA9; 2009-2010 Kai Willadsen"
+msgstr ""
+"ÐÐÑÐÑÑÐÐÐ ÐÑÐÐÐ &#xA9; 2002-2009 Stephen Kennedy\n"
+"ÐÐÑÐÑÑÐÐÐ ÐÑÐÐÐ &#xA9; 2009-2010 Kai Willadsen"
+
+#: ../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 ""
+"ÐÐÑÐÐÐÐ ÐÐÐÑÐÐ <awn bcs zp ua>, 2003\n"
+"ÐÐÐÑÑÐÐ ÐÐÑÑÑÑÐÐÐ <dmitry taurussoft org>, 2004\n"
+"ÐÐÐÐÐÐ ÐÐÐÑÐÑ <leon asplinux ru>, 2006"
+
+#: ../data/ui/patch-dialog.ui.h:1
+msgid "Copy to Clipboard"
+msgstr "ÐÐÐÐÑÐÐÐÑÑ Ð ÐÑÑÐÑ ÐÐÐÐÐÐ"
+
+#: ../data/ui/patch-dialog.ui.h:2
+msgid "Create Patch"
+msgstr "ÐÐÐÐÐÑÑ ÐÐÐÐÐÑÐÑ"
+
+#: ../data/ui/patch-dialog.ui.h:3
+msgid "Create a patch"
+msgstr "ÐÐÐÐÐÑÑ ÐÐÐÐÐÑÐÑ"
+
+#: ../data/ui/patch-dialog.ui.h:4
+msgid "Left and middle panes"
+msgstr "ÐÐÐÐÑ Ð ÑÑÐÐÐÑÑ ÐÐÐÐÐÑ"
+
+#: ../data/ui/patch-dialog.ui.h:5
+msgid "Middle and right panes"
+msgstr "ÐÑÐÐÐÑÑ Ð ÐÑÐÐÐÑ ÐÐÐÐÐÑ"
+
+#: ../data/ui/patch-dialog.ui.h:6
+msgid "Use differences between:"
+msgstr "ÐÑÐÐÐÑÐÐÐÐÑÑ ÑÐÐÐÐÑÐÑ ÐÐÐÐÑ:"
+
+#: ../data/ui/patch-dialog.ui.h:7
+msgid "_Reverse patch direction"
+msgstr "_ÐÐÑÐÑÐÑÑ ÐÐÐÑÐÐÐÐÐÐÐ ÐÐÑÑÐ"
+
+#: ../data/ui/preferences.ui.h:1
+msgid "Display"
+msgstr "ÐÐÐÑÐÐÐ ÐÐÐ"
+
+#: ../data/ui/preferences.ui.h:2
+msgid "Do not _split words over two lines"
+msgstr "ÐÐ _ÑÐÐÐÐÐÐÑÑ ÑÐÐÐÐ ÐÐ ÐÐÐ ÑÑÑÐÐÐ"
+
+#: ../data/ui/preferences.ui.h:3
+msgid "Edito_r command:"
+msgstr "ÐÐÐÐÐÐÐ _ÑÐÐÐÐÑÐÑÐ:"
+
+#: ../data/ui/preferences.ui.h:4
+msgid "Editor"
+msgstr "ÐÐÐÐÐÑÐÑ"
+
+#: ../data/ui/preferences.ui.h:5
+msgid "Enable text _wrapping"
+msgstr "ÐÐÐÑÐÑÐÑÑ _ÐÐÑÐÐÐÑ ÑÐÐÑÑÐ"
+
+#: ../data/ui/preferences.ui.h:6
+msgid "Encoding"
+msgstr "ÐÐÐÐÑÐÐÐÐ"
+
+#: ../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 "ÐÑÐÑÑ"
+
+#: ../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 "ÐÐÑÑÑÐÐÐÐ Meld"
+
+#: ../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 "ÐÐÐÑÑÐÑÑ ÐÐÐÑÐÐÑÐÑ _ÑÐÐÑÐÐÑÐÑÐ"
+
+#: ../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 "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 "ÐÑÐ ÑÑÐÐÐÐÐÐÐ ÐÐÑÐÐÐÐÐÐ ÐÐÐÐÐ ÑÐÐÑÑÑÐÐÐÑÑ ÑÐÐÐÑ Ð ÐÐÑÐÐÐÐÐ ÐÑ ÐÐÐÐÐÐÐÑÐ. ÐÐÐÐÐÑ ÑÑÑÐÐÐ â ÑÑÐ ÑÐÐÑÐÐ ÑÐÐÐÐÐÑÑ ÑÐÐÐÐÐÐÐ, ÑÐÐÐÐÐÑÐÐÑÑ ÐÑÐÐÐÐÐÐÐ."
+
+#: ../data/ui/preferences.ui.h:21
+msgid "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 "ÐÑÐ ÑÑÐÐÐÐÐÐÐ ÑÐÐÐÐÐ ÐÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÑ ÐÐÑÐÐÐÐÑÐÐÑÐ ÑÐÐÑ ÑÐÐÐÐÑÐÐ. ÐÐÐÑÑ Ð ÐÐÐÐÐÐ ÑÑÑÐÐÐ â ÑÐÐÑÐÑÑÐÐÐ ÐÑÑÐÐÐÐÐÐ Python; ÑÐÐÐÐÐÐÑÑÐÐ Ñ ÐÐÐ ÑÐÐÑÑ ÐÐÐÐÐÑÐÑÑÑ ÐÑÑÑÐÐ ÑÑÑÐÐÐÐ. ÐÑÐÐ ÐÑÑÐÐÐÐÐÐ ÑÐÐÐÑÐÐÑ ÐÑÑÐÐÑ, ÐÐÐÐÐÑÑÑÑÑ ÑÐÐÑÐÐ ÐÑÑÐÐÑ. ÐÐÐÑÐÐÐÐÐ ÑÐ. ÑÑÐÐÐÐÐÑÑÐÐ ÐÐÐÑÐÐÐÐÑÐÐÑ."
+
+#: ../data/ui/preferences.ui.h:22
+msgid "_Editor font:"
+msgstr "_ÐÑÐÑÑ ÑÐÐÐÐÑÐÑÐ:"
+
+#: ../data/ui/preferences.ui.h:23
+msgid "_Insert spaces instead of tabs"
+msgstr "_ÐÑÑÐÐÐÑÑÑ ÐÑÐÐÐÐÑ ÐÐÐÑÑÐ ÑÐÐÑÐÑÑÐÐ"
+
+#: ../data/ui/preferences.ui.h:24
+msgid "_Tab width:"
+msgstr "_ÐÐÑÐÐÐ ÑÐÐÑÐÑÑÐÐ:"
 
-#: ../dirdiff.py:283
+#: ../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:180
+msgid "Tag"
+msgstr "ÐÐÑÐÐ"
+
+#: ../data/ui/vcview.ui.h:9
+msgid "VC Log"
+msgstr "ÐÑÑÐÐÐ ÐÐÐ"
+
+#: ../meld/dirdiff.py:227
+#: ../meld/vcview.py:118
+msgid "_Compare"
+msgstr "_ÐÑÐÐÐÐÑÑ"
+
+#: ../meld/dirdiff.py:227
+#: ../meld/vcview.py:118
+msgid "Compare selected"
+msgstr "ÐÑÐÐÐÐÑÑ ÐÑÐÐÐÐÐÐÐÐ"
+
+#: ../meld/dirdiff.py:228
+#| msgid "Copy To Left"
+msgid "Copy _Left"
+msgstr "ÐÐÐÐÑÐÐÐÑÑ Ð_ÐÐÐÐ"
+
+#: ../meld/dirdiff.py:228
+#| msgid "Copy To Left"
+msgid "Copy to left"
+msgstr "ÐÐÐÐÑÐÐÐÑÑ ÐÐÐÐÐ"
+
+#: ../meld/dirdiff.py:229
+#| msgid "Copy To Right"
+msgid "Copy _Right"
+msgstr "ÐÐÐÐÑÐÐÐÑÑ Ð_ÐÑÐÐÐ"
+
+#: ../meld/dirdiff.py:229
+#| msgid "Copy To Right"
+msgid "Copy to right"
+msgstr "ÐÐÐÐÑÐÐÐÑÑ ÐÐÑÐÐÐ"
+
+#: ../meld/dirdiff.py:230
+msgid "Delete selected"
+msgstr "ÐÐÐÐÐÑÑ ÐÑÐÐÐÐÐÐÐÐ"
+
+#: ../meld/dirdiff.py:231
+#: ../meld/filediff.py:1137
+msgid "Hide"
+msgstr "ÐÐÑÑÑÑ"
+
+#: ../meld/dirdiff.py:231
+msgid "Hide selected"
+msgstr "ÐÐÑÑÑÑ ÐÑÐÐÐÐÐÐÐÐ"
+
+#: ../meld/dirdiff.py:233
+#: ../meld/filediff.py:287
+#: ../meld/vcview.py:119
+msgid "Open selected"
+msgstr "ÐÑÐÑÑÑÑ ÐÑÐÐÐÐÐÐÐÐ"
+
+#: ../meld/dirdiff.py:237
+msgid "Case"
+msgstr "ÐÐÐ ÑÐÐÐÑÑÑÐ"
+
+#: ../meld/dirdiff.py:237
+msgid "Ignore case of entries"
+msgstr "ÐÐÐÐÑÐÑÐÐÐÑÑ ÑÐÐÐÑÑÑ"
+
+#: ../meld/dirdiff.py:238
+msgid "Same"
+msgstr "ÐÐÐÐÐÐÐÐÑÐ"
+
+#: ../meld/dirdiff.py:238
+msgid "Show identical"
+msgstr "ÐÐÐÐÐÑÐÐÑÑ ÐÐÐÐÑÐÑÐÑÐ"
+
+#: ../meld/dirdiff.py:239
+msgid "New"
+msgstr "ÐÐÐÑÐ"
+
+#: ../meld/dirdiff.py:239
+msgid "Show new"
+msgstr "ÐÐÐÐÐÑÐÐÑÑ ÐÐÐÑÐ"
+
+#: ../meld/dirdiff.py:240
+msgid "Modified"
+msgstr "ÐÐÐÐÐÑÐÐÑÐ"
+
+#: ../meld/dirdiff.py:240
+#: ../meld/vcview.py:132
+msgid "Show modified"
+msgstr "ÐÐÐÐÐÑÐÐÑÑ ÐÐÐÐÐÑÐÐÑÐ"
+
+#: ../meld/dirdiff.py:242
+msgid "Filters"
+msgstr "ÐÐÐÑÑÑÑ"
+
+#: ../meld/dirdiff.py:242
+msgid "Set active filters"
+msgstr "ÐÑÑÐÐÐÐÐÑÑ ÑÐÐÑÑÑÑ"
+
+#: ../meld/dirdiff.py:359
 #, python-format
 msgid "Hide %s"
 msgstr "ÐÐÑÑÐÐÑÑ %s"
 
-#: ../dirdiff.py:364
-#: ../dirdiff.py:374
-#: ../vcview.py:213
-#: ../vcview.py:241
+#: ../meld/dirdiff.py:462
+#: ../meld/dirdiff.py:475
+#: ../meld/vcview.py:305
+#: ../meld/vcview.py:333
 #, python-format
 msgid "[%s] Scanning %s"
 msgstr "[%s] ÐÑÐÑÐÐÑÑ %s"
 
-#: ../dirdiff.py:407
+#: ../meld/dirdiff.py:574
 #, python-format
-msgid "'%s' hidden by '%s'"
-msgstr "Â%s ÑÐÑÑÐÐÐÑÑÑ Â%sÂ"
+msgid "[%s] Done"
+msgstr "[%s] ÐÐÑÐÐÐ"
 
-#: ../dirdiff.py:413
+#: ../meld/dirdiff.py:578
+msgid "Multiple errors occurred while scanning this folder"
+msgstr "ÐÑÐ ÑÐÐÐÐÑÐÐÐÐÐÐ ÑÑÐÐ ÐÐÐÐÐ ÐÑÐÐÐÐÑÐÐ ÐÐÑÐÐÐÑÐÐ ÐÑÐÐÐÐ"
+
+#: ../meld/dirdiff.py:579
+#| msgid "%s is not in encodings: %s"
+msgid "Files with invalid encodings found"
+msgstr "ÐÐÐÐÐÐÑ ÑÐÐÐÑ Ñ ÐÐÐÐÑÐÑÐÐ ÐÐÐÐÑÐÐÐÐÐÐ"
+
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:581
+msgid "Some files were in an incorrect encoding. The names are something like:"
+msgstr "ÐÐÐÐÑÐÑÑÐ ÑÐÐÐÑ ÐÑÐÐÐÑÐÑÑÑ ÐÐÐÑÐÐÐÐÑÐÑÑ ÐÐÐÐÑÐÐÐÑ. ÐÐÐÐÐ:"
+
+#: ../meld/dirdiff.py:583
+msgid "Files hidden by case insensitive comparison"
+msgstr "ÐÐÐÐÑ ÑÐÑÑÑÑÐ ÐÐ-ÐÐ ÐÐÑÑÑÑÐÐÑÑ ÑÐÐÐÐÑÐÐ Ð ÑÐÐÐÑÑÑÐÑ"
+
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:585
+#| msgid ""
+#| "You are running a case insensitive comparison on a case sensitive "
+#| "filesystem. Some files are not visible:\n"
+#| "%s"
+msgid "You are running a case insensitive comparison on a case sensitive filesystem. The following files in this folder are hidden:"
+msgstr "ÐÑ ÐÐÐÑÑÐÐÐÑÐ ÑÑÐÐÐÐÐÐÐ ÐÐÐ ÑÑÑÑÐ ÑÐÐÐÑÑÑÐ Ð ÑÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐ, ÑÑÐÑÑÐÐÑÐÐÑÐÐÐ Ð ÑÐÐÐÑÑÑÑ. ÐÐÐÐÑÑÑÐÐ ÑÐÐÐÑ Ð ÑÑÐÐ ÐÐÐÐÐ ÑÐÑÑÑÑ:"
+
+#: ../meld/dirdiff.py:596
 #, python-format
-msgid ""
-"You are running a case insensitive comparison on a case sensitive filesystem. Some files are not visible:\n"
-"%s"
-msgstr ""
-"ÐÑ ÐÑÐÐÐÐÐÑÐ ÑÑÐÐÐÐÐÐÐ ÐÐÐ ÑÑÐÑÐ ÑÐÐÐÑÑÑÐ ÐÐ ÑÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐ, ÑÑÐÑÑÐÐÑÐÐÑÐÐÐ Ð ÑÐÐÐÑÑÑÑ. ÐÐÐÐÑÐÑÑÐ ÑÐÐÐÑ ÐÐÐÑÑ ÐÑÑÑ ÐÐ ÐÐÐÐÑ:\n"
-"%s"
+msgid "'%s' hidden by '%s'"
+msgstr "Â%s ÑÐÑÑÑ Â%sÂ"
 
-#: ../dirdiff.py:487
-#, python-format
-msgid "[%s] Done"
-msgstr "[%s] ÐÐÑÐÐÐ"
+#: ../meld/dirdiff.py:621
+#: ../meld/filediff.py:1001
+#: ../meld/filediff.py:1141
+msgid "Hi_de"
+msgstr "Ð_ÐÑÑÑÑ"
 
-#: ../dirdiff.py:533
+#: ../meld/dirdiff.py:671
 #, python-format
 msgid ""
 "'%s' exists.\n"
@@ -63,29 +534,29 @@ msgstr ""
 "Â%s ÑÑÑÐÑÑÐÑÐÑ.\n"
 "ÐÐÑÐÐÐÑÐÑÑ?"
 
-#: ../dirdiff.py:540
+#: ../meld/dirdiff.py:678
 #, python-format
 msgid ""
 "Error copying '%s' to '%s'\n"
 "\n"
 "%s."
 msgstr ""
-"ÐÑÐÐÐÐÑÐÐ ÐÑÐÐÐÐ ÐÑÐ ÐÐÐÐÑÐÐÐÐÐÐ Â%s РÂ%sÂ\n"
+"ÐÑÐ ÐÐÐÐÑÐÐÐÐÐÐ Â%s РÂ%s ÐÑÐÐÐÐÑÐÐ ÐÑÐÐÐÐ\n"
 "\n"
 "%s."
 
-#: ../dirdiff.py:558
-#: ../vcview.py:405
+#: ../meld/dirdiff.py:696
+#: ../meld/vcview.py:505
 #, python-format
 msgid ""
 "'%s' is a directory.\n"
-"Remove recusively?"
+"Remove recursively?"
 msgstr ""
-"Â%s - ÑÑÐ ÐÐÑÐÐÐÐ.\n"
-"ÐÐÐÐÐÑÑ ÐÐÐ ÐÐÐÑÑÐ Ñ ÑÐÐÐÑÐÐÐÑÐ?"
+"Â%s â ÐÐÑÐÐÐÐ.\n"
+"ÐÐÐÐÐÑÑ ÐÐÐ ÐÐÐÑÑÐ ÑÐ ÐÑÐÐ ÑÐÐÐÑÐÐÐÑÐ?"
 
-#: ../dirdiff.py:565
-#: ../vcview.py:410
+#: ../meld/dirdiff.py:703
+#: ../meld/vcview.py:510
 #, python-format
 msgid ""
 "Error removing %s\n"
@@ -96,7 +567,7 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../dirdiff.py:576
+#: ../meld/dirdiff.py:715
 #, python-format
 msgid "%i second"
 msgid_plural "%i seconds"
@@ -104,7 +575,7 @@ msgstr[0] "%i ÑÐÐÑÐÐÐ"
 msgstr[1] "%i ÑÐÐÑÐÐÑ"
 msgstr[2] "%i ÑÐÐÑÐÐ"
 
-#: ../dirdiff.py:577
+#: ../meld/dirdiff.py:716
 #, python-format
 msgid "%i minute"
 msgid_plural "%i minutes"
@@ -112,7 +583,7 @@ msgstr[0] "%i ÐÐÐÑÑÐ"
 msgstr[1] "%i ÐÐÐÑÑÑ"
 msgstr[2] "%i ÐÐÐÑÑ"
 
-#: ../dirdiff.py:578
+#: ../meld/dirdiff.py:717
 #, python-format
 msgid "%i hour"
 msgid_plural "%i hours"
@@ -120,7 +591,7 @@ msgstr[0] "%i ÑÐÑ"
 msgstr[1] "%i ÑÐÑÐ"
 msgstr[2] "%i ÑÐÑÐÐ"
 
-#: ../dirdiff.py:579
+#: ../meld/dirdiff.py:718
 #, python-format
 msgid "%i day"
 msgid_plural "%i days"
@@ -128,7 +599,7 @@ msgstr[0] "%i ÐÐÐÑ"
 msgstr[1] "%i ÐÐÑ"
 msgstr[2] "%i ÐÐÐÐ"
 
-#: ../dirdiff.py:580
+#: ../meld/dirdiff.py:719
 #, python-format
 msgid "%i week"
 msgid_plural "%i weeks"
@@ -136,7 +607,7 @@ msgstr[0] "%i ÐÐÐÐÐÑ"
 msgstr[1] "%i ÐÐÐÐÐÐ"
 msgstr[2] "%i ÐÐÐÐÐÑ"
 
-#: ../dirdiff.py:581
+#: ../meld/dirdiff.py:720
 #, python-format
 msgid "%i month"
 msgid_plural "%i months"
@@ -144,7 +615,7 @@ msgstr[0] "%i ÐÐÑÑÑ"
 msgstr[1] "%i ÐÐÑÑÑÐ"
 msgstr[2] "%i ÐÐÑÑÑÐÐ"
 
-#: ../dirdiff.py:582
+#: ../meld/dirdiff.py:721
 #, python-format
 msgid "%i year"
 msgid_plural "%i years"
@@ -152,88 +623,223 @@ msgstr[0] "%i ÐÐÐ"
 msgstr[1] "%i ÐÐÐÐ"
 msgstr[2] "%i ÐÐÑ"
 
-#. Abbreviation for insert,overwrite so that it will fit in the status bar
-#: ../filediff.py:201
-msgid "INS,OVR"
-msgstr "ÐÐÐ,ÐÐÐ"
+#: ../meld/filediff.py:288
+msgid "Format as patch..."
+msgstr "ÐÐÐÐÐÑÑ ÐÐÐÐÐÑÐÑâ"
 
-#. Abbreviation for line, column so that it will fit in the status bar
-#: ../filediff.py:203
-#, python-format
-msgid "Ln %i, Col %i"
-msgstr "  ÐÑÑ %d, ÐÑÐÐ %d"
+#: ../meld/filediff.py:288
+msgid "Create a patch using differences between files"
+msgstr "ÐÐÐÐÐÑÑ ÐÐÐÐÐÑÐÑ, ÐÑÐÐÐÑÐÑÑ ÑÐÐÐÐÑÐÑ ÐÐÐÐÑ ÑÐÐÐÐÐÐ"
 
-#: ../filediff.py:261
-#, python-format
-msgid "Regular expression '%s' changed the number of lines in the file. Comparison will be incorrect. See the user manual for more details."
-msgstr "ÐÐÐÑÐÑÑÐÐÐ ÐÑÑÐÐÐÐÐÐ Â%s ÐÑÐÐÑÑÐÐÐÑ ÐÐÐÑÑÐ ÐÐÐÐÐ ÑÑÑÐÐÐ. ÐÐÐÑÐÑÑÐÑ ÑÑÐÐÐÐÐÐÑ ÐÑÐÐÑ ÐÐÑÐÑÐÑÐ. ÐÐÐÑÐÐÐÐÑÑÐ ÐÐÐÐÐ ÑÐÐÐÑÑ Ð ÑÑÐÐÐÐÐÑÑÐÐ ÐÐÐÑÐÐÐÐÑÐÐÑ."
+#: ../meld/filediff.py:289
+msgid "Previous conflict"
+msgstr "ÐÑÐÐÑÐÑÑÐÐ ÐÐÐÑÐÐÐÑ"
 
-#: ../filediff.py:504
-#, python-format
-msgid ""
-"Regular expression error\n"
-"'%s'"
-msgstr ""
-"ÐÑÐÐÐÐ Ð ÑÐÐÑÐÑÑÐÐÐ ÐÑÑÐÐÐÐÐÐ\n"
-"Â%sÂ"
+#: ../meld/filediff.py:289
+msgid "Go to the previous conflict"
+msgstr "ÐÐÑÐÐÑÐ Ð ÐÑÐÐÑÐÑÑÐÐÑ ÐÐÐÑÐÐÐÑÑ"
 
-#: ../filediff.py:516
-#, python-format
-msgid "The regular expression '%s' was not found."
-msgstr "ÐÐÐÑÐÑÑÐÐÐ ÐÑÑÐÐÐÐÐÐ Â%s ÐÐ ÐÐÐÐÐÐÐ."
+#: ../meld/filediff.py:290
+msgid "Next conflict"
+msgstr "ÐÐÐÐÑÑÑÐÐ ÐÐÐÑÐÐÐÑ"
+
+#: ../meld/filediff.py:290
+msgid "Go to the next conflict"
+msgstr "ÐÐÑÐÐÑÐ Ð ÑÐÐÐÑÑÑÐÐÑ ÐÐÐÑÐÐÐÑÑ"
+
+#: ../meld/filediff.py:291
+msgid "Push to left"
+msgstr "ÐÐÑÐÐÐÑÑÐÑÑ ÐÐÐÐÐÐ"
+
+#: ../meld/filediff.py:291
+msgid "Push current change to the left"
+msgstr "ÐÐÑÐÐÐÑÑÐÑÑ ÑÐÐÑÑÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐ"
+
+#: ../meld/filediff.py:292
+msgid "Push to right"
+msgstr "ÐÐÑÐÐÐÑÑÐÑÑ ÐÐÐÑÐÐÐ"
+
+#: ../meld/filediff.py:292
+msgid "Push current change to the right"
+msgstr "ÐÐÑÐÐÐÑÑÐÑÑ ÑÐÐÑÑÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÐÑÐÐÐ"
+
+#. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
+#: ../meld/filediff.py:294
+msgid "Pull from left"
+msgstr "ÐÐÑÑÑ ÑÐÐÐÐ"
+
+#: ../meld/filediff.py:294
+msgid "Pull change from the left"
+msgstr "ÐÐÑÑÑ ÐÐÐÐÐÐÐÐÐ ÑÐÐÐÐ"
+
+#: ../meld/filediff.py:295
+msgid "Pull from right"
+msgstr "ÐÐÑÑÑ ÑÐÑÐÐÐ"
+
+#: ../meld/filediff.py:295
+msgid "Pull change from the right"
+msgstr "ÐÐÑÑÑ ÐÐÐÐÐÐÐÐÐ ÑÐÑÐÐÐ"
+
+#: ../meld/filediff.py:296
+msgid "Copy above left"
+msgstr "ÐÐÐÐÑÐÐÐÑÑ ÐÐÐÐÐÐ ÐÑÑÐ"
+
+#: ../meld/filediff.py:296
+msgid "Copy change above the left chunk"
+msgstr "ÐÐÐÐÑÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐ ÐÑÑÐ ÐÐÐÐÐÐ ÐÐÐÐÐ"
+
+#: ../meld/filediff.py:297
+msgid "Copy below left"
+msgstr "ÐÐÐÐÑÐÐÐÑÑ ÐÐÐÐÐÐ ÐÐÐÐ"
+
+#: ../meld/filediff.py:297
+msgid "Copy change below the left chunk"
+msgstr "ÐÐÐÐÑÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐ ÐÐÐÐ ÐÐÐÐÐÐ ÐÐÐÐÐ"
+
+#: ../meld/filediff.py:298
+msgid "Copy above right"
+msgstr "ÐÐÐÐÑÐÐÐÑÑ ÐÐÑÐÐÐ ÐÑÑÐ"
 
-#: ../filediff.py:518
+#: ../meld/filediff.py:298
+msgid "Copy change above the right chunk"
+msgstr "ÐÐÐÐÑÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐ ÐÑÑÐ ÐÑÐÐÐÐÐ ÐÐÐÐÐ"
+
+#: ../meld/filediff.py:299
+msgid "Copy below right"
+msgstr "ÐÐÐÐÑÐÐÐÑÑ ÐÐÑÐÐÐ ÐÐÐÐ"
+
+#: ../meld/filediff.py:299
+msgid "Copy change below the right chunk"
+msgstr "ÐÐÐÐÑÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐ ÐÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐÐ"
+
+#: ../meld/filediff.py:300
+msgid "Delete"
+msgstr "ÐÐÐÐÐÑÑ"
+
+#: ../meld/filediff.py:300
+msgid "Delete change"
+msgstr "ÐÐÐÐÐÑÑ ÐÐÐÐÐÐÐÐÐ"
+
+#: ../meld/filediff.py:301
+msgid "Merge all changes from left"
+msgstr "ÐÐÑÐÐÐÐÐÑÑ ÐÑÐ ÐÐÐÐÐÐÐÐÑ ÑÐÐÐÐ"
+
+#: ../meld/filediff.py:301
+msgid "Merge all non-conflicting changes from the left"
+msgstr "ÐÐÑÐÐÐÐÐÑÑ ÐÑÐ ÐÐÐÐÐÑÐÐÐÑÑÑÑÐÐ ÐÐÐÐÐÐÐÐÑ ÑÐÐÐÐ"
+
+#: ../meld/filediff.py:302
+msgid "Merge all changes from right"
+msgstr "ÐÐÑÐÐÐÐÐÑÑ ÐÑÐ ÐÐÐÐÐÐÐÐÑ ÑÐÑÐÐÐ"
+
+#: ../meld/filediff.py:302
+msgid "Merge all non-conflicting changes from the right"
+msgstr "ÐÐÑÐÐÐÐÐÑÑ ÐÑÐ ÐÐÐÐÐÑÐÐÐÑÑÑÑÐÐ ÐÐÐÐÐÐÐÐÑ ÑÐÑÐÐÐ"
+
+#: ../meld/filediff.py:303
+msgid "Merge all non-conflicting"
+msgstr "ÐÐÑÐÐÐÐÐÑÑ ÐÑÐ ÐÐÐÐÐÑÐÐÐÑÑÑÑÐÐ"
+
+#: ../meld/filediff.py:303
+msgid "Merge all non-conflicting changes from left and right panes"
+msgstr "ÐÐÑÐÐÐÐÐÑÑ ÐÑÐ ÐÐÐÐÐÑÐÐÐÑÑÑÑÐÐ ÐÐÐÐÐÐÐÐÑ Ñ ÐÐÐÐÐ Ð ÐÑÐÐÐÐ ÐÐÐÐÐÐ"
+
+#: ../meld/filediff.py:304
+msgid "Cycle through documents"
+msgstr "ÐÑÐÐÑÐ ÐÐ ÐÐÐÑÐÐÐÑÐÐ"
+
+#: ../meld/filediff.py:304
+msgid "Move keyboard focus to the next document in this comparison"
+msgstr "ÐÐÑÐÐÐÑÑÐÑÑ ÑÐÐÑÑ ÐÐÐÐÐ ÐÐ ÑÐÐÐÑÑÑÐÐ ÐÐÐÑÐÐÐÑ Ð ÑÑÐÐÐÐÐÐÐ"
+
+#: ../meld/filediff.py:308
+msgid "Lock scrolling"
+msgstr "ÐÐÐÐÐÐÐÑÐÐÐÑÑ ÐÑÐÐÑÑÑÐÑ"
+
+#: ../meld/filediff.py:309
+msgid "Lock scrolling of all panes"
+msgstr "ÐÐÐÐÐÐÐÑÐÐÐÑÑ ÐÑÐÐÑÑÑÐÑ ÐÑÐÑ ÐÐÐÐÐÐÐ"
+
+#. Abbreviations for insert and overwrite that fit in the status bar
+#: ../meld/filediff.py:401
+msgid "INS"
+msgstr "ÐÐÐ"
+
+#: ../meld/filediff.py:401
+msgid "OVR"
+msgstr "ÐÐÐ"
+
+#. Abbreviation for line, column so that it will fit in the status bar
+#: ../meld/filediff.py:403
 #, python-format
-msgid "The text '%s' was not found."
-msgstr "ÐÐÐÑÑ Â%s ÐÐ ÐÐÐÐÐÐ."
+msgid "Ln %i, Col %i"
+msgstr "ÐÑÑ %d, ÐÑÐÐ %d"
 
-#: ../filediff.py:571
+#: ../meld/filediff.py:713
+#, python-format
+#| msgid ""
+#| "Regular expression '%s' changed the number of lines in the file. "
+#| "Comparison will be incorrect. See the user manual for more details."
+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:800
+msgid "<unnamed>"
+msgstr "<ÐÐÐ ÐÐÐÐÐ>"
+
+#: ../meld/filediff.py:989
 #, python-format
 msgid "[%s] Set num panes"
-msgstr "[%s] ÐÐÑÐÐÐÐÑÐÑÑÑ ÐÐÐÐÑÐÑÑÐÐ ÐÐÐÐÐÐÐ"
+msgstr "[%s] ÐÑÑÐÐÐÐÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../filediff.py:578
+#: ../meld/filediff.py:995
 #, python-format
 msgid "[%s] Opening files"
-msgstr "[%s] ÐÑÐÑÑÐÐÑÑÑÑ ÑÐÐÐÑ"
+msgstr "[%s] ÐÑÐÑÑÑÐÐ ÑÐÐÐÐÐ"
 
-#: ../filediff.py:595
-#: ../filediff.py:609
-#: ../filediff.py:625
-#: ../filediff.py:632
-#, python-format
-msgid "Could not read from '%s'"
-msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÑÐÑÐÑÑ ÑÐÐÐ Â%sÂ"
-
-#: ../filediff.py:596
-#: ../filediff.py:633
-msgid "The error was:"
-msgstr "ÐÑÐÐÐÐÑÐÐ ÐÑÐÐÐÐ:"
+#: ../meld/filediff.py:1019
+#: ../meld/filediff.py:1028
+#: ../meld/filediff.py:1040
+#: ../meld/filediff.py:1046
+msgid "Could not read file"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÐÑÐÑÑ ÑÐÐÐ"
 
-#: ../filediff.py:601
+#: ../meld/filediff.py:1020
 #, python-format
 msgid "[%s] Reading files"
-msgstr "[%s] ÐÐÐÑÑÐÐÑÑÑÑ ÑÐÐÐÑ"
+msgstr "[%s] ÐÐÐÑÑÐÐÐ ÑÐÐÐÐÐ"
 
-#: ../filediff.py:610
-msgid ""
-"It contains ascii nulls.\n"
-"Perhaps it is a binary file."
-msgstr ""
-"ÐÐ ÑÐÐÐÑÐÐÑ ÐÑÐÐÐÑÐ ÑÐÐÐÐÐÑ.\n"
-"ÐÐÐÐÐÐÐÐ, ÑÑÐ ÐÐÑÐÐÑÑÐÐÑÐ ÑÐÐÐ."
+#: ../meld/filediff.py:1029
+#, python-format
+msgid "%s appears to be a binary file."
+msgstr "%s ÑÐÐÑÐÑÑÑ ÐÐÐÐÑÐÑÐ ÑÐÐÐÐÐ."
 
-#: ../filediff.py:626
+#: ../meld/filediff.py:1041
 #, python-format
-msgid "I tried encodings %s."
-msgstr "ÐÑÐÐ ÐÑÐÑÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐÐÐ %s."
+msgid "%s is not in encodings: %s"
+msgstr "%s ÐÐ ÐÑÐÐÐÑ Ð ÑÐÐÑÐÐ ÐÐÐÐÑÐÐÐÐ: %s"
 
-#: ../filediff.py:655
+#: ../meld/filediff.py:1071
+#: ../meld/filemerge.py:67
 #, python-format
 msgid "[%s] Computing differences"
-msgstr "[%s] ÐÑÑÐÑÐÑÑÑÑÑ ÑÐÐÐÐÑÐÑ"
+msgstr "[%s] ÐÑÑÐÑÐÐÐÐÐ ÑÐÐÐÐÑÐÐ"
+
+#: ../meld/filediff.py:1128
+msgid "Text filters are being used, and may be masking differences between files. Would you like to compare the unfiltered files?"
+msgstr "ÐÑÐÐÐÑÐÑÑÑÑÑ ÑÐÐÑÑÐÐÑÐ ÑÐÐÑÑÑÑ, ÐÐÑÐÑÑÐ ÐÐÐÑÑ ÐÐÑÐÐÑÐÐÐÑÑ ÑÐÐÐÐÑÐÑ ÐÐÐÐÑ ÑÐÐÐÐÐÐ. ÐÐÑÐÑÐ ÑÑÐÐÐÐÑÑ ÑÐÐÐÑ ÐÐÐ ÐÑÐÐÐÑÐÐÐÐÐÐÑ ÑÐÐÑÑÑÐÐ?"
+
+#: ../meld/filediff.py:1134
+msgid "Files are identical"
+msgstr "ÐÐÐÐÑ ÐÐÐÐÑÐÑÐÑ"
+
+#: ../meld/filediff.py:1144
+#| msgid "Show ignored files"
+msgid "Show without filters"
+msgstr "ÐÐÐÐÐÐÑÑ ÐÐÐ ÑÐÐÑÑÑÐÐ"
 
-#: ../filediff.py:760
+#: ../meld/filediff.py:1298
 #, python-format
 msgid ""
 "\"%s\" exists!\n"
@@ -242,7 +848,7 @@ msgstr ""
 "Â%s ÑÑÑÐÑÑÐÑÐÑ!\n"
 "ÐÐÑÐÐÐÑÐÑÑ?"
 
-#: ../filediff.py:773
+#: ../meld/filediff.py:1311
 #, python-format
 msgid ""
 "Error writing to %s\n"
@@ -253,12 +859,12 @@ msgstr ""
 "\n"
 "%s."
 
-#: ../filediff.py:782
+#: ../meld/filediff.py:1320
 #, python-format
 msgid "Choose a name for buffer %i."
 msgstr "ÐÑÐÐÑÐÑÐ ÐÐÑ ÐÐÑ ÐÑÑÐÑÐ %i."
 
-#: ../filediff.py:795
+#: ../meld/filediff.py:1335
 #, python-format
 msgid ""
 "This file '%s' contains a mixture of line endings.\n"
@@ -267,9 +873,9 @@ msgid ""
 msgstr ""
 "ÐÐÐÐ Â%s ÑÐÐÐÑÐÐÑ ÐÐÐÑÑ ÑÑÑÐÐ Ð ÑÐÐÐÑÑ ÑÐÑÐÐÑÐÑ.\n"
 "\n"
-"ÐÐÐÐÐ ÑÐÑÐÐÑ ÐÑ ÑÐÑÐÑÐ ÐÑÐÐÐÑÐÐÐÐÑÑ?"
+"ÐÐÐÐÐ ÑÐÑÐÐÑ ÐÐÐÐÑÐÐÐÐÐ ÐÑÐÐÐÑÐÐÐÐÑÑ?"
 
-#: ../filediff.py:811
+#: ../meld/filediff.py:1351
 #, python-format
 msgid ""
 "'%s' contains characters not encodable with '%s'\n"
@@ -278,12 +884,7 @@ msgstr ""
 "Â%s ÑÐÐÐÑÐÐÑ ÑÐÐÐÐÐÑ, ÐÐÑÐÑÑÐ ÐÐÐÑÐÑ ÐÐÐÐÐÐÑÐÐÐÑÑ Ð Â%sÂ.\n"
 "ÐÐÑÐÑÐ ÑÐÑÑÐÐÐÑÑ Ð UTF-8?"
 
-#. save as
-#: ../filediff.py:862
-msgid "Save patch as..."
-msgstr "ÐÐÑÑÐÐÐÑÑ ÐÐÐÐÐÑÐÑ Ð ÑÐÐÐ..."
-
-#: ../filediff.py:916
+#: ../meld/filediff.py:1410
 #, python-format
 msgid ""
 "Reloading will discard changes in:\n"
@@ -291,757 +892,370 @@ msgid ""
 "\n"
 "You cannot undo this operation."
 msgstr ""
-"ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÑ Ð ÐÐÑÐÑÐ ÐÐÐÐÐÐÐÐÐ Ð ÑÐÐÐÑÑÑÐÑ ÑÐÐÐÐÑ:\n"
+"ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÐÐÐÑÑ Ð ÐÐÑÐÑÐ ÐÐÐÐÐÐÐÐÐ Ð ÑÐÐÐÑÑÑÐÑ ÑÐÐÐÐÑ:\n"
 "%s\n"
 "\n"
-"ÐÑ ÐÐ ÑÐÐÐÐÑÐ ÐÑÐÐÐÐÑÑ ÑÑÑ ÐÐÐÑÐÑÐÑ."
-
-#: ../glade2/dirdiff.glade.h:1
-msgid "Case"
-msgstr "ÐÐÐ ÑÐÐÐÑÑÑÐ"
+"ÐÑÐ ÐÐÐÑÐÑÐÑ ÐÐ ÐÐÐÐÑ ÐÑÑÑ ÐÑÐÐÐÐÐÐ."
 
-#: ../glade2/dirdiff.glade.h:2
-msgid "Compare"
-msgstr "ÐÑÐÐÐÐÐÐÐ"
-
-#: ../glade2/dirdiff.glade.h:3
-#: ../glade2/vcview.glade.h:6
-msgid "Compare selected"
-msgstr "ÐÑÐÐÐÐÑÑ ÐÑÐÑÐÐÐÐÐ"
-
-#: ../glade2/dirdiff.glade.h:4
-msgid "Copy To Left"
-msgstr "ÐÐÐÐÐÑÐÐÐÑÑ ÐÐÐÐÐ"
-
-#: ../glade2/dirdiff.glade.h:5
-msgid "Copy To Right"
-msgstr "ÐÐÐÐÐÑÐÐÐÑÑ ÐÐÑÐÐÐ"
-
-#: ../glade2/dirdiff.glade.h:6
-msgid "Delete selected"
-msgstr "ÐÐÐÐÐÑÑ ÐÑÐÑÐÐÐÐÐ"
-
-#: ../glade2/dirdiff.glade.h:7
-#: ../glade2/filediff.glade.h:7
-msgid "Edit"
-msgstr "ÐÑÐÑÑÑÑ Ð ÑÐÐÐÐÑÐÑÐ"
-
-#: ../glade2/dirdiff.glade.h:8
-msgid "Hide selected"
-msgstr "ÐÐÑÑÑÑ ÐÑÐÑÐÐÐÐÐ"
-
-#: ../glade2/dirdiff.glade.h:9
-msgid "Hide..."
-msgstr "ÐÐÑÑÑÑ..."
-
-#: ../glade2/dirdiff.glade.h:10
-msgid "Ignore case of entries"
-msgstr "ÐÐÐÐÑÐÑÐÐÐÑÑ ÑÐÐÐÑÑÑ"
-
-#: ../glade2/dirdiff.glade.h:11
-msgid "Left"
-msgstr "ÐÐÐÐÐ"
-
-#: ../glade2/dirdiff.glade.h:12
-msgid "Modified"
-msgstr "ÐÐÐÐÐÑÐÐÑÐ"
-
-#: ../glade2/dirdiff.glade.h:13
-#: ../glade2/meldapp.glade.h:50
-msgid "New"
-msgstr "ÐÐÐÑÐ"
-
-#: ../glade2/dirdiff.glade.h:14
-msgid "Right"
-msgstr "ÐÐÑÐÐÐ"
-
-#: ../glade2/dirdiff.glade.h:15
-msgid "Same"
-msgstr "ÐÐÐÐÐÐÐÐÑÐ"
-
-#: ../glade2/dirdiff.glade.h:16
-msgid "Show identical"
-msgstr "ÐÐÐÐÐÑÐÐÑÑ ÐÐÐÐÑÐÑÐÑÐ"
-
-#: ../glade2/dirdiff.glade.h:17
-#: ../glade2/vcview.glade.h:20
-msgid "Show modified"
-msgstr "ÐÐÐÐÐÑÐÐÑÑ ÐÐÐÐÐÑÐÐÑÐ"
-
-#: ../glade2/dirdiff.glade.h:18
-msgid "Show new"
-msgstr "ÐÐÐÐÐÑÐÐÑÑ ÐÐÐÑÐ"
-
-#: ../glade2/dirdiff.glade.h:19
-#: ../glade2/meldapp.glade.h:89
-#: ../glade2/vcview.glade.h:28
-msgid "_Compare"
-msgstr "_ÐÑÐÐÐÐÑÑ"
-
-#: ../glade2/dirdiff.glade.h:20
-msgid "_Delete Selected"
-msgstr "_ÐÐÐÐÐÑÑ ÐÑÐÑÐÐÐÐÐ"
-
-#: ../glade2/filediff.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Some files have been modified.\n"
-"Which ones would you like to save?</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">ÐÐÐÐÑÐÑÑÐ ÑÐÐÐÑ ÐÑÐÐ ÐÐÐÐÐÐÐÑ.\n"
-"ÐÐÐÐÐ ÐÐ ÐÐÑ ÐÑ ÑÐÑÐÑÐ ÑÐÑÑÐÐÐÑÑ?</span>"
-
-#: ../glade2/filediff.glade.h:3
-msgid "Copy All To _Left"
-msgstr "ÐÐÐÐÐÑÐÐÐÑÑ ÐÑÑ Ð_ÐÐÐÐ"
-
-#: ../glade2/filediff.glade.h:4
-msgid "Copy All To _Right"
-msgstr "ÐÐÐÐÐÑÐÐÐÑÑ ÐÑÑ Ð_ÐÑÐÐÐ"
-
-#: ../glade2/filediff.glade.h:5
-msgid "Copy to Clipboard"
-msgstr "CÐÐÐÐÑÐÐÐÑÑ Ð ÐÑÑÐÑ ÐÐÐÐÐÐ"
-
-#: ../glade2/filediff.glade.h:6
-msgid "Create Patch"
-msgstr "[%s] ÐÐÐÐÐÑÑ ÐÐÐÐÐÑÐÑ ÐÐ ÐÐÐÐ ÑÐÐÐÐÑÑ"
-
-#: ../glade2/filediff.glade.h:8
-msgid "Find"
-msgstr "ÐÐÐÑÐ"
-
-#: ../glade2/filediff.glade.h:9
-msgid "Match _entire word only"
-msgstr "ÐÐÐÑÐÐ _ÐÐÐÐÑÐ ÑÐÐÐÐ"
-
-#: ../glade2/filediff.glade.h:10
-msgid "Regular e_xpression"
-msgstr "_ÐÐÐÑÐÑÑÐÐÐ ÐÑÑÐÐÐÐÐÐ"
-
-#: ../glade2/filediff.glade.h:11
-msgid "Save modified files?"
-msgstr "ÐÐÑÑÐÐÐÑÑ ÐÐÐÐÐÑÐÐÑÐ ÑÐÐÐÑ?"
-
-#: ../glade2/filediff.glade.h:12
-msgid "Search for:"
-msgstr "ÐÐÐÑÐ:"
-
-#: ../glade2/filediff.glade.h:13
-msgid "_Match case"
-msgstr "ÐÑÐÑÑÐÐÑÑ _ÑÐÐÐÑÑÑ"
-
-#: ../glade2/filediff.glade.h:14
-msgid "_Wrap around"
-msgstr "ÐÐÑÐ_ÑÐÐÐÑÑ Ð ÐÐÑÐÐÑ"
-
-#: ../glade2/meldapp.glade.h:1
-msgid "(gnome-default-editor)"
-msgstr "ÐÐÐÑÑÐÐÑÐ ÑÐÐÐÐÑÐÑ ÐÐ ÑÐÐÐÑÐÐÐÑ"
-
-#: ../glade2/meldapp.glade.h:2
-msgid "<b>Drawing Style</b>"
-msgstr "<b>ÐÐÐ ÐÐÐÐÑÑ Ñ ÑÐÐÐÐÑÐÑÐÐ</b>"
-
-#: ../glade2/meldapp.glade.h:3
-msgid "<b>Edit Menu</b>"
-msgstr "<b>ÐÐÐÐÐÑÐÑ</b>"
-
-#: ../glade2/meldapp.glade.h:4
-msgid "<b>Font</b>"
-msgstr "<b>ÐÑÐÑÑ</b>"
-
-#: ../glade2/meldapp.glade.h:5
-msgid "<b>Global options</b>"
-msgstr "<b>ÐÐÑÐÐ ÐÐÑÐÐÐÑÑÑ</b>"
-
-#: ../glade2/meldapp.glade.h:6
-msgid "<b>Loading</b>"
-msgstr "<b>ÐÐÐÑÑÐÐÐ ÑÐÐÐÐÐ</b>"
-
-#: ../glade2/meldapp.glade.h:7
-msgid "<b>Misc</b>"
-msgstr "<b>ÐÐÐÐÐÐ</b>"
-
-#: ../glade2/meldapp.glade.h:8
-msgid "<b>Saving</b>"
-msgstr "<b>ÐÐÑÑÐÐÐÐÐÐ ÑÐÐÐÐÐ</b>"
-
-#: ../glade2/meldapp.glade.h:9
-msgid "<b>Toolbar Appearance</b>"
-msgstr "<b>ÐÐÐ ÐÐÐÐÐÐ ÐÐÑÑÑÑÐÐÐÑÐÐ</b>"
-
-#: ../glade2/meldapp.glade.h:10
-msgid "<b>Update Options</b>"
-msgstr "<b>ÐÐÑÐÐÐÑÑÑ ÐÐÐÐÐÐÐÐÐÑ</b>"
-
-#: ../glade2/meldapp.glade.h:11
-msgid "<b>Whitespace</b>"
-msgstr "<b>ÐÑÐÐÐÐ</b>"
+#: ../meld/filemerge.py:82
+#, python-format
+msgid "[%s] Merging files"
+msgstr "[%s] ÐÐÑÐÐÐÐÐÐÐÐ ÑÐÐÐÐÐ"
+
+#: ../meld/meldapp.py:149
+msgid "wrong number of arguments supplied to --diff"
+msgstr "ÐÐÐÐÑÐÐÐ ÑÐÑÐÐ ÐÑÐÑÐÐÐÑÐÐ ÐÐÑÐÐÐÐÐÑÑ --diff"
+
+#: ../meld/meldapp.py:153
+msgid "Start with an empty window"
+msgstr "ÐÐÑÐÑÑ Ñ ÐÑÑÑÑÐ ÐÐÐÐÐ"
+
+#: ../meld/meldapp.py:154
+#: ../meld/meldapp.py:155
+#: ../meld/meldapp.py:157
+msgid "file"
+msgstr "ÑÐÐÐ"
+
+#: ../meld/meldapp.py:154
+#: ../meld/meldapp.py:156
+#: ../meld/meldapp.py:157
+msgid "dir"
+msgstr "ÐÐÑ."
+
+#: ../meld/meldapp.py:154
+msgid "Start a version control comparison"
+msgstr "ÐÐÑÐÑÑ ÑÑÐÐÐÐÐÐÐ, ÐÑÐÐÐÑÐÑÑ ÐÐÐ"
+
+#: ../meld/meldapp.py:155
+msgid "Start a 2- or 3-way file comparison"
+msgstr "ÐÐÑÐÑÑ ÑÑÐÐÐÐÐÐÐ 2-Ñ ÐÐÐ 3-Ñ ÑÐÐÐÐÐ"
+
+#: ../meld/meldapp.py:156
+msgid "Start a 2- or 3-way directory comparison"
+msgstr "ÐÐÑÐÑÑ ÑÑÐÐÐÐÐÐÐ 2-Ñ ÐÐÐ 3-Ñ ÐÐÑÐÐÐÐÐÐ"
+
+#: ../meld/meldapp.py:157
+msgid "Start a comparison between file and dir/file"
+msgstr "ÐÐÑÐÑÑ ÑÑÐÐÐÐÐÐÐ ÐÐÐÐÑ ÑÐÐÐÐÐ Ð ÐÐÑÐÐÐÐÐÐ/ÑÐÐÐÐÐ"
+
+#: ../meld/meldapp.py:163
+msgid "Meld is a file and directory comparison tool."
+msgstr "Meld â ÐÐÑÑÑÑÐÐÐÑ ÐÐÑ ÑÑÐÐÐÐÐÐÑ ÑÐÐÐÐÐ Ð ÐÐÑÐÐÐÐÐÐ."
+
+#: ../meld/meldapp.py:166
+msgid "Set label to use instead of file name"
+msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÑ ÐÐÑ ÐÑÐÐÐÑÐÐÐÐÐÐÑ ÐÐÐÑÑÐ ÐÐÐÐÐ ÑÐÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:12
-msgid "<span weight=\"bold\" size=\"x-large\">CVS</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">ÐÐÑÐÐÐÐÐÐÐ ÐÐÑÑÐÑÐÐ</span>"
+#: ../meld/meldapp.py:168
+msgid "Automatically compare all differing files on startup"
+msgstr "ÐÐÑÐÐÐÑÐÑÐÑÐÐ ÑÑÐÐÐÐÐÐÑÑ ÐÑÐ ÑÐÐÐÐÑÐÑÑÐÐÑÑ ÑÐÐÐÑ ÐÑÐ ÐÐÐÑÑÐÐ"
 
-#: ../glade2/meldapp.glade.h:13
-msgid "<span weight=\"bold\" size=\"x-large\">Compare</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">ÐÑÐÐÐÐÐÐÐ</span>"
+#: ../meld/meldapp.py:170
+msgid "Ignored for compatibility"
+msgstr "ÐÐÐÐÑÐÑÑÐÑÑÑ ÐÐÑ ÑÐÐÐÐÑÑÐÐÐÑÑÐ"
 
-#: ../glade2/meldapp.glade.h:14
-msgid "<span weight=\"bold\" size=\"x-large\">Display</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">ÐÐÐÑÐÐÐ ÐÐÐ</span>"
+#: ../meld/meldapp.py:173
+msgid "Set the target file for saving a merge result"
+msgstr "ÐÑÐÑÐÑÑ ÑÐÐÐÐÐÐ ÑÐÐÐ ÐÐÑ ÑÐÑÑÐÐÐÐÐÑ ÑÐÐÑÐÑÑÐÑÐ ÐÐÑÐÐÐÐÐÐÐÑ"
 
-#: ../glade2/meldapp.glade.h:15
-msgid "<span weight=\"bold\" size=\"x-large\">Editor</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">ÐÐÑÑÑÐÐÐÐÐ ÑÐÐÐÐÑÐÑ</span>"
+#: ../meld/meldapp.py:176
+msgid "Creates a diff tab for up to 3 supplied files or directories."
+msgstr "ÐÐÐÐÐÑÑ ÐÐÐÐÐÐÑ Ñ ÑÐÐÐÐÑÐÑÐÐ ÑÐÐÐÐÐ ÐÐÐ ÐÐÑÐÐÐÐÐÐ."
 
-#: ../glade2/meldapp.glade.h:16
-msgid "<span weight=\"bold\" size=\"x-large\">Encoding</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">ÐÐÐÐÑÐÐÐÐ</span>"
+#: ../meld/meldapp.py:179
+#, python-format
+msgid "too many arguments (wanted 0-4, got %d)"
+msgstr "ÑÐÐÑÐÐÐ ÐÐÐÐÐ ÐÐÑÐÐÐÑÑÐÐ (ÐÐÐÐÐÐÐÑÑ 0-4, ÐÐÐÑÑÐÐÐ %d)"
 
-#: ../glade2/meldapp.glade.h:17
-msgid "<span weight=\"bold\" size=\"x-large\">File Filters</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">ÐÐÐÑÑÑÑ ÑÐÐÐÐÐ</span>"
+#: ../meld/meldapp.py:181
+#: ../meld/meldapp.py:185
+#| msgid "Cannot compare a mixture of files and directories.\n"
+msgid "can't compare more than three directories"
+msgstr "ÐÐÐÑÐÑ ÑÑÐÐÐÐÐÐÑÑ ÐÐÐÑÑÐ ÑÑÑÑ ÐÐÑÐÐÐÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:18
-msgid "<span weight=\"bold\" size=\"x-large\">Text Filters</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">ÐÐÐÑÑÑÑ ÑÐÐÐÐÑÐÐ</span>"
+#: ../meld/melddoc.py:51
+#: ../meld/melddoc.py:52
+msgid "untitled"
+msgstr "ÐÐÐ ÐÐÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:19
-msgid "Automatically supply missing newline at end of file"
-msgstr "ÐÐÐÐÐÐÑÑÑ ÑÐÐÐÐÐ ÐÐÐÐÐ ÑÑÑÐÐÐ Ð ÐÐÐÑÐ ÑÐÐÐÐ, ÐÑÐÐ ÐÐÐ ÑÐÐ ÐÐÑ"
+#: ../meld/meldwindow.py:125
+msgid "_File"
+msgstr "_ÐÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:20
-msgid "CVS"
-msgstr "ÐÐÑÐÐÐÐÐÐÐ ÐÐÑÑÐÑÐÐ"
+#: ../meld/meldwindow.py:126
+msgid "_New..."
+msgstr "_ÐÐÐÐÐÑÑâ"
 
-#: ../glade2/meldapp.glade.h:21
-msgid "CVS binary"
-msgstr "ÐÑÐÐÑÐÐÐÐ CVS"
+#: ../meld/meldwindow.py:126
+msgid "Start a new comparison"
+msgstr "ÐÐÑÐÑÑ ÐÐÐÐÐ ÑÑÐÐÐÐÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:22
-msgid "Choose Files"
-msgstr "ÐÑÐÐÑÐÑÐ ÑÑÐÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÑÑ"
+#: ../meld/meldwindow.py:127
+msgid "Save the current file"
+msgstr "ÐÐÑÑÐÐÐÑÑ ÑÐÐÑÑÐÐ ÑÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:23
-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 "ÐÑÐÐÑÐÑÐ ÐÐÐ ÐÐÐÐÑÑ ÑÐÐÐÐÑÐÐ ÐÑÐ ÑÑÐÐÐÐÐÐÐ. ÐÑÐÐ ÐÑÐÐÑÑÑÐÐ ÐÐÐÐÐÐÑÑÑ ÐÐÐ ÐÐÐÐÐÐÐÐÐ, ÐÐÐÑÐÐÑÐÑÐ ÐÑÐÑÐÑÑ ÐÐÐ ÐÐÐÑÐÑÐ."
+#: ../meld/meldwindow.py:129
+msgid "Close the current file"
+msgstr "ÐÐÐÑÑÑÑ ÑÐÐÑÑÐÐ ÑÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:24
-msgid "Copyright (C) 2002-2006 Stephen Kennedy"
-msgstr "Copyright (C) 2002-2006 Stephen Kennedy"
+#: ../meld/meldwindow.py:130
+msgid "Quit the program"
+msgstr "ÐÑÐÑÐ ÐÐ ÐÑÐÐÑÐÐÐÑ"
 
-#: ../glade2/meldapp.glade.h:25
-msgid "Create missing directories (-d)"
-msgstr "ÐÐÐÐÐÐÐÑÑ ÐÑÑÑÑÑÑÐÑÑÑÐÐ ÐÐÑÐÐÐÐÐ (-d)"
+#: ../meld/meldwindow.py:132
+msgid "_Edit"
+msgstr "_ÐÑÐÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:26
-msgid "Curved: Filled Curves"
-msgstr "ÐÑÐÐÑÐ: ÑÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐ, ÐÐÐÐÐÐÐÐÐÑÐ ÑÐÐÑÐÐ"
+#: ../meld/meldwindow.py:133
+msgid "Undo the last action"
+msgstr "ÐÑÐÐÐÐÑÑ ÐÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:27
-msgid "Custom command"
-msgstr "ÐÐÐÑÐÐÐÐÑÐÐÑÑÐÐÑ ÐÐÐÐÐÐÐ"
+#: ../meld/meldwindow.py:134
+msgid "Redo the last undone action"
+msgstr "ÐÐÐÑÐÑÐÑÑ ÐÑÐÐÐÑÐÐÐÐ ÐÐÐÑÑÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:28
-msgid "Directory"
-msgstr "ÐÐÑÐÐÐÐ"
+#: ../meld/meldwindow.py:135
+msgid "Cut the selection"
+msgstr "ÐÑÑÐÐÐÑÑ ÐÑÐÐÐÐÐÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:29
-msgid "Display"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐ"
+#: ../meld/meldwindow.py:136
+msgid "Copy the selection"
+msgstr "ÐÐÐÐÑÐÐÐÑÑ ÐÑÐÐÐÐÐÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:30
-msgid "Down"
-msgstr "ÐÐÐÐ"
+#: ../meld/meldwindow.py:137
+msgid "Paste the clipboard"
+msgstr "ÐÑÑÐÐÐÑÑ ÐÑÑÐÑ ÐÐÐÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:31
-msgid "Edit files with:"
-msgstr "ÐÐÐÐÐÑÐÑÐÐÐÑÑ ÑÐÐÐÐ Ñ ÐÐÐÐÑÑÑ:"
+#: ../meld/meldwindow.py:138
+msgid "Search for text"
+msgstr "ÐÑÐÐÑÑ ÑÐÐÑÑ"
 
-#: ../glade2/meldapp.glade.h:32
-msgid "Editor"
-msgstr "ÐÐÐÐÐÑÐÑ"
-
-#: ../glade2/meldapp.glade.h:33
-msgid "Encoding"
-msgstr "ÐÐÐÐÑÐÐÐÐ"
-
-#: ../glade2/meldapp.glade.h:34
-msgid "File Filters"
-msgstr "ÐÐÐÑÑÑÑ ÑÐÐÐÐÐ"
-
-#: ../glade2/meldapp.glade.h:35
+#: ../meld/meldwindow.py:139
 msgid "Find Ne_xt"
 msgstr "ÐÐÐÑÐ _ÑÐÐÐÑÑÑÐÐ"
 
-#: ../glade2/meldapp.glade.h:36
-msgid "Gnome Default"
-msgstr "ÐÐ ÑÐÐÐÑÐÐÐÑ ÐÐÑ GNOME"
-
-#: ../glade2/meldapp.glade.h:37
-msgid "Gnome default editor"
-msgstr "ÐÐÐÑÑÐÐÑÐ ÑÐÐÐÐÑÐÑ ÐÐ ÑÐÐÐÑÐÐÐÑ"
-
-#: ../glade2/meldapp.glade.h:38
-msgid "Icons Only"
-msgstr "ÐÐÐÑÐÐ ÐÐÐÑÐÐ"
-
-#: ../glade2/meldapp.glade.h:39
-msgid "Ignore .cvsrc (-f)"
-msgstr "ÐÐ ÐÑÐÐÐÑÐÐÐÐÑÑ .cvsrc (-f)"
-
-#: ../glade2/meldapp.glade.h:40
-msgid "Ignore changes in amount of white space"
-msgstr "ÐÐÐÐÑÐÑÐÐÐÑÑ ÑÐÐÐÐÑÐÑ Ð ÑÐÑÐÐ ÐÑÐÐÐÐÐÐ"
+#: ../meld/meldwindow.py:139
+msgid "Search forwards for the same text"
+msgstr "ÐÑÐÐÑÑ ÐÐÐÐÐ ÑÑÐÑ ÐÐ ÑÐÐÑÑ"
 
-#: ../glade2/meldapp.glade.h:41
-msgid "Ignore changes in case; consider upper and lower-case letters equivalent"
-msgstr "ÐÑÐÐÑÑÐÐÑÑ ÑÐÐÐÐÑÐÑ Ð ÑÐÐÐÑÑÑÐ ÑÐÐÐÐÐÐÐ"
+#: ../meld/meldwindow.py:140
+#| msgid "_Previous"
+msgid "Find _Previous"
+msgstr "ÐÐÐÑÐ _ÐÑÐÐÑÐÑÑÐÐ"
 
-#: ../glade2/meldapp.glade.h:42
-msgid "Ignore changes that just insert or delete blank lines"
-msgstr "ÐÑÐÐÑÑÐÐÑÑ ÑÐÐÐÐÑÐÑ Ð ÑÐÑÐÐ ÐÑÑÑÑÑ ÑÑÑÐÐ"
+#: ../meld/meldwindow.py:140
+#| msgid "Search forwards for the same text"
+msgid "Search backwards for the same text"
+msgstr "ÐÑÐÐÑÑ ÑÐÑ ÐÐ ÑÐÐÑÑ Ð ÐÐÑÐÑÐÐÐ ÐÐÐÑÐÐÐÐÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:43
-msgid "Ignore changes which insert or delete blank lines"
-msgstr "ÐÑÐÐÑÑÐÐÑÑ ÑÐÐÐÐÑÐÑ Ð ÐÑÑÑÑÑ ÑÑÑÐÐÐÑ"
+#: ../meld/meldwindow.py:141
+msgid "Find and replace text"
+msgstr "ÐÐÐÑÐ Ð ÐÐÐÐÐÐ ÑÐÐÑÑÐ"
 
-#: ../glade2/meldapp.glade.h:44
-msgid "Ignore symbolic links"
-msgstr "ÐÑÐÐÑÑÐÐÑÑ ÑÐÐÐÐÐÑÐÑÐ ÑÑÑÐÐÐ"
+#: ../meld/meldwindow.py:142
+msgid "Prefere_nces"
+msgstr "_ÐÐÑÑÑÐÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:45
-msgid "Internal editor"
-msgstr "ÐÐÑÑÑÐÐÐÐÐ ÑÐÐÐÐÑÐÑ"
+#: ../meld/meldwindow.py:142
+msgid "Configure the application"
+msgstr "ÐÐÑÑÑÐÐÑÑ ÐÑÐÐÐÐÐÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:46
-msgid "Line Wrapping "
-msgstr "ÐÐÑÐÐÐÑ ÑÑÑÐÐ "
+#: ../meld/meldwindow.py:144
+msgid "_Changes"
+msgstr "ÐÐ_ÐÐÐÐÐÐÑ"
 
-#: ../glade2/meldapp.glade.h:47
-msgid "Mailing _List"
-msgstr "ÐÐÐÑÐÐ _ÑÐÑÑÑÐÐÐ"
+#: ../meld/meldwindow.py:145
+msgid "Next change"
+msgstr "ÐÐÐÐÑÑÑÐÐ ÐÐÐÐÐÐÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:48
-msgid "Meld"
-msgstr "Meld"
+#: ../meld/meldwindow.py:145
+msgid "Go to the next change"
+msgstr "ÐÐÑÐÐÑÐ Ð ÑÐÐÐÑÑÑÐÐÑ ÐÐÐÐÐÐÐÐÑ"
 
-#: ../glade2/meldapp.glade.h:49
-msgid "Mine"
-msgstr "ÐÐÐ"
+#: ../meld/meldwindow.py:146
+msgid "Previous change"
+msgstr "ÐÑÐÐÑÐÑÑÐÐ ÐÐÐÐÐÐÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:51
-msgid "Original"
-msgstr "ÐÑÐÐÐÐÐÐ"
+#: ../meld/meldwindow.py:146
+msgid "Go to the previous change"
+msgstr "ÐÐÑÐÐÑÐ Ð ÐÑÐÐÑÐÑÑÐÐÑ ÐÐÐÐÐÐÐÐÑ"
 
-#: ../glade2/meldapp.glade.h:52
-msgid "Other"
-msgstr "ÐÑÐÑÐÐ"
+#: ../meld/meldwindow.py:148
+msgid "_View"
+msgstr "_ÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:53
-msgid "Preferences : Meld"
-msgstr "ÐÐÑÑÑÐÐÐÐ : Meld"
+#: ../meld/meldwindow.py:149
+msgid "File status"
+msgstr "ÐÐÑÑÐÑÐÐÐ ÑÐÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:54
-msgid "Prune empty directories (-P)"
-msgstr "ÐÐÐÐÑÑÑ ÐÑÑÑÑÐ ÐÐÑÐÐÐÐÐ (-P)"
+#: ../meld/meldwindow.py:150
+msgid "Version status"
+msgstr "ÐÐÑÑÐÑÐÐÐ ÐÐÑÑÐÐ"
 
-#: ../glade2/meldapp.glade.h:55
-msgid "Quiet mode (-q)"
-msgstr "ÐÐÑÐÐ ÑÐÐÐÐ (-q)"
+#: ../meld/meldwindow.py:151
+msgid "File filters"
+msgstr "ÐÐÐÑÑÑÑ ÑÐÐÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:56
-msgid "Redo"
-msgstr "ÐÐÑÐÑÑÑ"
+#: ../meld/meldwindow.py:152
+msgid "Stop the current action"
+msgstr "ÐÑÑÐÐÐÐÐÑÑ ÑÐÐÑÑÐÐ ÐÐÐÑÑÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:57
-msgid "Refresh"
-msgstr "ÐÐÐÐÐÐÑÑ"
+#: ../meld/meldwindow.py:153
+msgid "Refresh the view"
+msgstr "ÐÐÐÐÐÐÑÑ ÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:58
+#: ../meld/meldwindow.py:154
 msgid "Reload"
 msgstr "ÐÐÑÐÐÐÐÑÑÐÐÑÑ"
 
-#: ../glade2/meldapp.glade.h:59
-msgid "Report _Bug"
-msgstr "Ð_ÑÐÑÐÐÑÑ ÐÑÑÑÑ ÐÐ ÐÑÐÐÐÐ"
-
-#: ../glade2/meldapp.glade.h:60
-msgid "Save"
-msgstr "ÐÐÑÑÐÐÐÑÑ"
-
-#: ../glade2/meldapp.glade.h:61
-msgid "Save _As"
-msgstr "ÐÐÑÑÐÐÐÑÑ _ÐÐÐ"
-
-#: ../glade2/meldapp.glade.h:62
-msgid "Save in UTF-8 encoding"
-msgstr "ÐÐÑÑÐÐÑÑÑ Ð UTF-8"
-
-#: ../glade2/meldapp.glade.h:63
-msgid "Save in the files original encoding"
-msgstr "ÐÐÑÑÐÐÑÑÑ ÑÐÐÐÑ Ð ÐÑ ÐÑÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐÐ"
-
-#: ../glade2/meldapp.glade.h:64
-msgid "Show line numbers"
-msgstr "ÐÐÐÐÐÑÐÐÑÑ ÐÐÐÐÑÐ ÑÑÑÐÐ"
-
-#: ../glade2/meldapp.glade.h:65
-msgid "Simple: Lines only"
-msgstr "ÐÑÐÑÑÐÐ: ÑÐÐÑÐÐ ÐÐÐÐÐ"
-
-#: ../glade2/meldapp.glade.h:66
-msgid "Solid: Filled Quadilaterals"
-msgstr "Ð ÐÐÐÐÐÐÐÐÐÐÐ: ÑÑÐÐÐÑÐÐ, ÐÐÐÐÐÐÐÐÐÑÐ ÑÐÐÑÐÐ"
-
-#: ../glade2/meldapp.glade.h:67
-msgid "Stop"
-msgstr "ÐÑÑÐÐÐÐÐÑÑ"
-
-#: ../glade2/meldapp.glade.h:68
-msgid "Tab width"
-msgstr "ÐÐÐ ÑÐÐÑÐÑÑÐÐ"
-
-#: ../glade2/meldapp.glade.h:69
-msgid "Text Beside Icons"
-msgstr "ÐÐÐÑÑ ÑÐÐÐÑ ÐÑ ÐÐÐÑÐÐÐ"
-
-#: ../glade2/meldapp.glade.h:70
-msgid "Text Filters"
-msgstr "ÐÐÐÑÑÑÑ ÑÐÐÐÐÑÐÐ"
-
-#: ../glade2/meldapp.glade.h:71
-msgid "Text Only"
-msgstr "ÐÐÐÑÐÐ ÑÐÐÑÑ"
-
-#: ../glade2/meldapp.glade.h:72
-msgid "Text Under Icons"
-msgstr "ÐÐÐÑÑ ÐÐÐ ÐÐÐÑÐÐÐÐ"
-
-#: ../glade2/meldapp.glade.h:73
-msgid "Three way directory"
-msgstr "ÐÑÐÐÐÐÐÐÐ Ñ ÑÑÐÑÑÐÐ ÐÐÑÐÐÐÐÐÐ"
-
-#: ../glade2/meldapp.glade.h:74
-msgid "Three way file"
-msgstr "ÐÑÐÐÐÐÐÐÐ Ñ ÑÑÐÑÑÐÐ ÑÐÐÐÐÐ"
-
-#: ../glade2/meldapp.glade.h:75
-msgid "Two way directory"
-msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐÑÑ ÐÐÑÐÐÐÐÐÐ"
-
-#: ../glade2/meldapp.glade.h:76
-msgid "Two way file"
-msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐÑÑ ÑÐÐÐÐÐ"
-
-#: ../glade2/meldapp.glade.h:77
-msgid "Undo"
-msgstr "ÐÑÐÐÐÐÑÑ"
-
-#: ../glade2/meldapp.glade.h:78
-msgid "Up"
-msgstr "ÐÐÐÑÑ"
-
-#: ../glade2/meldapp.glade.h:79
-msgid "Use Compression (-z)"
-msgstr "ÐÑÐÐÐÑÐÐÐÐÑÑ ÑÐÐÑÐÐ (-z)"
-
-#: ../glade2/meldapp.glade.h:80
-msgid "Use GNOME monospace font"
-msgstr "ÐÑÐÐÐÑÐÐÐÐÑÑ ÐÐÐÐÑÐÑÐÐÐÑÐ ÑÑÐÑÑ GNOME"
-
-#: ../glade2/meldapp.glade.h:81
-msgid "Use custom font"
-msgstr "ÐÑÐÐÐÑÐÐÐÐÑÑ ÐÑÑÐÐÐ ÑÑÐÑÑ "
-
-#: ../glade2/meldapp.glade.h:82
-msgid "Use syntax highlighting"
-msgstr "ÐÐÐÑÑÐÑÑ ÐÐÐÑÐÐÑÐÑ ÑÐÐÑÐÐÑÐÑÐ"
-
-#: ../glade2/meldapp.glade.h:83
-msgid "Version control view"
-msgstr "ÐÐÑÐÐÐÐÐÐÐ ÐÐÑÑÐÑÐÐ"
-
-#: ../glade2/meldapp.glade.h:84
-msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
-msgstr "ÐÑÐÐÐÐÐÑÑ ÐÐÐÐÑÐÐÐÐ Ð ÑÑÐÐ ÐÐÑÑÐÐÐ (ÐÐÐÑ., utf8, iso8859)"
-
-#: ../glade2/meldapp.glade.h:85
-msgid "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 "ÐÑÐ ÑÑÐÐÐÐÐÐÐ ÐÐÐÐÐ ÐÑ ÐÐÐÐÑÐ ÑÐÐÑÑÑÐÐÐÑÑ ÑÐÐÐÑ Ð ÐÐÐÐÐ ÐÐ ÐÑ ÐÐÐÐÐÐÐÑÐ. ÐÐÐÐÐÑ ÑÑÑÐÐÐ - ÑÑÐ ÑÐÐÑÐÐ ÑÐÐÐÐÐÑÑ ÑÐÐÐÐÐÐÐ, ÑÐÐÐÐÐÑÐÐÑÑ ÐÑÐÐÐÐÐÐÐ."
-
-#: ../glade2/meldapp.glade.h:86
-msgid "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 "ÐÑÐ ÑÑÐÐÐÐÐÐÐ ÑÐÐÐÐÐ ÐÑ ÐÐÐÐÑÐ ÐÐÐÐÑÐÑÐÐÐÑÑ ÐÐÑÐÐÐÐÑÐÐÑÐ ÑÐÐÑ ÑÐÐÐÐÑÐÐ. ÐÐÐÑÑ Ð ÐÐÐÐÐÐ ÑÑÑÐÐÐ - ÑÐÐÑÐÑÑÐÐÐ ÐÑÑÐÐÐÐÐÐ Python; ÑÐÐÐÐÐÐÑÑÐÐ Ñ ÐÐÐ ÑÐÐÑÑ ÐÐÐÐÐÑÐÑÑÑ ÐÑÑÑÐÐ ÑÑÑÐÐÐÐ. ÐÑÐÐ ÐÑÑÐÐÐÐÐÐ ÑÐÐÐÑÐÐÑ ÐÑÑÐÐÑ, ÐÐÐÐÐÑÑÑÑÑ ÑÐÐÑÐÐ ÐÑÑÐÐÑ. ÐÐÐÑÐÐÐÐÑÑÐ ÐÐÐÐÐ ÐÐÐÑÐ Ð ÑÑÐÐÐÐÐÑÑÐÐ."
-
-#: ../glade2/meldapp.glade.h:87
-msgid "Whitespace is significant"
-msgstr "ÐÑÐÑÑÐÐÑÑ ÐÑÐ ÐÑÐÐÐÐÑ"
-
-#: ../glade2/meldapp.glade.h:88
-msgid "Yes"
-msgstr "ÐÐ"
-
-#: ../glade2/meldapp.glade.h:90
-msgid "_Contents"
-msgstr "_ÐÐÐÐÑÐÐÐÐÐ"
-
-#: ../glade2/meldapp.glade.h:91
-msgid "_Directory Comparison"
-msgstr "ÐÑÐÐÐÐÐÐÐ _ÐÐÑÐÐÐÐÐÐ"
-
-#: ../glade2/meldapp.glade.h:92
-msgid "_Down"
-msgstr "Ð_ÐÐÐ"
-
-#: ../glade2/meldapp.glade.h:93
-#: ../glade2/vcview.glade.h:29
-msgid "_Edit"
-msgstr "_ÐÑÐÐÐÐ"
-
-#: ../glade2/meldapp.glade.h:94
-msgid "_File"
-msgstr "_ÐÐÐÐ"
-
-#: ../glade2/meldapp.glade.h:95
-msgid "_File Comparison"
-msgstr "ÐÑÐÐÐÐÐÐÐ _ÑÐÐÐÐÐ"
-
-#: ../glade2/meldapp.glade.h:96
+#: ../meld/meldwindow.py:154
+msgid "Reload the comparison"
+msgstr "ÐÐÑÐÐÐÐÑÑÐÐÑÑ ÑÑÐÐÐÐÐÐÐ"
+
+#: ../meld/meldwindow.py:156
+msgid "_Tabs"
+msgstr "_ÐÐÐÐÐÐÐ"
+
+#: ../meld/meldwindow.py:157
+#| msgid "_Previous"
+msgid "_Previous Tab"
+msgstr "_ÐÑÐÐÑÐÑÑÐÑ ÐÐÐÐÐÐÐ"
+
+#: ../meld/meldwindow.py:157
+#| msgid "Go to the previous change"
+msgid "Activate previous tab"
+msgstr "ÐÐÑÐÐÑÐ Ð ÐÑÐÐÑÐÑÑÐÐ ÐÐÐÐÐÐÐ"
+
+#: ../meld/meldwindow.py:158
+#| msgid "_Next"
+msgid "_Next Tab"
+msgstr "_ÐÐÐÐÑÑÑÐÑ ÐÐÐÐÐÐÐ"
+
+#: ../meld/meldwindow.py:158
+msgid "Activate next tab"
+msgstr "ÐÐÑÐÐÑÐ Ð ÑÐÐÐÑÑÑÐÐ ÐÐÐÐÐÐÐ"
+
+#: ../meld/meldwindow.py:159
+#| msgid "Copy To Left"
+msgid "Move Tab _Left"
+msgstr "ÐÐÑÐÐÐÑÑÐÑÑ ÐÐÐÐÐÐÑ Ð_ÐÐÐÐ"
+
+#: ../meld/meldwindow.py:159
+#| msgid "Push current change to the left"
+msgid "Move current tab to left"
+msgstr "ÐÐÑÐÐÐÑÑÐÑÑ ÑÐÐÑÑÑÑ ÐÐÐÐÐÐÑ ÐÐÐÐÐ"
+
+#: ../meld/meldwindow.py:160
+#| msgid "Copy To Right"
+msgid "Move Tab _Right"
+msgstr "ÐÐÑÐÐÐÑÑÐÑÑ ÐÐÐÐÐÐÑ Ð_ÐÑÐÐÐ"
+
+#: ../meld/meldwindow.py:160
+#| msgid "Push current change to the right"
+msgid "Move current tab to right"
+msgstr "ÐÐÑÐÐÐÑÑÐÑÑ ÑÐÐÑÑÑÑ ÐÐÐÐÐÐÑ ÐÐÑÐÐÐ"
+
+#: ../meld/meldwindow.py:162
 msgid "_Help"
 msgstr "_ÐÐÑÐÐÐÐ"
 
-#: ../glade2/meldapp.glade.h:97
-msgid "_Logo"
-msgstr "_ÐÐÐÑÐÐ"
-
-#: ../glade2/meldapp.glade.h:98
-msgid "_New..."
-msgstr "ÐÑÐÐÐÐÑÑ..."
-
-#: ../glade2/meldapp.glade.h:99
-msgid "_Save"
-msgstr "_ÐÐÑÑÐÐÐÑÑ"
-
-#: ../glade2/meldapp.glade.h:100
-msgid "_Stop"
-msgstr "_ÐÑÑÐÐÐÐÐÑÑ"
-
-#: ../glade2/meldapp.glade.h:101
-msgid "_Three Way Compare"
-msgstr "ÐÑÑÑÐÐÑÑÐÐÐ ÑÑÐÐÐÐÐÐÐ"
-
-#: ../glade2/meldapp.glade.h:102
-msgid "_Up"
-msgstr "_ÐÐÐÑÑ"
-
-#: ../glade2/meldapp.glade.h:103
-msgid "_Version Control Browser"
-msgstr "ÐÐÑÐÐÐÐÐÐÐ _ÐÐÑÑÐÑÐÐ"
-
-#: ../glade2/meldapp.glade.h:104
-msgid "_View"
-msgstr "_ÐÐÐ"
-
-#: ../glade2/vcview.glade.h:1
-msgid "Add _Binary"
-msgstr "ÐÐÐÐÐÐÑÑ ÐÐÐ ÐÐÐÐÑÐÑÐ ÑÐÐÐ"
-
-#: ../glade2/vcview.glade.h:2
-msgid "Add to VC"
-msgstr "ÐÐÐÐÐÐÑÑ ÑÐÐÐ(Ñ) Ð ÑÐÑÑÐÐÑ ÑÐÑÐÐÐÐÐÐÑ ÐÐÑÑÐÑÐÐ"
-
-#: ../glade2/vcview.glade.h:3
-msgid "Commit"
-msgstr "ÐÐÑÑÐÐÐÑÑ ÐÐÐÑÑ ÐÐÑÑÐÑ Ð ÑÐÑÑÐÐÐ ÑÐÑÐÐÐÐÐÐÑ ÐÐÑÑÐÑÐÐ"
-
-#: ../glade2/vcview.glade.h:4
-msgid "Commit Files"
-msgstr "ÐÐÑÑÐÐÐÑÑ ÑÐÐÐÑ Ð ÑÐÑÑÐÐÐ ÑÐÑÐÐÐÐÐÐÑ ÐÐÑÑÐÑÐÐ"
-
-#: ../glade2/vcview.glade.h:5
-msgid "Compare Options"
-msgstr "ÐÐÑÑÑÐÐÐÐ ÑÑÐÐÐÐÐÐÑ"
-
-#: ../glade2/vcview.glade.h:7
-msgid "Date"
-msgstr "ÐÐÑÐ"
-
-#: ../glade2/vcview.glade.h:8
-msgid "Delete locally"
-msgstr "ÐÐÐÐÐÑÑ ÑÐÐÐÑÑÑ ÐÐÐÐÑ"
-
-#: ../glade2/vcview.glade.h:9
-msgid "Flatten directories"
-msgstr "ÐÐÐÐÐÑÐÐÑÑ ÐÐÐÑÐÐÐ ÑÐÐÑÐÐÐ"
-
-#: ../glade2/vcview.glade.h:10
-msgid "Ignored"
-msgstr "ÐÐÐÐÑÐÑÑÐÐÑÐ"
-
-#: ../glade2/vcview.glade.h:11
-msgid "Local copy against other remote revision"
-msgstr "ÐÐÐÑ ÐÐÐÐÑ Ñ ÐÑÑÐÐÐ ÑÐÐÐÐÐÐÐ ÐÐ ÑÐÑÐÐÑÐ"
-
-#: ../glade2/vcview.glade.h:12
-msgid "Local copy against same remote revision"
-msgstr "ÐÐÐÑ ÐÐÐÐÑ Ñ ÑÐÐÑÐÐÑÑÑÐÑÑÑÐÐ ÑÐÐÐÐÐÐÐ ÐÐ ÑÐÑÐÐÑÐ"
-
-#: ../glade2/vcview.glade.h:13
-msgid "Log Message"
-msgstr "ÐÐÐÐÑÑ Ð ÐÑÑÐÐÐÐ ÑÐÑÐÐÐÐÐÐÑ ÐÐÑÑÐÑÐÐ"
-
-#: ../glade2/vcview.glade.h:14
-msgid "Non _VC"
-msgstr "ÐÐÐ _ÐÐÑÑÐÐ"
-
-#: ../glade2/vcview.glade.h:15
-msgid "Previous Logs"
-msgstr "ÐÑÐÑÐÑÐ ÐÐÐÐÐÐÑÐÑÐÐ"
-
-#: ../glade2/vcview.glade.h:16
-msgid "Remove _Locally"
-msgstr "ÐÐÐÐÐÑÑ ÑÐÐÐÑÑÑ ÐÐÐÐÑ"
-
-#: ../glade2/vcview.glade.h:17
-msgid "Remove from VC"
-msgstr "ÐÐÐÐÐÑÑ ÑÐÐÐ(Ñ) ÐÐ ÑÐÑÑÐÐÑ ÑÐÑÐÐÐÐÐÐÑ ÐÐÑÑÐÑÐÐ"
-
-#: ../glade2/vcview.glade.h:18
-msgid "Revert to original"
-msgstr "ÐÐÑÐÑÑÑ ÐÑÐÐÐÐÐÐ"
-
-#: ../glade2/vcview.glade.h:19
-msgid "Show ignored files"
-msgstr "ÐÐÐÐÐÑÐÐÑÑ ÐÐÐÐÑÐÑÑÐÐÑÐ ÑÐÐÐÑ"
-
-#: ../glade2/vcview.glade.h:21
-msgid "Show normal"
-msgstr "ÐÐÐÐÐÑÐÐÑÑ ÐÐÑÑÐÑÐ ÑÐÐÐÑ"
-
-#: ../glade2/vcview.glade.h:22
-msgid "Show unversioned files"
-msgstr "ÐÐÐÐÐÑÐÐÑÑ ÑÐÐÐÑ, ÐÑÑÑÑÑÑÐÑÑÑÐÐ Ð ÑÐÑÑÐÐÐ ÑÐÑÐÐÐÐÐÐÑ ÐÐÑÑÐÑÐÐ"
+#: ../meld/meldwindow.py:163
+msgid "_Contents"
+msgstr "_ÐÐÐÐÑÐÐÐÐÐ"
 
-#: ../glade2/vcview.glade.h:23
-#: ../vcview.py:173
-msgid "Tag"
-msgstr "ÐÐÐ"
+#: ../meld/meldwindow.py:163
+msgid "Open the Meld manual"
+msgstr "ÐÑÐÑÑÑÑ ÑÑÐÐÐÐÐÑÑÐÐ ÐÐ Meld"
 
-#: ../glade2/vcview.glade.h:24
-msgid "Update"
-msgstr "ÐÐÐÐÐÐÑÑ"
+#: ../meld/meldwindow.py:164
+msgid "Report _Bug"
+msgstr "_ÐÐÐÐÑÐÑÑ ÐÐ ÐÑÐÐÐÐ"
 
-#: ../glade2/vcview.glade.h:25
-msgid "VC Log"
-msgstr "ÐÑÑÐÐÐ ÑÐÑÐÐÐÐÐÐÑ ÐÐÑÑÐÑÐÐ"
+#: ../meld/meldwindow.py:164
+msgid "Report a bug in Meld"
+msgstr "ÐÐÐÐÑÐÑÑ ÐÐ ÐÑÐÐÐÐ Ð Meld"
 
-#: ../glade2/vcview.glade.h:26
-msgid "_Add"
-msgstr "ÐÐÐ_ÐÐÐÑÑ"
+#: ../meld/meldwindow.py:165
+msgid "About this program"
+msgstr "Ð ÐÑÐÐÑÐÐÐÐ"
 
-#: ../glade2/vcview.glade.h:27
-msgid "_Commit"
-msgstr "ÐÐÑÐÐÑÐÑÐÐÐÑÑ"
+#: ../meld/meldwindow.py:168
+msgid "Full Screen"
+msgstr "ÐÐ ÐÐÐÐÑÐ ÑÐÑÐÐ"
 
-#: ../glade2/vcview.glade.h:30
-msgid "_Flatten"
-msgstr "ÐÐÐ ÑÐÐÑÐÐ"
+#: ../meld/meldwindow.py:168
+msgid "View the comparison in full screen"
+msgstr "ÐÐÐÐÐÐÑÑ ÑÑÐÐÐÐÐÐÐ Ð ÐÐÐÐÐÑÐÑÐÐÐÐÐ ÑÐÐÐÐÐ"
 
-#: ../glade2/vcview.glade.h:31
-msgid "_Modified"
-msgstr "ÐÐÐÐÐÐÐÐÑÐ"
+#: ../meld/meldwindow.py:169
+msgid "_Toolbar"
+msgstr "_ÐÐÐÐÐÑ ÐÐÑÑÑÑÐÐÐÑÐÐ"
 
-#: ../glade2/vcview.glade.h:32
-msgid "_Normal"
-msgstr "_ÐÐÑÑÐÑÐ"
+#: ../meld/meldwindow.py:169
+msgid "Show or hide the toolbar"
+msgstr "ÐÐÐÐÐÑÐÐÑÑ ÐÐÐ ÑÐÑÑÐÐÑÑ ÐÐÐÐÐÑ ÐÐÑÑÑÑÐÐÐÑÐÐ"
 
-#: ../glade2/vcview.glade.h:33
-msgid "_Remove"
-msgstr "Ð_ÐÐÐÐÑÑ"
+#: ../meld/meldwindow.py:170
+msgid "_Statusbar"
+msgstr "_ÐÑÑÐÐÐ ÑÐÑÑÐÑÐÐÑ"
 
-#: ../glade2/vcview.glade.h:34
-msgid "_Update"
-msgstr "_ÐÐÐÐÐÐÑÑ"
+#: ../meld/meldwindow.py:170
+msgid "Show or hide the statusbar"
+msgstr "ÐÐÐÐÐÑÐÐÑÑ ÐÐÐ ÑÐÑÑÐÐÑÑ ÑÑÑÐÐÑ ÑÐÑÑÐÑÐÐÑ"
 
-#: ../meld:60
-#: ../meld:70
-#: ../meld:80
-#, c-format
-msgid "Meld requires %s or higher."
-msgstr "Meld ÑÑÐÐÑÐÑ %s ÐÐÐ ÐÐÐÐÐ ÐÐÐÐÐÑÑ ÐÐÑÑÐÑ."
+#: ../meld/meldwindow.py:534
+msgid "Switch to this tab"
+msgstr "ÐÐÑÐÐÐÑÑÐÑÑÑÑ ÐÐ ÑÑÑ ÐÐÐÐÐÐÑ"
 
-#: ../meld:81
-msgid "Due to incompatible API changes some functions may not operate as expected."
-msgstr "ÐÐÑÐÐÑÐÐÑÑÑÐÐÐ ÐÑÐÐÑÐÐÐÐÐÐÐ ÐÐÑÐÑÑÐÐÑÐ ÐÐÐÐÑ ÐÑÐÐÐÑÑÐ Ð ÑÐÐÑ, ÑÑÐ ÐÐÐÐÑÐÑÑÐ ÑÑÐÐÑÐÐ ÐÐ ÐÑÐÑÑ ÐÐÑÐÐÐÑÐÐ ÑÐÐÐÑÐÑÑ."
+#. exit at first non found directory + file
+#: ../meld/meldwindow.py:625
+msgid "Cannot compare a mixture of files and directories.\n"
+msgstr "ÐÐ ÑÐÐÐÐÑÑ ÑÑÐÐÐÐÑÑ ÑÐÐÑÑ ÑÐÐÐÐÐ Ð ÐÐÑÐÐÐÐÐÐ.\n"
 
-#: ../meld.desktop.in.h:1
-msgid "Compare and merge your files."
-msgstr "ÐÑÐÐÑÐÐÐÐ ÐÐÑ ÑÑÐÐÐÐÐÐÑ Ð ÑÐÐÑÐÐÑ ÑÐÐÐÐÐ"
+#. no common path. empty names get changed to "[None]"
+#: ../meld/misc.py:174
+msgid "[None]"
+msgstr "(ÐÐÑ)"
 
-#: ../meld.desktop.in.h:2
-msgid "Meld Diff Viewer"
-msgstr "Meld - ÐÑÐÑÐÐÑÑ ÑÐÐÐÐÑÐÐ"
+#: ../meld/patchdialog.py:122
+msgid "Save Patch As..."
+msgstr "ÐÐÑÑÐÐÐÑÑ ÐÐÐÐÐÑÐÑ ÐÐÐâ"
 
-#: ../meldapp.py:147
+#: ../meld/preferences.py:37
 msgid "label"
 msgstr "ÐÐÑÐÐ"
 
-#: ../meldapp.py:148
+#: ../meld/preferences.py:37
 msgid "pattern"
 msgstr "ÑÐÐÐÐÐ"
 
-#. file filters
-#. text filters
-#: ../meldapp.py:249
-#: ../meldapp.py:254
-#: ../vcview.py:153
-msgid "Name"
-msgstr "ÐÐÑ"
-
-#: ../meldapp.py:249
-#: ../meldapp.py:254
-msgid "Active"
-msgstr "ÐÐÑÐÐÐÐ"
-
-#: ../meldapp.py:249
-msgid "Pattern"
-msgstr "ÐÐÐÐÐÐ"
-
-#: ../meldapp.py:254
-msgid "Regex"
-msgstr "ÐÐÐÑÐÑÑÐÐÐ ÐÑÑÐÐÐÐÐÐ"
-
-#: ../meldapp.py:296
-msgid "Line numbers are only available if you have gnome-python-desktop installed."
-msgstr "ÐÐÑ ÐÐÐÑÐÐÑÐÐ ÑÐÐÑÐÐÑÐÑÐ ÐÑÐÐÐ ÑÑÑÐÐÐÐÐÑÑ ÐÐÐÑÐÑ pygtksourceview."
-
-#: ../meldapp.py:300
-msgid "Syntax highlighting is only available if you have gnome-python-desktop installed."
-msgstr "ÐÐÐÑÐÐÑÐÐ ÑÐÐÑÐÐÑÐÑÐ ÐÐÐÐÑ ÐÑÐÐÐÑÐÐÐÐÑÑÑÑ ÑÐÐÑÐÐ ÐÑÐ ÑÑÑÐÐÐÐÐÐÐÐÐÐ ÐÐÐÑÐÐ pygtksourceview."
+#: ../meld/preferences.py:105
+msgid "Only available if you have gnome-python-desktop installed"
+msgstr "ÐÐÑÑÑÐÐÐ, ÐÑÐÐ ÑÑÑÐÐÐÐÐÐÐ ÐÐÐÐÑ gnome-python-desktop"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:444
+#: ../meld/preferences.py:233
 msgid "Backups\t1\t#*# .#* ~* *~ *.{orig,bak,swp}\n"
-msgstr "ÐÐÐÐÑ ÑÐÐÐÑÐÐÑÑ ÐÐÐÐÐ\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
-#: ../meldapp.py:446
-msgid "Version Control\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-inventory RCS\n"
-msgstr "ÐÐÐÐÑ ÑÐÑÑÐÐ ÐÐÐÑÑÐÐÑ ÐÐÑÑÐÐ\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-inventory RCS\n"
+#: ../meld/preferences.py:235
+#, python-format
+msgid "Version Control\t1\t%s\n"
+msgstr "ÐÐÑÑÐÐÐ ÐÐÐÑÑÐÐÑ ÐÐÑÑÐÐ\t1\t%s\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:448
+#: ../meld/preferences.py:237
 msgid "Binaries\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
-msgstr "ÐÐÐÐÑ Ñ ÐÐÑÐÐÐÑÐ ÐÐÐÐÐ\t1\t*.{pyc,a,obj,o,so,la,lib,dll}\n"
+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
-#: ../meldapp.py:450
+#: ../meld/preferences.py:239
 msgid "Media\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
-msgstr "ÐÐÑÑÐÐÐÐ Ð ÐÐÑÐÐ\t0\t*.{jpg,gif,png,wav,mp3,ogg,xcf,xpm}"
+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
-#: ../meldapp.py:452
+#: ../meld/preferences.py:241
 msgid ""
 "CVS keywords\t0\t\\$\\w+(:[^\\n"
 "$]+)?\\$\n"
@@ -1050,128 +1264,281 @@ msgstr ""
 "$]+)?\\$\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:454
+#: ../meld/preferences.py:243
 msgid "C++ comment\t0\t//.*\n"
 msgstr "ÐÐÐÐÐÐÑÐÑÐÐ C++\t0\t//.*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:456
+#: ../meld/preferences.py:245
 msgid "C comment\t0\t/\\*.*?\\*/\n"
 msgstr "ÐÐÐÐÐÐÑÐÑÐÐ C\t0\t/\\*.*?\\*/\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:458
+#: ../meld/preferences.py:247
 msgid "All whitespace\t0\t[ \\t\\r\\f\\v]*\n"
 msgstr "ÐÑÐÑÐ ÐÑÐÐÐÐÑ\t0\t[ \\t\\r\\f\\v]*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:460
+#: ../meld/preferences.py:249
 msgid "Leading whitespace\t0\t^[ \\t\\r\\f\\v]*\n"
 msgstr "ÐÐÐÑÑÐÐ ÐÑÐÐÐÐÑ\t0\t^[ \\t\\r\\f\\v]*\n"
 
 #. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:462
+#: ../meld/preferences.py:251
 msgid "Script comment\t0\t#.*"
 msgstr "ÐÐÐÐÐÐÑÐÑÐÐ Ð ÑÑÐÐÐÑÐÑÑ\t0\t#.*"
 
-#: ../meldapp.py:781
-msgid "Cannot compare a mixture of files and directories.\n"
-msgstr "ÐÐÐÐÐÐÐÐÐÐ ÑÑÐÐÐÐÑÑ ÑÐÐÑÑ ÑÐÐÐÐÐ Ð ÐÐÑÐÐÐÐÐÐ.\n"
-
-#. ###############################################################################
-#.
-#. usage
-#.
-#. ###############################################################################
-#: ../meldapp.py:829
-#, python-format
-msgid ""
-"Meld %s\n"
-"Written by Stephen Kennedy <stevek gnome org>"
-msgstr ""
-"Meld %s\n"
-"ÐÐÑÐÑ - ÐÑÐÐÐÐ ÐÐÐÐÐÐÐ <stevek gnome org>"
+#: ../meld/vcview.py:120
+#| msgid "Commit"
+msgid "Co_mmit"
+msgstr "_ÐÐÑÐÐÑÐÑÐÐÐÑÑ"
 
-#: ../meldapp.py:858
-msgid "Set label to use instead of file name"
-msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐÑ ÐÐÑ ÐÑÐÐÐÑÐÐÐÐÐÐÑ ÐÐÐÑÑÐ ÐÐÐÐÐ ÑÐÐÐÐ"
+#: ../meld/vcview.py:120
+msgid "Commit"
+msgstr "ÐÐÑÐÐÑÐÑÐÐÐÑÑ"
 
-#: ../meldapp.py:859
-#: ../meldapp.py:860
-#: ../meldapp.py:861
-#: ../meldapp.py:862
-msgid "Ignored for compatibility"
-msgstr "ÐÐÑ ÑÐÐÐÐÑÑÐÐÐÑÑÐ, ÐÐÐÐÑÐÑÑÐÑÑÑ"
+#: ../meld/vcview.py:121
+msgid "_Update"
+msgstr "_ÐÐÐÐÐÐÑÑ"
 
-#: ../meldapp.py:888
-#, python-format
-msgid "Wrong number of arguments (Got %i)"
-msgstr "ÐÐÐÐÑÐÐÐ ÑÐÑÐÐ ÐÑÐÑÐÐÐÑÐÐ (ÐÑÐÐÐ %i) "
+#: ../meld/vcview.py:121
+msgid "Update"
+msgstr "ÐÐÐÐÐÐÑÑ"
 
-#: ../melddoc.py:45
-msgid "untitled"
-msgstr "ÐÐÐ ÐÐÐÐÐ"
+#: ../meld/vcview.py:122
+msgid "Add to VC"
+msgstr "ÐÐÐÐÐÐÑÑ Ð ÐÐÐ"
 
-#. no common path. empty names get changed to "[None]"
-#: ../misc.py:118
-msgid "[None]"
-msgstr "(ÐÐÑ)"
+#: ../meld/vcview.py:123
+msgid "Add _Binary"
+msgstr "ÐÐÐÐÐÐÑÑ _ÐÐÐÐÑÐÑÐ ÑÐÐÐ"
+
+#: ../meld/vcview.py:123
+msgid "Add binary to VC"
+msgstr "ÐÐÐÐÐÐÑÑ ÐÐÐÐÑÐÑÐ ÑÐÐÐ Ð ÐÐÐ"
+
+#: ../meld/vcview.py:124
+msgid "Remove from VC"
+msgstr "ÐÐÐÐÐÑÑ ÐÐ ÐÐÐ"
+
+#: ../meld/vcview.py:125
+msgid "_Resolved"
+msgstr "_ÐÐÐÑÐÑÐÐÐ"
+
+#: ../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 "ÐÐÐÐÐÑÑ ÑÐÐÐÑÑÑ ÐÐÐÐÑ"
+
+#: ../meld/vcview.py:131
+msgid "_Flatten"
+msgstr "ÐÐÐ _ÑÐÐÑÐÐ"
+
+#: ../meld/vcview.py:131
+msgid "Flatten directories"
+msgstr "ÐÐÐÐÐÑÐÐÑÑ ÐÐÐÑÐÐÐ ÑÐÐÑÐÐÐ"
+
+#: ../meld/vcview.py:132
+msgid "_Modified"
+msgstr "_ÐÐÐÐÐÑÐÐÑÐ"
+
+#: ../meld/vcview.py:133
+msgid "_Normal"
+msgstr "_ÐÐÑÑÐÑÐ"
 
-#: ../vcview.py:170
+#: ../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 "ÐÐÐÐÑÐÑÑÐÐÑÐ"
+
+#: ../meld/vcview.py:135
+msgid "Show ignored files"
+msgstr "ÐÐÐÐÐÑÐÐÑÑ ÐÐÐÐÑÐÑÑÐÐÑÐ ÑÐÐÐÑ"
+
+#: ../meld/vcview.py:177
+#: ../meld/vcview.py:301
 msgid "Location"
 msgstr "ÐÐÑÑÐÐÐÐÐÐÐÐÐÐ"
 
-#: ../vcview.py:171
+#: ../meld/vcview.py:178
 msgid "Status"
 msgstr "ÐÐÑÑÐÑÐÐÐ"
 
-#: ../vcview.py:172
+#: ../meld/vcview.py:179
 msgid "Rev"
-msgstr "ÐÐÐÐÐÑÐÑ"
+msgstr "ÐÑÐÐÐÐ"
 
-#: ../vcview.py:174
+#: ../meld/vcview.py:181
 msgid "Options"
-msgstr "ÐÐÑÑÑÐÐÐÐ"
+msgstr "ÐÐÑÐÐÐÑÑÑ"
+
+#: ../meld/vcview.py:233
+msgid "Choose one Version Control"
+msgstr "ÐÑÐÐÑÐÑÐ ÐÐÐÑ ÑÐÑÑÐÐÑ ÐÐÐÑÑÐÐÑ ÐÐÑÑÐÐ"
+
+#: ../meld/vcview.py:234
+msgid "Only one Version Control in this directory"
+msgstr "ÐÐÐÑÐÐ ÐÐÐÐ ÐÐÐ Ð ÑÑÐÐ ÐÐÑÐÐÐÐÐ"
+
+#. TRANSLATORS: this is an error message when a version control
+#. application isn't installed or can't be found
+#: ../meld/vcview.py:247
+#, python-format
+msgid "%s Not Installed"
+msgstr "ÐÑÐÐÐÐÐÐÐÐ %s ÐÐ ÑÑÑÐÐÐÐÐÐÐÐ"
+
+#. TRANSLATORS: this is an error message when a version
+#. controlled repository is invalid or corrupted
+#: ../meld/vcview.py:251
+msgid "Invalid Repository"
+msgstr "ÐÐÐÐÑÐÑÐ ÑÐÐÐÐÐÑÐÑÐÐ"
+
+#: ../meld/vcview.py:260
+#, python-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#. TRANSLATORS: This is the location of the directory the user is diffing
+#: ../meld/vcview.py:301
+#, python-format
+msgid "%s: %s"
+msgstr "%s: %s"
 
-#: ../vcview.py:257
+#: ../meld/vcview.py:349
 msgid "(Empty)"
 msgstr "(ÐÑÑÑÐ)"
 
-#: ../vcview.py:294
+#: ../meld/vcview.py:387
 #, python-format
 msgid "[%s] Fetching differences"
-msgstr "[%s] ÐÑÑÐÑÐÑÑÑÑÑ ÑÐÐÐÐÑÐÑ"
+msgstr "[%s] ÐÐÐÑÑÐÐÐÐ ÑÐÐÐÐÑÐÐ"
 
-#: ../vcview.py:301
+#: ../meld/vcview.py:395
 #, python-format
 msgid "[%s] Applying patch"
-msgstr "[%s] ÐÐÐÐÐÐÑÐÐÐÑÑÑ ÐÐÐÐÐÑÐÐ"
-
-#: ../vcview.py:305
-msgid "No differences found."
-msgstr "ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÐ."
+msgstr "[%s] ÐÑÐÐÐÐÐÐÐÐ ÐÐÐÐÐÑÐÐ"
 
-#: ../vcview.py:382
+#: ../meld/vcview.py:480
 msgid "Select some files first."
 msgstr "ÐÐÐÑÐÐÐ ÐÑÐÐÑÐÑÐ ÑÐÐÐÑ."
 
-#: ../vcview.py:446
-msgid "Invoking patch failed, you need GNU patch."
-msgstr "ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÐÐÑÑ ÐÑÐÐÑÐÐÐÑ patch, ÐÐÐÐÑÐÐÐÐÐ ÐÑÐÐÑÐÐÐÐ patch ÐÑÐÐÐÑÐ GNU"
+#: ../meld/vcview.py:553
+#, python-format
+msgid ""
+"\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 ""
+"\n"
+"                    ÐÑÐÐÐ ÐÑÐÐÑÐÐÐÑ Âpatch ÐÐÑÐÐÑÐÐ.\n"
+"                    \n"
+"                    ÐÐÐÐÐÐÐÐ, Ñ ÐÐÑ ÐÐÑ ÑÑÑÐÐÐÐÐÐÐÐÐÐ ÐÑÐÐÑÐÐÐÑ ÂGNU patchÂ,\n"
+"                    ÐÐÐ ÐÑ ÐÑÐÐÐÑÐÑÐÑÐ ÐÐÐÑÐÑÐÑÑÐÑÐÐÐÐÐÑÑ ÐÐÑÑÐÑ %s.\n"
+"                    \n"
+"                    ÐÐÐÐÐÑÐÑÑÐ, ÐÑÐÑÐÐÑÑÐ ÐÑÑÐÑ ÐÐ ÐÑÐÐÐÐ ÐÐ:\n"
+"                    meld-list gnome org\n"
+"                    \n"
+"                    ÐÐÐÐÑÐÐÑÐÐ ÑÐÐÐÑÑÑÑÑ ÐÐÑÐÑÐÐÑÐÑ:\n"
+"                    \n"
+"                    â ÐÐÑÑÐÑ meld: Â%sÂ\n"
+"                    â ÑÐÐ ÐÑÐÐÑÐÐÐÑ ÐÐÐÑÑÐÐÑ ÐÑÑÐÐÐÑÑ ÑÐÐÑÑÐÐ: Â%sÂ\n"
+"                    â ÐÐÑÑÐÑ ÐÑÐÐÑÐÐÐÑ ÐÐÐÑÑÐÐÑ ÐÑÑÐÐÐÑÑ ÑÐÐÑÑÐÐ: ÂX.Y.ZÂ\n"
+"                    â ÐÑÐÐÐ Â%s ÐÑÐÐÐ_ÑÐÐÐ.txtÂ\n"
+"                    â ÐÐÐÐÐÐÑ patch: Â%sÂ\n"
+"                    (ÐÐ ÐÐÑÐÐÑÐÐÑÐÐ ÐÐÐÑÑÐÐÑÑ, ÐÑÐÑÑÐ ÐÑÐÑÐÐÑÐ\n"
+"                    ÑÑÑÐÐÑ ÐÐÑÐÐÐÑÑÐÐ) \n"
+"                    \n"
+"                    ÐÐÐÐÐÐÑÐ ÂX.Y.ZÂ ÐÐ ÐÑÐÐÐÑÐÑÐÐÑÑ ÐÐÑÑÐÑ\n"
+"                    ÐÑÐÐÑÐÐÐÑ ÐÐÐÑÑÐÐÑ ÐÑÑÐÐÐÑÑ ÑÐÐÑÑÐÐ.\n"
+"                    "
+
+#: ../meld/ui/findbar.py:127
+#, python-format
+msgid ""
+"Regular expression error\n"
+"'%s'"
+msgstr ""
+"ÐÑÐÐÐÐ Ð ÑÐÐÑÐÑÑÐÐÐ ÐÑÑÐÐÐÐÐÐ\n"
+"Â%sÂ"
+
+#: ../meld/ui/historyentry.py:293
+msgid "_Browse..."
+msgstr "_ÐÐÐÐÑâ"
+
+#: ../meld/ui/historyentry.py:301
+msgid "Path"
+msgstr "ÐÑÑÑ"
+
+#: ../meld/ui/historyentry.py:302
+msgid "Path to file"
+msgstr "ÐÑÑÑ Ð ÑÐÐÐÑ"
+
+#: ../meld/ui/historyentry.py:303
+msgid "Pop up a file selector to choose a file"
+msgstr "ÐÑÐÑÑÑÑ ÐÐÐÐÐÐ ÐÐÑ ÐÑÐÐÑÐ ÑÐÐÐÐ"
+
+#: ../meld/ui/historyentry.py:441
+msgid "Select directory"
+msgstr "ÐÑÐÑÐÑÑ ÐÐÑÐÐÐÐ"
+
+#: ../meld/ui/historyentry.py:445
+msgid "Select file"
+msgstr "ÐÑÐÑÐÑÑ ÑÐÐÐ"
+
+#: ../meld/ui/notebooklabel.py:60
+msgid "Close tab"
+msgstr "ÐÐÐÑÑÑÑ ÐÐÐÐÐÐÑ"
 
 #. These are the possible states of files. Be sure to get the colons correct.
-#: ../vc/_vc.py:39
-msgid "Ignored:Unversioned:::Error::Newly added:Modified:<b>Conflict</b>:Removed:Missing"
-msgstr "ÐÐÐÐÑ.:ÐÐÐ ÐÐÑÑÐÐ:::ÐÑÐÐÐÐ::ÐÐÐÑÐ:ÐÐÐÐÐÑÐ:<b>ÐÐÐÑÐÐÐÑ</b>:ÐÐÐÐÑÐ:ÐÑÑÑÑÑÑÐÑÐÑ"
+#: ../meld/vc/_vc.py:40
+msgid "Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing"
+msgstr "ÐÐÐÐÑ.:ÐÐÐ ÐÐÑÑÐÐ:::ÐÑÐÐÐÐ::ÐÐÐÑÐ:ÐÐÐÐÐÑÐ:ÐÐÐÑÐÐÐÑ:ÐÐÐÐÑÐ:ÐÑÑÑÑÑÑÐÑÐÑ"
 
-#: ../vc/cvs.py:153
+#: ../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"
+"ÐÑÐÐÐÐ ÐÑÐÐÐÑÐÐÐÐÐÐÐÑ Ð ÑÐÐÑÐÑÑÐÐÐ ÐÑÑÐÐÐÐÐÐ\n"
 "ÐÐÐÐÐÐ: Â%sÂ\n"
 "ÐÑÐÐÐÐ: Â%sÂ"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]