[meld] Updated Bulgarian translation
- From: Alexander Alexandrov Shopov <al_shopov src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Updated Bulgarian translation
- Date: Fri, 3 Feb 2012 11:29:31 +0000 (UTC)
commit ec311ee8f0e046bc9ca17a70d3ce0ec6af3dfdb9
Author: Alexander Shopov <ash kambanaria org>
Date: Fri Feb 3 13:28:48 2012 +0200
Updated Bulgarian translation
po/bg.po | 1766 +++++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 1048 insertions(+), 718 deletions(-)
---
diff --git a/po/bg.po b/po/bg.po
index 6ec5a46..8637208 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,136 +1,501 @@
# Bulgarian translation of meld po-file
-# Copyright (C) 2004, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2008, 2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the meld package.
-# Alexander Shopov <ash contact bg>, 2004, 2005, 2008.
+# Alexander Shopov <ash kambanaria org>, 2004, 2005, 2008, 2012.
#
msgid ""
msgstr ""
-"Project-Id-Version: meld trunk\n"
+"Project-Id-Version: meld master\n"
"Report-Msgid-Bugs-To: Stephen Kennedy <stevek gnome org>\n"
-"POT-Creation-Date: 2008-08-02 09:01+0300\n"
-"PO-Revision-Date: 2008-08-02 08:39+0300\n"
-"Last-Translator: Alexander Shopov <ash contact bg>\n"
+"POT-Creation-Date: 2012-02-03 13:29+0200\n"
+"PO-Revision-Date: 2012-02-03 13:26+0200\n"
+"Last-Translator: Alexander Shopov <ash kambanaria org>\n"
"Language-Team: Bulgarian <dict fsa-bg org>\n"
+"Language: bg\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../dirdiff.py:194 ../glade2/meldapp.glade.h:65 ../vcview.py:120
+#: ../bin/meld:97
+msgid "Cannot import: "
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐÑ ÐÐÐÑÐÐÐ: "
+
+#: ../bin/meld:100
+#, 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 "Add new filter"
+msgstr "ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐ ÑÐÐÑÑÑ"
+
+#: ../data/ui/EditableList.ui.h:3
+msgid "Editable List"
+msgstr "ÐÐÐÑÑÐ Ñ ÑÐÐÐÐÑÐÑÐÐÐÑÐ ÑÐÐÐÐÐÐ"
+
+#: ../data/ui/EditableList.ui.h:4
+msgid "Move _Down"
+msgstr "ÐÐ_ÐÐÑÐ"
+
+#: ../data/ui/EditableList.ui.h:5
+msgid "Move _Up"
+msgstr "ÐÐ_ÐÐÐÑ"
+
+#: ../data/ui/EditableList.ui.h:6
+msgid "Move item down"
+msgstr "ÐÑÐÐÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÑÐ"
+
+#: ../data/ui/EditableList.ui.h:7
+msgid "Move item up"
+msgstr "ÐÑÐÐÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑ"
+
+#: ../data/ui/EditableList.ui.h:8 ../meld/vcview.py:166
+msgid "Name"
+msgstr "ÐÐÐ"
+
+#: ../data/ui/EditableList.ui.h:9
+msgid "Pattern"
+msgstr "ÐÐÐÐÐÐ"
+
+#: ../data/ui/EditableList.ui.h:10
+msgid "Remove selected filter"
+msgstr "ÐÑÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑ ÑÐÐÑÑÑ"
+
+#: ../data/ui/EditableList.ui.h:11 ../meld/vcview.py:130
+msgid "_Add"
+msgstr "_ÐÐÐÐÐÑÐÐ"
+
+#: ../data/ui/EditableList.ui.h:12 ../meld/vcview.py:132
+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 © 2002-2009 Stephen Kennedy\n"
+"Copyright © 2009-2011 Kai Willadsen"
+msgstr ""
+"ÐÐÑÐÑÑÐÐ ÐÑÐÐÐ Â 2002-2009 Stephen Kennedy\n"
+"ÐÐÑÐÑÑÐÐ ÐÑÐÐÐ Â 2009-2011 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 ""
+"ÐÐÐÐÑÐÐÐÑÑ ÐÐÐÐÐ <ash kambanaria org>\n"
+"\n"
+"ÐÑÐÐÐÑÑÑ ÐÐ ÐÑÐÐÐÐ ÐÐ GNOME ÐÐÐ ÐÑÐÐÐ ÐÑ ÐÐÐÐÑÐÐÐ.\n"
+"ÐÐÑÑÐÑÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑ ÐÐ http://gnome.cult.bg\n";
+"ÐÐÐÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÑÐÐ ÐÐ http://gnome.cult.bg/bugs";
+
+#: ../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 "ÐÐÐÐÐÐÐÐÐÐ ÐÐ ÑÑÐÐÐÐÑÑÐÐÑ _ÑÐÐÐÐÑÐÑ ÐÐ GNOME"
+
+#: ../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 ""
+"ÐÑÐ ÑÑÐÐÐÑÐÐÐÐ ÐÐ ÑÐÐÐÐÐÐ ÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÐÑÐÐÐÐÑ. ÐÑÐÐÐ "
+"ÑÐÐÐÐÐ ÑÑÐ Ð ÑÐÐÑÐÑÑÐÐ ÐÐÑÐÐ Ð ÐÐÐÐÐ ÐÐÑÐÐ, ÐÐÐÑÐ ÐÐÐÐÐÑ ÐÑÐÐÐ ÐÐÐÐÑÐÐÑ "
+"ÑÐÐÑÑ Ñ ÐÑÐÐÐÐ ÐÐÐ, ÐÑÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÑÐ ÑÑÐÐÐÑÐÐÐÐÑÐ. ÐÐÐ ÐÐÑÐÐÑÑ ÑÑÐÑÑÐÐ "
+"ÐÑÑÐÐ, ÑÐÐÐ ÐÑÑÐÐÑÐ ÑÐ ÐÐÐÐÐÑÑ. ÐÐÑÑÐÐÑÐ ÑÐ ÐÑÐ ÑÑÐÐÐÐÐÑÑÐÐÑÐ ÐÐ ÐÐÐÐÑÐ "
+"ÐÐÐÑÐÐÐÐÑÑÐ."
+
+#: ../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 "ÐÐÑÐÐÐ ÐÐ _ÑÐÐÑÐÐÑÐÑÐ:"
+
+#: ../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 "Log Message"
+msgstr "ÐÑÐÐÑÐÐÐÐ Ð ÐÐÐÐÐÐÐÐ"
+
+#: ../data/ui/vcview.ui.h:3
+msgid "Previous Logs"
+msgstr "ÐÑÐÐÐÑÐÐ ÑÑÐÐÑÐÐÐÑ"
+
+#: ../data/ui/vcview.ui.h:4
+msgid "VC Log"
+msgstr "ÐÐÐÐÐÐÐ ÐÐ ÑÑÐÐÐÐÐÑÐÑÐ"
+
+#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
msgid "_Compare"
msgstr "_ÐÑÐÐÐÑÐÐÐÐ"
-#: ../dirdiff.py:194 ../vcview.py:120
+#: ../meld/dirdiff.py:232 ../meld/vcview.py:127
msgid "Compare selected"
msgstr "ÐÑÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐ"
-#. FIXME: the glade files were inconsistent: GO_BACK vs GOTO_FIRST, "Left" vs "Copy To Left"
-#: ../dirdiff.py:196
-msgid "Left"
-msgstr "ÐÑÐ"
+#: ../meld/dirdiff.py:233
+msgid "Copy _Left"
+msgstr "ÐÐÐÐÑÐÐÐ ÐÐ_ÐÑÐÐ"
-#: ../dirdiff.py:196 ../filediff.py:142
-msgid "Copy To Left"
+#: ../meld/dirdiff.py:233
+msgid "Copy to left"
msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐ"
-#. FIXME: the glade files were inconsistent: GO_FORWARD vs GOTO_LAST, "Right" vs "Copy To Right"
-#: ../dirdiff.py:198
-msgid "Right"
-msgstr "ÐÐÑÐÐ"
+#: ../meld/dirdiff.py:234
+msgid "Copy _Right"
+msgstr "ÐÐÐÐÑÐÐÐ ÐÐ_ÐÑÑÐÐ"
-#: ../dirdiff.py:198 ../filediff.py:143
-msgid "Copy To Right"
+#: ../meld/dirdiff.py:234
+msgid "Copy to right"
msgstr "ÐÐÐÐÑÐÐÐ ÐÐÐÑÑÐÐ"
-#: ../dirdiff.py:199
+#: ../meld/dirdiff.py:235
msgid "Delete selected"
msgstr "ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐ"
-#: ../dirdiff.py:200
-msgid "Hide..."
-msgstr "ÐÐÑÐÐÐÐÐâ"
+#: ../meld/dirdiff.py:236 ../meld/filediff.py:1157
+msgid "Hide"
+msgstr "ÐÐÑÐÐÐÐÐ"
-#: ../dirdiff.py:200
+#: ../meld/dirdiff.py:236
msgid "Hide selected"
msgstr "ÐÐÑÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐ"
-#: ../dirdiff.py:202
-msgid "Edit"
-msgstr "ÐÐÐÐÐÑÐÑÐÐÐ"
-
-#: ../dirdiff.py:202
-msgid "Edit selected"
-msgstr "ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐ"
-
-#: ../dirdiff.py:206
+#: ../meld/dirdiff.py:240
msgid "Case"
msgstr "ÐÐÐÐÑÑÑÑ"
-#: ../dirdiff.py:206
+#: ../meld/dirdiff.py:240
msgid "Ignore case of entries"
msgstr "ÐÐÐÐÑÑÑÑÑÑ ÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐ Ð ÐÐÐ ÐÐÐÑÐÐÐÐ"
-#: ../dirdiff.py:207
+#: ../meld/dirdiff.py:241
msgid "Same"
-msgstr "ÐÐÐÐÐÑÐ"
+msgstr "ÐÐÐÐÐÐÐ"
-#: ../dirdiff.py:207
+#: ../meld/dirdiff.py:241
msgid "Show identical"
msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐ"
-#: ../dirdiff.py:208
+#: ../meld/dirdiff.py:242
msgid "New"
-msgstr "ÐÐÐ"
+msgstr "ÐÐÐÐ"
-#: ../dirdiff.py:208
+#: ../meld/dirdiff.py:242
msgid "Show new"
msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐ"
-#: ../dirdiff.py:209
+#: ../meld/dirdiff.py:243
msgid "Modified"
-msgstr "ÐÑÐÐÐÐÐÐ"
+msgstr "ÐÑÐÐÐÐÐÐÐ"
-#: ../dirdiff.py:209 ../vcview.py:133
+#: ../meld/dirdiff.py:243 ../meld/vcview.py:140
msgid "Show modified"
msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐÑÐ"
-#: ../dirdiff.py:270 ../dirdiff.py:285
-#, python-format
-msgid "Error converting pattern '%s' to regular expression"
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÑÐÐÑÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐ â%sâ ÐÑÐ ÑÐÐÑÐÑÑÐÐ ÐÐÑÐÐ"
+#: ../meld/dirdiff.py:245
+msgid "Filters"
+msgstr "ÐÐÐÑÑÐ"
-#: ../dirdiff.py:293
+#: ../meld/dirdiff.py:245
+msgid "Set active filters"
+msgstr "ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐÐÐ ÑÐÐÑÑÐ"
+
+#: ../meld/dirdiff.py:362
#, python-format
msgid "Hide %s"
msgstr "ÐÐÑÐÐÐÐÐ ÐÐ %s"
-#: ../dirdiff.py:378 ../dirdiff.py:388 ../vcview.py:225 ../vcview.py:253
+#: ../meld/dirdiff.py:465 ../meld/dirdiff.py:478 ../meld/vcview.py:322
+#: ../meld/vcview.py:346
#, python-format
msgid "[%s] Scanning %s"
msgstr "[%s] ÐÑÐÐÐÑÐÐ ÐÐ %s"
-#: ../dirdiff.py:421
+#: ../meld/dirdiff.py:577
#, python-format
-msgid "'%s' hidden by '%s'"
-msgstr "â%sâ Ð ÑÐÑÐÑ ÐÑ â%sâ"
+msgid "[%s] Done"
+msgstr "[%s] ÐÐÑÐÐÐ"
-#: ../dirdiff.py:427
-#, python-format
+#: ../meld/dirdiff.py:581
+msgid "Multiple errors occurred while scanning this folder"
+msgstr "ÐÑÐ ÐÐÑÐÐÐÐÐÐÑÐ ÐÐ ÑÐÐÐ ÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑÐ ÐÐÐÐÐÑÑÐÐ ÐÑÐÑÐÐ"
+
+#: ../meld/dirdiff.py:582
+msgid "Files with invalid encodings found"
+msgstr "ÐÑÐÑÐÑÐ ÑÐ ÑÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
+
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:584
+msgid "Some files were in an incorrect encoding. The names are something like:"
+msgstr "ÐÑÐÐÐ ÑÐÐÐÐÐÐ ÑÐ Ð ÐÑÑÐÐ ÐÐÐÐÑÐÐÐ. ÐÐÐÐÐÑÐ ÐÐ ÑÐ:"
+
+#: ../meld/dirdiff.py:586
+msgid "Files hidden by case insensitive comparison"
+msgstr "ÐÑÐÐÐÐÐÐÐÑÐ ÐÐÐ ÑÐÐÐÐÐÐ ÐÐÐÐÐÐ/ÐÐÐÐÐ ÐÑÐÐ ÑÐÐÐÐÐÐ"
+
+#. TRANSLATORS: This is followed by a list of files
+#: ../meld/dirdiff.py:588
msgid ""
"You are running a case insensitive comparison on a case sensitive "
-"filesystem. Some files are not visible:\n"
-"%s"
+"filesystem. The following files in this folder are hidden:"
msgstr ""
"ÐÐÐÑÑÑÐÐÑÐ ÑÑÐÐÐÑÐÐÐÐ ÐÐÐ ÐÑÑÐÑÐÐÐ ÐÐ ÑÐÐÐÑÑÑÑÐ ÐÐ ÐÑÐÐÐÑÐ ÐÑÑÑÑ ÑÐÐÐÐÐÐ "
-"ÑÐÑÑÐÐÐ, ÐÐÑÑÐ ÐÑÑÐÑÐ ÑÐÐÐÑÑÑÑÐ ÐÐ ÐÑÐÐÐÑÐ. ÐÑÐÐÐ ÑÐÐÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÑ:\n"
+"ÑÐÑÑÐÐÐ, ÐÐÑÑÐ ÐÑÑÐÑÐ ÑÐÐÐÑÑÑÑÐ ÐÐ ÐÑÐÐÐÑÐ. ÐÐÐÐÐÐÑÐ ÑÐÐÐÐÐÐ ÐÐ ÑÐ ÐÐÐÐÐÑ:\n"
"%s"
-#: ../dirdiff.py:501
+#: ../meld/dirdiff.py:599
#, python-format
-msgid "[%s] Done"
-msgstr "[%s] ÐÐÑÐÐÐ"
+msgid "'%s' hidden by '%s'"
+msgstr "â%sâ Ð ÑÐÑÐÑ ÐÑ â%sâ"
+
+#: ../meld/dirdiff.py:624 ../meld/filediff.py:1008 ../meld/filediff.py:1161
+msgid "Hi_de"
+msgstr "_ÐÐÑÐÐÐÐÐ"
-#: ../dirdiff.py:547
+#: ../meld/dirdiff.py:674
#, python-format
msgid ""
"'%s' exists.\n"
@@ -139,7 +504,7 @@ msgstr ""
"â%sâ ÑÑÑÐÑÑÐÑÐÐ.\n"
"ÐÐ ÑÐ ÐÑÐÐÐÐÐÑÐ?"
-#: ../dirdiff.py:554
+#: ../meld/dirdiff.py:681
#, python-format
msgid ""
"Error copying '%s' to '%s'\n"
@@ -150,16 +515,16 @@ msgstr ""
"\n"
"%s."
-#: ../dirdiff.py:572 ../vcview.py:417
+#: ../meld/dirdiff.py:699 ../meld/vcview.py:526
#, python-format
msgid ""
"'%s' is a directory.\n"
-"Remove recusively?"
+"Remove recursively?"
msgstr ""
"â%sâ Ð ÐÐÐÐÐ.\n"
"ÐÐ ÑÐ ÐÐÑÑÐÐ ÐÐ ÑÐÐÑÑÑÐÐÐÐ?"
-#: ../dirdiff.py:579 ../vcview.py:422
+#: ../meld/dirdiff.py:706 ../meld/vcview.py:531
#, python-format
msgid ""
"Error removing %s\n"
@@ -170,177 +535,274 @@ msgstr ""
"\n"
"%s."
-#: ../dirdiff.py:590
+#: ../meld/dirdiff.py:731
#, python-format
msgid "%i second"
msgid_plural "%i seconds"
msgstr[0] "%i ÑÐÐÑÐÐÐ"
msgstr[1] "%i ÑÐÐÑÐÐÐ"
-#: ../dirdiff.py:591
+#: ../meld/dirdiff.py:732
#, python-format
msgid "%i minute"
msgid_plural "%i minutes"
msgstr[0] "%i ÐÐÐÑÑÐ"
msgstr[1] "%i ÐÐÐÑÑÐ"
-#: ../dirdiff.py:592
+#: ../meld/dirdiff.py:733
#, python-format
msgid "%i hour"
msgid_plural "%i hours"
msgstr[0] "%i ÑÐÑ"
msgstr[1] "%i ÑÐÑÐ"
-#: ../dirdiff.py:593
+#: ../meld/dirdiff.py:734
#, python-format
msgid "%i day"
msgid_plural "%i days"
msgstr[0] "%i ÐÐÐ"
msgstr[1] "%i ÐÐÐÐ"
-#: ../dirdiff.py:594
+#: ../meld/dirdiff.py:735
#, python-format
msgid "%i week"
msgid_plural "%i weeks"
msgstr[0] "%i ÑÐÐÐÐÑÐ"
msgstr[1] "%i ÑÐÐÐÐÑÐ"
-#: ../dirdiff.py:595
+#: ../meld/dirdiff.py:736
#, python-format
msgid "%i month"
msgid_plural "%i months"
msgstr[0] "%i ÐÐÑÐÑ"
msgstr[1] "%i ÐÐÑÐÑÐ"
-#: ../dirdiff.py:596
+#: ../meld/dirdiff.py:737
#, python-format
msgid "%i year"
msgid_plural "%i years"
msgstr[0] "%i ÐÐÐÐÐÐ"
msgstr[1] "%i ÐÐÐÐÐÐ"
-#: ../filediff.py:135 ../meldapp.py:533
-msgid "Save the current file"
-msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑ ÑÐÐÐ"
+#: ../meld/filediff.py:294
+msgid "Format as patch..."
+msgstr "ÐÐÑÐÐÑÐÑÐÐÐ ÐÐ ÐÑÑÐÐÐâ"
-#: ../filediff.py:136
-msgid "Save the current file with a different name"
-msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑ ÑÐÐÐ Ñ ÑÐÐÐÐÑÐÐ ÐÐÐ"
+#: ../meld/filediff.py:294
+msgid "Create a patch using differences between files"
+msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐ ÐÑÑÐÐÐ ÐÐ ÐÐÐÐ ÑÐÐÐÐÐÐÑÐ ÐÐÐÐÑ ÑÐÐÐÐÐÐÑÐ"
-#: ../filediff.py:137 ../meldapp.py:541
-msgid "Cut the selection"
-msgstr "ÐÑÑÑÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐ"
+#: ../meld/filediff.py:295
+msgid "Previous conflict"
+msgstr "ÐÑÐÐÐÑÐÐ ÐÐÐÑÐÐÐÑ"
-#: ../filediff.py:138 ../meldapp.py:542
-msgid "Copy the selection"
-msgstr "ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐ"
+#: ../meld/filediff.py:295
+msgid "Go to the previous conflict"
+msgstr "ÐÑÐ ÐÑÐÐÐÑÐÐÑ ÐÐÐÑÐÐÐÑ"
-#: ../filediff.py:139 ../meldapp.py:543
-msgid "Paste the clipboard"
-msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÐÐÑ ÐÑÑÐÑ"
+#: ../meld/filediff.py:296
+msgid "Next conflict"
+msgstr "ÐÐÐÐÐÐÑ ÐÐÐÑÐÐÐÑ"
-#: ../filediff.py:140
-msgid "Edit the selected file"
-msgstr "ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐ"
+#: ../meld/filediff.py:296
+msgid "Go to the next conflict"
+msgstr "ÐÑÐ ÑÐÐÐÐÐÑÐÑ ÐÐÐÑÐÐÐÑ"
-#: ../filediff.py:141 ../glade2/filediff.glade.h:4
-msgid "Create Patch"
-msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐ ÐÑÑÐÐÐ"
+#: ../meld/filediff.py:297
+msgid "Push to left"
+msgstr "ÐÐÐÑÐÐ"
-#: ../filediff.py:141
-msgid "Create a patch"
-msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐ ÐÑÑÐÐÐ"
+#: ../meld/filediff.py:297
+msgid "Push current change to the left"
+msgstr "ÐÐÐÑÐÑÑÐÐ ÐÐ ÑÐÐÑÑÐÑÐ ÐÑÐÐÑÐÐ ÐÐÐÑÐÐ"
+
+#: ../meld/filediff.py:298
+msgid "Push to right"
+msgstr "ÐÐÐÑÑÐÐ"
+
+#: ../meld/filediff.py:298
+msgid "Push current change to the right"
+msgstr "ÐÐÐÑÐÑÑÐÐ ÐÐ ÑÐÐÑÑÐÑÐ ÐÑÐÐÑÐÐ ÐÐÐÑÑÐÐ"
+
+#. FIXME: using LAST and FIRST is terrible and unreliable icon abuse
+#: ../meld/filediff.py:300
+msgid "Pull from left"
+msgstr "ÐÑ ÐÑÐÐ"
+
+#: ../meld/filediff.py:300
+msgid "Pull change from the left"
+msgstr "ÐÐÐÑÐÑÑÐÐ ÐÐ ÑÐÐÑÑÐÑÐ ÐÑÐÐÑÐÐ ÐÑÐÑÐÐ"
+
+#: ../meld/filediff.py:301
+msgid "Pull from right"
+msgstr "ÐÑ ÐÑÑÐÐ"
+
+#: ../meld/filediff.py:301
+msgid "Pull change from the right"
+msgstr "ÐÐÐÑÐÑÑÐÐ ÐÐ ÑÐÐÑÑÐÑÐ ÐÑÐÐÑÐÐ ÐÑÐÑÑÐÐ"
+
+#: ../meld/filediff.py:302
+msgid "Copy above left"
+msgstr "ÐÑÐÐÑÐ ÐÑÐÑÐÐ"
+
+#: ../meld/filediff.py:302
+msgid "Copy change above the left chunk"
+msgstr "ÐÐÐÑÐÑÑÐÐ ÐÐ ÐÑÐÐÑÐÐÑÐ ÐÐÐ ÐÑÐÐÑÐ ÐÐÑÑÐ ÐÐÐ"
+
+#: ../meld/filediff.py:303
+msgid "Copy below left"
+msgstr "ÐÑÐÐÐÑ ÐÑÐÑÐÐ"
+
+#: ../meld/filediff.py:303
+msgid "Copy change below the left chunk"
+msgstr "ÐÐÐÑÐÑÑÐÐ ÐÐ ÐÑÐÐÑÐÐÑÐ ÐÐÐ ÐÑÐÐÑÐ ÐÐÑÑÐ ÐÐÐ"
+
+#: ../meld/filediff.py:304
+msgid "Copy above right"
+msgstr "ÐÑÐÐÑÐ ÐÑÐÑÑÐÐ"
+
+#: ../meld/filediff.py:304
+msgid "Copy change above the right chunk"
+msgstr "ÐÐÐÑÐÑÑÐÐ ÐÐ ÐÑÐÐÑÐÐÑÐ ÐÐÐ ÐÑÑÐÐÑÐ ÐÐÑÑÐ ÐÐÐ"
+
+#: ../meld/filediff.py:305
+msgid "Copy below right"
+msgstr "ÐÑÐÐÐÑ ÐÑÐÑÑÐÐ"
+
+#: ../meld/filediff.py:305
+msgid "Copy change below the right chunk"
+msgstr "ÐÐÐÑÐÑÑÐÐ ÐÐ ÐÑÐÐÑÐÐÑÐ ÐÐÐ ÐÑÑÐÐÑÐ ÐÐÑÑÐ ÐÐÐ"
+
+#: ../meld/filediff.py:306
+msgid "Delete"
+msgstr "ÐÐÐÐÑÐÐÐÐÐ"
+
+#: ../meld/filediff.py:306
+msgid "Delete change"
+msgstr "ÐÐÐÐÑÐÐÐÐÐ ÐÐ ÐÑÐÐÑÐÐÑÐ"
+
+#: ../meld/filediff.py:307
+msgid "Merge all changes from left"
+msgstr "ÐÐÐÐÐÐÐ ÐÐ ÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÑ ÐÑÐÐ"
+
+#: ../meld/filediff.py:307
+msgid "Merge all non-conflicting changes from the left"
+msgstr "ÐÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ ÐÑ ÐÑÐÐ, ÐÐÐÑÐÐÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑ"
+
+#: ../meld/filediff.py:308
+msgid "Merge all changes from right"
+msgstr "ÐÐÐÐÐÐÐ ÐÐ ÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÑ ÐÑÑÐÐ"
+
+#: ../meld/filediff.py:308
+msgid "Merge all non-conflicting changes from the right"
+msgstr "ÐÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ ÐÑ ÐÑÑÐÐ, ÐÐÐÑÐÐÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑ"
-#: ../filediff.py:142
-msgid "Copy all changes from right pane to left pane"
-msgstr "ÐÐÐÐÑÐÐÐ ÐÐ ÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÑ ÐÐÐÐÑ ÐÐÐÐÐ Ð ÐÐÑÐÐÑ"
+#: ../meld/filediff.py:309
+msgid "Merge all non-conflicting"
+msgstr "ÐÐÐÐÐÐÐ ÐÐ ÐÑÐÑÐÐ ÐÑÐÐÐÐÐ"
-#: ../filediff.py:143
-msgid "Copy all changes from left pane to right pane"
-msgstr "ÐÐÐÐÑÐÐÐ ÐÐ ÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÑ ÐÐÑÐÐÑ ÐÐÐÐÐ Ð ÐÐÐÐÑ"
+#: ../meld/filediff.py:309
+msgid "Merge all non-conflicting changes from left and right panes"
+msgstr "ÐÐÐÐÐÐÐ ÐÐ ÐÑÐÑÐÐ ÐÑÐÐÐÐÐ ÐÑ ÐÑÐÐ Ð ÐÑ ÐÑÑÐÐ, ÐÐÐÑÐÐÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑ"
-#. Abbreviation for insert,overwrite so that it will fit in the status bar
-#: ../filediff.py:192
-msgid "INS,OVR"
-msgstr "ÐÐÑÐÐÐÐÐ,ÐÐÐÐÑÑÐÐÐÐ"
+#: ../meld/filediff.py:310
+msgid "Cycle through documents"
+msgstr "ÐÑÐÐÐÐÐÐÐÐÐ ÐÑÐÐ ÐÐÐÑÐÐÐÑÐÑÐ"
+
+#: ../meld/filediff.py:310
+msgid "Move keyboard focus to the next document in this comparison"
+msgstr ""
+"ÐÑÐÑÐÑÑÐÑÐÐ ÐÐ ÑÐÐÑÑÐ ÐÐ ÐÐÐÐÐÐÑÑÑÐÑÐ ÐÑÐ ÑÐÐÐÐÐÑÐÑ ÐÐÐÑÐÐÐÑ Ð ÑÑÐÐÐÐÐÐÐÑÐ"
+
+#: ../meld/filediff.py:314
+msgid "Lock scrolling"
+msgstr "ÐÑÐÐÐÑÑÐÐ ÐÑÐÐÐÐÐÐÐÐÐ"
+
+#: ../meld/filediff.py:315
+msgid "Lock scrolling of all panes"
+msgstr "ÐÑÐÑÐÐ ÐÐÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÐÐÐÐÑ ÑÑÐÐÐÑÑÐÐ"
+
+#. Abbreviations for insert and overwrite that fit in the status bar
+#: ../meld/filediff.py:396
+msgid "INS"
+msgstr "ÐÐÐ"
+
+#: ../meld/filediff.py:396
+msgid "OVR"
+msgstr "ÐÐÐ"
#. Abbreviation for line, column so that it will fit in the status bar
-#: ../filediff.py:194
+#: ../meld/filediff.py:398
#, python-format
msgid "Ln %i, Col %i"
msgstr "ÐÐÐ %i, ÐÐÐ. %i"
-#: ../filediff.py:252
-#, 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â ÐÑÐÐÐÐÐ ÐÑÐÑ ÐÐ ÑÐÐÐÐÐÑÐ ÐÑÐ ÑÐÐÐÐ. ÐÑÐÐÐÑÐÐÐÐÑÐ ÐÑÐÐ "
-"ÐÐ ÐÑÐÐ ÐÐÑÐÐÑÐÐ. ÐÐÑÑÐÐÑÐ ÑÐ ÐÑÐ ÑÑÐÐÐÐÐÑÑÐÐÑÐ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑÐÑ."
-
-#: ../filediff.py:506
+#: ../meld/filediff.py:722
#, python-format
msgid ""
-"Regular expression error\n"
-"'%s'"
+"Filter '%s' changed the number of lines in the file. Comparison will be "
+"incorrect. See the user manual for more details."
msgstr ""
-"ÐÑÐÑÐÐ Ð ÑÐÐÑÐÑÑÐÐÑ ÐÐÑÐÐ:\n"
-"â%sâ"
-
-#: ../filediff.py:518
-#, python-format
-msgid "The regular expression '%s' was not found."
-msgstr "ÐÐÐÑÐÑÑÐÐÑÑ ÐÐÑÐÐ â%sâ ÐÐ ÐÐ ÐÑÐÑÐÑ"
+"ÐÐÐÑÑÑÑÑ â%sâ ÐÑÐÐÐÐÐ ÐÑÐÑ ÐÐ ÑÐÐÐÐÐÑÐ ÐÑÐ ÑÐÐÐÐ. ÐÑÐÐÐÑÐÐÐÐÑÐ ÐÑÐÐ ÐÐ ÐÑÐÐ "
+"ÐÐÑÐÐÑÐÐ. ÐÐÑÑÐÐÑÐ ÑÐ ÐÑÐ ÑÑÐÐÐÐÐÑÑÐÐÑÐ ÐÐ ÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑÐÑ."
-#: ../filediff.py:520
-#, python-format
-msgid "The text '%s' was not found."
-msgstr "ÐÐÐÑÑÑÑ â%sâ ÐÐ ÐÐ ÐÑÐÑÐÑ"
+#. TRANSLATORS: this is the name of a new file which has not yet been saved
+#: ../meld/filediff.py:809
+msgid "<unnamed>"
+msgstr "<ÐÐÐÐÐÐÐÐÐÐÐÐ>"
-#: ../filediff.py:573
+#: ../meld/filediff.py:996
#, python-format
msgid "[%s] Set num panes"
msgstr "[%s] ÐÐÐÐÐÐÐÐ ÐÐ ÐÑÐÑ ÐÐÐÐÐÐ"
-#: ../filediff.py:580
+#: ../meld/filediff.py:1002
#, python-format
msgid "[%s] Opening files"
msgstr "[%s] ÐÑÐÐÑÑÐÐ ÐÐ ÑÐÐÐÐÐÐ"
-#: ../filediff.py:597 ../filediff.py:611 ../filediff.py:627 ../filediff.py:634
-#, python-format
-msgid "Could not read from '%s'"
-msgstr "ÐÐÐÑÐÐÐÐÐÐ ÑÐÑÐÐÐ ÐÑ â%sâ"
-
-#: ../filediff.py:598 ../filediff.py:635
-msgid "The error was:"
-msgstr "ÐÑÐÑÐÐÑÐ ÐÐ:"
+#: ../meld/filediff.py:1026 ../meld/filediff.py:1035 ../meld/filediff.py:1047
+#: ../meld/filediff.py:1053
+msgid "Could not read file"
+msgstr "ÐÐÐÐÑÑ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÑÐÑÐÑÐÐ"
-#: ../filediff.py:603
+#: ../meld/filediff.py:1027
#, python-format
msgid "[%s] Reading files"
msgstr "[%s] ÐÑÐÑÐÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐ"
-#: ../filediff.py:612
-msgid ""
-"It contains ascii nulls.\n"
-"Perhaps it is a binary file."
-msgstr ""
-"ÐÑÐÑÑÐÐ ÐÐÐÐÐ ASCII NUL.\n"
-"ÐÐÑÐÑÑÐÐ Ð ÐÐÐÐÑÐÐ ÑÐÐÐ."
+#: ../meld/filediff.py:1036
+#, python-format
+msgid "%s appears to be a binary file."
+msgstr "%s ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÐ ÑÐÐÐ."
-#: ../filediff.py:628
+#: ../meld/filediff.py:1048
#, python-format
-msgid "I tried encodings %s."
-msgstr "ÐÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ %s."
+msgid "%s is not in encodings: %s"
+msgstr "%s ÐÐ Ð Ð ÐÐÐÐÑÐÐÐÑÐ: %s"
-#: ../filediff.py:657
+#: ../meld/filediff.py:1078 ../meld/filemerge.py:67
#, python-format
msgid "[%s] Computing differences"
msgstr "[%s] ÐÐÑÐÑÐÑÐÐÐÐ ÐÐ ÑÐÐÐÐÐÐÑÐ"
-#: ../filediff.py:762
+#: ../meld/filediff.py:1148
+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:1154
+msgid "Files are identical"
+msgstr "ÐÐÐÐÐÐÐÑÐ ÑÐ ÐÐÐÐÐÐÐ"
+
+#: ../meld/filediff.py:1164
+msgid "Show without filters"
+msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐÐ ÑÐÐÑÑÐ"
+
+#: ../meld/filediff.py:1354
#, python-format
msgid ""
"\"%s\" exists!\n"
@@ -349,7 +811,7 @@ msgstr ""
"â%sâ ÑÑÑÐÑÑÐÑÐÐ.\n"
"ÐÐ ÑÐ ÐÑÐÐÐÐÐÑÐ?"
-#: ../filediff.py:775
+#: ../meld/filediff.py:1367
#, python-format
msgid ""
"Error writing to %s\n"
@@ -360,12 +822,12 @@ msgstr ""
"\n"
"%s."
-#: ../filediff.py:784
+#: ../meld/filediff.py:1376
#, python-format
msgid "Choose a name for buffer %i."
msgstr "ÐÐÐÐÑ ÐÐ ÐÐÐ ÐÐ ÐÑÑÐÑÐ %i."
-#: ../filediff.py:797
+#: ../meld/filediff.py:1391
#, python-format
msgid ""
"This file '%s' contains a mixture of line endings.\n"
@@ -376,7 +838,7 @@ msgstr ""
"\n"
"ÐÐÐ ÐÐÑÐÐÐÑ ÐÑÐÐÑÐ ÐÐ ÑÐ ÐÐÐÐÐÐ?"
-#: ../filediff.py:813
+#: ../meld/filediff.py:1407
#, python-format
msgid ""
"'%s' contains characters not encodable with '%s'\n"
@@ -385,12 +847,7 @@ msgstr ""
"â%sâ ÑÑÐÑÑÐÐ ÐÐÐÑÐ, ÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÑÐ ÐÐÐÐÑÐÑ ÑÑÐÐ â%sâ\n"
"ÐÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐ ÐÐÐÐÑÐ Ð âUTF-8â?"
-#. save as
-#: ../filediff.py:864
-msgid "Save patch as..."
-msgstr "ÐÐÐÐÑ ÐÐ ÐÑÑÐÐÐ ÐÐÑÐâ"
-
-#: ../filediff.py:923
+#: ../meld/filediff.py:1466
#, python-format
msgid ""
"Reloading will discard changes in:\n"
@@ -403,772 +860,645 @@ msgstr ""
"\n"
"ÐÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÐÑÐ ÑÐÐÐ ÐÐÐÑÐÑÐÑ."
-#: ../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>"
+#: ../meld/filemerge.py:82
+#, python-format
+msgid "[%s] Merging files"
+msgstr "[%s] ÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐÐÐÐ"
-#: ../glade2/filediff.glade.h:3
-msgid "Copy to Clipboard"
-msgstr "ÐÐÐÐÑÐÐÐ Ð ÐÐÐÐÐÐÐÐÑ ÐÑÑÐÑ"
-
-#: ../glade2/filediff.glade.h:5
-msgid "Find"
-msgstr "ÐÑÑÑÐÐÐ"
-
-#: ../glade2/filediff.glade.h:6
-msgid "Match _entire word only"
-msgstr "ÐÑÐÐÐÐÐÐÐ ÑÐÐÐ ÐÐ _ÑÐÐÐ ÐÑÐÐ"
-
-#: ../glade2/filediff.glade.h:7
-msgid "Regular e_xpression"
-msgstr "ÐÐ_ÐÑÐÑÑÐÐ ÐÐÑÐÐ"
-
-#: ../glade2/filediff.glade.h:8
-msgid "Save modified files?"
-msgstr "ÐÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐÐÑÐ ÑÐÐÐÐÐÐ?"
-
-#: ../glade2/filediff.glade.h:9
-msgid "Search for:"
-msgstr "ÐÑÑÑÐÐÐ ÐÐ:"
-
-#: ../glade2/filediff.glade.h:10
-msgid "_Match case"
-msgstr "_ÐÐÐÐÑÑÑÑÑÑ ÐÐ ÐÑÐÐÐÑÐ Ð ÐÑ ÐÐÐÑÐÐÐÐ"
-
-#: ../glade2/filediff.glade.h:11
-msgid "_Wrap around"
-msgstr "_Ð ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÑÐÑ ÐÐ ÑÐ ÐÐÑÐÐ ÐÑÐÐÑÐÐÐ"
+#: ../meld/meldapp.py:152
+msgid "wrong number of arguments supplied to --diff"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐ ÐÑÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÑÐ â--diffâ"
-#: ../glade2/meldapp.glade.h:1
-msgid "(gnome-default-editor)"
-msgstr "(ÑÑÐÐÐÐÑÑÐÐ-ÑÐÐÐÐÑÐÑ-ÐÐ-GNOME)"
+#: ../meld/meldapp.py:156
+msgid "Start with an empty window"
+msgstr "ÐÑÐÑÑÐÑÐÐÐ Ñ ÐÑÐÐÐÐ ÐÑÐÐÐÑÐÑ"
-#: ../glade2/meldapp.glade.h:2
-msgid "<b>Drawing Style</b>"
-msgstr "<b>ÐÑÐÐ ÐÐ ÑÐÑÑÐÐÐ</b>"
+#: ../meld/meldapp.py:157 ../meld/meldapp.py:158 ../meld/meldapp.py:160
+msgid "file"
+msgstr "ÑÐÐÐ"
-#: ../glade2/meldapp.glade.h:3
-msgid "<b>Edit Menu</b>"
-msgstr "<b>ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÑ</b>"
+#: ../meld/meldapp.py:157 ../meld/meldapp.py:159 ../meld/meldapp.py:160
+msgid "dir"
+msgstr "ÐÐÐÐÐ"
-#: ../glade2/meldapp.glade.h:4
-msgid "<b>Font</b>"
-msgstr "<b>ÐÑÐÑÑ</b>"
+#: ../meld/meldapp.py:157
+msgid "Start a version control comparison"
+msgstr "ÐÐÐÐ ÑÑÐÐÐÐÐÐÐ ÑÐÑÑÐÐ ÑÐÑÑÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐ"
-#: ../glade2/meldapp.glade.h:5
-msgid "<b>Loading</b>"
-msgstr "<b>ÐÐÑÐÐÐÐÐÐ</b>"
+#: ../meld/meldapp.py:158
+msgid "Start a 2- or 3-way file comparison"
+msgstr "ÐÐÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ 2 ÐÐÐ 3 ÑÐÐÐÐ"
-#: ../glade2/meldapp.glade.h:6
-msgid "<b>Misc</b>"
-msgstr "<b>ÐÐÐÐÐ</b>"
+#: ../meld/meldapp.py:159
+msgid "Start a 2- or 3-way directory comparison"
+msgstr "ÐÐÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ 2 ÐÐÐ 3 ÐÐÐÐÐ"
-#: ../glade2/meldapp.glade.h:7
-msgid "<b>Saving</b>"
-msgstr "<b>ÐÐÐÐÑ</b>"
+#: ../meld/meldapp.py:160
+msgid "Start a comparison between file and dir/file"
+msgstr "ÐÐÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐ Ð ÐÐÐÐÐ/ÑÐÐÐ"
-#: ../glade2/meldapp.glade.h:8
-msgid "<b>Toolbar Appearance</b>"
-msgstr "<b>ÐÐÐ ÐÐ ÐÐÐÑÐÑÐ Ñ ÐÐÑÑÑÑÐÐÐÑÐ</b>"
+#: ../meld/meldapp.py:166
+msgid "Meld is a file and directory comparison tool."
+msgstr "Meld Ð ÐÐÑÑÑÑÐÐÐÑ ÐÐ ÑÑÐÐÐÑÐÐÐÐ ÐÐ ÑÐÐÐÐÐÐ Ð ÐÐÐÐÐ."
-#: ../glade2/meldapp.glade.h:9
-msgid "<b>Whitespace</b>"
-msgstr "<b>ÐÑÐÐÐÐ ÐÐÐÑÐ</b>"
-
-#: ../glade2/meldapp.glade.h:10
-msgid "<span weight=\"bold\" size=\"x-large\">Compare</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">ÐÑÐÐÐÑÐÐÐÐ</span>"
-
-#: ../glade2/meldapp.glade.h:11
-msgid "<span weight=\"bold\" size=\"x-large\">Display</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">ÐÐÐÑÐÐÐÐÐÑÐÑ</span>"
-
-#: ../glade2/meldapp.glade.h:12
-msgid "<span weight=\"bold\" size=\"x-large\">Editor</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">ÐÐÐÐÐÑÐÑ</span>"
-
-#: ../glade2/meldapp.glade.h:13
-msgid "<span weight=\"bold\" size=\"x-large\">Encoding</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">ÐÐÐÐÑÐÐÐ</span>"
-
-#: ../glade2/meldapp.glade.h:14
-msgid "<span weight=\"bold\" size=\"x-large\">File Filters</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÐÐÐ</span>"
+#: ../meld/meldapp.py:169
+msgid "Set label to use instead of file name"
+msgstr "ÐÐÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐÑ, ÐÐÐÑÐ ÐÐ ÑÐ ÐÐÐÐÐÐ ÐÐÐÑÑÐ ÐÐÐ ÐÐ ÑÐÐÐ"
-#: ../glade2/meldapp.glade.h:15
-msgid "<span weight=\"bold\" size=\"x-large\">Text Filters</span>"
-msgstr "<span weight=\"bold\" size=\"x-large\">ÐÐÐÑÑÐ ÐÐ ÑÐÐÑÑ</span>"
+#: ../meld/meldapp.py:171
+msgid "Automatically compare all differing files on startup"
+msgstr ""
+"ÐÑÐ ÑÑÐÑÑÐÑÐÐÐ ÐÐÑÐÐÐÑÐÑÐÐ ÐÐ ÑÐ ÑÑÐÐÐÑÐÐÑ ÐÑÐÑÐÐ ÑÐÐÐÐÑÐÐÐÑÐ ÑÐ ÑÐÐÐÐÐÐ"
-#: ../glade2/meldapp.glade.h:16
-msgid "Automatically supply missing newline at end of file"
-msgstr "ÐÐÑÐÐÐÑÐÑÐÐ ÐÐÐÑÑÑÐÐÐÐ ÐÐ ÑÐÐÐ Ñ ÐÑÐÐÐÐ ÑÐÐ."
+#: ../meld/meldapp.py:173
+msgid "Ignored for compatibility"
+msgstr "ÐÐÐÐÑÐÑÐ ÑÐ ÐÐ ÑÑÐÐÐÑÑÐÐÐÑÑ"
-#: ../glade2/meldapp.glade.h:17
-msgid "Choose Files"
-msgstr "ÐÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐ"
+#: ../meld/meldapp.py:176
+msgid "Set the target file for saving a merge result"
+msgstr "ÐÐÐÐÐÐÐÐ ÐÑÐÐ ÐÐ ÑÐ ÐÐÐÐÑÐ ÑÐÐÑÐÑÐÑÑÑ ÐÑ ÑÐÐÐÐÐÐÑÐ"
-#: ../glade2/meldapp.glade.h:18
-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/meldapp.py:179
+msgid "Creates a diff tab for up to 3 supplied files or directories."
+msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÑÐÑ ÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ 3 ÐÐÐÐÐÐÐÐ ÑÐÐÐ."
-#: ../glade2/meldapp.glade.h:19
-msgid "Copyright (C) 2002-2006 Stephen Kennedy"
-msgstr "ÐÐÑÐÑÑÐÐ ÐÑÐÐÐ (C) 2002-2006 Stephen Kennedy"
+#: ../meld/meldapp.py:182
+#, python-format
+msgid "too many arguments (wanted 0-4, got %d)"
+msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐÐÐÐ ÐÑÐÑÐÐÐÑÐ (ÐÐÐÐÐÐÐÐÐ ÑÐ 0Ã4, Ð ÐÐ %d)"
-#: ../glade2/meldapp.glade.h:20
-msgid "Curved: Filled Curves"
-msgstr "ÐÑÐÐÐ: ÐÐÐÑÐÐÐÐÐ ÐÑÐÐÐ"
+#: ../meld/meldapp.py:184 ../meld/meldapp.py:188
+msgid "can't compare more than three directories"
+msgstr "ÐÐÐÑÐÐÐÐÐÐ Ð ÐÐ ÑÐ ÑÑÐÐÐÑÐÐÑ ÐÐÐÐÑÐ ÐÑ ÑÑÐ ÐÐÐÐÐ"
-#: ../glade2/meldapp.glade.h:21
-msgid "Custom command"
-msgstr "ÐÐÑÑÐÐÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐ"
+#: ../meld/melddoc.py:56 ../meld/melddoc.py:57
+msgid "untitled"
+msgstr "ÐÐÐÐÐÐÐÐÐ"
-#: ../glade2/meldapp.glade.h:22
-msgid "Directory"
-msgstr "ÐÐÐÐÐ"
+#: ../meld/meldwindow.py:125
+msgid "_File"
+msgstr "_ÐÐÐÐ"
-#: ../glade2/meldapp.glade.h:23
-msgid "Display"
-msgstr "ÐÐÐÑÐÐÐÐÐÑÐÑ"
+#: ../meld/meldwindow.py:126
+msgid "_New..."
+msgstr "_ÐÐÐÐâ"
-#: ../glade2/meldapp.glade.h:24
-msgid "Edit files with:"
-msgstr "ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐÑÐ Ñ:"
+#: ../meld/meldwindow.py:126
+msgid "Start a new comparison"
+msgstr "ÐÐÐÐ ÑÑÐÐÐÐÐÐÐ"
-#: ../glade2/meldapp.glade.h:25
-msgid "Editor"
-msgstr "ÐÐÐÐÐÑÐÑ"
+#: ../meld/meldwindow.py:127
+msgid "Save the current file"
+msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑ ÑÐÐÐ"
-#: ../glade2/meldapp.glade.h:26
-msgid "Encoding"
-msgstr "ÐÐÐÐÑÐÐÐ"
+#: ../meld/meldwindow.py:129
+msgid "Close the current file"
+msgstr "ÐÐÑÐÐÑÑÐÐ ÐÐ ÑÐÐÑÑÐÑ ÑÐÐÐ"
-#: ../glade2/meldapp.glade.h:27
-msgid "File Filters"
-msgstr "ÐÐÐÑÑÑ ÐÐ ÑÐÐÐÐÐÐ"
+#: ../meld/meldwindow.py:130
+msgid "Quit the program"
+msgstr "ÐÐÐÑÐÐÐ ÐÐ ÐÑÐÐÑÐÐÐÑÐ"
-#: ../glade2/meldapp.glade.h:28
-msgid "Gnome Default"
-msgstr "ÐÑÐÐÐÐÑÑÐÐÑÐ ÐÐÑÑÑÐÐÐÐ ÐÐ GNOME"
+#: ../meld/meldwindow.py:132
+msgid "_Edit"
+msgstr "_ÐÐÐÐÐÑÐÑÐÐÐ"
-#: ../glade2/meldapp.glade.h:29
-msgid "Gnome default editor"
-msgstr "ÐÑÐÐÐÐÑÑÐÐÑÑ ÑÐÐÐÐÑÐÑ ÐÐ GNOME"
+#: ../meld/meldwindow.py:133
+msgid "Undo the last action"
+msgstr "ÐÑÐÑÐÐ ÐÐ ÐÐÑÐÐÐÐÐÑÐ ÐÐÐÑÑÐÐÐ"
-#: ../glade2/meldapp.glade.h:30
-msgid "Icons Only"
-msgstr "ÐÐÐÐ ÐÐÐÐÐ"
+#: ../meld/meldwindow.py:134
+msgid "Redo the last undone action"
+msgstr "ÐÐÐÑÐÑÑÐÐ ÐÐ ÐÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐ"
-#: ../glade2/meldapp.glade.h:31
-msgid "Ignore changes in amount of white space"
-msgstr "ÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ Ð ÐÑÐÐÐÐÑÐ ÐÐÐÑÐ"
+#: ../meld/meldwindow.py:135
+msgid "Cut the selection"
+msgstr "ÐÑÑÑÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐ"
-#: ../glade2/meldapp.glade.h:32
-msgid ""
-"Ignore changes in case; consider upper and lower-case letters equivalent"
-msgstr ""
-"ÐÐÐÐÑÐÑÐÐÐ ÐÐ ÑÐÐÐÑÑÑÑÐ â ÐÐÐÐÐÐÑÐ Ð ÐÐÐÐÐÑÐ ÐÑÐÐÐ ÑÐ ÑÑÐÑÐÑ ÐÐ ÐÐÐÐÐÐÐÐÐÑÐÐ"
+#: ../meld/meldwindow.py:136
+msgid "Copy the selection"
+msgstr "ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐ"
-#: ../glade2/meldapp.glade.h:33
-msgid "Ignore changes that just insert or delete blank lines"
-msgstr "ÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐ Ð ÐÑÐÑ Ð ÐÐÐÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÐÑÐ ÑÐÐÐÐÐ"
+#: ../meld/meldwindow.py:137
+msgid "Paste the clipboard"
+msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐÐÐÐÑ ÐÑÑÐÑ"
-#: ../glade2/meldapp.glade.h:34
-msgid "Ignore changes which insert or delete blank lines"
-msgstr "ÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐ Ð ÐÑÐÑ Ð ÐÐÐÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÐÑÐ ÑÐÐÐÐÐ"
+#: ../meld/meldwindow.py:138
+msgid "Search for text"
+msgstr "ÐÑÑÑÐÐÐ ÐÐ ÑÐÐÑÑ"
-#: ../glade2/meldapp.glade.h:35
-msgid "Ignore symbolic links"
-msgstr "ÐÐÐÐÑÐÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐÐÑÐ ÐÑÑÐÐÐ"
+#: ../meld/meldwindow.py:139
+msgid "Find Ne_xt"
+msgstr "_ÐÐÐÐÐÐÑÐ ÐÐÑÐÐ"
-#: ../glade2/meldapp.glade.h:36
-msgid "Internal editor"
-msgstr "ÐÑÑÑÐÑÐÐ ÑÐÐÐÐÑÐÑ"
+#: ../meld/meldwindow.py:139
+msgid "Search forwards for the same text"
+msgstr "ÐÑÑÑÐÐÐ ÐÐÐÑÐÐ ÐÐ ÑÑÑÐÑ ÑÐÐÑÑ"
-#: ../glade2/meldapp.glade.h:37
-msgid "Line Wrapping "
-msgstr "ÐÑÐÐÐÑÑÐÐ ÐÐ ÑÐÐÐÐÐ"
+#: ../meld/meldwindow.py:140
+msgid "Find _Previous"
+msgstr "_ÐÑÐÐÐÑÐÐ ÐÐÑÐÐ"
-#: ../glade2/meldapp.glade.h:38
-msgid "Meld"
-msgstr "Meld"
+#: ../meld/meldwindow.py:140
+msgid "Search backwards for the same text"
+msgstr "ÐÑÑÑÐÐÐ ÐÐÐÐÐ ÐÐ ÑÑÑÐÑ ÑÐÐÑÑ"
-#: ../glade2/meldapp.glade.h:39
-msgid "Mine"
-msgstr "ÐÐÐ"
+#: ../meld/meldwindow.py:141
+msgid "Find and replace text"
+msgstr "ÐÑÑÑÐÐÐ Ð ÐÐÐÑÐÐ ÐÐ ÑÐÐÑÑ"
-#: ../glade2/meldapp.glade.h:40
-msgid "Original"
-msgstr "ÐÑÑÐÐÐÐÑÐÐÐÐ"
+#: ../meld/meldwindow.py:142
+msgid "Prefere_nces"
+msgstr "_ÐÐÑÑÑÐÐÐÐ"
-#: ../glade2/meldapp.glade.h:41
-msgid "Other"
-msgstr "ÐÑÐÐÐ"
+#: ../meld/meldwindow.py:142
+msgid "Configure the application"
+msgstr "ÐÐÑÑÑÐÐÐÐ ÐÐ ÐÑÐÐÑÐÐÐÑÐ"
-#: ../glade2/meldapp.glade.h:42
-msgid "Preferences : Meld"
-msgstr "ÐÐÑÑÑÐÐÐÐ: Meld"
+#: ../meld/meldwindow.py:144
+msgid "_Changes"
+msgstr "_ÐÐÐÐÐÐÐ"
-#: ../glade2/meldapp.glade.h:43
-msgid "Save in UTF-8 encoding"
-msgstr "ÐÐÐÐÑ Ð ÑÐÐÐÐÐÐÑÐ Ð ÐÐÐÐÑÐÐÐ UTF-8"
+#: ../meld/meldwindow.py:145
+msgid "Next change"
+msgstr "ÐÐÐÐÐÐÑÐ ÑÐÐÐÐÐÐ"
-#: ../glade2/meldapp.glade.h:44
-msgid "Save in the files original encoding"
-msgstr "ÐÐÐÐÑ ÐÐ ÑÐÐÐÐÐÐÑÐ Ð ÐÑÑÐÐÐÐÑÐÐÐÐÑÐ ÐÐÐÐÑÐÐÐ"
+#: ../meld/meldwindow.py:145
+msgid "Go to the next change"
+msgstr "ÐÑÐ ÑÐÐÐÐÐÑÐÑÐ ÑÐÐÐÐÐÐ"
-#: ../glade2/meldapp.glade.h:45
-msgid "Show line numbers"
-msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÑÐ ÐÐ ÑÐÐÐÐÐÑÐ"
+#: ../meld/meldwindow.py:146
+msgid "Previous change"
+msgstr "ÐÑÐÐÐÑÐÐ ÑÐÐÐÐÐÐ"
-#: ../glade2/meldapp.glade.h:46
-msgid "Simple: Lines only"
-msgstr "ÐÐÐÐÐÐ: ÑÐÐÐ ÐÐÐÐÐ"
+#: ../meld/meldwindow.py:146
+msgid "Go to the previous change"
+msgstr "ÐÑÐ ÐÑÐÐÐÑÐÐÑÐ ÑÐÐÐÐÐÐ"
-#: ../glade2/meldapp.glade.h:47
-msgid "Solid: Filled Quadilaterals"
-msgstr "ÐÐÐÑÐÐÐÐÐ: ÐÐÐÑÐÐÐÐÐ ÑÐÑÐÑÐÑÐÑÐÐÐÑÐ"
+#: ../meld/meldwindow.py:147
+msgid "Open externally"
+msgstr "ÐÑÐÐÑÑÐÐ Ñ ÐÑÐÑÐÐ ÐÑÐÐÑÐÐÐ"
-#: ../glade2/meldapp.glade.h:48
-msgid "Tab width"
-msgstr "ÐÐÑÐÐÐ ÐÐ ÑÐÐÑÐÐÑÐÑÐ"
+#: ../meld/meldwindow.py:147
+msgid "Open selected file or directory in the default external application"
+msgstr "ÐÑÐÐÑÑÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐÐ ÐÐÐ ÑÐÐÐ Ð ÑÑÐÐÐÐÑÑÐÐÑÐ ÐÑÐÑÐÐ ÐÑÐÐÑÐÐÐ"
-#: ../glade2/meldapp.glade.h:49
-msgid "Text Beside Icons"
-msgstr "ÐÐÐÑÑ ÐÐ ÐÐÐÐÐÑÐ"
+#: ../meld/meldwindow.py:149
+msgid "_View"
+msgstr "_ÐÐÐÐÐÐ"
-#: ../glade2/meldapp.glade.h:50
-msgid "Text Filters"
-msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÑÑ"
+#: ../meld/meldwindow.py:150
+msgid "File status"
+msgstr "ÐÑÑÑÐÑÐÐÐ ÐÐ ÑÐÐÐÐ"
-#: ../glade2/meldapp.glade.h:51
-msgid "Text Only"
-msgstr "ÐÐÐÐ ÑÐÐÑÑ"
+#: ../meld/meldwindow.py:151
+msgid "Version status"
+msgstr "ÐÑÑÑÐÑÐÐÐ ÐÐ ÐÐÑÑÐÑÑÐ"
-#: ../glade2/meldapp.glade.h:52
-msgid "Text Under Icons"
-msgstr "ÐÐÐÑÑ ÐÐÐ ÐÐÐÐÐÑÐ"
+#: ../meld/meldwindow.py:152
+msgid "File filters"
+msgstr "ÐÐÐÑÑÐ ÐÐ ÑÐÐÐÐÐÐ"
-#: ../glade2/meldapp.glade.h:53
-msgid "Three way directory"
-msgstr "ÐÑÐÐÐÑÐÐÐÐ ÐÐ 3 ÐÐÐÐÐ"
+#: ../meld/meldwindow.py:153
+msgid "Stop the current action"
+msgstr "ÐÐÐÑÐÐÐ ÐÐ ÑÐÐÑÑÐÑÐ ÐÐÐÑÑÐÐÐ"
-#: ../glade2/meldapp.glade.h:54
-msgid "Three way file"
-msgstr "ÐÑÐÐÐÑÐÐÐÐ ÐÐ 3 ÑÐÐÐÐ"
+#: ../meld/meldwindow.py:154
+msgid "Refresh the view"
+msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐÐÐ"
-#: ../glade2/meldapp.glade.h:55
-msgid "Two way directory"
-msgstr "ÐÑÐÐÐÑÐÐÐÐ ÐÐ 2 ÐÐÐÐÐ"
+#: ../meld/meldwindow.py:155
+msgid "Reload"
+msgstr "ÐÑÐÐÐÑÐÐÐÐÐÐ"
-#: ../glade2/meldapp.glade.h:56
-msgid "Two way file"
-msgstr "ÐÑÐÐÐÑÐÐÐÐ ÐÐ 2 ÑÐÐÐÐ"
+#: ../meld/meldwindow.py:155
+msgid "Reload the comparison"
+msgstr "ÐÑÐÐÐÑÐÐÐÐÐÐ ÐÐ ÑÑÐÐÐÐÐÐÐÑÐ"
-#: ../glade2/meldapp.glade.h:57
-msgid "Use GNOME monospace font"
-msgstr "ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÑÐÐÐÐ ÑÑÐÑÑ"
+#: ../meld/meldwindow.py:157
+msgid "_Tabs"
+msgstr "_ÐÐÐÐÑÐÐÐÑÑÐ"
-#: ../glade2/meldapp.glade.h:58
-msgid "Use custom font"
-msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑÑÐÐÐÑÐÐÑÐÐ ÑÑÐÑÑ"
+#: ../meld/meldwindow.py:158
+msgid "_Previous Tab"
+msgstr "_ÐÑÐÐÐÑeÐ ÐÐÐÐÑÐÐÐÑÐÑ"
-#: ../glade2/meldapp.glade.h:59
-msgid "Use syntax highlighting"
-msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐ ÐÑÐÐÑÑÐÐÐÐ ÐÐ ÑÐÐÑÐÐÑÐÑÐ"
+#: ../meld/meldwindow.py:158
+msgid "Activate previous tab"
+msgstr "ÐÐÐÑÑÐÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐÐÑ ÐÐÐÐÑÐÐÐÑÐÑ"
-#: ../glade2/meldapp.glade.h:60
-msgid "Version control view"
-msgstr "ÐÐÐÐÐÐ ÑÐÑÑÐÐ ÐÐÐÑÑÐÐÐ ÐÐ ÐÐÑÑÐÐÑÐ"
+#: ../meld/meldwindow.py:159
+msgid "_Next Tab"
+msgstr "_ÐÐÐÐÐÐÑ ÐÐÐÐÑÐÐÐÑÐÑ"
-#: ../glade2/meldapp.glade.h:61
-msgid "When loading, try these codecs in order. (e.g. utf8, iso8859)"
-msgstr ""
-"ÐÑÐ ÐÐÑÐÐÐÐÐÐ ÐÐ ÑÐÐÐ, ÐÐ ÑÐ ÐÑÐÐÐÐÑ ÐÐÐÐÑÐÐÐÑÑÐ Ð ÑÐÐÐ ÐÐÑÐÐÐÐÐÐÑÐÐÐÐÑÑ "
-"(ÐÐÐÑ.: utf8, iso8859)"
+#: ../meld/meldwindow.py:159
+msgid "Activate next tab"
+msgstr "ÐÐÐÑÑÐÑÐÐÐ ÐÐ ÑÐÐÐÐÐÑÐÑ ÐÐÐÐÑÐÐÐÑÐÑ"
-#: ../glade2/meldapp.glade.h:62
-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 ""
-"ÐÑÐ ÑÑÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐ ÐÑÐÐÐ ÑÐÐÐÐÐÐ Ð ÐÐÑÐÐÑÐÑÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÐÑÐÐÐÐÑ. "
-"ÐÑÐÐÐ ÑÐÐ Ð ÑÐÐÑÑÐ ÐÑ ÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÐÑÐ, ÑÐÐÐÐÐÐÐÐ Ñ ÐÐÑÐÑÐÐÐÐ."
+#: ../meld/meldwindow.py:160
+msgid "Move Tab _Left"
+msgstr "ÐÑÐÐÐÑÑÐÐÐÐ ÐÐ_ÐÑÐÐ"
-#: ../glade2/meldapp.glade.h:63
-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 ""
-"ÐÑÐ ÑÑÐÐÐÑÐÐÐÐ ÐÐ ÑÐÐÐÐÐÐ ÐÑÐÐÐ ÐÑÐÐÐÐÐ ÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÐÐÑÐÐÐÐÑ. ÐÑÐÐÐ "
-"ÑÐÐÐÐÐ ÑÑÐ Ð ÑÐÐÑÐÑÑÐÐ ÐÐÑÐÐ Ð ÐÐÐÐÐ ÐÐÑÐÐ, ÐÐÐÑÐ ÐÐÐÐÐÑ ÐÑÐÐÐ ÐÐÐÐÑÐÐÑ "
-"ÑÐÐÑÑ Ñ ÐÑÐÐÐÐ ÐÐÐ, ÐÑÐÐÐ ÐÐ ÑÐ ÐÐÐÑÑÑÐ ÑÑÐÐÐÑÐÐÐÐÑÐ. ÐÐÐ ÐÐÑÐÐÑÑ ÑÑÐÑÑÐÐ "
-"ÐÑÑÐÐ, ÑÐÐÐ ÐÑÑÐÐÑÐ ÑÐ ÐÐÐÐÐÑÑ. ÐÐÑÑÐÐÑÐ ÑÐ ÐÑÐ ÑÑÐÐÐÐÐÑÑÐÐÑÐ ÐÐ ÐÐÐÐÑÐ "
-"ÐÐÐÑÐÐÐÐÑÑÐ."
+#: ../meld/meldwindow.py:160
+msgid "Move current tab to left"
+msgstr "ÐÑÐÐÐÑÑÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑ ÐÑÐÐÐÑÐÑ ÐÐÐÑÐÐ"
-#: ../glade2/meldapp.glade.h:64
-msgid "Whitespace is significant"
-msgstr "ÐÑÐÐÐÐÑÐ ÐÐÐÑÐ ÐÐÐÑ ÐÐÐÑÐÐÐÐ"
+#: ../meld/meldwindow.py:161
+msgid "Move Tab _Right"
+msgstr "ÐÑÐÐÐÑÑÐÐÐÐ ÐÐ_ÐÑÑÐÐ"
-#: ../glade2/meldapp.glade.h:66
-msgid "_Directory Comparison"
-msgstr "ÐÑÐÐÐÑÐÐÐÐ ÐÐ _ÐÐÐÐÐ"
+#: ../meld/meldwindow.py:161
+msgid "Move current tab to right"
+msgstr "ÐÑÐÐÐÑÑÐÐÐÐ ÐÐ ÑÐÐÑÑÐÑ ÐÑÐÐÐÑÐÑ ÐÐÐÑÑÐÐ"
-#: ../glade2/meldapp.glade.h:67
-msgid "_File Comparison"
-msgstr "ÐÑÐÐÐÑÐÐÐÐ ÐÐ _ÑÐÐÐÐÐÐ"
+#: ../meld/meldwindow.py:163
+msgid "_Help"
+msgstr "ÐÐÐÐ_Ñ"
-#: ../glade2/meldapp.glade.h:68
-msgid "_Logo"
-msgstr "_ÐÐÐÐ"
+#: ../meld/meldwindow.py:164
+msgid "_Contents"
+msgstr "_ÐÑÐÑÑÐÐÐÐÐ"
-#: ../glade2/meldapp.glade.h:69
-msgid "_Three Way Compare"
-msgstr "_ÐÑÐÐÐÐ ÑÑÐÐÐÑÐÐÐÐ"
+#: ../meld/meldwindow.py:164
+msgid "Open the Meld manual"
+msgstr "ÐÑÐÐÑÑÐÐ ÐÐ ÑÑÐÐÐÐÐÑÑÐÐÑÐ ÐÐ Meld"
-#: ../glade2/meldapp.glade.h:70
-msgid "_Version Control Browser"
-msgstr "ÐÐÐÐÐÐÑÐÑ ÐÑÐ ÐÐÐÑÑÐÐÐ ÐÐ _ÐÐÑÑÐÐÑÐ"
+#: ../meld/meldwindow.py:165
+msgid "Report _Bug"
+msgstr "_ÐÐÐÐÐÐÐÐÐÐ ÐÐ ÐÑÐÑÐÐ"
-#: ../glade2/vcview.glade.h:1
-msgid "Commit Files"
-msgstr "ÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐ"
+#: ../meld/meldwindow.py:165
+msgid "Report a bug in Meld"
+msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐ ÐÑÐÑÐÐ Ð Meld"
-#: ../glade2/vcview.glade.h:2
-msgid "Compare Options"
-msgstr "ÐÐÑÑÑÐÐÐÐ ÐÐ ÑÑÐÐÐÑÐÐÐÐÑÐ"
+#: ../meld/meldwindow.py:166
+msgid "About this program"
+msgstr "ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÑÐÐÐ ÐÑÐÐÑÐÐÐ"
-#: ../glade2/vcview.glade.h:3
-msgid "Date"
-msgstr "ÐÐÑÐ"
+#: ../meld/meldwindow.py:169
+msgid "Full Screen"
+msgstr "ÐÐ ÑÑÐ ÐÐÑÐÐ"
-#: ../glade2/vcview.glade.h:4
-msgid "Local copy against other remote revision"
-msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐÐ ÑÐÑÑÐÐ ÑÐÐÐÐÑÐÐ ÐÐÑÑÐÑ Ð ÑÑÐÐÐÐÐÑÐÑÐ"
+#: ../meld/meldwindow.py:169
+msgid "View the comparison in full screen"
+msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐ ÑÑÐÐÐÐÐÐÐÑÐ ÐÐ ÑÑÐ ÐÐÑÐÐ"
-#: ../glade2/vcview.glade.h:5
-msgid "Local copy against same remote revision"
-msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐÐ ÑÐÑÑÐÐ ÑÑÑÐÑÐ ÐÐÑÑÐÑ Ð ÑÑÐÐÐÐÐÑÐÑÐ"
+#: ../meld/meldwindow.py:170
+msgid "_Toolbar"
+msgstr "ÐÐÐÑÐ Ñ _ÐÐÑÑÑÑÐÐÐÑÐ"
-#: ../glade2/vcview.glade.h:6
-msgid "Log Message"
-msgstr "ÐÑÐÐÑÐÐÐÐ Ð ÐÐÐÐÐÐÐÐ"
+#: ../meld/meldwindow.py:170
+msgid "Show or hide the toolbar"
+msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐ Ñ ÐÐÑÑÑÑÐÐÐÑÐ"
-#: ../glade2/vcview.glade.h:7
-msgid "Previous Logs"
-msgstr "ÐÑÐÐÐÑÐÐ ÑÑÐÐÑÐÐÐÑ"
+#: ../meld/meldwindow.py:171
+msgid "_Statusbar"
+msgstr "_ÐÐÐÑÐ ÐÐ ÑÑÑÑÐÑÐÐÐ"
-#: ../glade2/vcview.glade.h:8 ../vcview.py:185
-msgid "Tag"
-msgstr "ÐÑÐÐÐÑ"
+#: ../meld/meldwindow.py:171
+msgid "Show or hide the statusbar"
+msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐ ÐÐ ÑÑÑÑÐÑÐÐÐ"
-#: ../glade2/vcview.glade.h:9
-msgid "VC Log"
-msgstr "ÐÐÐÐÐÐÐ ÐÐ ÑÑÐÐÐÐÐÑÐÑÐ"
+#: ../meld/meldwindow.py:538
+msgid "Switch to this tab"
+msgstr "ÐÐÐÑÑÐÑÐÐÐ ÐÐ ÑÐÐÐ ÐÐÐÐÑÐÐÐÑÐÑ"
-#: ../meld:47
-#, c-format
-msgid "Meld requires %s or higher."
-msgstr "Meld ÐÐÐÑÐÐÐ %s ÐÐÐ ÐÐ-ÐÐÑÐÐÐ ÐÐÑÑÐÑ."
+#. exit at first non found directory + file
+#: ../meld/meldwindow.py:629
+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:150
+#: ../meld/preferences.py:37
msgid "label"
msgstr "ÐÑÐÐÐÑ"
-#: ../meldapp.py:151
+#: ../meld/preferences.py:37
msgid "pattern"
msgstr "ÑÐÐÐÐÐ"
-#. file filters
-#. text filters
-#: ../meldapp.py:252 ../meldapp.py:257 ../vcview.py:165
-msgid "Name"
-msgstr "ÐÐÐ"
-
-#: ../meldapp.py:252 ../meldapp.py:257
-msgid "Active"
-msgstr "ÐÐÐÑÑÐÐÑ"
-
-#: ../meldapp.py:252
-msgid "Pattern"
-msgstr "ÐÐÐÐÐÐ"
-
-#: ../meldapp.py:257
-msgid "Regex"
-msgstr "ÐÐÐÑÐÑÑÐÐ ÐÐÑÐÐ"
-
-#: ../meldapp.py:291
-msgid ""
-"Line numbers are only available if you have gnome-python-desktop installed."
-msgstr ""
-"ÐÐÐÐÑÐÑÐ ÐÐ ÑÐÐÐÐÐÑÐ ÑÐ ÐÐÐÑÐÐÐÐÐÑÐÑ, ÑÐÐÐ ÐÐÐ ÐÐÐÑÐ ÐÐÑÑÐÐÐÑÐÐ "
-"pygtksourceview."
-
-#: ../meldapp.py:295
-msgid ""
-"Syntax highlighting is only available if you have gnome-python-desktop "
-"installed."
-msgstr "ÐÐÐÑÐÐÑÐÑÑÑ ÑÐ ÐÑÐÐÑÑÐÐ, ÑÐÐÐ ÐÐÐ ÐÐÐÑÐ ÐÐÑÑÐÐÐÑÐÐ pygtksourceview."
-
-#: ../meldapp.py:383
-msgid "Close tab"
-msgstr "ÐÐÑÐÐÑÑÐÐ ÐÐ ÑÐÐÐ"
+#: ../meld/preferences.py:111
+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:234
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
-#: ../meldapp.py:446
+#: ../meld/preferences.py:236
msgid ""
-"Version Control\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-inventory RCS\n"
+"OS-specific metadata\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db "
+"Desktop.ini\n"
msgstr ""
-"ÐÐÐÑÑÐÐ ÐÐ ÐÐÑÑÐÐÑÐ\t1\tCVS .svn MT [{]arch[}] .arch-ids .arch-inventory "
-"RCS\n"
+"ÐÐÑÐÐÐÐÐÐ ÐÐ ÐÐ\t0\t.DS_Store ._* .Spotlight-V100 .Trashes Thumbs.db Desktop."
+"ini\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:448
+#: ../meld/preferences.py:238
+#, python-format
+msgid "Version Control\t1\t%s\n"
+msgstr "ÐÐÐÑÑÐÐ ÐÐ ÐÐÑÑÐÐÑÐ\t1\t%s\n"
+
+#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
+#: ../meld/preferences.py:240
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
-#: ../meldapp.py:450
+#: ../meld/preferences.py:242
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
-#: ../meldapp.py:452
+#: ../meld/preferences.py:244
msgid "CVS keywords\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
msgstr "ÐÐÑÑÐÐÐ ÐÑÐÐ ÐÐ CVS\t0\t\\$\\w+(:[^\\n$]+)?\\$\n"
#. TRANSLATORS: translate this string ONLY to the first "\t", leave it and the following parts intact
-#: ../meldapp.py:454
+#: ../meld/preferences.py:246
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:248
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:250
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:252
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:254
msgid "Script comment\t0\t#.*"
msgstr "ÐÐÐÐÐÑÐÑ Ð ÑÐÑÐÐÑ\t0\t#.*"
-#: ../meldapp.py:532
-msgid "_New..."
-msgstr "_ÐÐÐÐâ"
-
-#: ../meldapp.py:532
-msgid "Start a new comparison"
-msgstr "ÐÐÐÐ ÑÑÐÐÐÐÐÐÐ"
-
-#: ../meldapp.py:535
-msgid "Close the current file"
-msgstr "ÐÐÑÐÐÑÑÐÐ ÐÐ ÑÐÐÑÑÐÑ ÑÐÐÐ"
-
-#: ../meldapp.py:536
-msgid "Quit the program"
-msgstr "ÐÐÐÑÐÐÐ ÐÐ ÐÑÐÐÑÐÐÐÑÐ"
-
-#: ../meldapp.py:539
-msgid "Undo the last action"
-msgstr "ÐÑÐÑÐÐ ÐÐ ÐÐÑÐÐÐÐÐÑÐ ÐÐÐÑÑÐÐÐ"
-
-#: ../meldapp.py:540
-msgid "Redo the last undone action"
-msgstr "ÐÐÐÑÐÑÑÐÐ ÐÐ ÐÐÑÐÐÐÐÐÑÐ ÐÑÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐ"
-
-#: ../meldapp.py:544
-msgid "Search for text"
-msgstr "ÐÑÑÑÐÐÐ ÐÐ ÑÐÐÑÑ"
-
-#: ../meldapp.py:545
-msgid "Find Ne_xt"
-msgstr "_ÐÐÐÐÐÐÑÐ ÐÐÑÐÐ"
-
-#: ../meldapp.py:545
-msgid "Search forwards for the same text"
-msgstr "ÐÑÑÑÐÐÐ ÐÐÐÑÐÐ ÐÐ ÑÑÑÐÑ ÑÐÐÑÑ"
-
-#: ../meldapp.py:546
-msgid "Go to the next difference"
-msgstr "ÐÑÐ ÑÐÐÐÐÐÑÐÑÐ ÑÐÐÐÐÐÐ"
-
-#: ../meldapp.py:547
-msgid "Go to the previous difference"
-msgstr "ÐÑÐ ÐÑÐÐÐÑÐÐÑÐ ÑÐÐÐÐÐÐ"
-
-#: ../meldapp.py:548
-msgid "Configure the application"
-msgstr "ÐÐÑÑÑÐÐÐÐ ÐÐ ÐÑÐÐÑÐÐÐÑÐ"
-
-#: ../meldapp.py:551
-msgid "Stop the current action"
-msgstr "ÐÐÐÑÐÐÐ ÐÐ ÑÐÐÑÑÐÑÐ ÐÐÐÑÑÐÐÐ"
-
-#: ../meldapp.py:552
-msgid "Refresh the view"
-msgstr "ÐÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐÐÐ"
-
-#: ../meldapp.py:553
-msgid "Reload"
-msgstr "ÐÑÐÐÐÑÐÐÐÐÐÐ"
-
-#: ../meldapp.py:553
-msgid "Reload the comparison"
-msgstr "ÐÑÐÐÐÑÐÐÐÐÐÐ ÐÐ ÑÑÐÐÐÐÐÐÐÑÐ"
-
-#: ../meldapp.py:556
-msgid "_Contents"
-msgstr "_ÐÑÐÑÑÐÐÐÐÐ"
-
-#: ../meldapp.py:556
-msgid "Open the Meld manual"
-msgstr "ÐÑÐÐÑÑÐÐ ÐÐ ÑÑÐÐÐÐÐÑÑÐÐÑÐ ÐÐ Meld"
-
-#: ../meldapp.py:557
-msgid "Report _Bug"
-msgstr "_ÐÐÐÐÐÐÐÐÐÐ ÐÐ ÐÑÐÑÐÐ"
+#: ../meld/vcview.py:128
+msgid "Co_mmit"
+msgstr "ÐÐ_ÐÐÐÐÐÐ"
-#: ../meldapp.py:557
-msgid "Report a bug in Meld"
-msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐ ÐÑÐÑÐÐ Ð Meld"
-
-#: ../meldapp.py:558
-msgid "Mailing _List"
-msgstr "_ÐÐÑÐÐÑÐÐ ÑÐÐÑÑÐ"
-
-#: ../meldapp.py:558
-msgid "Go to the Meld mailing list"
-msgstr "ÐÑÐ ÐÐÑÐÐÑÐÐÑ ÑÐÐÑÑÐ ÐÐ Meld"
-
-#: ../meldapp.py:559
-msgid "About this program"
-msgstr "ÐÐÑÐÑÐÐÑÐÑ ÐÐ ÑÐÐÐ ÐÑÐÐÑÐÐÐ"
-
-#: ../meldapp.py:821
-msgid "Cannot compare a mixture of files and directories.\n"
-msgstr "ÐÐÐÑÐÐÐÐÐÐ Ð ÐÐ ÑÐ ÑÑÐÐÐÑÐÐÑ ÑÐÐÐÐÐÐ Ñ ÐÐÐÐÐ.\n"
-
-#. ###############################################################################
-#.
-#. usage
-#.
-#. ###############################################################################
-#: ../meldapp.py:869
-#, python-format
-msgid ""
-"Meld %s\n"
-"Written by Stephen Kennedy <stevek gnome org>"
-msgstr ""
-"Meld %s\n"
-"ÐÐÐÐÑÐÐ ÐÑ Stephen Kennedy <stevek gnome org>"
-
-#: ../meldapp.py:898
-msgid "Set label to use instead of file name"
-msgstr "ÐÐÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐÑ, ÐÐÐÑÐ ÐÐ ÑÐ ÐÐÐÐÐÐ ÐÐÐÑÑÐ ÐÐÐ ÐÐ ÑÐÐÐ"
-
-#: ../meldapp.py:899 ../meldapp.py:900 ../meldapp.py:901 ../meldapp.py:902
-msgid "Ignored for compatibility"
-msgstr "ÐÐÐÐÑÐÑÐ ÑÐ ÐÐ ÑÑÐÐÐÑÑÐÐÐÑÑ"
-
-#: ../meldapp.py:930
-#, python-format
-msgid "Wrong number of arguments (Got %i)"
-msgstr "ÐÑÐÑÐÐ ÐÑÐÐ ÐÑÐÑÐÐÐÑÐ (ÐÐÐÑÑÐÐÐ ÑÐ %i)"
-
-#: ../melddoc.py:46
-msgid "untitled"
-msgstr "ÐÐÐÐÐÐÐÐÐ"
-
-#. no common path. empty names get changed to "[None]"
-#: ../misc.py:121
-msgid "[None]"
-msgstr "[ÐÐÐÑÐÐ]"
-
-#: ../vcview.py:121
-msgid "_Edit"
-msgstr "_ÐÐÐÐÐÑÐÑÐÐÐ"
-
-#: ../vcview.py:121
-msgid "Edit files"
-msgstr "ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐÑÐ"
-
-#: ../vcview.py:122
-msgid "_Commit"
-msgstr "_ÐÐÐÐÐÐÐÐ"
-
-#: ../vcview.py:122
+#: ../meld/vcview.py:128
msgid "Commit"
msgstr "ÐÐÐÐÐÐÐÐ"
-#. FIXME: popup used to use gtk.STOCK_GO_BACK
-#: ../vcview.py:123
+#: ../meld/vcview.py:129
msgid "_Update"
msgstr "_ÐÐÐÐÐÑÐÐÐÐ"
-#: ../vcview.py:123
+#: ../meld/vcview.py:129
msgid "Update"
msgstr "ÐÐÐÐÐÑÐÐÐÐ"
-#. FIXME: popup used to use gtk.STOCK_GO_FORWARD
-#: ../vcview.py:124
-msgid "_Add"
-msgstr "_ÐÐÐÐÐÑÐÐ"
-
-#: ../vcview.py:124
+#: ../meld/vcview.py:130
msgid "Add to VC"
msgstr "ÐÐÐÐÐÑÐÐ ÐÑÐ ÐÐÐÑÑÐÐÐ"
-#. FIXME: popup used to use gtk.STOCK_ADD
-#: ../vcview.py:125
+#: ../meld/vcview.py:131
msgid "Add _Binary"
msgstr "ÐÐÐÐÐÑÐÐ ÐÐ Ð_ÐÐÐÑÐÐ"
-#: ../vcview.py:125
+#: ../meld/vcview.py:131
msgid "Add binary to VC"
msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐÐÑÐÐ ÐÑÐ ÐÐÐÑÑÐÐÐ"
-#. FIXME: stock is inconsistent with other VC actions
-#: ../vcview.py:126
-msgid "_Remove"
-msgstr "_ÐÑÐÐÐÑÐÐÐÐ"
-
-#: ../vcview.py:126
+#: ../meld/vcview.py:132
msgid "Remove from VC"
msgstr "ÐÑÐÐÐÑÐÐÐÐ ÐÑ ÐÐÐÑÑÐÐ"
-#. FIXME: popup used to use gtk.STOCK_REMOVE
-#: ../vcview.py:127
+#: ../meld/vcview.py:133
+msgid "_Resolved"
+msgstr "_ÐÐÐÑÐÑÐÐ"
+
+#: ../meld/vcview.py:133
+msgid "Mark as resolved for VC"
+msgstr "ÐÑÐÐÐÑÐÐÐÐÐ ÐÐÑÐ ÑÐÐÑÐÑÐÐ ÑÐÑÑÐÐ ÐÐÐÑÑÐÐÐ ÐÐ ÐÐÑÑÐÐÑÐ"
+
+#: ../meld/vcview.py:134
msgid "Revert to original"
msgstr "ÐÑÑÑÐÐÐ ÐÑÐ ÐÑÐÐÐÐÐÐÐ"
-#: ../vcview.py:128
+#: ../meld/vcview.py:135
msgid "Delete locally"
msgstr "ÐÐÐÐÐÐÐ ÐÐÑÑÐÐÐÐÐ"
-#: ../vcview.py:132
+#: ../meld/vcview.py:139
msgid "_Flatten"
msgstr "_ÐÐÐ ÐÐÑÐÑÑÐÑ"
-#: ../vcview.py:132
+#: ../meld/vcview.py:139
msgid "Flatten directories"
msgstr "ÐÑÐÐÑÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑÐ ÐÐÑÐ ÐÐÐÐ"
-#: ../vcview.py:133
+#: ../meld/vcview.py:140
msgid "_Modified"
msgstr "_ÐÑÐÐÐÐÐÐÐ"
-#: ../vcview.py:134
+#: ../meld/vcview.py:141
msgid "_Normal"
msgstr "_ÐÐÑÐÐÐÐÐ"
-#: ../vcview.py:134
+#: ../meld/vcview.py:141
msgid "Show normal"
msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐÐÐÐÑÐ"
-#: ../vcview.py:135
+#: ../meld/vcview.py:142
msgid "Non _VC"
msgstr "ÐÐÐÑÐ _ÐÐÐÑÑÐÐ"
-#: ../vcview.py:135
+#: ../meld/vcview.py:142
msgid "Show unversioned files"
msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÑÐÐÐÑÐÐÐÑÐ ÑÐÐÐÐÐÐ"
-#: ../vcview.py:136
+#: ../meld/vcview.py:143
msgid "Ignored"
msgstr "ÐÐÐÐÑÐÑÐÐÐ"
-#: ../vcview.py:136
+#: ../meld/vcview.py:143
msgid "Show ignored files"
msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐ ÑÐÐÐÐÐÐ"
-#: ../vcview.py:182
+#: ../meld/vcview.py:186 ../meld/vcview.py:318
msgid "Location"
msgstr "ÐÐÑÑÐÐÐÐÐÐÐÐÐÐ"
-#: ../vcview.py:183
+#: ../meld/vcview.py:187
msgid "Status"
msgstr "ÐÑÑÑÐÑÐÐÐ"
-#: ../vcview.py:184
+#: ../meld/vcview.py:188
msgid "Rev"
msgstr "ÐÐÐÐÐÐÑ"
-#: ../vcview.py:186
+#: ../meld/vcview.py:189
+msgid "Tag"
+msgstr "ÐÑÐÐÐÑ"
+
+#: ../meld/vcview.py:190
msgid "Options"
msgstr "ÐÐÑÑÑÐÐÐÐ"
-#: ../vcview.py:269
+#: ../meld/vcview.py:249
+msgid "Choose one Version Control"
+msgstr "ÐÐÐÐÑ ÐÐ ÐÐÐÑÑÐÐ ÐÐ ÐÐÑÑÐÐÑÐ"
+
+#: ../meld/vcview.py:250
+msgid "Only one Version Control in this directory"
+msgstr "ÐÐÐÐ ÐÐÐÐ ÐÐÐ ÐÐÐÑÑÐÐ ÐÐ ÐÐÑÑÐÐÑÐ Ð ÑÐÐÐ ÐÐÐÐÐ"
+
+#. TRANSLATORS: this is an error message when a version control
+#. application isn't installed or can't be found
+#: ../meld/vcview.py:263
+#, python-format
+msgid "%s Not Installed"
+msgstr "%s ÐÐ Ð ÐÐÑÑÐÐÐÑÐÐ"
+
+#. TRANSLATORS: this is an error message when a version
+#. controlled repository is invalid or corrupted
+#: ../meld/vcview.py:267
+msgid "Invalid Repository"
+msgstr "ÐÑÑÐÐÐÐ ÑÑÐÐÐÐÐÑÐ"
+
+#: ../meld/vcview.py:276
+#, python-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#. TRANSLATORS: This is the location of the directory the user is diffing
+#: ../meld/vcview.py:318
+#, python-format
+msgid "%s: %s"
+msgstr "%s: %s"
+
+#: ../meld/vcview.py:362
msgid "(Empty)"
msgstr "(ÐÑÐÐÐÐ)"
-#: ../vcview.py:306
+#: ../meld/vcview.py:400
#, python-format
msgid "[%s] Fetching differences"
msgstr "[%s] ÐÐÐÐÐÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐÑÐ"
-#: ../vcview.py:313
+#: ../meld/vcview.py:408
#, python-format
msgid "[%s] Applying patch"
msgstr "[%s] ÐÑÐÐÐÐÐÐÐ ÐÐ ÐÑÑÐÐÐ"
-#: ../vcview.py:317
-msgid "No differences found."
-msgstr "ÐÑÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÐÐÐÐ"
-
-#: ../vcview.py:394
+#: ../meld/vcview.py:501
msgid "Select some files first."
msgstr "ÐÑÑÐÐ ÐÐÐÐÑÐÑÐ ÑÐÐÐÐÐÐ."
-#: ../vcview.py:461
-msgid "Invoking patch failed, you need GNU patch."
+#: ../meld/vcview.py:574
+#, 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 ""
-"ÐÐÑÑÐÐÑÐÐ ÑÑÐÑÑÐÑÐÐÐ ÐÐ patch. ÐÐÐÐÑÐÐÐÐÐ ÐÐ Ð ÐÐÑÑÐÑÑÐ ÐÐ ÐÑÐÐÐÑÐ GNU."
+"\n"
+" ÐÐÑÑÐÐÑÐÐ ÑÑÐÑÑÐÑÐÐÐ ÐÐ ÐÑÐÐÑÐÐÐÑÐ âpatchâ.\n"
+" \n"
+" ÐÑÐÐÐÐÐÐ Ð ÐÑÐÐÑÐÐÐÑÐ âGNU patchâ ÐÐ ÐÐ Ð\n"
+" ÐÐÑÑÐÐÐÑÐÐÐ ÐÐÐ ÐÐÑÑÐÑÑÐ ÐÑÐ ÐÐÑ ÐÐ %s ÐÐ\n"
+" ÐÐ Ð ÑÐÑÑÐÐÐÐ.\n"
+" \n"
+" ÐÐÐÑ, ÐÐÐÑÐÑÐÑÐ ÐÐÐÐÐÐ ÐÐ ÐÑÐÑÐÐ ÐÐ:\n"
+" meld-list gnome org\n"
+" \n"
+" ÐÐÐÑÑÐÑÐ ÑÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑÐÑ:\n"
+" \n"
+" - ÐÐÑÑÐÑ ÐÐ meld: â%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: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:40
+#: ../meld/vc/_vc.py:40
msgid ""
-"Ignored:Unversioned:::Error::Newly added:Modified:<b>Conflict</b>:Removed:"
-"Missing"
+"Ignored:Unversioned:::Error::Newly added:Modified:Conflict:Removed:Missing"
msgstr ""
-"ÐÐÐÐÑÐÑÐÐ:ÐÐÐÐÐÑÑÐÐÐÑÐÐ:::ÐÑÐÑÐÐ::ÐÐÐÐÐÐÐÐÐÐÐ:ÐÑÐÐÐÐÐÐ:<b>Ð ÐÐÐÑÐÐÐÑ</b>:"
-"ÐÐÑÑÐÑ:ÐÐÐÑÐÐÑ"
+"ÐÐÐÐÑÐÑÐÐ:ÐÐÐÐÐÑÑÐÐÐÑÐÐ:::ÐÑÐÑÐÐ::ÐÐÐÐÐÐÐÐÐÐÐ:ÐÑÐÐÐÐÐÐ:Ð ÐÐÐÑÐÐÐÑ:ÐÐÑÑÐÑ:"
+"ÐÐÐÑÐÐÑ"
-#: ../vc/cvs.py:155
+#: ../meld/vc/cvs.py:163
#, python-format
msgid ""
"Error converting to a regular expression\n"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
