X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Translations%2FWinMerge%2FRussian.po;h=82ae97213348defda4a20d715bdad138f9d7bf82;hb=40b4ad8721bdf3d8d13eca5b72f595385dc99692;hp=9f2d073a221faaedc4e23426718de963a24fe9eb;hpb=edf8c69af547356e231580e8f9c496a5bbd9138f;p=winmerge-jp%2Fwinmerge-jp.git
diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index 9f2d073a2..82ae97213 100644
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -1,22 +1,19 @@
-# This file is part from WinMerge
+# This file is part from WinMerge
# Released under the "GNU General Public License"
#
# Translators:
-# * wvxwxvw
+# * wvxwxvw
# * Dmitriy Rublev
# * Valerij Romanovskij
# * Dmitriy S. Aleshkowskiy
# * geek2k
#
-# ID line follows -- this is updated by SVN
-# $Id: Russian.po 7582 2013-01-13 04:54:26Z christianlist $
-#
msgid ""
msgstr ""
"Project-Id-Version: WinMerge\n"
"Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2020-07-28 01:00+0300\n"
+"POT-Creation-Date: 2021-04-20 22:26+0000\n"
+"PO-Revision-Date: 2021-04-29 00:00+0000\n"
"Last-Translator: wvxwxvw\n"
"Language-Team: Russian \n"
"MIME-Version: 1.0\n"
@@ -43,8 +40,23 @@ msgstr "ÐопиÑоваÑÑ Ñлева"
msgid "Copy fro&m Right"
msgstr "ÐопиÑоваÑÑ ÑпÑава"
-msgid "&Select Line Difference"
-msgstr "&ÐÑбÑаÑÑ Ð¾ÑлиÑие"
+msgid "Copy Selected Line(s) to Right"
+msgstr "ÐопиÑоваÑÑ Ð²ÑбÑаннÑе ÑÑÑоки впÑаво"
+
+msgid "Copy Selected Line(s) to Left"
+msgstr "ÐопиÑоваÑÑ Ð²ÑбÑаннÑе ÑÑÑоки влево"
+
+msgid "Copy Selected Line(s) from Left"
+msgstr "ÐопиÑоваÑÑ Ð²ÑбÑаннÑе ÑÑÑоки Ñлева"
+
+msgid "Copy Selected Line(s) from Right"
+msgstr "ÐопиÑоваÑÑ Ð²ÑбÑаннÑе ÑÑÑоки ÑпÑава"
+
+msgid "&Select Line Difference\tF4"
+msgstr "&ÐÑбÑаÑÑ Ð¾ÑлиÑие\tF4"
+
+msgid "Add this change to Substitution &Filters"
+msgstr "ÐобавиÑÑ ÑÑо изменение в &ÑилÑÑÑÑ Ð·Ð°Ð¼ÐµÐ½Ñ"
msgid "&Undo"
msgstr "&ÐÑмениÑÑ"
@@ -61,21 +73,30 @@ msgstr "&ÐопиÑоваÑÑ"
msgid "&Paste"
msgstr "&ÐÑÑавиÑÑ"
-msgid "&Goto..."
-msgstr "ÐеÑейÑи к..."
+msgid "&Go to...\tCtrl+G"
+msgstr "ÐеÑейÑи к...\tCtrl+G"
+
+msgid "Go to Moved Line Between Left and Middle\tCtrl+Shift+G"
+msgstr "ÐеÑейÑи к пеÑемеÑенной Ð¼ÐµÐ¶Ð´Ñ Ð»ÐµÐ²Ð¾Ð¹ и ÑÑедней\tCtrl+Shift+G"
+
+msgid "Go to Moved Line Between Middle and Right\tCtrl+Alt+G"
+msgstr "ÐеÑейÑи к пеÑемеÑенной Ð¼ÐµÐ¶Ð´Ñ ÑÑедней и пÑавой\tCtrl+Alt+G"
msgid "Op&en"
msgstr "ÐÑ&кÑÑÑÑ"
-msgid "with &Registered Application"
+msgid "With &Registered Application"
msgstr "СвÑзанной пÑогÑаммой"
-msgid "with &External Editor\tCtrl+Alt+E"
+msgid "With &External Editor\tCtrl+Alt+E"
msgstr "ÐнеÑним ÑедакÑоÑом\tCtrl+Alt+E"
-msgid "&with..."
+msgid "&With..."
msgstr "С помоÑÑÑ..."
+msgid "Open &Parent Folder..."
+msgstr "ÐÑкÑÑÑÑ &ÑодиÑелÑÑкÑÑ Ð¿Ð°Ð¿ÐºÑ..."
+
msgid "S&hell Menu"
msgstr "ÐÐµÐ½Ñ Ð¾Ð±Ð¾Ð»Ð¾Ñки"
@@ -150,17 +171,35 @@ msgstr "ÐеÑÑикалÑное ÑÑиÑание"
msgid "&Horizontal Wipe"
msgstr "ÐоÑизонÑалÑное ÑÑиÑание"
+msgid "&Rectangle Select"
+msgstr "&ÐÑÑмоÑголÑнÑй вÑбоÑ"
+
msgid "&Set Background Color"
msgstr "Ð¦Ð²ÐµÑ Ñона"
msgid "&Vector Image Scaling"
msgstr "&ÐаÑÑÑаб изобÑажений"
+msgid "Compare Extracted &Text From Image"
+msgstr "СÑавниÑÑ Ð¸Ð·Ð²Ð»ÐµÑеннÑй из изобÑÐ°Ð¶ÐµÐ½Ð¸Ñ ÑекÑÑ"
+
msgid "&File"
msgstr "&Файл"
-msgid "&New\tCtrl+N"
-msgstr "СоздаÑÑ\tCtrl+N"
+msgid "&New"
+msgstr "СоздаÑÑ"
+
+msgid "&Text"
+msgstr "ТекÑÑ"
+
+msgid "T&able"
+msgstr "ТаблиÑа"
+
+msgid "&Binary"
+msgstr "ÐвоиÑнÑй"
+
+msgid "&Image"
+msgstr "ÐзобÑажение"
msgid "New (&3 panes)"
msgstr "СоздаÑÑ (&3 панели)"
@@ -186,8 +225,8 @@ msgstr "Ðедавние ÑÐ°Ð¹Ð»Ñ Ð¸ папки"
msgid "< Empty >"
msgstr "< ÐÐµÑ >"
-msgid "E&xit"
-msgstr "Ð&ÑÑ
од"
+msgid "E&xit\tCtrl+Q"
+msgstr "Ð&ÑÑ
од\tCtrl+Q"
msgid "&Edit"
msgstr "&ÐÑавка"
@@ -229,7 +268,7 @@ msgid "&Plugins"
msgstr "ÐлагинÑ"
msgid "P&lugin Settings..."
-msgstr "ÐаÑÑÑойки плагинов"
+msgstr "ÐаÑÑÑойки плагинов..."
msgid "Ma&nual Prediffer"
msgstr "Ð ÑÑное пÑедÑÑавнение"
@@ -249,11 +288,11 @@ msgstr "&ÐеÑезагÑÑзиÑÑ Ð¿Ð»Ð°Ð³Ð¸Ð½Ñ"
msgid "&Window"
msgstr "&Ðкно"
-msgid "Cl&ose"
-msgstr "ÐакÑÑÑÑ"
+msgid "Cl&ose\tCtrl+W"
+msgstr "&ÐакÑÑÑÑ\tCtrl+W"
msgid "Clo&se All"
-msgstr "ÐакÑÑÑÑ Ð²Ñе"
+msgstr "ÐакÑÑÑ&Ñ Ð²Ñе"
msgid "Change &Pane\tF6"
msgstr "СмениÑÑ Ð¿Ð°Ð½ÐµÐ»Ñ\tF6"
@@ -300,7 +339,7 @@ msgstr "СеÑедина ÑолÑко Ð´Ð»Ñ ÑÑениÑ"
msgid "Ri&ght Read-only"
msgstr "С&пÑава ÑолÑко Ð´Ð»Ñ ÑÑениÑ"
-msgid "File En&coding..."
+msgid "&File Encoding..."
msgstr "ÐодиÑовка Ñайла..."
msgid "Select &All\tCtrl+A"
@@ -363,16 +402,25 @@ msgstr "С&веÑнÑÑÑ Ð¿Ð¾Ð´Ð¿Ð°Ð¿ÐºÐ¸"
msgid "Select &Font..."
msgstr "ÐÑбÑаÑÑ &ÑÑиÑÑ..."
-msgid "Use Default F&ont"
+msgid "Use Default Font"
msgstr "ШÑиÑÑ Ð¿Ð¾ &ÑмолÑаниÑ"
msgid "Sw&ap Panes"
msgstr "ÐоменÑÑÑ Ð¿Ð°Ð½ÐµÐ»Ð¸ меÑÑами"
-msgid "Compa&re Statistics"
-msgstr "СÑаÑиÑÑика ÑÑавнениÑ"
+msgid "Swap &1st | 2nd"
+msgstr "ÐоменÑÑÑ &1-й | 2-й"
+
+msgid "Swap &2nd | 3rd"
+msgstr "ÐоменÑÑÑ &2-й | 3-й"
-msgid "Refre&sh\tF5"
+msgid "Swap 1st | &3rd"
+msgstr "ÐоменÑÑÑ 1-й | &3-й"
+
+msgid "Com&pare Statistics..."
+msgstr "СÑаÑиÑÑика ÑÑавнениÑ..."
+
+msgid "Refresh\tF5"
msgstr "&ÐбновиÑÑ\tF5"
msgid "&Refresh Selected\tCtrl+F5"
@@ -444,8 +492,8 @@ msgstr "СоÑ
ÑаниÑÑ Ð¿Ð¾ÑеÑедине как..."
msgid "Save &Right As..."
msgstr "СоÑ
ÑаниÑÑ ÑпÑава как..."
-msgid "&Print..."
-msgstr "&ÐеÑаÑÑ..."
+msgid "&Print...\tCtrl+P"
+msgstr "&ÐеÑаÑÑ...\tCtrl+P"
msgid "Page Set&up..."
msgstr "ÐаÑамеÑÑÑ ÑÑÑаниÑÑ..."
@@ -456,32 +504,17 @@ msgstr "ÐÑедпÑоÑмоÑÑ..."
msgid "&Convert Line Endings to"
msgstr "&ÐамениÑÑ ÐºÐ¾Ð½ÑÑ ÑÑÑок на"
-msgid "&Merge Mode\tF9"
+msgid "Mer&ge Mode\tF9"
msgstr "Режим обÑединениÑ\tF9"
msgid "Re&load\tCtrl+F5"
msgstr "ÐбновиÑÑ\tCtrl+F5"
-msgid "&File Encoding..."
-msgstr "ÐодиÑовка Ñайла..."
-
-msgid "Recompare As"
+msgid "Reco&mpare As"
msgstr "ÐеÑеÑÑавниÑÑ ÐºÐ°Ðº"
-msgid "&Text"
-msgstr "ТекÑÑ"
-
-msgid "&Table"
-msgstr "ТаблиÑа"
-
msgid "&XML"
-msgstr "&XML"
-
-msgid "&Binary"
-msgstr "ÐвоиÑнÑй"
-
-msgid "&Image"
-msgstr "ÐзобÑажение"
+msgstr ""
msgid "&Undo\tCtrl+Z"
msgstr "&ÐÑмениÑÑ\tCtrl+Z"
@@ -531,9 +564,6 @@ msgstr "&ÐÑедÑдÑÑÐ°Ñ Ð·Ð°ÐºÐ»Ð°Ð´ÐºÐ°\tShift+F2"
msgid "&Clear All Bookmarks"
msgstr "&УдалиÑÑ Ð²Ñе закладки"
-msgid "&Go To...\tCtrl+G"
-msgstr "ÐеÑейÑи к...\tCtrl+G"
-
msgid "Syntax Highlight"
msgstr "ÐодÑвеÑка ÑинÑакÑиÑа"
@@ -564,12 +594,18 @@ msgstr "&9 ÑÑÑок"
msgid "&Toggle All and 0-9 Lines\tCtrl+D"
msgstr "ÐеÑеклÑÑиÑÑ Ð²Ñе и 0-9 ÑÑÑок\tCtrl+D"
+msgid "&Invert (Hide Different Lines)"
+msgstr "ÐнвеÑÑиÑоваÑÑ (ÑкÑÑÑÑ Ð¾ÑлиÑнÑе ÑÑÑоки)"
+
msgid "&Lock Panes"
msgstr "ÐаблокиÑоваÑÑ Ð¿Ð°Ð½ÐµÐ»Ð¸"
msgid "&View Whitespace"
msgstr "ÐоказÑ&ваÑÑ Ð½ÐµÐ²Ð¸Ð´Ð¸Ð¼Ñе"
+msgid "View E&OL"
+msgstr "ÐоказÑваÑÑ EOL"
+
msgid "Vie&w Line Differences"
msgstr "ÐоказÑваÑÑ Ð¾ÑлиÑÐ¸Ñ ÑÑÑок"
@@ -759,11 +795,8 @@ msgstr "&СкÑÑÑÑ"
msgid "&Open Left"
msgstr "ÐÑкÑÑÑÑ Ð»ÐµÐ²Ñй"
-msgid "with &External Editor"
-msgstr "внеÑним ÑедакÑоÑом"
-
-msgid "&Parent Folder"
-msgstr "РодиÑелÑÑÐºÐ°Ñ Ð¿Ð°Ð¿ÐºÐ°"
+msgid "With &External Editor"
+msgstr "ÐнеÑним ÑедакÑоÑом"
msgid "Open Midd&le"
msgstr "ÐÑкÑÑÑÑ ÑÑедний"
@@ -815,9 +848,6 @@ msgstr "ÐÑе на... (%1 из %2)"
msgid "Differences to... (%1 of %2)"
msgstr "ÐÑлиÑÐ¸Ñ Ð½Ð°... (%1 из %2)"
-msgid "&Refresh"
-msgstr "&ÐбновиÑÑ"
-
msgid "Left Shell menu"
msgstr "ÐÐµÐ½Ñ Ð¾Ð±Ð¾Ð»Ð¾Ñки Ñлева"
@@ -845,7 +875,7 @@ msgstr "&Ðез пÑедÑÑавнениÑ"
msgid "Auto prediffer"
msgstr "&ÐвÑопÑедÑÑавнение"
-msgid "G&oto Diff"
+msgid "G&o to Diff"
msgstr "ÐеÑейÑи к &оÑлиÑиÑ"
msgid "&No Moved Blocks"
@@ -854,9 +884,6 @@ msgstr "&Ðез пеÑемеÑеннÑÑ
блоков"
msgid "&All Moved Blocks"
msgstr "&ÐÑе пеÑемеÑеннÑе блоки"
-msgid "Moved Block for &Current Diff"
-msgstr "ÐеÑемеÑеннÑй блок ÑекÑÑего оÑлиÑиÑ"
-
msgid "W&hitespaces"
msgstr "ÐевидимÑе"
@@ -869,8 +896,8 @@ msgstr "ÐгноÑиÑоваÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ"
msgid "Ig&nore all"
msgstr "ÐгноÑиÑоваÑÑ Ð²Ñе"
-msgid "Case sensi&tive"
-msgstr "УÑиÑÑваÑÑ ÑегиÑÑÑ"
+msgid "Ignore &case"
+msgstr "ÐгноÑиÑоваÑÑ Ñ&егиÑÑÑ"
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
msgstr "ÐгноÑиÑоваÑÑ ÐºÐ¾Ð½ÑÑ ÑÑÑок (Win/Unix/Mac)"
@@ -908,7 +935,7 @@ msgstr "ÐагÑÑзиÑÑ Ð¿ÑоекÑ..."
msgid "About WinMerge"
msgstr "РпÑогÑамме WinMerge"
-msgid "Visit the WinMerge HomePage!"
+msgid "Visit the WinMerge Homepage!"
msgstr "ÐомаÑнÑÑ ÑÑÑаниÑа WinMerge !"
msgid "OK"
@@ -942,7 +969,7 @@ msgid "Swap 2nd | 3rd"
msgstr "ÐоменÑÑÑ 2-й | 3-й"
msgid "B&rowse..."
-msgstr "ÐбзоÑ"
+msgstr "ÐбзоÑ..."
msgid "&3rd File or Folder (Optional)"
msgstr "&3-й Ñайл или папка (необÑзаÑелÑно)"
@@ -966,7 +993,7 @@ msgid " File: Unpacker Plugin"
msgstr " Файл: плагин ÑаÑпаковÑика"
msgid "Se&lect..."
-msgstr "ÐÑбÑаÑÑ"
+msgstr "ÐÑбÑаÑÑ..."
msgid "Co&mpare"
msgstr "СÑавниÑÑ"
@@ -984,16 +1011,19 @@ msgid "General"
msgstr "ÐÑновнÑе"
msgid "Automatically &scroll to first difference"
-msgstr "ÐвÑомаÑиÑеÑки &ÑÑÑановиÑÑ Ð½Ð° пеÑвое оÑлиÑие"
+msgstr "ÐвÑопÑокÑÑÑка на пеÑвое оÑлиÑие"
-msgid "Cl&ose windows with ESC:"
-msgstr "Ðа&кÑÑваÑÑ Ð¾ÐºÐ½Ð° клавиÑей ESC"
+msgid "Automatically s&croll to first inline difference"
+msgstr "ÐвÑопÑокÑÑÑка на пеÑвое оÑлиÑие в ÑÑÑоке"
+
+msgid "Cl&ose windows with 'Esc':"
+msgstr "Ðа&кÑÑваÑÑ Ð¾ÐºÐ½Ð° клавиÑей 'Esc':"
msgid "&Automatically verify paths in Open-dialog"
-msgstr "ÐвÑомаÑиÑеÑки пÑовеÑÑÑÑ Ð¿ÑÑи в диалоге оÑкÑÑÑÐ¸Ñ Ñайлов"
+msgstr "ÐвÑопÑовеÑка пÑÑи в диалоге оÑкÑÑÑÐ¸Ñ Ñайлов"
-msgid "All&ow only one instance to run"
-msgstr "&РазÑеÑиÑÑ Ð·Ð°Ð¿ÑÑк ÑолÑко одной копии"
+msgid "Single instance mode:"
+msgstr "Режим одной копии:"
msgid "As&k when closing multiple windows"
msgstr "ÐодÑвеÑждаÑÑ Ð·Ð°ÐºÑÑÑие окон"
@@ -1005,15 +1035,15 @@ msgid "Show \"Select Files or Folders\" Dialog on Startup"
msgstr "ÐоказÑваÑÑ Ð´Ð¸Ð°Ð»Ð¾Ð³ \"ÐÑбÑаÑÑ ÑÐ°Ð¹Ð»Ñ Ð¸Ð»Ð¸ папки\" пÑи запÑÑке"
msgid "Close \"Select Files or Folders\" Dialog on clicking OK button"
-msgstr "ÐакÑÑваÑÑ Ð´Ð¸Ð°Ð»Ð¾Ð³ \"ÐÑбÑаÑÑ ÑÐ°Ð¹Ð»Ñ Ð¸Ð»Ð¸ папки\" пÑи нажаÑии кнопки ÐÐ"
+msgstr "ÐакÑÑваÑÑ Ð´Ð¸Ð°Ð»Ð¾Ð³ \"ÐÑбÑаÑÑ ÑÐ°Ð¹Ð»Ñ Ð¸Ð»Ð¸ папки\" пÑи нажаÑии ÐÐ"
-msgid "O&pen-dialog Auto-Completion:"
+msgid "Op&en-dialog Auto-Completion:"
msgstr "ÐвÑозавеÑÑение в диалоге оÑкÑÑÑиÑ:"
msgid "Language:"
msgstr "ЯзÑк:"
-msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
+msgid "WinMerge allows hiding some common message boxes. Press the Reset button to make all message boxes visible again."
msgstr "WinMerge позволÑÐµÑ ÑкÑÑваÑÑ Ð½ÐµÐºÐ¾ÑоÑÑе ÑообÑениÑ. ÐажмиÑе ÐºÐ½Ð¾Ð¿ÐºÑ Ð¡Ð±ÑоÑ, ÑÑÐ¾Ð±Ñ Ð¿Ð¾ÐºÐ°Ð·ÑваÑÑ Ð²Ñе ÑообÑениÑ."
msgid "Reset"
@@ -1056,7 +1086,7 @@ msgid "Re&place with:"
msgstr "Ðа&мениÑÑ:"
msgid "&Don't wrap end of file"
-msgstr "Ðе оÑÑанавливаÑÑÑÑ Ð¿Ñи доÑÑижении конÑа Ñайла"
+msgstr "Ðе оÑÑанавливаÑÑÑÑ Ð² конÑе Ñайла"
msgid "Replace in"
msgstr "ÐамениÑÑ"
@@ -1091,7 +1121,7 @@ msgstr "Ð¦Ð²ÐµÑ Ñона:"
msgid "&Apply"
msgstr "&ÐÑимениÑÑ"
-msgid "Linefilters"
+msgid "Line Filters"
msgstr "СÑÑоковÑе ÑилÑÑÑÑ"
msgid "Enable Line Filters"
@@ -1106,11 +1136,26 @@ msgstr "ÐзмениÑÑ"
msgid "Remove"
msgstr "УдалиÑÑ"
+msgid "Substitution Filters"
+msgstr "ФилÑÑÑÑ Ð·Ð°Ð¼ÐµÐ½Ñ"
+
+msgid "The changes that appear on the panels as the listed pairs below will be ignored or marked as insignificant. Patches are unaffected."
+msgstr "ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² ÑекÑÑе ÑооÑвеÑÑвÑÑÑие паÑам, в ÑпиÑке ниже, бÑдÑÑ Ð¸Ð³Ð½Ð¾ÑиÑоваÑÑÑÑ"
+
+msgid "Enable"
+msgstr "ÐклÑÑено"
+
+msgid "Add"
+msgstr "ÐобавиÑÑ"
+
+msgid "Clear"
+msgstr "ÐÑиÑÑиÑÑ"
+
msgid "Colors"
msgstr "ЦвеÑа"
msgid "Color Scheme:"
-msgstr "ЦвеÑÐ¾Ð²Ð°Ñ ÑÑ
ема"
+msgstr "ЦвеÑÐ¾Ð²Ð°Ñ ÑÑ
ема:"
msgid "Background"
msgstr "Фон"
@@ -1247,8 +1292,8 @@ msgstr "ÐÑÐ±Ð¾Ñ ÑаÑпаковÑика"
msgid "File unpacker:"
msgstr "Файл ÑаÑпаковÑика:"
-msgid "Display all unpackers, don't check the extension"
-msgstr "ÐоказÑваÑÑ Ð²Ñе ÑаÑпаковÑики, не пÑовеÑÑÑÑ ÑаÑÑиÑение"
+msgid "Display all unpackers, don't check the extension."
+msgstr "ÐоказÑваÑÑ Ð²Ñе ÑаÑпаковÑики, не пÑовеÑÑÑÑ ÑаÑÑиÑение."
msgid "Extensions list:"
msgstr "СпиÑок ÑаÑÑиÑений:"
@@ -1274,17 +1319,17 @@ msgstr "ÐбÑабоÑано:"
msgid "Items total:"
msgstr "ÐÑего:"
-msgid "Go To"
+msgid "Go to"
msgstr "ÐеÑейÑи"
-msgid "G&oto:"
-msgstr "&Ð:"
+msgid "G&o to:"
+msgstr "&ÐеÑейÑи к:"
msgid "File"
msgstr "ФайлÑ"
-msgid "Goto what"
-msgstr "Ð ÑемÑ"
+msgid "Go to what"
+msgstr "ÐеÑейÑи к ÑемÑ"
msgid "Li&ne"
msgstr "&СÑÑоке"
@@ -1292,7 +1337,7 @@ msgstr "&СÑÑоке"
msgid "&Difference"
msgstr "&ÐÑлиÑиÑ"
-msgid "&Go To"
+msgid "&Go to"
msgstr "ÐеÑейÑ&и"
msgid "Compare"
@@ -1313,8 +1358,8 @@ msgstr "ÐгноÑиÑоваÑÑ &вÑе невидимÑе"
msgid "Ignore blan&k lines"
msgstr "ÐгноÑиÑоваÑÑ Ð¿ÑÑÑ&Ñе ÑÑÑоки"
-msgid "Ignore &case"
-msgstr "ÐгноÑиÑоваÑÑ Ñ&егиÑÑÑ"
+msgid "Ignore c&omment differences"
+msgstr "ÐгноÑиÑоваÑÑ Ð¾ÑлиÑÐ¸Ñ Ð² комменÑаÑиÑÑ
"
msgid "E&nable moved block detection"
msgstr "ÐбнаÑÑжение пеÑеме&ÑеннÑÑ
блоков"
@@ -1328,11 +1373,8 @@ msgstr "ÐлгоÑиÑм ÑÑÐ°Ð²Ð½ÐµÐ½Ð¸Ñ (ÑкÑпеÑименÑ.):"
msgid "Enable indent &heuristic"
msgstr "ÐклÑÑаÑÑ ÑвÑиÑÑÐ¸ÐºÑ Ð¾ÑÑÑÑпов"
-msgid "Comments"
-msgstr "ÐомменÑаÑии"
-
-msgid "Filter Comments"
-msgstr "ФилÑÑÑ ÐºÐ¾Ð¼Ð¼ÐµÐ½ÑаÑиев"
+msgid "Completely unhighlight the ignored differences"
+msgstr "ÐообÑе не подÑвеÑиваÑÑ Ð¸Ð³Ð½Ð¾ÑиÑÑемÑе ÑазлиÑиÑ"
msgid "Editor"
msgstr "РедакÑоÑ"
@@ -1374,9 +1416,9 @@ msgid "W&ord break characters:"
msgstr "Ð¡Ð¸Ð¼Ð²Ð¾Ð»Ñ ÑазÑÑва Ñлов:"
msgid "&Rendering Mode:"
-msgstr "Режим оÑÑиÑовки"
+msgstr "Режим оÑÑиÑовки:"
-msgid "Filefilters"
+msgid "File Filters"
msgstr "ФилÑÑÑÑ Ñайлов"
msgid "Test..."
@@ -1436,11 +1478,11 @@ msgstr "ÐÐ¾Ð´Ð¾Ð²Ð°Ñ ÑÑÑаниÑа по ÑмолÑаниÑ"
msgid "Select the default codepage assumed when loading non-Unicode files:"
msgstr "ÐÑбеÑиÑе кодовÑÑ ÑÑÑаниÑÑ Ð¿Ð¾ ÑмолÑаниÑ, Ð´Ð»Ñ Ð½Ðµ Юникод-Ñайлов:"
-msgid "Detect codepage info for these files: .html, .rc, .xml \nneed to restart session"
-msgstr "ÐпÑеделÑÑÑ ÐºÐ¾Ð´Ð¸ÑÐ¾Ð²ÐºÑ Ð´Ð»Ñ ÑÑиÑ
Ñайлов: .html, .rc, .xml \nнеобÑ
одим пеÑезапÑÑк ÑеÑÑии"
+msgid "Detect codepage info for these type of files: .html, .rc, .xml\nNeed to restart session."
+msgstr "ÐпÑеделÑÑÑ ÐºÐ¾Ð´Ð¸ÑÐ¾Ð²ÐºÑ Ð´Ð»Ñ Ñипов Ñайлов: .html, .rc, .xml \nÐеобÑ
одим пеÑезапÑÑк ÑеÑÑии."
-msgid "Detect codepage for text files using mlang.dll\nneed to restart session"
-msgstr "ÐпÑеделÑÑÑ ÐºÐ¾Ð´Ð¾Ð²ÑÑ ÑÑÑаниÑÑ Ð´Ð»Ñ ÑекÑÑовÑÑ
Ñайлов Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ mlang.dll\nнеобÑ
одим пеÑезапÑÑк ÑеÑÑии"
+msgid "Detect codepage for text files with mlang.dll\nNeed to restart session."
+msgstr "ÐпÑеделÑÑÑ ÐºÐ¾Ð´Ð¸ÑÐ¾Ð²ÐºÑ Ð´Ð»Ñ ÑекÑÑовÑÑ
Ñайлов Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ mlang.dll\nÐеобÑ
одим пеÑезапÑÑк ÑеÑÑии."
msgid "System codepage"
msgstr "СиÑÑÐµÐ¼Ð½Ð°Ñ ÐºÐ¾Ð´Ð¾Ð²Ð°Ñ ÑÑÑаниÑа"
@@ -1644,7 +1686,7 @@ msgid "Custom &Delimiter-Separated Values"
msgstr "Свои знаÑÐµÐ½Ð¸Ñ ÑазделиÑелей"
msgid "D&elimiter character:"
-msgstr "Символ ÑазделиÑелÑ"
+msgstr "Символ ÑазделиÑелÑ:"
msgid "&Allow newlines in quotes"
msgstr "РазÑеÑиÑÑ Ð½Ð¾Ð²Ñе ÑÑÑоки в кавÑÑкаÑ
"
@@ -1688,7 +1730,7 @@ msgstr "ÐлобалÑной ÑезеÑвной папке:"
msgid "Backup filename:"
msgstr "ÐÐ¼Ñ ÑезеÑвного Ñайла:"
-msgid "&Append .bak -extension"
+msgid "&Append .bak extension"
msgstr "&ÐобавиÑÑ ÑаÑÑиÑение .bak"
msgid "A&ppend timestamp"
@@ -1706,6 +1748,9 @@ msgstr "Слева"
msgid "To right"
msgstr "ÐапÑаво"
+msgid "Don't ask this &question again."
+msgstr "Ðе ÑпÑавÑиваÑÑ &болÑÑе."
+
msgid "Yes"
msgstr "Ðа"
@@ -1755,7 +1800,7 @@ msgstr "&ÐÑÑанавливаÑÑÑÑ Ð¿Ð¾Ñле пеÑвого оÑлиÑиÑ
msgid "Ign&ore time differences less than 3 seconds"
msgstr "ÐгноÑиÑоваÑÑ ÑазниÑÑ Ð²Ñемени менее 3 ÑекÑнд"
-msgid "&Include unique subfolders contents"
+msgid "Include &unique subfolders contents"
msgstr "ÐклÑÑÐ°Ñ ÑникалÑное ÑодеÑжимое подпапок"
msgid "&Automatically expand all subfolders"
@@ -1783,7 +1828,7 @@ msgid "Custom Delimiter-Separated Values"
msgstr "Свои знаÑÐµÐ½Ð¸Ñ ÑазделиÑелей"
msgid "File Patterns:"
-msgstr "Ð¨Ð°Ð±Ð»Ð¾Ð½Ñ Ñайлов"
+msgstr "Ð¨Ð°Ð±Ð»Ð¾Ð½Ñ Ñайлов:"
msgctxt "Options dialog|Categories"
msgid "Binary"
@@ -1813,26 +1858,29 @@ msgstr "Ð¨Ð°Ð±Ð»Ð¾Ð½Ñ Ð¸Ð·Ð¾Ð±Ñажений:"
msgid "&Enable image compare in folder compare"
msgstr "CÑавниваÑÑ Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð² папкаÑ
ÑÑавнениÑ"
+msgid "OCR result:"
+msgstr "РезÑлÑÑÐ°Ñ OCR"
+
msgid "&Hex View"
msgstr "&Hex"
msgid "EXT"
-msgstr "EXT"
+msgstr ""
msgid "CAP"
-msgstr "CAP"
+msgstr ""
msgid "NUM"
-msgstr "NUM"
+msgstr ""
msgid "SCRL"
-msgstr "SCRL"
+msgstr ""
msgid "OVR"
-msgstr "OVR"
+msgstr ""
msgid "REC"
-msgstr "REC"
+msgstr ""
msgid "\nNew Documents (Ctrl+N)"
msgstr "\nСоздаÑÑ Ð´Ð¾ÐºÑменÑÑ (Ctrl+N)"
@@ -1843,11 +1891,11 @@ msgstr "\nÐÑкÑÑÑÑ (Ctrl+O)"
msgid "\nSave (Ctrl+S)"
msgstr "\nСоÑ
ÑаниÑÑ (Ctrl+S)"
-msgid "Unknown error attempting to open project file"
-msgstr "ÐеизвеÑÑÐ½Ð°Ñ Ð¾Ñибка пÑи оÑкÑÑÑии Ñайла пÑоекÑа"
+msgid "Unknown error attempting to open project file."
+msgstr "ÐеизвеÑÑÐ½Ð°Ñ Ð¾Ñибка пÑи оÑкÑÑÑии Ñайла пÑоекÑа."
-msgid "Unknown error attempting to save project file"
-msgstr "ÐеизвеÑÑÐ½Ð°Ñ Ð¾Ñибка пÑи ÑоÑ
Ñанении Ñайла пÑоекÑа"
+msgid "Unknown error attempting to save project file."
+msgstr "ÐеизвеÑÑÐ½Ð°Ñ Ð¾Ñибка пÑи ÑоÑ
Ñанении Ñайла пÑоекÑа."
msgid "Project file successfully loaded."
msgstr "Файл пÑоекÑа ÑÑпеÑно загÑÑжен."
@@ -1867,9 +1915,6 @@ msgstr "\nFileCompare\n\n\n\nWinMerge.FileCompare\nWinMerge СÑавнение
msgid "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge Folder Compare"
msgstr "\nFolderCompare\n\n\n\nWinMerge.FolderCompare\nWinMerge СÑавнение Ðапок"
-msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaka, Gal Hammer, Alexander Skinner"
-msgstr "РазÑабоÑÑики:\nÐин ÐÑимм (Dean Grimm), ÐÑиÑÑиан ÐиÑÑ (Christian List), Ðиммо ÐаÑÐ¸Ñ (Kimmo Varis), ÐоÑ
ен ТÑÑ
Ñ (Jochen Tucht), Тим ÐеÑÑÐ½Ð´Ñ (Tim Gerundt), ТакаÑи Саванака (Takashi Sawanaka), ÐÑл Ð¥Ð°Ð¼Ð¼ÐµÑ (Gal Hammer), ÐлекÑÐ°Ð½Ð´Ñ Ð¡ÐºÐ¸Ð½Ð½ÐµÑ (Alexander Skinner)"
-
msgid "WinMerge comes with ABSOLUTELY NO WARRANTY. This is free software and you are welcome to redistribute it under certain circumstances; see the GNU General Public License in the Help menu for details."
msgstr "WinMerge поÑÑавлÑеÑÑÑ ÐÐÐ ÐÐÐÐÐ-ÐÐÐÐ ÐÐÐ ÐÐТÐÐ. ÐÑо Ñвободное ÐРи Ð¼Ñ Ð¿ÑивеÑÑÑвÑем его ÑаÑпÑоÑÑÑанение ÑоглаÑно некоÑоÑÑÑ
ÑÑловий; ознакомÑÑеÑÑ Ñ GNU General Public License в Ð¼ÐµÐ½Ñ ÐомоÑÑ Ð´Ð»Ñ Ð±Ð¾Ð»ÐµÐµ подÑобной инÑоÑмаÑии."
@@ -1907,20 +1952,17 @@ msgid "Skip &all"
msgstr "ÐÑоп&ÑÑÑиÑÑ Ð²Ñе"
msgid "Don't display this &message again."
-msgstr "Ðе показÑваÑÑ &болÑÑе"
+msgstr "Ðе показÑваÑÑ &болÑÑе."
-msgid "Don't ask this &question again."
-msgstr "Ðе ÑпÑавÑиваÑÑ &болÑÑе"
+msgid "To make this message box visible again, press the Reset button on the General page of the Options dialog."
+msgstr "ЧÑÐ¾Ð±Ñ Ñнова показÑваÑÑ ÑÑо ÑообÑение, нажмиÑе ÐºÐ½Ð¾Ð¿ÐºÑ Ð¡Ð±ÑÐ¾Ñ Ð½Ð° ÑÑÑаниÑе наÑÑÑоек ÐбÑие."
-msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
-msgstr "ЧÑÐ¾Ð±Ñ Ñнова показÑваÑÑ ÑÑо ÑообÑение, нажмиÑе ÐºÐ½Ð¾Ð¿ÐºÑ Ð¡Ð±ÑÐ¾Ñ Ð½Ð° ÑÑÑаниÑе наÑÑÑоек ÐбÑие"
+msgid "Syntax"
+msgstr "СинÑакÑиÑ"
msgid "Color Schemes"
msgstr "ЦвеÑÐ¾Ð²Ð°Ñ ÑÑ
ема"
-msgid "Syntax"
-msgstr "СинÑакÑиÑ"
-
msgid "Folder Compare"
msgstr "СÑавнение папок"
@@ -1942,12 +1984,18 @@ msgstr "СпÑава:"
msgid "To right:"
msgstr "ÐапÑаво:"
+msgid "From middle:"
+msgstr "Ðз ÑеÑединÑ:"
+
+msgid "To middle:"
+msgstr "Ðа ÑеÑединÑ:"
+
#, c-format
msgid "Version %1"
msgstr "ÐеÑÑÐ¸Ñ %1"
msgid "X64"
-msgstr "X64"
+msgstr ""
#, c-format
msgid "Options (%1)"
@@ -1984,17 +2032,23 @@ msgstr "Ð¤Ð°Ð¹Ð»Ñ HTML (*.htm,*.html)|*.htm;*.html|ÐÑе ÑÐ°Ð¹Ð»Ñ (*.*)|*.*|
msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
msgstr "Ð¤Ð°Ð¹Ð»Ñ XML (*.xml)|*.xml|ÐÑе ÑÐ°Ð¹Ð»Ñ (*.*)|*.*||"
+msgid "File Type"
+msgstr "Тип Ñайла"
+
+msgid "Extension"
+msgstr "РаÑÑиÑение"
+
msgid "Name"
msgstr "ÐмÑ"
msgid "Location"
-msgstr "Ðоложение"
+msgstr "РаÑоложение"
msgid "Filters"
msgstr "ФилÑÑÑÑ"
msgid "[F] "
-msgstr "[F] "
+msgstr ""
msgid "Description"
msgstr "ÐпиÑание"
@@ -2032,8 +2086,8 @@ msgstr "ФилÑÑÑ Ñже ÑÑÑеÑÑвÑеÑ. ÐеÑезапиÑаÑÑ?"
msgid "Regular expression"
msgstr "РегÑлÑÑное вÑÑажение"
-msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select No and refresh compares later."
-msgstr "ФилÑÑÑÑ Ð±Ñли обновленÑ. ÐбновиÑÑ Ð²Ñе оÑкÑÑÑÑе ÑÑавниваемÑе папки?\nÐÑли не Ñ
оÑиÑе обновлÑÑÑ ÑейÑаÑ, нажмиÑе \"ÐеÑ\" и обновиÑе ÑÑавниваемое позже."
+msgid "Filters were updated. Do you want to refresh all open folder compares?\n\nIf you do not want to refresh all compares now you can select 'No' and refresh compares later."
+msgstr "ФилÑÑÑÑ Ð±Ñли обновленÑ. ÐбновиÑÑ Ð²Ñе оÑкÑÑÑÑе ÑÑавниваемÑе папки?\n\nÐÑли не Ñ
оÑиÑе обновлÑÑÑ ÑейÑаÑ, нажмиÑе \"ÐеÑ\"."
msgid "Folder Comparison Results"
msgstr "РезÑлÑÑаÑÑ ÑÑÐ°Ð²Ð½ÐµÐ½Ð¸Ñ Ð¿Ð°Ð¿Ð¾Ðº"
@@ -2050,12 +2104,18 @@ msgstr "ÐезÑмÑннÑй поÑеÑедине"
msgid "Untitled right"
msgstr "ÐезÑмÑннÑй ÑпÑава"
+msgid "Base File"
+msgstr "ÐазовÑй Ñайл"
+
msgid "Theirs File"
msgstr "ÐÑ
Ñайл"
msgid "Mine File"
msgstr "Ðой Ñайл"
+msgid "Original File"
+msgstr "ÐÑÑ
однÑй Ñайл"
+
#, c-format
msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr "СÑÑ: %s СÑб: %d/%d Симв: %d/%d EOL: %s"
@@ -2068,6 +2128,10 @@ msgstr "СÑÑока: %s"
msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr "СÑÑ: %s СÑб: %d/%d Симв: %d/%d"
+#, c-format
+msgid " Sel: %d | %d"
+msgstr ""
+
msgid "Merge"
msgstr "ÐбÑединение"
@@ -2084,7 +2148,7 @@ msgstr "Ðайдено вÑего одно оÑлиÑие"
#. Abbreviation from "Read Only"
msgid "RO"
-msgstr "RO"
+msgstr ""
#, c-format
msgid "Item %1 of %2"
@@ -2094,8 +2158,8 @@ msgstr "ÐÐ»ÐµÐ¼ÐµÐ½Ñ %1 из %2"
msgid "Items: %1"
msgstr "ÐлеменÑов: %1"
-msgid "Select two existing folders or files to compare"
-msgstr "ÐÑбеÑиÑе Ð´Ð»Ñ ÑÑÐ°Ð²Ð½ÐµÐ½Ð¸Ñ 2 ÑÑÑеÑÑвÑÑÑиÑ
папки или Ñайла"
+msgid "Select two existing folders or files to compare."
+msgstr "ÐÑбеÑиÑе Ð´Ð»Ñ ÑÑÐ°Ð²Ð½ÐµÐ½Ð¸Ñ 2 ÑÑÑеÑÑвÑÑÑиÑ
папки или Ñайла."
msgid "Folder Selection"
msgstr "ÐÑÐ±Ð¾Ñ Ð¿Ð°Ð¿ÐºÐ¸"
@@ -2116,7 +2180,7 @@ msgid "Right (3rd) path is invalid!"
msgstr "ÐÑÑÑ ÑпÑава (3-й) Ñказан невеÑно!"
msgid "Both paths are invalid!"
-msgstr "Ðба пÑÑи ÑÐºÐ°Ð·Ð°Ð½Ñ Ð½ÐµÐ²ÐµÑно"
+msgstr "Ðба пÑÑи ÑÐºÐ°Ð·Ð°Ð½Ñ Ð½ÐµÐ²ÐµÑно!"
msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr "ÐÑÑи Ñлева (1-й) и поÑеÑедине (2-й) ÑÐºÐ°Ð·Ð°Ð½Ñ Ð½ÐµÐ²ÐµÑно!"
@@ -2128,9 +2192,9 @@ msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr "ÐÑÑи поÑеÑедине (2-й) и ÑпÑава (3-й) ÑÐºÐ°Ð·Ð°Ð½Ñ Ð½ÐµÐ²ÐµÑно!"
msgid "All paths are invalid!"
-msgstr "ÐÑе пÑÑи ÑÐºÐ°Ð·Ð°Ð½Ñ Ð½ÐµÐ²ÐµÑно"
+msgstr "ÐÑе пÑÑи ÑÐºÐ°Ð·Ð°Ð½Ñ Ð½ÐµÐ²ÐµÑно!"
-msgid "Only enabled for File comparisons"
+msgid "Only enabled for file comparisons"
msgstr "ÐклÑÑено ÑолÑко Ð´Ð»Ñ ÑÑÐ°Ð²Ð½ÐµÐ½Ð¸Ñ Ñайлов"
msgid "Cannot compare file and folder!"
@@ -2149,25 +2213,25 @@ msgid "Cannot open file\n%1\n\n%2"
msgstr "Ðе ÑдаеÑÑÑ Ð¾ÑкÑÑÑÑ Ñайл\n%1\n\n%2"
msgid "Failed to parse conflict file."
-msgstr "Сбой ÑазбоÑа Ñайла конÑликÑов"
+msgstr "Сбой ÑазбоÑа Ñайла конÑликÑов."
#, c-format
msgid "The file\n%1\nis not a conflict file."
-msgstr "Файл\n%1\nне ÑвлÑеÑÑÑ Ñайлом конÑликÑов"
+msgstr "Файл\n%1\nне ÑвлÑеÑÑÑ Ñайлом конÑликÑов."
msgid "You are about to compare very large files.\nShowing the contents of the files requires a very large amount of memory.\nDo you want to show only the comparison results, not the contents of the files?\n\n"
msgstr "ÐÑ ÑобиÑаеÑеÑÑ ÑÑавниÑÑ Ð¾ÑÐµÐ½Ñ Ð±Ð¾Ð»ÑÑие ÑайлÑ.\nÐÑобÑажение ÑодеÑжимого ÑÑиÑ
Ñайлов ÑÑебÑÐµÑ Ð¾ÑÐµÐ½Ñ Ð¼Ð½Ð¾Ð³Ð¾ памÑÑи.\nХоÑиÑе ÑвидеÑÑ ÑолÑко ÑезÑлÑÑаÑÑ ÑÑавнениÑ, а не ÑодеÑжимое Ñайлов?\n\n"
msgid "Save As"
-msgstr "СоÑ
ÑаниÑÑ ÐºÐ°Ðº..."
+msgstr "СоÑ
ÑаниÑÑ ÐºÐ°Ðº"
#, c-format
msgid "Save changes to %1?"
msgstr "СоÑ
ÑаниÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² %1?"
#, c-format
-msgid "%1 is marked read-only. Would you like to override the read-only file ? (No to save as new filename.)"
-msgstr "%1 помеÑен как ÑолÑко Ð´Ð»Ñ ÑÑениÑ. ÐеÑезапиÑаÑÑ Ñайл ÑолÑко Ð´Ð»Ñ ÑÑÐµÐ½Ð¸Ñ ? (оÑвеÑив ÐÐµÑ Ð¼Ð¾Ð¶Ð½Ð¾ ÑоÑ
ÑаниÑÑ Ñайл Ñ Ð´ÑÑгим именем)"
+msgid "%1 is marked read-only. Would you like to override the read-only file? (No to save as new filename.)"
+msgstr "%1 помеÑен как ÑолÑко Ð´Ð»Ñ ÑÑениÑ. ÐеÑезапиÑаÑÑ Ñайл ÑолÑко Ð´Ð»Ñ ÑÑениÑ? (оÑвеÑив ÐÐµÑ Ð¼Ð¾Ð¶Ð½Ð¾ ÑоÑ
ÑаниÑÑ Ñайл Ñ Ð´ÑÑгим именем)"
msgid "Error backing up file"
msgstr "ÐÑибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÑезеÑвной копии"
@@ -2177,16 +2241,20 @@ msgid "Unable to backup original file:\n%1\n\nContinue anyway?"
msgstr "Ðе ÑдаеÑÑÑ ÑоздаÑÑ ÐºÐ¾Ð¿Ð¸Ñ Ð¸ÑÑ
одного Ñайла:\n%1\n\nÐÑодолжиÑÑ Ð² лÑбом ÑлÑÑае?"
#, c-format
-msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t- use a different filename (Press Ok)\n\t- abort the current operation (Press Cancel)?"
-msgstr "Сбой ÑоÑ
ÑÐ°Ð½ÐµÐ½Ð¸Ñ Ñайла.\n%1\n%2\nХоÑиÑе:\n\t- иÑполÑзоваÑÑ Ð´ÑÑгое Ð¸Ð¼Ñ Ñайла (ÐажмиÑе Ok)\n\t-оÑмениÑÑ ÑекÑÑÑÑ Ð¾Ð¿ÐµÑаÑÐ¸Ñ (ÐажмиÑе ÐÑмена)?"
+msgid "Saving file failed.\n%1\n%2\nDo you want to:\n\t- use a different filename (Press OK)\n\t- abort the current operation (Press Cancel)?"
+msgstr "Сбой ÑоÑ
ÑÐ°Ð½ÐµÐ½Ð¸Ñ Ñайла.\n%1\n%2\nХоÑиÑе:\n\t- иÑполÑзоваÑÑ Ð´ÑÑгое Ð¸Ð¼Ñ Ñайла (ÐажмиÑе OK)\n\t-оÑмениÑÑ ÑекÑÑÑÑ Ð¾Ð¿ÐµÑаÑÐ¸Ñ (ÐажмиÑе ÐÑмена)?"
#, c-format
msgid "Plugin '%2' cannot pack your changes to the left file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
-msgstr "Ðлагин '%2' не Ð¼Ð¾Ð¶ÐµÑ ÑпаковаÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¾Ð±ÑаÑно в Ñайл Ñлева '%1'.\n\nÐÑÑ
однÑй Ñайл не бÑÐ´ÐµÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½.\n\nСоÑ
ÑаниÑÑ ÑаÑпакованнÑÑ Ð²ÐµÑÑÐ¸Ñ Ð² дÑÑгой Ñайл?"
+msgstr "Ðлагин '%2' не Ð¼Ð¾Ð¶ÐµÑ ÑпаковаÑÑ Ð²Ð°Ñи Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð· левого Ñайла обÑаÑно в '%1'.\n\nÐÑÑ
однÑй Ñайл не бÑÐ´ÐµÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½.\n\nСоÑ
ÑаниÑÑ ÑаÑпакованнÑÑ Ð²ÐµÑÑÐ¸Ñ Ð² дÑÑгой Ñайл?"
+
+#, c-format
+msgid "Plugin '%2' cannot pack your changes to the middle file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
+msgstr "Ðлагин '%2' не Ð¼Ð¾Ð¶ÐµÑ ÑпаковаÑÑ Ð²Ð°Ñи Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð· ÑÑеднего Ñайла обÑаÑно в '%1'.\n\nÐÑÑ
однÑй Ñайл не бÑÐ´ÐµÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½.\n\nСоÑ
ÑаниÑÑ ÑаÑпакованнÑÑ Ð²ÐµÑÑÐ¸Ñ Ð² дÑÑгой Ñайл?"
#, c-format
msgid "Plugin '%2' cannot pack your changes to the right file back into '%1'.\n\nThe original file will not be changed.\n\nDo you want to save the unpacked version to another file?"
-msgstr "Ðлагин '%2' не Ð¼Ð¾Ð¶ÐµÑ ÑпаковаÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¾Ð±ÑаÑно в Ñайл ÑпÑава '%1'.\n\nÐÑÑ
однÑй Ñайл не бÑÐ´ÐµÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½.\n\nСоÑ
ÑаниÑÑ ÑаÑпакованнÑÑ Ð²ÐµÑÑÐ¸Ñ Ð² дÑÑгой Ñайл?"
+msgstr "Ðлагин '%2' не Ð¼Ð¾Ð¶ÐµÑ ÑпаковаÑÑ Ð²Ð°Ñи Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð· пÑавого Ñайла обÑаÑно в '%1'.\n\nÐÑÑ
однÑй Ñайл не бÑÐ´ÐµÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½.\n\nСоÑ
ÑаниÑÑ ÑаÑпакованнÑÑ Ð²ÐµÑÑÐ¸Ñ Ð² дÑÑгой Ñайл?"
#, c-format
msgid "Another application has updated file\n%1\nsince WinMerge loaded it.\n\nOverwrite changed file?"
@@ -2201,13 +2269,13 @@ msgid "Another application has updated file\n%1\nsince WinMerge scanned it last
msgstr "ÐÑÑгое пÑиложение обновило Ñайл\n%1\nÑже пÑовеÑеннÑй WinMerge.\n\nÐеÑезагÑÑзиÑÑ Ñайл?"
msgid "Save Left File As"
-msgstr "СоÑ
ÑаниÑÑ Ñайл Ñлева как..."
+msgstr "СоÑ
ÑаниÑÑ Ñайл Ñлева как"
msgid "Save Middle File As"
-msgstr "СоÑ
ÑаниÑÑ Ñайл поÑеÑедине как..."
+msgstr "СоÑ
ÑаниÑÑ Ñайл поÑеÑедине как"
msgid "Save Right File As"
-msgstr "СоÑ
ÑаниÑÑ Ñайл ÑпÑава как..."
+msgstr "СоÑ
ÑаниÑÑ Ñайл ÑпÑава как"
#, c-format
msgid "The file\n%1\nhas disappeared. Please save a copy of the file to continue."
@@ -2311,23 +2379,23 @@ msgstr "(%1 из %2 Ñайлов обÑабоÑано)"
msgid "Are you sure you want to delete\n\n%1 ?"
msgstr "УвеÑенÑ, ÑÑо Ñ
оÑиÑе ÑдалиÑÑ\n\n%1 ?"
-msgid "Are you sure you want to copy:"
-msgstr "УвеÑенÑ, ÑÑо Ñ
оÑиÑе копиÑоваÑÑ:"
+msgid "Are you sure you want to copy?"
+msgstr "УвеÑенÑ, ÑÑо Ñ
оÑиÑе копиÑоваÑÑ?"
#, c-format
-msgid "Are you sure you want to copy %d items:"
-msgstr "УвеÑенÑ, ÑÑо Ñ
оÑиÑе копиÑоваÑÑ %d ÑлеменÑов:"
+msgid "Are you sure you want to copy %d items?"
+msgstr "УвеÑенÑ, ÑÑо Ñ
оÑиÑе копиÑоваÑÑ %d ÑлеменÑов?"
#, c-format
msgid "Operation aborted!\n\nFolder contents at disks has changed, path\n%1\nwas not found.\n\nPlease refresh the compare."
msgstr "ÐпеÑаÑÐ¸Ñ Ð¿ÑеÑвана!\n\nСодеÑжимое папки изменено, пÑÑÑ\n%1\nне бÑл найден.\n\nÐбновиÑе ÑÑавнение."
-msgid "Are you sure you want to move:"
-msgstr "УвеÑенÑ, ÑÑо Ñ
оÑиÑе пеÑемеÑÑиÑÑ:"
+msgid "Are you sure you want to move?"
+msgstr "УвеÑенÑ, ÑÑо Ñ
оÑиÑе пеÑемеÑÑиÑÑ?"
#, c-format
-msgid "Are you sure you want to move %d items:"
-msgstr "УвеÑенÑ, ÑÑо Ñ
оÑиÑе пеÑемеÑÑиÑÑ %d ÑлеменÑов:"
+msgid "Are you sure you want to move %d items?"
+msgstr "УвеÑенÑ, ÑÑо Ñ
оÑиÑе пеÑемеÑÑиÑÑ %d ÑлеменÑов?"
msgid "Confirm Move"
msgstr "ÐодÑвеÑдиÑе пеÑемеÑение"
@@ -2361,9 +2429,6 @@ msgstr "ÐаÑа ÑпÑава"
msgid "Middle Date"
msgstr "ÐаÑа поÑеÑедине"
-msgid "Extension"
-msgstr "РаÑÑиÑение"
-
msgid "Left Size"
msgstr "Ð Ð°Ð·Ð¼ÐµÑ Ñлева"
@@ -2582,7 +2647,7 @@ msgid "Middle side creation time."
msgstr "ÐÑÐµÐ¼Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñайла поÑеÑедине."
msgid "Tells which side has newer modification date."
-msgstr "ÐоказаÑÑ Ñ ÐºÐ°ÐºÐ¾Ð¹ из ÑÑоÑон даÑа Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñайла новее"
+msgstr "ÐоказаÑÑ Ð½Ð° какой из ÑÑоÑон даÑа Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñайла новее."
msgid "Left side file version, only for some filetypes."
msgstr "ÐеÑÑÐ¸Ñ Ñайла Ñлева, ÑолÑко Ð´Ð»Ñ Ð½ÐµÐºÐ¾ÑоÑÑÑ
Ñипов Ñайлов."
@@ -2606,13 +2671,13 @@ msgid "Middle side attributes."
msgstr "ÐÑÑибÑÑÑ Ð¿Ð¾ÑеÑедине."
msgid "Left side file EOL type."
-msgstr "Тип конÑа ÑÑÑоки Ð´Ð»Ñ Ñайла Ñлева"
+msgstr "Тип конÑа ÑÑÑоки Ð´Ð»Ñ Ñайла Ñлева."
msgid "Right side file EOL type."
-msgstr "Тип конÑа ÑÑÑоки Ð´Ð»Ñ Ñайла ÑпÑава"
+msgstr "Тип конÑа ÑÑÑоки Ð´Ð»Ñ Ñайла ÑпÑава."
msgid "Middle side file EOL type."
-msgstr "Тип конÑа ÑÑÑоки Ð´Ð»Ñ Ñайла поÑеÑедине"
+msgstr "Тип конÑа ÑÑÑоки Ð´Ð»Ñ Ñайла поÑеÑедине."
msgid "Left side encoding."
msgstr "ÐодиÑовка Ñлева."
@@ -2658,8 +2723,11 @@ msgstr "ÐÑибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¾ÑÑеÑа:\n%1"
msgid "The report has been created successfully."
msgstr "ÐÑÑÐµÑ ÑÑпеÑно Ñоздан."
+msgid "Cannot add a synchronization point at this line."
+msgstr "Ðевозможно добавиÑÑ ÑоÑÐºÑ ÑинÑ
ÑонизаÑии в ÑÑой ÑÑÑоке."
+
msgid "The same file is opened in both panels."
-msgstr "Ðа обоиÑ
панелÑÑ
оÑкÑÑÑ Ð¾Ð´Ð¸Ð½ и ÑÐ¾Ñ Ð¶Ðµ Ñайл"
+msgstr "Ðа обеиÑ
панелÑÑ
оÑкÑÑÑ Ð¾Ð´Ð¸Ð½ и ÑÐ¾Ñ Ð¶Ðµ Ñайл."
msgid "The selected files are identical."
msgstr "ÐÑбÑаннÑе ÑÐ°Ð¹Ð»Ñ Ð¸Ð´ÐµÐ½ÑиÑнÑ."
@@ -2670,8 +2738,8 @@ msgstr "ÐÑи ÑÑавнении Ñайлов пÑоизоÑла оÑибка."
msgid "Temporary files could not be created. Check your temporary path settings."
msgstr "ÐÑеменнÑе ÑÐ°Ð¹Ð»Ñ Ð½Ðµ могÑÑ Ð±ÑÑÑ ÑозданÑ. ÐÑовеÑÑÑе наÑÑÑойки пÑÑей вÑеменнÑÑ
Ñайлов."
-msgid "These files use different carriage return types.\n\nDo you want to treat all carriage return types as equivalent for this comparison?\n\nNote: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences..' in the Compare tab of the options dialog (available under Edit/Options)."
-msgstr "Ð ÑайлаÑ
иÑполÑзÑÑÑÑÑ ÑазлиÑнÑе ÑÐ¸Ð¿Ñ ÐºÐ¾Ð½Ñа ÑÑÑоки.\n\nÐгноÑиÑоваÑÑ Ð² ÑÑом ÑÑавнении (ÑÑиÑаÑÑ ÑавнознаÑнÑми) ?\n\nÐнимание: ÐÑли ÐÐ°Ñ Ð½Ðµ инÑеÑеÑÑÑÑ Ð¾ÑлиÑÐ¸Ñ EOL, ÑÑÑановиÑе паÑамеÑÑ 'ÐгноÑиÑоваÑÑ ÑазниÑÑ Ð²Ð¾Ð·Ð²ÑаÑа каÑеÑки..' на вкладке СÑавнение в ÐаÑÑÑойкаÑ
."
+msgid "These files use different carriage return types.\n\nDo you want to treat all carriage return types as equivalent for this comparison?\n\nNote: If you always want to treat all carriage return types as equivalent, set the option 'Ignore carriage return differences (Windows/Unix/Mac)' in the Compare tab of the options dialog (available under Edit/Options)."
+msgstr "Ð ÑайлаÑ
иÑполÑзÑÑÑÑÑ ÑазлиÑнÑе ÑÐ¸Ð¿Ñ ÐºÐ¾Ð½Ñа ÑÑÑоки.\n\nÐгноÑиÑоваÑÑ Ð² ÑÑом ÑÑавнении (ÑÑиÑаÑÑ ÑавнознаÑнÑми) ?\n\nÐнимание: ÐÑли ÐÐ°Ñ Ð½Ðµ инÑеÑеÑÑÑÑ Ð¾ÑлиÑÐ¸Ñ EOL, ÑÑÑановиÑе паÑамеÑÑ 'ÐгноÑиÑоваÑÑ ÐºÐ¾Ð½ÑÑ ÑÑÑок (Win/Unix/Mac)' на вкладке СÑавнение в ÐаÑÑÑойкаÑ
."
msgid "The selected folder is invalid."
msgstr "ÐÑбÑÐ°Ð½Ð½Ð°Ñ Ð¿Ð°Ð¿ÐºÐ° Ñказана невеÑно."
@@ -2695,6 +2763,12 @@ msgstr "ÐеÑейÑи к ÑледÑÑÑей ÑÑÑаниÑе?"
msgid "Do you want to move to the previous page?"
msgstr "ÐеÑейÑи к пÑедÑдÑÑей ÑÑÑаниÑе?"
+msgid "Do you want to move to the first file?"
+msgstr "ÐеÑейÑи к пеÑÐ²Ð¾Ð¼Ñ ÑайлÑ?"
+
+msgid "Do you want to move to the last file?"
+msgstr "ÐеÑейÑи к поÑÐ»ÐµÐ´Ð½ÐµÐ¼Ñ ÑайлÑ?"
+
#, c-format
msgid "Different codepages found in left (cp%d) and right (cp%d) files.\nDisplaying each file in its codepage will give a better display but merging/copying will be dangerous.\nWould you like to treat both files as being in the default Windows codepage (recommended)?"
msgstr "РазлиÑнÑе кодиÑовки: Ñлева - (cp%d), ÑпÑава - (cp%d). \nÐаждÑй из Ñайлов Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¾ÑобÑажен в Ñвоей кодиÑовке, но иÑ
обÑединение или копиÑование Ð¼Ð¾Ð¶ÐµÑ Ð¿Ð¾Ð²ÑедиÑÑ Ð¸Ð½ÑоÑмаÑиÑ.\nÐÑобÑазиÑÑ Ð¾Ð±Ð° Ñайла в ÑиÑÑемной кодиÑовке Windows по ÑмолÑÐ°Ð½Ð¸Ñ (ÑекомендÑеÑÑÑ)?"
@@ -2722,27 +2796,27 @@ msgid "Replaced %1 string(s)."
msgstr "Ðаменено ÑÑÑок %1."
#, c-format
-msgid "Cannot find string \"%s\""
-msgstr "Ðе ÑдаеÑÑÑ Ð½Ð°Ð¹Ñи ÑÑÑÐ¾ÐºÑ \"%s\""
+msgid "Cannot find string \"%s\"."
+msgstr "Ðе ÑдаеÑÑÑ Ð½Ð°Ð¹Ñи ÑÑÑÐ¾ÐºÑ \"%s\"."
-msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
-msgstr "ÐÑ Ð²Ñ
одиÑе в Ñежим обÑединениÑ. ÐÐ»Ñ Ð¾ÑклÑÑÐµÐ½Ð¸Ñ Ñежима обÑÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð½Ð°Ð¶Ð¼Ð¸Ñе клавиÑÑ F9"
+msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key."
+msgstr "ÐÑ Ð²Ñ
одиÑе в Ñежим обÑединениÑ. ÐÐ»Ñ Ð¾ÑклÑÑÐµÐ½Ð¸Ñ Ñежима обÑÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð½Ð°Ð¶Ð¼Ð¸Ñе клавиÑÑ F9."
#, c-format
msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2"
msgstr "ÐолиÑеÑÑво авÑомаÑиÑеÑки обÑединÑемÑÑ
изменений: %1\nÐолиÑеÑÑво неÑазÑеÑеннÑÑ
конÑликÑов: %2"
-msgid "The change of codepage has been merged"
-msgstr "Ðзменение кодовой ÑÑÑаниÑÑ Ð¾Ð±Ñединено"
+msgid "The change of codepage has been merged."
+msgstr "Ðзменение кодовой ÑÑÑаниÑÑ Ð¾Ð±Ñединено."
-msgid "The changes of codepage are conflicting"
-msgstr "ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð´Ð¾Ð²Ð¾Ð¹ ÑÑÑаниÑÑ Ð¿ÑоÑивоÑеÑÐ°Ñ Ð´ÑÑг дÑÑгÑ"
+msgid "The changes of codepage are conflicting."
+msgstr "ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÐºÐ¾Ð´Ð¾Ð²Ð¾Ð¹ ÑÑÑаниÑÑ Ð¿ÑоÑивоÑеÑÐ°Ñ Ð´ÑÑг дÑÑгÑ."
-msgid "The change of EOL has been merged"
-msgstr "Ðзменение EOL бÑло обÑединено"
+msgid "The change of EOL has been merged."
+msgstr "Ðзменение EOL бÑло обÑединено."
-msgid "The changes of EOL are conflicting"
-msgstr "ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ EOL пÑоÑивоÑеÑÐ°Ñ Ð´ÑÑг дÑÑгÑ"
+msgid "The changes of EOL are conflicting."
+msgstr "ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ EOL пÑоÑивоÑеÑÐ°Ñ Ð´ÑÑг дÑÑгÑ."
msgid "Location Pane"
msgstr "ÐÐ°Ð½ÐµÐ»Ñ Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ"
@@ -2783,8 +2857,8 @@ msgstr "Ðе ÑдаеÑÑÑ Ð·Ð°Ð¿Ð¸ÑаÑÑ Ð² Ñайл %1."
msgid "The specified output path is not an absolute path: %1"
msgstr "УказаннÑй пÑÑÑ Ð´Ð»Ñ Ð²Ñвода не ÑвлÑеÑÑÑ Ð°Ð±ÑолÑÑнÑм: %1"
-msgid "Specify an output file"
-msgstr "УказаÑÑ Ð²ÑÑ
одной Ñайл"
+msgid "Specify an output file."
+msgstr "УказаÑÑ Ð²ÑÑ
одной Ñайл."
msgid "Cannot create a patch file from binary files."
msgstr "Ðе ÑдаеÑÑÑ ÑоздаÑÑ Ð¿Ð°ÑÑ Ð¸Ð· двоиÑнÑÑ
Ñайлов."
@@ -2798,8 +2872,8 @@ msgstr "СнаÑала ÑоÑ
ÑаниÑе вÑе ÑайлÑ.\n\nÐÐ»Ñ Ñозд
msgid "Folder does not exist."
msgstr "Ðапка не ÑÑÑеÑÑвÑеÑ."
-msgid "Archive support is not enabled.\nAll needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\nSee manual for more info about archive support and how to enable it."
-msgstr "ÐоддеÑжка аÑÑ
ивов не вклÑÑена.\nÐе Ð½Ð°Ð¹Ð´ÐµÐ½Ñ Ð²Ñе необÑ
одимÑе компоненÑÑ (7-zip и/или Merge7z*.dll).\nÐоÑмоÑÑиÑе инÑÑÑÑкÑÐ¸Ñ Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑелÑной инÑоÑмаÑии о поддеÑжке аÑÑ
ивов и о Ñом, как ее вклÑÑиÑÑ."
+msgid "Archive support is not enabled.\nAll needed components (7-Zip and/or Merge7z*.dll) for archive support cannot be found.\nSee manual for more info about archive support and how to enable it."
+msgstr "ÐоддеÑжка аÑÑ
ивов не вклÑÑена.\nÐе Ð½Ð°Ð¹Ð´ÐµÐ½Ñ Ð½ÐµÐ¾Ð±Ñ
одимÑе компоненÑÑ (7-Zip и/или Merge7z*.dll) Ð´Ð»Ñ Ð¿Ð¾Ð´Ð´ÐµÑжки аÑÑ
ивов.\nÐополниÑелÑнÑÑ Ð¸Ð½ÑоÑмаÑÐ¸Ñ Ð¾ поддеÑжке аÑÑ
ивов и ее вклÑÑении ÑмоÑÑиÑе в ÑÑководÑÑве."
msgid "Select file for export"
msgstr "ÐÑбÑаÑÑ Ñайл Ð´Ð»Ñ ÑкÑпоÑÑа"
@@ -2836,6 +2910,9 @@ msgstr "ÐеÑ"
msgid "Marker Color %d"
msgstr "Ð¦Ð²ÐµÑ Ð¼Ð°ÑкеÑа %d"
+msgid "New Pattern"
+msgstr "ÐовÑй Ñаблон"
+
msgid "Type"
msgstr "Тип"
@@ -2849,7 +2926,7 @@ msgid "Editor script"
msgstr "РедакÑÐ¾Ñ ÑкÑипÑов"
msgid "\nDifference in the Current Line"
-msgstr "ÐÑлиÑÐ¸Ñ Ð² ÑекÑÑей ÑÑÑоке"
+msgstr "\nÐÑлиÑие в ÑекÑÑей ÑÑÑоке"
msgid "\nOptions"
msgstr "\nÐаÑÑÑойки"
@@ -2899,8 +2976,20 @@ msgstr "\nÐÑе налево"
msgid "\nAuto Merge (Ctrl+Alt+M)"
msgstr "\nÐвÑо обÑединение (Ctrl+Alt+M)"
-msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
-msgstr "ÐвÑомаÑиÑеÑкий Ð¿Ð¾Ð´Ð±Ð¾Ñ ÑаÑпаковÑика (ÑкажиÑе ÑаÑÑиÑение Ñ
оÑÑ Ð±Ñ Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ из Ñайлов)"
+msgid "\nFirst File"
+msgstr "\nÐеÑвÑй Ñайл"
+
+msgid "\nNext File (Ctrl+F8)"
+msgstr "\nСледÑÑÑий Ñайл (Ctrl+F8)"
+
+msgid "\nLast File"
+msgstr "\nÐоÑледний Ñайл"
+
+msgid "\nPrevious File (Ctrl+F7)"
+msgstr "\nÐÑедÑдÑÑий Ñайл (Ctrl+F7)"
+
+msgid "The adapted unpacker is applied to both files (one file only needs the extension)."
+msgstr "ÐвÑомаÑиÑеÑкий Ð¿Ð¾Ð´Ð±Ð¾Ñ ÑаÑпаковÑика (ÑкажиÑе ÑаÑÑиÑение Ñ
оÑÑ Ð±Ñ Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ из Ñайлов)."
msgid "No prediffer (normal)"
msgstr "Ðез пÑедÑÑÐ°Ð²Ð½ÐµÐ½Ð¸Ñ (обÑÑно)"
@@ -2915,8 +3004,8 @@ msgstr "ÐÑÑгие плагинÑ"
msgid "Private Build: %1"
msgstr "ЧаÑÑнÑй билд: %1"
-msgid "Your software is up to date"
-msgstr "ÐаÑа пÑогÑамма акÑÑалÑна"
+msgid "Your software is up to date."
+msgstr "ÐаÑа пÑогÑамма акÑÑалÑна."
#, c-format
msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?"
@@ -2938,8 +3027,11 @@ msgid ""
msgstr "<ÐвÑомаÑиÑеÑки>"
#, c-format
-msgid "G&oto Line %1"
-msgstr "ÐеÑейÑи к &ÑÑÑоке %1"
+msgid "G&o to Line %1"
+msgstr "ÐеÑейÑи к ÑÑÑоке %1"
+
+msgid "Go to Moved Line\tCtrl+Shift+G"
+msgstr "ÐеÑейÑи к пеÑемеÑенной ÑÑÑоке\tCtrl+Shift+G"
msgid "Disabled"
msgstr "ÐÑклÑÑен"
@@ -2956,9 +3048,6 @@ msgstr "Ðез вÑделениÑ"
msgid "Batch"
msgstr "ÐакеÑ"
-msgid "Lua"
-msgstr "ÐиблиоÑека Lua"
-
msgid "Portable Object"
msgstr "ÐоÑÑаÑивнÑй обÑекÑ"
@@ -2968,9 +3057,6 @@ msgstr "РеÑÑÑÑÑ"
msgid "Shell"
msgstr "ÐболоÑка"
-msgid "VHDL"
-msgstr "VHDL"
-
msgid "Close &Left Tabs"
msgstr "ÐакÑÑÑÑ Ð²ÐºÐ»Ð°Ð´ÐºÐ¸ Ñлева"
@@ -2983,8 +3069,8 @@ msgstr "ÐакÑÑÑÑ Ð´ÑÑгие вкладки"
msgid "Enable &Auto Max Width"
msgstr "ÐклÑÑиÑÑ Ð¼Ð°ÐºÑималÑнÑÑ Ð°Ð²Ñо ÑиÑинÑ"
-msgid "frhed is not installed"
-msgstr "frhed не ÑÑÑановлен"
+msgid "Frhed is not installed."
+msgstr "Frhed не ÑÑÑановлен."
#, c-format
msgid "%1 does not exist. Do you want to create it?"
@@ -3104,18 +3190,51 @@ msgid "Page:"
msgstr "СÑÑаниÑа:"
#, c-format
-msgid "Pt:(%d, %d) RGBA : (%d, %d, %d, %d) "
+msgid "Pt: (%d, %d) RGBA: (%d, %d, %d, %d) "
msgstr ""
#, c-format
-msgid "Dist:%g "
+msgid "Dist: %g "
msgstr ""
#, c-format
-msgid "Dist:%g,%g "
+msgid "Dist: %g, %g "
msgstr ""
#, c-format
-msgid "Page:%d/%d Zoom:%d%% %dx%dpx %dbpp"
-msgstr "СÑÑаниÑа:%d/%d ÐаÑÑÑаб:%d%% %dx%dpx %dbpp"
+msgid "Page: %d/%d Zoom: %d%% %dx%dpx %dbpp"
+msgstr "СÑÑаниÑа: %d/%d ÐаÑÑÑаб: %d%% %dx%dpx %dbpp"
+
+#, c-format
+msgid "Rc: (%d, %d) "
+msgstr ""
+
+msgid ""
+msgstr "<РедакÑиÑоваÑÑ Ð·Ð´ÐµÑÑ>"
+
+msgid "No differences to select found"
+msgstr "ÐикакиÑ
оÑлиÑий Ð´Ð»Ñ Ð²ÑбоÑа не найдено"
+
+msgid "No differences found to add as substitution filter"
+msgstr "ÐикакиÑ
оÑлиÑий не найдено Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð² ÑилÑÑÑ Ð·Ð°Ð¼ÐµÐ½Ñ"
+
+msgid "The pair is already present in the list of Substitution Filters"
+msgstr "ÐÑа паÑа Ñже пÑиÑÑÑÑÑвÑÐµÑ Ð² ÑпиÑке ÑилÑÑÑов заменÑ"
+
+msgid "Add this change to Substitution Filters?"
+msgstr "ÐобавиÑÑ ÑÑо изменение в ÑилÑÑÑÑ Ð·Ð°Ð¼ÐµÐ½Ñ?"
+
+msgid "Text only"
+msgstr "ТолÑко ÑекÑÑ"
+
+msgid "Line-by-line position and text"
+msgstr "ÐоÑÑÑоÑÐ½Ð°Ñ Ð¿Ð¾Ð·Ð¸ÑÐ¸Ñ Ð¸ ÑекÑÑ"
+
+msgid "Word-by-word position and text"
+msgstr "ÐоÑÐ»Ð¾Ð²Ð½Ð°Ñ Ð¿Ð¾Ð·Ð¸ÑÐ¸Ñ Ð¸ ÑекÑÑ"
+
+msgid "Allow only one instance to run"
+msgstr "РазÑеÑиÑÑ Ð·Ð°Ð¿ÑÑк ÑолÑко одной копии"
+msgid "Allow only one instance to run and wait for the instance to terminate"
+msgstr "РазÑеÑиÑÑ Ð·Ð°Ð¿ÑÑк ÑолÑко одной копии и дожидаÑÑÑÑ ÐµÐµ завеÑÑениÑ"