-# This file is part from WinMerge <http://winmerge.org/>
+# This file is part from WinMerge <http://winmerge.org/>
# Released under the "GNU General Public License"
#
# Translators:
"Last-Translator: Valerij Romanovskij <valerik-roma at mail.ru>\n"
"Language-Team: Russian <winmerge-translate@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CP1251\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Russian\n"
-"X-Poedit-SourceCharset: CP1251\n"
+"X-Poedit-SourceCharset: UTF-8\n"
"X-Poedit-Basepath: ../../Src/\n"
"X-Poedit-Country: RUSSIAN FEDERATION\n"
#. LANGUAGE, SUBLANGUAGE
-#: Merge.rc:22
-#: Merge.rc:51
+#: Merge.rc:5F458438
#, c-format
msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
msgstr "LANG_RUSSIAN, SUBLANG_DEFAULT"
#. Codepage
-#: Merge.rc:23
-#: Merge.rc:52
+#: Merge.rc:2C983F1
#, c-format
msgid "1252"
-msgstr "1251"
+msgstr "65001"
-#: Merge.rc:74
+#: Merge.rc:1C6125F3
#, c-format
msgid "C&opy to Right"
-msgstr "Ñêîïèðîâàòü íà &ïðàâóþ ïàíåëü"
+msgstr "Скопировать на &правую панель"
-#: Merge.rc:75
+#: Merge.rc:92C6C92
#, c-format
msgid "Cop&y to Left"
-msgstr "Ñêîïèðîâàòü íà &ëåâóþ ïàíåëü"
+msgstr "Скопировать на &левую панель"
-#: Merge.rc:76
+#: Merge.rc:6FC398B6
#, c-format
msgid "Copy &from Left"
msgstr ""
-#: Merge.rc:77
+#: Merge.rc:8AF7E68
#, c-format
msgid "Copy fro&m Right"
msgstr ""
-#: Merge.rc:79
+#: Merge.rc:381D79E4
#, c-format
msgid "&Select Line Difference"
-msgstr "&Âûáðàòü îòëè÷èå"
+msgstr "&Выбрать отличие"
-#: Merge.rc:81
+#: Merge.rc:43017E40
#, c-format
msgid "&Undo"
-msgstr "&Îòìåíà"
+msgstr "&Отменить"
-#: Merge.rc:82
+#: Merge.rc:43017E41
#, c-format
msgid "&Redo"
-msgstr "Â&åðíóòü"
+msgstr "В&ернуть"
-#: Merge.rc:84
+#: Merge.rc:3CF9F83
#, c-format
msgid "Cu&t"
-msgstr "Âû&ðåçàòü"
+msgstr "Вы&резать"
-#: Merge.rc:85
-#: Merge.rc:619
+#: Merge.rc:43017E42
#, c-format
msgid "&Copy"
-msgstr "&Êîïèðîâàòü"
+msgstr "&Копировать"
-#: Merge.rc:86
+#: Merge.rc:1D2E49F6
#, c-format
msgid "&Paste"
-msgstr "&Âñòàâèòü"
+msgstr "&Вставить"
-#: Merge.rc:88
-#: Merge.rc:711
+#: Merge.rc:AC3AA11
#, c-format
msgid "&Goto..."
-msgstr "Ïåðåéòè ê ñòðîêå..."
+msgstr "Перейти к строке..."
-#: Merge.rc:90
+#: Merge.rc:B4D35A1
#, c-format
msgid "Op&en"
-msgstr "Îò&êðûòü"
+msgstr "От&крыть"
-#: Merge.rc:92
-#: Merge.rc:642
-#: Merge.rc:648
+#: Merge.rc:37625055
#, c-format
msgid "with &Registered Application"
-msgstr "çàðåãèñòðèðîâàííûì ïðèëîæåíèåì"
+msgstr "зарегистрированным приложением"
-#: Merge.rc:93
-#: Merge.rc:643
-#: Merge.rc:649
+#: Merge.rc:321D741E
#, c-format
-msgid "with &External Editor"
-msgstr "âíåøíèì ðåäàêòîðîì"
+msgid "with &External Editor\tCtrl+Alt+E"
+msgstr ""
-#: Merge.rc:94
-#: Merge.rc:644
-#: Merge.rc:650
+#: Merge.rc:AC3AA12
#, c-format
msgid "&with..."
-msgstr "ñ ïîìîùüþ..."
+msgstr "с помощью..."
-#: Merge.rc:103
+#: Merge.rc:1A8FADD3
#, c-format
msgid "View &Differences"
msgstr ""
-#: Merge.rc:104
+#: Merge.rc:71E3C8E3
#, c-format
msgid "Diff &Block Size"
msgstr ""
-#: Merge.rc:106
-#: Merge.rc:467
-#, c-format
-msgid "&1"
-msgstr ""
-
-#: Merge.rc:107
-#: Merge.rc:116
-#, c-format
-msgid "&2"
-msgstr ""
-
-#: Merge.rc:108
-#: Merge.rc:117
-#, c-format
-msgid "&4"
-msgstr ""
-
-#: Merge.rc:109
-#: Merge.rc:118
-#, c-format
-msgid "&8"
-msgstr ""
-
-#: Merge.rc:110
-#: Merge.rc:119
-#, c-format
-msgid "1&6"
-msgstr ""
-
-#: Merge.rc:111
-#: Merge.rc:120
-#, c-format
-msgid "&32"
-msgstr ""
-
-#: Merge.rc:113
+#: Merge.rc:67D67717
#, c-format
msgid "&Ignore Color Difference (Color Distance Threshold)"
msgstr ""
-#: Merge.rc:115
-#: Merge.rc:466
-#, c-format
-msgid "&0"
-msgstr ""
-
-#: Merge.rc:121
-#, c-format
-msgid "64"
-msgstr ""
-
-#: Merge.rc:124
-#: Merge.rc:128
+#: Merge.rc:5A9A7139
#, c-format
msgid "&Previous Page"
-msgstr ""
+msgstr "Предыдущая страница"
-#: Merge.rc:125
-#: Merge.rc:129
+#: Merge.rc:68816EE1
#, c-format
msgid "&Next Page"
-msgstr ""
+msgstr "Следующая страница"
-#: Merge.rc:126
+#: Merge.rc:4DE14271
#, c-format
msgid "&Active Pane"
-msgstr ""
+msgstr "Активная панель"
-#: Merge.rc:132
-#: Merge.rc:452
+#: Merge.rc:43017E43
#, c-format
msgid "&Zoom"
-msgstr "&Ìàñøòàá"
-
-#: Merge.rc:134
-#, c-format
-msgid "&800%"
-msgstr ""
+msgstr "&Масштаб"
-#: Merge.rc:135
+#: Merge.rc:AC3AA13
#, c-format
-msgid "&400%"
-msgstr ""
-
-#: Merge.rc:136
-#, c-format
-msgid "&200%"
+msgid "&Overlay"
msgstr ""
-#: Merge.rc:137
+#: Merge.rc:43017E44
#, c-format
-msgid "&100%"
-msgstr ""
+msgid "&None"
+msgstr "&Нет"
-#: Merge.rc:138
+#: Merge.rc:4DE14272
#, c-format
-msgid "&50%"
+msgid "&Alpha Blend"
msgstr ""
-#: Merge.rc:139
+#: Merge.rc:237A0532
#, c-format
-msgid "&25%"
+msgid "Alpha &Blend Animation"
msgstr ""
-#: Merge.rc:141
+#: Merge.rc:5806E58F
#, c-format
-msgid "&Overlay"
+msgid "Dragging &Mode"
msgstr ""
-#: Merge.rc:143
-#: Merge.rc:179
-#: Merge.rc:283
-#: Merge.rc:486
+#: Merge.rc:43017E45
#, c-format
-msgid "&None"
-msgstr "&Íåò"
-
-#: Merge.rc:144
-#, c-format
-msgid "&XOR"
-msgstr ""
+msgid "&Move"
+msgstr "&Переместить"
-#: Merge.rc:145
+#: Merge.rc:5A9A713A
#, c-format
-msgid "&Alpha Blend"
+msgid "&Adjust Offset"
msgstr ""
-#: Merge.rc:147
+#: Merge.rc:100AAFAC
#, c-format
msgid "&Set Background Color"
-msgstr ""
+msgstr "Установить цвет фона"
-#: Merge.rc:153
-#: Merge.rc:231
-#: Merge.rc:358
+#: Merge.rc:43017E46
#, c-format
msgid "&File"
-msgstr "&Ôàéë"
+msgstr "&Файл"
-#: Merge.rc:155
-#: Merge.rc:233
-#: Merge.rc:360
+#: Merge.rc:4DE14273
#, c-format
msgid "&New\tCtrl+N"
-msgstr "Íîâûé\tCtrl+N"
+msgstr "Новый\tCtrl+N"
-#: Merge.rc:156
-#: Merge.rc:234
-#: Merge.rc:361
+#: Merge.rc:2C8061AC
#, c-format
msgid "New (&3 panes)"
msgstr ""
-#: Merge.rc:157
-#: Merge.rc:235
-#: Merge.rc:362
+#: Merge.rc:1DC30E61
#, c-format
msgid "&Open...\tCtrl+O"
-msgstr "&Îòêðûòü...\tCtrl+O"
+msgstr "&Открыть...\tCtrl+O"
-#: Merge.rc:158
-#: Merge.rc:236
-#: Merge.rc:363
-#, c-format
-msgid "Op&en Conflict File..."
-msgstr "Îòêðûòü ôàéë ñ êîíôëèêòàìè..."
+#: Merge.rc:6829F68F
+msgid "Open Conflic&t File..."
+msgstr "Открыть файл с конфликтами..."
-#: Merge.rc:160
-#: Merge.rc:238
-#: Merge.rc:365
+#: Merge.rc:5869BBD
#, c-format
msgid "Open Pro&ject...\tCtrl+J"
-msgstr "Îòêðûòü ïðîåêò...\tCtrl+J"
+msgstr "Открыть проект...\tCtrl+J"
-#: Merge.rc:161
-#: Merge.rc:239
-#: Merge.rc:366
+#: Merge.rc:1BF42625
#, c-format
msgid "Sa&ve Project..."
-msgstr "Ñîõðàíèòü ïðîåêò..."
+msgstr "Сохранить проект..."
-#: Merge.rc:163
+#: Merge.rc:47D4A3FA
#, c-format
msgid "Recent Projects"
-msgstr "Íåäàâíèå ïðîåêòû"
+msgstr "Недавние проекты"
-#: Merge.rc:164
-#: Merge.rc:250
-#: Merge.rc:410
+#: Merge.rc:73E9B1DA
#, c-format
msgid "Recent F&iles Or Folders"
-msgstr ""
+msgstr "Недавние Файлы или Папки"
-#: Merge.rc:166
-#: Merge.rc:252
-#: Merge.rc:412
-#: Merge.rc:572
-#: Merge.rc:2946
+#: Merge.rc:29D50B4A
#, c-format
msgid "< Empty >"
-msgstr "< Íåò >"
+msgstr "< Нет >"
-#: Merge.rc:169
-#: Merge.rc:255
-#: Merge.rc:415
+#: Merge.rc:79AB21E0
#, c-format
msgid "E&xit"
-msgstr "Â&ûõîä"
+msgstr "В&ыход"
-#: Merge.rc:171
-#: Merge.rc:257
-#: Merge.rc:417
+#: Merge.rc:43017E47
#, c-format
msgid "&Edit"
-msgstr "&Ïðàâêà"
+msgstr "&Правка"
-#: Merge.rc:173
-#: Merge.rc:261
-#: Merge.rc:446
+#: Merge.rc:27AC6D7E
#, c-format
msgid "&Options..."
-msgstr "&Íàñòðîéêè..."
+msgstr "&Настройки..."
-#: Merge.rc:175
-#: Merge.rc:263
-#: Merge.rc:448
+#: Merge.rc:43017E48
#, c-format
msgid "&View"
-msgstr "&Âèä"
+msgstr "&Вид"
-#: Merge.rc:177
-#: Merge.rc:281
-#: Merge.rc:484
+#: Merge.rc:AC3AA14
#, c-format
msgid "&Toolbar"
-msgstr "Ïà&íåëü èíñòðóìåíòîâ"
+msgstr "Па&нель инструментов"
-#: Merge.rc:180
-#: Merge.rc:284
-#: Merge.rc:487
+#: Merge.rc:1D2E49F7
#, c-format
msgid "&Small"
-msgstr "&Ìàëåíüêèå çíà÷êè"
+msgstr "&Мелкие значки"
-#: Merge.rc:181
-#: Merge.rc:285
-#: Merge.rc:488
+#: Merge.rc:22956A6
#, c-format
msgid "&Big"
-msgstr "&Áîëüøèå çíà÷êè"
+msgstr "&Крупные значки"
+
+#: Merge.rc:43017E49
+#, c-format
+msgid "&Huge"
+msgstr "&Огромные значки"
-#: Merge.rc:183
-#: Merge.rc:287
-#: Merge.rc:490
+#: Merge.rc:27AC6D7F
#, c-format
msgid "&Status Bar"
-msgstr "&Ñòðîêà ñîñòîÿíèÿ"
+msgstr "&Строка состояния"
-#: Merge.rc:184
-#: Merge.rc:288
-#: Merge.rc:491
+#: Merge.rc:2C015CFD
#, c-format
msgid "Ta&b Bar"
-msgstr "Ïàíåëü òàáîâ"
+msgstr "Панель табов"
-#: Merge.rc:186
-#: Merge.rc:311
-#: Merge.rc:547
+#: Merge.rc:1D2E49F8
#, c-format
msgid "&Tools"
-msgstr "&Èíñòðóìåíòû"
+msgstr "&Инструменты"
-#: Merge.rc:188
-#: Merge.rc:314
-#: Merge.rc:549
+#: Merge.rc:27AC6D80
#, c-format
msgid "&Filters..."
-msgstr "&Ôèëüòðû..."
+msgstr "&Фильтры..."
-#: Merge.rc:189
-#: Merge.rc:315
-#: Merge.rc:550
+#: Merge.rc:3938FFC0
#, c-format
msgid "&Generate Patch..."
-msgstr "&Ñîçäàòü ïàò÷..."
+msgstr "&Создать патч..."
-#: Merge.rc:191
-#: Merge.rc:318
-#: Merge.rc:553
+#: Merge.rc:AC3AA15
#, c-format
msgid "&Plugins"
-msgstr "&Äîïîëíåíèÿ"
+msgstr "Плагины"
-#: Merge.rc:193
-#: Merge.rc:320
-#: Merge.rc:555
-#: Merge.rc:1837
+#: Merge.rc:4C6CFD95
#, c-format
msgid "P&lugin Settings..."
-msgstr ""
+msgstr "Настройки плагинов"
-#: Merge.rc:195
-#: Merge.rc:322
-#: Merge.rc:557
+#: Merge.rc:729280D7
#, c-format
msgid "Ma&nual Prediffer"
-msgstr ""
+msgstr "Ручное предсравнение"
-#: Merge.rc:196
-#: Merge.rc:323
-#: Merge.rc:558
+#: Merge.rc:7CF93368
#, c-format
msgid "A&utomatic Prediffer"
-msgstr ""
+msgstr "Автоматическое предсравнение"
-#: Merge.rc:198
-#: Merge.rc:325
-#: Merge.rc:560
+#: Merge.rc:1A9EBDEC
#, c-format
msgid "&Manual Unpacking"
-msgstr "Ðàñïàêîâêà âðó÷íóþ"
+msgstr "Ð Ñ\83Ñ\87наÑ\8f Ñ\80аÑ\81паковка"
-#: Merge.rc:199
-#: Merge.rc:326
-#: Merge.rc:561
+#: Merge.rc:4EF8162D
#, c-format
msgid "&Automatic Unpacking"
-msgstr "Ðàñïàêîâêà àâòîìàòè÷åñêè"
+msgstr "Ð\90вÑ\82омаÑ\82иÑ\87еÑ\81каÑ\8f Ñ\80аÑ\81паковка"
-#: Merge.rc:201
-#: Merge.rc:328
-#: Merge.rc:563
-#: Merge.rc:1909
+#: Merge.rc:714B45FD
#, c-format
msgid "&Edit with Unpacker..."
msgstr ""
-#: Merge.rc:203
-#: Merge.rc:330
-#: Merge.rc:575
+#: Merge.rc:78B3B622
#, c-format
msgid "&Reload plugins"
-msgstr "&Ïåðåãðóçèòü âñå äîïîëíåíèÿ"
+msgstr "&Перезагрузить плагины"
-#: Merge.rc:205
-#: Merge.rc:332
-#: Merge.rc:577
+#: Merge.rc:89AF4F7
#, c-format
msgid "&Window"
-msgstr "&Îêíî"
+msgstr "&Окно"
-#: Merge.rc:207
-#: Merge.rc:334
-#: Merge.rc:579
+#: Merge.rc:4E65D33F
#, c-format
msgid "Cl&ose"
-msgstr "Çàêðûòü"
+msgstr "Закрыть"
-#: Merge.rc:208
-#: Merge.rc:335
-#: Merge.rc:580
+#: Merge.rc:34E43607
#, c-format
msgid "Clo&se All"
-msgstr "Çàêðûòü âñå"
+msgstr "Закрыть все"
-#: Merge.rc:210
-#: Merge.rc:337
-#: Merge.rc:582
+#: Merge.rc:8AF7E69
#, c-format
msgid "Change &Pane\tF6"
-msgstr "Ïåðåêëþ÷èòü &Îêíî\tF6"
+msgstr "Переключить &Окно\tF6"
-#: Merge.rc:212
-#: Merge.rc:339
-#: Merge.rc:584
+#: Merge.rc:5CCED707
#, c-format
msgid "Tile &Horizontally"
-msgstr "Ðàçìåñòèòü &Ãîðèçîíòàëüíî"
+msgstr "РазмеÑ\81Ñ\82иÑ\82Ñ\8c &Ð\93оÑ\80изонÑ\82алÑ\8cно"
-#: Merge.rc:213
-#: Merge.rc:340
-#: Merge.rc:585
+#: Merge.rc:52870A1
#, c-format
msgid "Tile &Vertically"
-msgstr "Ðàçìåñòèòü &Âåðòèêàëüíî"
+msgstr "РазмеÑ\81Ñ\82иÑ\82Ñ\8c &Ð\92еÑ\80Ñ\82икалÑ\8cно"
-#: Merge.rc:214
-#: Merge.rc:341
-#: Merge.rc:586
+#: Merge.rc:AC3AA16
#, c-format
msgid "&Cascade"
-msgstr "&Êàñêàä"
+msgstr "&Каскад"
-#: Merge.rc:216
-#: Merge.rc:343
-#: Merge.rc:588
-#: Merge.rc:2161
+#: Merge.rc:43017E4A
#, c-format
msgid "&Help"
-msgstr "&Ïîìîùü"
+msgstr "&Помощь"
-#: Merge.rc:218
-#: Merge.rc:345
-#: Merge.rc:590
+#: Merge.rc:3938FFC1
#, c-format
msgid "&WinMerge Help\tF1"
-msgstr "Ñïðàâêà &WinMerge\tF1"
+msgstr "Справка &WinMerge\tF1"
-#: Merge.rc:220
-#: Merge.rc:347
-#: Merge.rc:592
+#: Merge.rc:1B17601E
#, c-format
msgid "R&elease Notes"
-msgstr "&Çàìå÷àíèÿ ê ðåëèçó"
+msgstr ""
-#: Merge.rc:221
-#: Merge.rc:348
-#: Merge.rc:593
+#: Merge.rc:6E470BE7
#, c-format
msgid "&Translations"
-msgstr "&Ïåðåâîäû"
+msgstr "Переводы"
-#: Merge.rc:222
-#: Merge.rc:349
-#: Merge.rc:594
+#: Merge.rc:1C6125F4
#, c-format
msgid "C&onfiguration"
-msgstr "&Êîíôèãóðàöèÿ"
+msgstr "&Конфигурация"
-#: Merge.rc:224
-#: Merge.rc:351
-#: Merge.rc:596
+#: Merge.rc:175DEEEB
#, c-format
msgid "&GNU General Public License"
msgstr "&GNU General Public License"
-#: Merge.rc:225
-#: Merge.rc:352
-#: Merge.rc:597
+#: Merge.rc:3938FFC2
#, c-format
msgid "&About WinMerge..."
-msgstr "&Î ïðîãðàììå WinMerge..."
+msgstr "&О программе WinMerge..."
-#: Merge.rc:241
-#: Merge.rc:386
+#: Merge.rc:68816EE2
#, c-format
msgid "&Read-only"
-msgstr ""
+msgstr "Только для чтения"
-#: Merge.rc:243
-#: Merge.rc:388
+#: Merge.rc:71676C45
#, c-format
msgid "L&eft Read-only"
-msgstr "Ôàéë ñ&ëåâà òîëüêî äëÿ ÷òåíèÿ"
+msgstr "С&лева только для чтения"
-#: Merge.rc:244
-#: Merge.rc:389
+#: Merge.rc:729280D8
#, c-format
msgid "M&iddle Read-only"
-msgstr ""
+msgstr "Посередине только для чтения"
-#: Merge.rc:245
-#: Merge.rc:390
+#: Merge.rc:32BFDBA9
#, c-format
msgid "Ri&ght Read-only"
-msgstr "Ôàéë ñ&ïðàâà òîëüêî äëÿ ÷òåíèÿ"
+msgstr "С&права только для чтения"
-#: Merge.rc:248
+#: Merge.rc:453F5DDB
#, c-format
msgid "File En&coding..."
-msgstr ""
+msgstr "Кодировка файла..."
-#: Merge.rc:259
-#: Merge.rc:427
+#: Merge.rc:E44718
#, c-format
msgid "Select &All\tCtrl+A"
-msgstr "Â&ûáðàòü Âñå\tCtrl+A"
+msgstr "В&ыбрать Все\tCtrl+A"
-#: Merge.rc:265
+#: Merge.rc:58EEEB7E
#, c-format
msgid "Show &Identical Items"
-msgstr "Îäèíàêîâûå"
+msgstr "Одинаковые"
-#: Merge.rc:266
+#: Merge.rc:58EEEB7F
#, c-format
msgid "Show &Different Items"
-msgstr "Ðàçëè÷íûå"
+msgstr "РазлиÑ\87нÑ\8bе"
-#: Merge.rc:267
+#: Merge.rc:58E210F9
#, c-format
msgid "Show L&eft Unique Items"
-msgstr "Óíèêàëüíûå ñëåâà"
+msgstr "Уникальные слева"
+
+#: Merge.rc:28A1C3B4
+#, c-format
+msgid "Show Midd&le Unique Items"
+msgstr ""
-#: Merge.rc:268
+#: Merge.rc:43600E8F
#, c-format
msgid "Show Ri&ght Unique Items"
-msgstr "Óíèêàëüíûå ñïðàâà"
+msgstr "Уникальные справа"
-#: Merge.rc:269
+#: Merge.rc:E44719
#, c-format
msgid "Show S&kipped Items"
-msgstr "Ïðîïóùåííûå"
+msgstr "Пропущенные"
-#: Merge.rc:270
+#: Merge.rc:6F833C16
#, c-format
msgid "S&how Binary Files"
-msgstr "Áèíàðíûå ôàéëû"
+msgstr "Бинарные файлы"
+
+#: Merge.rc:5A9A713B
+#, c-format
+msgid "&3-way Compare"
+msgstr ""
-#: Merge.rc:272
+#: Merge.rc:200AD0D1
+#, c-format
+msgid "Show &Left Only Different Items"
+msgstr ""
+
+#: Merge.rc:4899EBE1
+#, c-format
+msgid "Show &Middle Only Different Items"
+msgstr ""
+
+#: Merge.rc:614F49A9
+#, c-format
+msgid "Show &Right Only Different Items"
+msgstr ""
+
+#: Merge.rc:6F833C17
#, c-format
msgid "Show Hidd&en Items"
-msgstr "Ñêðûòûå"
+msgstr "Скрытые"
-#: Merge.rc:274
+#: Merge.rc:311E1D87
#, c-format
msgid "Tree &Mode"
-msgstr "Ðåæèì &äåðåâà"
+msgstr "Режим &деÑ\80ева"
-#: Merge.rc:275
+#: Merge.rc:3E934D
#, c-format
msgid "E&xpand All Subfolders"
-msgstr "Ð&àçâåðíóòü âñå ïîäïàïêè"
+msgstr "Ð &азвеÑ\80нÑ\83Ñ\82Ñ\8c вÑ\81е подпапки"
-#: Merge.rc:276
+#: Merge.rc:4B91C2CF
#, c-format
msgid "&Collapse All Subfolders"
-msgstr "Ñ&âåðíóòü âñå ïîäïàïêè"
+msgstr "С&вернуть все подпапки"
-#: Merge.rc:278
-#: Merge.rc:450
+#: Merge.rc:E6D7EE
#, c-format
msgid "Select &Font..."
-msgstr "Âûáðàòü &Øðèôò..."
+msgstr "Выбрать &Шрифт..."
-#: Merge.rc:279
-#: Merge.rc:451
+#: Merge.rc:5D3AA8D3
#, c-format
msgid "Use Default F&ont"
-msgstr "Èñïîëüçîâàòü øðèôò ïî &óìîë÷àíèþ"
+msgstr "Использовать шрифт по &умолчанию"
+
+#: Merge.rc:2E3BFCA1
+#, c-format
+msgid "Sw&ap Panes"
+msgstr "Поменять панели местами"
-#: Merge.rc:290
+#: Merge.rc:3E681460
#, c-format
msgid "Compa&re Statistics"
-msgstr "Ñðàâíèòü ñòàòèñòèêè"
+msgstr "Статистика сравнения"
-#: Merge.rc:292
-#: Merge.rc:495
+#: Merge.rc:507A4C02
#, c-format
msgid "Refre&sh\tF5"
-msgstr "&Îáíîâèòü\tF5"
+msgstr "&Обновить\tF5"
-#: Merge.rc:293
+#: Merge.rc:2E2C5206
#, c-format
msgid "&Refresh Selected\tCtrl+F5"
-msgstr "Îáíîâèòü &âûäåëåííûå\tCtrl+F5"
+msgstr "Обновить &выделенное\tCtrl+F5"
-#: Merge.rc:295
-#: Merge.rc:497
+#: Merge.rc:1D2E49F9
#, c-format
msgid "&Merge"
-msgstr "&Îáúåäèíåíèå"
+msgstr "&Объединение"
-#: Merge.rc:297
+#: Merge.rc:6FC398B7
#, c-format
msgid "Co&mpare\tEnter"
-msgstr "Ñðàâíèòü\tEnter"
+msgstr "Сравнить\tEnter"
-#: Merge.rc:299
-#: Merge.rc:499
+#: Merge.rc:2E2C5207
#, c-format
msgid "&Next Difference\tAlt+Down"
-msgstr "&Ñëåäóþùåå îòëè÷èå\tAlt+Down"
+msgstr "&Следующее отличие\tAlt+Down"
-#: Merge.rc:300
-#: Merge.rc:500
+#: Merge.rc:545FEEA0
#, c-format
msgid "&Previous Difference\tAlt+Up"
-msgstr "Ï&ðåäûäóùåå îòëè÷èå\tAlt+Up"
+msgstr "П&редыдущее отличие\tAlt+Up"
-#: Merge.rc:302
-#: Merge.rc:526
+#: Merge.rc:175DEEEC
#, c-format
msgid "&First Difference\tAlt+Home"
-msgstr "Ïåð&âîå îòëè÷èå\tAlt+Home"
+msgstr "Пер&вое отличие\tAlt+Home"
-#: Merge.rc:303
-#: Merge.rc:527
+#: Merge.rc:3C1ECDD9
#, c-format
msgid "&Current Difference\tAlt+Enter"
-msgstr "&Òåêóùåå îòëè÷èå\tAlt+Enter"
+msgstr "&Текущее отличие\tAlt+Enter"
-#: Merge.rc:304
-#: Merge.rc:528
+#: Merge.rc:26A69749
#, c-format
msgid "&Last Difference\tAlt+End"
-msgstr "Ïîñë&åäíåå îòëè÷èå\tAlt+End"
+msgstr "Посл&еднее отличие\tAlt+End"
-#: Merge.rc:306
-#: Merge.rc:530
+#: Merge.rc:334E25B0
#, c-format
msgid "Copy to &Right\tAlt+Right"
-msgstr "Ñêîïèðîâàòü íà &ïðàâóþ ïàíåëü\tAlt+Right"
+msgstr "Скопировать на &правую панель\tAlt+Right"
-#: Merge.rc:307
-#: Merge.rc:531
+#: Merge.rc:69AD3BF7
#, c-format
msgid "Copy to L&eft\tAlt+Left"
-msgstr "Ñêîïèðîâàòü íà &ëåâóþ ïàíåëü\tAlt+Left"
+msgstr "Скопировать на &левую панель\tAlt+Left"
-#: Merge.rc:309
+#: Merge.rc:4DE14274
#, c-format
msgid "&Delete\tDel"
-msgstr "&Óäàëèòü\tDel"
+msgstr "&Удалить\tDel"
-#: Merge.rc:313
-#: Merge.rc:683
+#: Merge.rc:100AAFAD
#, c-format
msgid "&Customize Columns..."
-msgstr "&Íàñòðîèòü êîëîíêè..."
+msgstr "&Настроить колонки..."
-#: Merge.rc:316
-#: Merge.rc:551
+#: Merge.rc:2F07210E
#, c-format
msgid "Generate &Report..."
-msgstr "Ñîçäàòü &îò÷åò..."
+msgstr "Создать &отчет..."
-#: Merge.rc:368
+#: Merge.rc:6E470BE8
#, c-format
msgid "&Save\tCtrl+S"
-msgstr "&Ñîõðàíèòü\tCtrl+S"
+msgstr "&Сохранить\tCtrl+S"
-#: Merge.rc:369
+#: Merge.rc:125AD721
#, c-format
msgid "Sav&e"
-msgstr ""
+msgstr "Сохранить"
-#: Merge.rc:371
+#: Merge.rc:751AB58E
#, c-format
msgid "Save &Left"
-msgstr "Ñîõðàíèòü ôàéë ñ&ëåâà"
+msgstr "Сохранить с&лева"
-#: Merge.rc:372
+#: Merge.rc:194397DD
#, c-format
msgid "Save &Middle"
-msgstr ""
+msgstr "Сохранить посередине"
-#: Merge.rc:373
+#: Merge.rc:2E3BFCA2
#, c-format
msgid "Save &Right"
-msgstr "Ñîõðàíèòü ôàéë ñ&ïðàâà"
+msgstr "Сохранить с&права"
-#: Merge.rc:375
+#: Merge.rc:79321BE1
#, c-format
msgid "Save &As"
-msgstr ""
+msgstr "Сохранить как"
-#: Merge.rc:377
+#: Merge.rc:1BF42626
#, c-format
msgid "Save &Left As..."
-msgstr ""
+msgstr "Сохранить слева как..."
-#: Merge.rc:378
+#: Merge.rc:6F833C18
#, c-format
msgid "Save &Middle As..."
-msgstr ""
+msgstr "Сохранить посередине как..."
-#: Merge.rc:379
+#: Merge.rc:62909ED4
#, c-format
msgid "Save &Right As..."
-msgstr ""
+msgstr "Сохранить справа как..."
-#: Merge.rc:382
+#: Merge.rc:4DB19837
#, c-format
msgid "&Print..."
-msgstr "&Ïå÷àòü..."
+msgstr "&Печать..."
-#: Merge.rc:383
-#, c-format
-msgid "Page Se&tup"
-msgstr "Ïàðàìåòðû ñòðàíèöû..."
+#: Merge.rc:60FF375A
+msgid "Page Set&up"
+msgstr "Параметры страницы..."
-#: Merge.rc:384
+#: Merge.rc:23CBE0E5
#, c-format
msgid "Print Previe&w"
-msgstr "Ïðåäâàðèòåëüíûé ïðîñìîòð"
+msgstr "Предварительный просмотр"
-#: Merge.rc:393
+#: Merge.rc:4B91C2D0
#, c-format
msgid "&Convert Line Endings to"
-msgstr "&Çàìåíèòü ïåðåíîñû ñòðîê íà"
-
-#: Merge.rc:395
-#, c-format
-msgid "&Windows (CRLF)"
-msgstr "&Windows (CRLF)"
-
-#: Merge.rc:396
-#, c-format
-msgid "&Unix (LF)"
-msgstr "&Unix (LF)"
-
-#: Merge.rc:397
-#, c-format
-msgid "&Mac (CR)"
-msgstr "&Mac (CR)"
+msgstr "&Заменить переносы строк на"
-#: Merge.rc:400
+#: Merge.rc:78B3B623
#, c-format
msgid "&Merge Mode\tF9"
-msgstr "Ðåæèì ñëèÿíèÿ\tF9"
+msgstr "Режим Ñ\81лиÑ\8fниÑ\8f\tF9"
-#: Merge.rc:402
+#: Merge.rc:32BFDBAA
#, c-format
msgid "Re&load\tCtrl+F5"
msgstr ""
-#: Merge.rc:403
-#: Merge.rc:1908
+#: Merge.rc:1A9EBDED
#, c-format
msgid "&File Encoding..."
-msgstr "Êîäèðîâàíèå ôàéëà..."
+msgstr "Кодировка файла..."
-#: Merge.rc:404
+#: Merge.rc:507A4C03
#, c-format
msgid "Recompare As"
-msgstr ""
+msgstr "Пересравнить как"
+
+#: Merge.rc:43017E4B
+#, c-format
+msgid "&Text"
+msgstr "Текст"
-#: Merge.rc:406
-#: Merge.rc:615
+#: Merge.rc:22956A7
#, c-format
msgid "&XML"
msgstr "&XML"
-#: Merge.rc:407
-#: Merge.rc:616
+#: Merge.rc:89AF4F8
#, c-format
msgid "&Binary"
+msgstr "Двоичный"
+
+#: Merge.rc:1D2E49FA
+#, c-format
+msgid "&Image"
msgstr ""
-#: Merge.rc:419
+#: Merge.rc:6E470BE9
#, c-format
msgid "&Undo\tCtrl+Z"
-msgstr "&Îòìåíà\tCtrl+Z"
+msgstr "&Отменить\tCtrl+Z"
-#: Merge.rc:420
+#: Merge.rc:6E470BEA
#, c-format
msgid "&Redo\tCtrl+Y"
-msgstr "Â&åðíóòü\tCtrl+Y"
+msgstr "В&ернуть\tCtrl+Y"
-#: Merge.rc:422
+#: Merge.rc:CAEDA34
#, c-format
msgid "Cu&t\tCtrl+X"
-msgstr "Âû&ðåçàòü\tCtrl+X"
+msgstr "Вы&резать\tCtrl+X"
-#: Merge.rc:423
+#: Merge.rc:6E470BEB
#, c-format
msgid "&Copy\tCtrl+C"
-msgstr "&Êîïèðîâàòü\tCtrl+C"
+msgstr "&Копировать\tCtrl+C"
-#: Merge.rc:424
+#: Merge.rc:5A9A713C
#, c-format
msgid "&Paste\tCtrl+V"
-msgstr "&Âñòàâèòü\tCtrl+V"
+msgstr "&Вставить\tCtrl+V"
-#: Merge.rc:426
+#: Merge.rc:73FB245
#, c-format
msgid "Select Line &Difference\tF4"
-msgstr "Âûáðàòü îòëè÷èå\tF4"
+msgstr "Выбрать отличие\tF4"
-#: Merge.rc:429
+#: Merge.rc:444C5DDB
#, c-format
msgid "F&ind...\tCtrl+F"
-msgstr "&Íàéòè...\tCtrl+F"
+msgstr "&Найти...\tCtrl+F"
-#: Merge.rc:430
+#: Merge.rc:44BC83EC
#, c-format
msgid "Repla&ce...\tCtrl+H"
-msgstr "&Çàìåíèòü...\tCtrl+H"
+msgstr "&Заменить...\tCtrl+H"
+
+#: Merge.rc:4B91C2D1
+#, c-format
+msgid "&Marker...\tCtrl+Shift+M"
+msgstr ""
-#: Merge.rc:432
+#: Merge.rc:669F87F4
#, c-format
msgid "Advanced"
-msgstr "&Äîïîëíèòåëüíî"
+msgstr "&Дополнительно"
-#: Merge.rc:434
+#: Merge.rc:45A190D
#, c-format
msgid "&Copy With Line Numbers\tCtrl+Shift+C"
-msgstr "&Êîïèðîâàòü ñ íóìåðàöèåé ñòðîê\tCtrl+Shift+C"
+msgstr "&Копировать с нумерацией строк\tCtrl+Shift+C"
-#: Merge.rc:437
+#: Merge.rc:68816EE3
#, c-format
msgid "&Bookmarks"
-msgstr "&Çàêëàäêè"
+msgstr "&Закладки"
-#: Merge.rc:439
+#: Merge.rc:26A6974A
#, c-format
msgid "&Toggle Bookmark\tCtrl+F2"
-msgstr "&Çàêëàäêà\tCtrl+F2"
+msgstr "&Переключить закладку\tCtrl+F2"
-#: Merge.rc:440
+#: Merge.rc:3938FFC3
#, c-format
msgid "&Next Bookmark\tF2"
-msgstr "&Ñëåäóþùàÿ çàêëàäêà\tF2"
+msgstr "&Следующая закладка\tF2"
-#: Merge.rc:441
+#: Merge.rc:545FEEA1
#, c-format
msgid "&Previous bookmark\tShift+F2"
-msgstr "&Ïðåäûäóùàÿ çàêëàäêà\tShift+F2"
+msgstr "&Предыдущая закладка\tShift+F2"
-#: Merge.rc:442
+#: Merge.rc:4EF8162E
#, c-format
msgid "&Clear All Bookmarks"
-msgstr "&Óäàëèòü âñå çàêëàäêè"
+msgstr "&Удалить все закладки"
-#: Merge.rc:444
+#: Merge.rc:1A9EBDEE
#, c-format
msgid "&Go To...\tCtrl+G"
-msgstr "Ïåðåéòè ê ñòðîêå...\tCtrl+G"
+msgstr "Перейти к...\tCtrl+G"
-#: Merge.rc:454
+#: Merge.rc:7C622F87
#, c-format
msgid "Zoom &In\tCtrl++"
-msgstr "Ïðèáëèçèòü\tCtrl++"
+msgstr "Увеличить\tCtrl++"
-#: Merge.rc:455
+#: Merge.rc:FE3C1D1
#, c-format
msgid "Zoom &Out\tCtrl+-"
-msgstr "Îòäàëèòü\tCtrl+-"
+msgstr "Уменьшить\tCtrl+-"
#. Zoom to normal
-#: Merge.rc:456
+#: Merge.rc:78B3B624
#, c-format
msgid "&Normal\tCtrl+*"
-msgstr "Îáû÷íûé\tCtrl+*"
+msgstr "Обычный\tCtrl+*"
-#: Merge.rc:458
+#: Merge.rc:1BF42627
#, c-format
msgid "Syntax Highlight"
-msgstr "Ïîäñâåòêà ñèíòàêñèñà"
+msgstr "Подсветка синтаксиса"
-#: Merge.rc:463
+#: Merge.rc:6E470BEC
#, c-format
msgid "&Diff Context"
msgstr ""
-#: Merge.rc:465
+#: Merge.rc:68816EE4
#, c-format
-msgid "&All"
-msgstr ""
+msgid "&All Lines"
+msgstr "Все строки"
-#: Merge.rc:468
+#: Merge.rc:AC3AA17
#, c-format
-msgid "&3"
-msgstr ""
+msgid "&0 Lines"
+msgstr "&0 строк"
-#: Merge.rc:469
+#: Merge.rc:89AF4F9
#, c-format
-msgid "&5"
-msgstr ""
+msgid "&1 Line"
+msgstr "&1 строка"
-#: Merge.rc:470
+#: Merge.rc:AC3AA18
#, c-format
-msgid "&7"
-msgstr ""
+msgid "&3 Lines"
+msgstr "&3 строки"
-#: Merge.rc:471
+#: Merge.rc:AC3AA19
#, c-format
-msgid "&9"
-msgstr ""
+msgid "&5 Lines"
+msgstr "&5 строк"
-#: Merge.rc:474
+#: Merge.rc:AC3AA1A
+#, c-format
+msgid "&7 Lines"
+msgstr "&7 строк"
+
+#: Merge.rc:AC3AA1B
+#, c-format
+msgid "&9 Lines"
+msgstr "&9 строк"
+
+#: Merge.rc:44B58195
+#, c-format
+msgid "&Toggle All and 0-9 Lines\tCtrl+D"
+msgstr "Переключить все и 0-9 строк\tCtrl+D"
+
+#: Merge.rc:27AC6D81
#, c-format
msgid "&Lock Panes"
-msgstr "Çàáëîêèðîâàòü ïàíåëè"
+msgstr "Заблокировать панели"
-#: Merge.rc:475
+#: Merge.rc:1DC30E62
#, c-format
msgid "&View Whitespace"
-msgstr "Ïîêàçû&âàòü íåâèäèìûå"
+msgstr "Показы&вать невидимые"
-#: Merge.rc:476
+#: Merge.rc:4A81EF3E
#, c-format
msgid "Vie&w Line Differences"
-msgstr "Ïîêàçûâàòü îòëè÷èÿ â ñòðîêàõ"
+msgstr "Показывать отличия в строках"
-#: Merge.rc:477
+#: Merge.rc:37660CE9
#, c-format
msgid "View Line &Numbers"
-msgstr "Ïîêàçûâàòü íîìåðà ñòðîê"
+msgstr "Показывать номера строк"
-#: Merge.rc:478
+#: Merge.rc:4FF286
#, c-format
msgid "View &Margins"
-msgstr "Ïîêàçûâàòü ïîëÿ"
+msgstr "Показывать поля"
-#: Merge.rc:479
+#: Merge.rc:3FE258FF
#, c-format
msgid "W&rap Lines"
-msgstr "Ïåðåíîñ ïî ñëîâàì"
-
-#: Merge.rc:481
-#, c-format
-msgid "Sw&ap Panes"
-msgstr "Ïîìåíÿòü ïàíåëè ìåñòàìè"
+msgstr "Перенос по словам"
-#: Merge.rc:482
+#: Merge.rc:62909ED5
#, c-format
msgid "Split V&ertically"
msgstr ""
-#: Merge.rc:492
+#: Merge.rc:70E79DFF
#, c-format
msgid "Diff &Pane"
-msgstr "Ïàíå&ëü ñðàâíåíèÿ"
+msgstr "Пане&ль сравнения"
-#: Merge.rc:493
+#: Merge.rc:3534E273
#, c-format
msgid "Lo&cation Pane"
-msgstr "Ïàíåëü ìåñòîïîëîæåíèé"
+msgstr "Панель местоположений"
-#: Merge.rc:502
+#: Merge.rc:59B87E1C
#, c-format
msgid "Ne&xt Conflict\tAlt+Shift+Down"
-msgstr ""
+msgstr "Следующий конфликт\tAlt+Shift+Down"
-#: Merge.rc:503
+#: Merge.rc:3BDD62C2
#, c-format
msgid "Pre&vious Conflict\tAlt+Shift+Up"
-msgstr ""
+msgstr "Предыдущий конфликт\tAlt+Shift+Up"
-#: Merge.rc:505
+#: Merge.rc:6D5176E5
#, c-format
msgid "A&dvanced"
msgstr ""
-#: Merge.rc:507
+#: Merge.rc:9DA4F24
#, c-format
msgid "Next Difference Between Left and Middle\tAlt+1"
-msgstr ""
+msgstr "Следующее отличие между левым и средним\tAlt+1"
-#: Merge.rc:508
+#: Merge.rc:2EBE17F8
#, c-format
msgid "Previous Difference Between Left And Middle\tAlt+Shift+1"
-msgstr ""
+msgstr "Предыдущее отличие между левым и средним\tAlt+Shift+1"
-#: Merge.rc:510
+#: Merge.rc:21599F72
#, c-format
msgid "Next Difference Between Left and Right\tAlt+2"
-msgstr ""
+msgstr "Следующее отличие между левым и правым\tAlt+2"
-#: Merge.rc:511
+#: Merge.rc:5416A5EC
#, c-format
msgid "Previous Difference Between Left And Right\tAlt+Shift+2"
-msgstr ""
+msgstr "Предыдущее отличие между левым и правым\tAlt+Shift+2"
-#: Merge.rc:513
+#: Merge.rc:316F95AC
#, c-format
msgid "Next Difference Between Middle and Right\tAlt+3"
-msgstr ""
+msgstr "Следующее отличие между средним и правым\tAlt+3"
-#: Merge.rc:514
+#: Merge.rc:2904E763
#, c-format
msgid "Previous Difference Between Middle And Right\tAlt+Shift+3"
-msgstr ""
+msgstr "Предыдущее отличие между средним и правым\tAlt+Shift+3"
-#: Merge.rc:516
+#: Merge.rc:4D91737D
#, c-format
msgid "Next Left Only Difference\tAlt+7"
-msgstr ""
+msgstr "Следующее отличие только слева\tAlt+7"
-#: Merge.rc:517
+#: Merge.rc:4BFD42D
#, c-format
msgid "Previous Left Only Difference\tAlt+Shift+7"
-msgstr ""
+msgstr "Предыдущее отличие только слева\tAlt+Shift+7"
-#: Merge.rc:519
+#: Merge.rc:2F029443
#, c-format
msgid "Next Middle Only Difference\tAlt+8"
-msgstr ""
+msgstr "Следующее отличие только посередине\tAlt+8"
-#: Merge.rc:520
+#: Merge.rc:541B8710
#, c-format
msgid "Previous Middle Only Difference\tAlt+Shift+8"
-msgstr ""
+msgstr "Предыдущее отличие только посередине\tAlt+Shift+8"
-#: Merge.rc:522
+#: Merge.rc:649CFC83
#, c-format
msgid "Next Right Only Difference\tAlt+9"
-msgstr ""
+msgstr "Следующее отличие только справа\tAlt+9"
-#: Merge.rc:523
+#: Merge.rc:133AB1C4
#, c-format
msgid "Previous Right Only Difference\tAlt+Shift+9"
-msgstr ""
+msgstr "Предыдущее отличие только справа\tAlt+Shift+9"
-#: Merge.rc:533
+#: Merge.rc:30FF7A4C
#, c-format
msgid "Copy from Left\tAlt+Shift+Right"
msgstr ""
-#: Merge.rc:534
+#: Merge.rc:30FF7A4D
#, c-format
msgid "Copy from Right\tAlt+Shift+Left"
msgstr ""
-#: Merge.rc:536
+#: Merge.rc:28C70E7F
#, c-format
msgid "C&opy to Right and Advance\tAlt+Ctrl+Right"
-msgstr "Ñêîïèðîâàòü íà ïðàâóþ ïàíåëü è ïåðåéòè ê ñëåäóþùåìó\tAlt+Ctrl+Right"
+msgstr "Скопировать на правую панель и перейти к следующему\tAlt+Ctrl+Right"
-#: Merge.rc:537
+#: Merge.rc:4A3B5872
#, c-format
msgid "Copy &to Left and Advance\tAlt+Ctrl+Left"
-msgstr "Ñêîïèðîâàòü íà ëåâóþ ïàíåëü è ïåðåéòè ê ñëåäóþùåìó\tAlt+Ctrl+Left"
+msgstr "Скопировать на левую панель и перейти к следующему\tAlt+Ctrl+Left"
-#: Merge.rc:539
+#: Merge.rc:1AC98D09
#, c-format
msgid "Copy &All to Right"
-msgstr "Ñê&îïèðîâàòü âñå íà ïðàâóþ ïàíåëü"
+msgstr "Ск&опировать все на правую панель"
-#: Merge.rc:540
+#: Merge.rc:D404EDD
#, c-format
msgid "Cop&y All to Left"
-msgstr "Ñêîï&èðîâàòü âñå íà ëåâóþ ïàíåëü"
+msgstr "Скоп&ировать все на левую панель"
-#: Merge.rc:542
+#: Merge.rc:4BC6A157
#, c-format
msgid "A&uto Merge\tAlt+Ctrl+M"
msgstr ""
-#: Merge.rc:544
+#: Merge.rc:13D827C3
#, c-format
msgid "Add &Synchronization Point\tAlt+S"
-msgstr ""
+msgstr "Добавить точку синхронизации\tAlt+S"
-#: Merge.rc:545
+#: Merge.rc:6F88EC67
#, c-format
msgid "Clear Sync&hronization Points"
-msgstr ""
+msgstr Очистить точки синхронизации""
-#: Merge.rc:565
+#: Merge.rc:68816EE5
#, c-format
msgid "&Prediffer"
-msgstr "&Ïðåäñðàâíåíèå"
+msgstr "&Предсравнение"
-#: Merge.rc:570
+#: Merge.rc:AC3AA1C
#, c-format
msgid "&Scripts"
-msgstr "&Ñêðèïòû"
+msgstr "&Скрипты"
+
+#: Merge.rc:39000D56
+#, c-format
+msgid "Sp&lit"
+msgstr ""
-#: Merge.rc:605
+#: Merge.rc:4C3E0A2B
#, c-format
msgid "Comp&are"
-msgstr "Ñ&ðàâíèòü"
+msgstr "С&равнить"
-#: Merge.rc:606
+#: Merge.rc:334E25B1
#, c-format
msgid "Compare Non-hor&izontally"
-msgstr ""
+msgstr "Сравнить не по горизонтали"
-#: Merge.rc:608
+#: Merge.rc:20F0A449
#, c-format
msgid "First &left item with second left item"
-msgstr ""
+msgstr Первый левый элемент со вторым левым элементом""
-#: Merge.rc:609
+#: Merge.rc:2758BFC0
#, c-format
msgid "First &right item with second right item"
-msgstr ""
+msgstr "Первый правый элемент со вторым правым элементом"
-#: Merge.rc:610
+#: Merge.rc:56380EAD
#, c-format
msgid "&First left item with second right item"
-msgstr ""
+msgstr "Первый левый элемент со вторым правым элементом"
-#: Merge.rc:611
+#: Merge.rc:56380EAE
#, c-format
msgid "&Second left item with first right item"
-msgstr ""
+msgstr "Второй левый элемент со вторым правым элементом"
-#: Merge.rc:613
+#: Merge.rc:67A28B28
#, c-format
msgid "Co&mpare As"
+msgstr "Сравнить как"
+
+#: Merge.rc:4D4D2E92
+#, c-format
+msgid "Left to Middle (%1 of %2)"
msgstr ""
-#: Merge.rc:621
+#: Merge.rc:1723859F
#, c-format
-msgid "&Left to Right"
-msgstr "Ñëåâà íàïðàâî"
+msgid "Left to Right (%1 of %2)"
+msgstr "Слева направо (%1 из %2)"
-#: Merge.rc:622
+#: Merge.rc:20155F58
#, c-format
-msgid "L&eft to..."
-msgstr "Ñëåâà íà ..."
+msgid "Left to... (%1 of %2)"
+msgstr "Слева на... (%1 из %2)"
-#: Merge.rc:623
+#: Merge.rc:6CA26872
#, c-format
-msgid "&Right to Left"
-msgstr "Ñïðàâà íàëåâî"
+msgid "Middle to Left (%1 of %2)"
+msgstr ""
-#: Merge.rc:624
+#: Merge.rc:27AAA635
#, c-format
-msgid "R&ight to..."
-msgstr "Ñïðàâà íà ..."
+msgid "Middle to Right (%1 of %2)"
+msgstr ""
-#: Merge.rc:626
+#: Merge.rc:7F2E4118
#, c-format
-msgid "&Move"
-msgstr "&Ïåðåìåñòèòü"
+msgid "Middle to... (%1 of %2)"
+msgstr ""
+
+#: Merge.rc:2044B100
+#, c-format
+msgid "Right to Middle (%1 of %2)"
+msgstr ""
-#: Merge.rc:628
+#: Merge.rc:73E9B1DB
#, c-format
-msgid "&Left to..."
-msgstr "&Ñëåâà â..."
+msgid "Right to Left (%1 of %2)"
+msgstr "Справа налево (%1 из %2)"
-#: Merge.rc:629
+#: Merge.rc:6DBD6123
#, c-format
-msgid "&Right to..."
-msgstr "&Ñïðàâà â..."
+msgid "Right to... (%1 of %2)"
+msgstr "Справа на... (%1 из %2)"
-#: Merge.rc:631
+#: Merge.rc:89AF4FA
#, c-format
msgid "&Delete"
-msgstr "Óäàëèòü"
+msgstr "Удалить"
-#: Merge.rc:633
-#: Merge.rc:1351
-#: Merge.rc:1686
+#: Merge.rc:43017E4C
#, c-format
msgid "&Left"
-msgstr "Ñëåâà"
+msgstr "Слева"
+
+#: Merge.rc:89AF4FB
+#, c-format
+msgid "&Middle"
+msgstr "Посередине"
-#: Merge.rc:634
-#: Merge.rc:1355
-#: Merge.rc:1692
+#: Merge.rc:1D2E49FB
#, c-format
msgid "&Right"
-msgstr "Ñïðàâà"
+msgstr "Справа"
-#: Merge.rc:635
+#: Merge.rc:43017E4D
#, c-format
msgid "&Both"
-msgstr "Îáà"
+msgstr "Оба"
+
+#: Merge.rc:22956A8
+#, c-format
+msgid "&All"
+msgstr "Все"
-#: Merge.rc:637
+#: Merge.rc:4876CD3D
#, c-format
msgid "Re&name"
-msgstr "&Ïåðåèìåíîâàòü"
+msgstr "&Переименовать"
-#: Merge.rc:638
+#: Merge.rc:27AC6D82
#, c-format
msgid "&Hide Items"
-msgstr "&Ñêðûòü"
+msgstr "&Скрыть"
-#: Merge.rc:640
+#: Merge.rc:68816EE6
#, c-format
msgid "&Open Left"
-msgstr "Îòêðûòü ëåâûé ôàéë"
+msgstr "Открыть левый"
+
+#: Merge.rc:46724E8D
+#, c-format
+msgid "with &External Editor"
+msgstr "внешним редактором"
+
+#: Merge.rc:5A9A713D
+#, c-format
+msgid "&Parent Folder"
+msgstr ""
+
+#: Merge.rc:761E6872
+#, c-format
+msgid "Open Midd&le"
+msgstr "Открыть средний"
-#: Merge.rc:646
+#: Merge.rc:1C95A043
#, c-format
msgid "O&pen Right"
-msgstr "Îòêðûòü ïðàâûé ôàéë"
+msgstr "Открыть правый"
-#: Merge.rc:653
+#: Merge.rc:6FC398B8
#, c-format
msgid "Cop&y Pathnames"
-msgstr "Ñêîïèðîâàòü ïóòè"
+msgstr "Копировать пути"
+
+#: Merge.rc:71676C46
+#, c-format
+msgid "Left (%1 of %2)"
+msgstr "Слева (%1 из %2)"
+
+#: Merge.rc:729280D9
+#, c-format
+msgid "Middle (%1 of %2)"
+msgstr "Посередине (%1 of %2)"
-#: Merge.rc:655
-#: Merge.rc:662
+#: Merge.rc:32BFDBAB
#, c-format
-msgid "&Left (%1 of %2)"
-msgstr "Ñ&ëåâà (%1 èç %2)"
+msgid "Right (%1 of %2)"
+msgstr "Справа (%1 из %2)"
-#: Merge.rc:656
-#: Merge.rc:663
+#: Merge.rc:36B164C3
#, c-format
-msgid "&Right (%1 of %2)"
-msgstr "Ñ&ïðàâà (%1 èç %2)"
+msgid "Both (%1 of %2)"
+msgstr "Оба (%1 из %2)"
-#: Merge.rc:657
-#: Merge.rc:664
+#: Merge.rc:2515A6BA
#, c-format
-msgid "&Both (%1 of %2)"
-msgstr "Î&áà (%1 èç %2)"
+msgid "All (%1 of %2)"
+msgstr "Все (%1 of %2)"
-#: Merge.rc:659
+#: Merge.rc:6FC398B9
#, c-format
msgid "Copy &Filenames"
-msgstr "Ñêîïèðîâàòü &èìåíà ôàéëîâ"
+msgstr "Копировать &имена файлов"
-#: Merge.rc:660
+#: Merge.rc:4BFA4345
#, c-format
msgid "Copy Items To Clip&board"
-msgstr ""
+msgstr "Копировать элементы в буфер обмена"
-#: Merge.rc:667
+#: Merge.rc:22956A9
#, c-format
msgid "&Zip"
-msgstr "&Çààðõèâèðîâàòü"
+msgstr "&Заархивировать"
-#: Merge.rc:669
+#: Merge.rc:7370E045
#, c-format
-msgid "&Left... (%1 of %2)"
-msgstr "Ñ&ëåâà... (%1 èç %2)"
-
-#: Merge.rc:670
-#, c-format
-msgid "&Right... (%1 of %2)"
-msgstr "Ñ&ïðàâà... (%1 èç %2)"
+msgid "Both to... (%1 of %2)"
+msgstr ""
-#: Merge.rc:671
+#: Merge.rc:7CF93369
#, c-format
-msgid "&Both... (%1 of %2)"
-msgstr "Î&áà... (%1 èç %2)"
+msgid "All to... (%1 of %2)"
+msgstr ""
-#: Merge.rc:672
+#: Merge.rc:31EF0955
#, c-format
-msgid "&Differences... (%1 of %2)"
-msgstr "Òîëüêî &îòëè÷èÿ... (%1 èç %2)"
+msgid "Differences to... (%1 of %2)"
+msgstr ""
-#: Merge.rc:675
+#: Merge.rc:AC3AA1D
#, c-format
msgid "&Refresh"
-msgstr "&Îáíîâèòü"
+msgstr "&Обновить"
-#: Merge.rc:677
+#: Merge.rc:71676C47
#, c-format
msgid "Left Shell menu"
-msgstr "Ëåâîå ìåíþ îáîëî÷êè"
+msgstr "Левое меню оболочки"
-#: Merge.rc:678
+#: Merge.rc:729280DA
#, c-format
msgid "Middle Shell menu"
-msgstr ""
+msgstr "Среднее меню оболочки"
-#: Merge.rc:679
+#: Merge.rc:32BFDBAC
#, c-format
msgid "Right Shell menu"
-msgstr "Ïðàâîå ìåíþ îáîëî÷êè"
+msgstr "Правое меню оболочки"
-#: Merge.rc:691
+#: Merge.rc:3CF9F84
#, c-format
msgid "Copy"
-msgstr ""
+msgstr "Копировать"
-#: Merge.rc:692
+#: Merge.rc:78B3B625
#, c-format
msgid "&Copy Full Path"
-msgstr "Ñêîïèðîâàòü ïîëíûé ïóòü"
+msgstr "Копировать полный путь"
-#: Merge.rc:693
+#: Merge.rc:1C6125F5
#, c-format
msgid "Copy &Filename"
-msgstr "Ñêîïèðîâàòü èìÿ ôàéëà"
+msgstr "Копировать имя файла"
-#: Merge.rc:699
+#: Merge.rc:27A06B44
#, c-format
msgid "Prediffer Settings"
-msgstr "Ïàðàìåòðû ïðåäñðàâíåíèÿ"
+msgstr "Параметры предсравнения"
-#: Merge.rc:701
+#: Merge.rc:6E470BED
#, c-format
msgid "&No prediffer"
-msgstr "&Íåò ïðåäñðàâíåíèÿ"
+msgstr "&Нет предсравнения"
-#: Merge.rc:702
+#: Merge.rc:2515A6BB
#, c-format
msgid "Auto prediffer"
-msgstr "&Àâòîïðåäñðàâíåíèå"
+msgstr "&Автопредсравнение"
-#: Merge.rc:710
+#: Merge.rc:24F1D5E9
#, c-format
msgid "G&oto Diff"
-msgstr "Ïåðåéòè ê &îòëè÷èþ"
+msgstr "Перейти к &отличию"
-#: Merge.rc:713
+#: Merge.rc:1DC30E63
#, c-format
msgid "&No Moved Blocks"
-msgstr "&Áåç ïåðåìåùåííûõ áëîêîâ"
+msgstr "&Без перемещенных блоков"
-#: Merge.rc:714
+#: Merge.rc:1A9EBDEF
#, c-format
msgid "&All Moved Blocks"
-msgstr "&Âñå ïåðåìåùåííûå áëîêè"
+msgstr "&Все перемещенные блоки"
-#: Merge.rc:715
+#: Merge.rc:BA50068
#, c-format
msgid "Moved Block for &Current Diff"
-msgstr "Ïåðåìåù. áëîê äëÿ &äàííîãî îòëè÷èÿ"
+msgstr "Перемещ. блок для текущего отличия"
-#: Merge.rc:723
-#: Merge.rc:1251
+#: Merge.rc:3C68C747
#, c-format
msgid "W&hitespaces"
-msgstr "Íåâèäèìûå"
+msgstr "Невидимые"
-#: Merge.rc:725
-#: Merge.rc:1252
+#: Merge.rc:4C3E0A2C
#, c-format
msgid "Com&pare"
-msgstr "Ñðàâíèòü"
+msgstr "Сравнить"
-#: Merge.rc:726
-#: Merge.rc:1254
+#: Merge.rc:4630D06B
#, c-format
msgid "I&gnore changes"
-msgstr "Èãíîðèðîâàòü èçìåíåíèÿ"
+msgstr "Игнорировать изменения"
-#: Merge.rc:727
-#: Merge.rc:1256
+#: Merge.rc:21C15B6
#, c-format
msgid "Ig&nore all"
-msgstr "Èãíîðèðîâàòü âñå"
+msgstr "Игнорировать все"
-#: Merge.rc:729
-#: Merge.rc:1260
+#: Merge.rc:6FC398BA
#, c-format
msgid "Case sensi&tive"
-msgstr "×óâñòâèòåëüíîñòü ðåãèñòðà"
+msgstr "Учитывать регистр"
-#: Merge.rc:730
-#: Merge.rc:1262
-#: Merge.rc:1377
+#: Merge.rc:620FF1AC
#, c-format
msgid "Igno&re carriage return differences (Windows/Unix/Mac)"
-msgstr "Èãíîðèðîâàòü ðàçíèöó â âîçâðàòàõ êàðåòêè (Win/Unix/Mac)"
+msgstr "Игнорировать разницу возврата каретки (Win/Unix/Mac)"
+
+#: Merge.rc:6DE6F873
+#, c-format
+msgid "&Include Subfolders"
+msgstr "&Включая подпапки"
-#: Merge.rc:731
-#: Merge.rc:1861
+#: Merge.rc:1DC30E64
#, c-format
msgid "&Compare method:"
-msgstr ""
+msgstr "Метод сравнения:"
-#: Merge.rc:733
-#: Merge.rc:2238
+#: Merge.rc:7A4CFAFB
#, c-format
msgid "Full Contents"
-msgstr "Ïîëíûé ïîèñê ïî ñîäåðæèìîìó"
+msgstr "Полный поиск по содержимому"
-#: Merge.rc:734
-#: Merge.rc:2239
+#: Merge.rc:5F71A081
#, c-format
msgid "Quick Contents"
-msgstr "Áûñòðûé ïîèñê ïî ñîäåðæèìîìó"
+msgstr "Быстрый поиск по содержимому"
-#: Merge.rc:735
-#: Merge.rc:2240
+#: Merge.rc:36B164C4
#, c-format
msgid "Binary Contents"
-msgstr ""
+msgstr "По двоичному содержимому"
-#: Merge.rc:736
-#: Merge.rc:2241
+#: Merge.rc:2CEE4748
#, c-format
msgid "Modified Date"
-msgstr "Ïî ðàçëè÷èÿì â äàòå"
+msgstr "По дате изменения"
-#: Merge.rc:737
-#: Merge.rc:2242
+#: Merge.rc:39C7AF82
#, c-format
msgid "Modified Date and Size"
-msgstr "Ïî äàòå èçìåíåíèÿ è ðàçìåðó"
+msgstr "По дате изменения и размеру"
-#: Merge.rc:738
-#: Merge.rc:2243
+#: Merge.rc:4B89B93
#, c-format
msgid "Size"
-msgstr "Ïî ðàçìåðó"
+msgstr "По размеру"
-#: Merge.rc:832
+#: Merge.rc:1DC30E65
#, c-format
-msgid "About WinMerge"
-msgstr "Î ïðîãðàììå WinMerge"
+msgid "&Load Project..."
+msgstr "Загрузить проект..."
-#: Merge.rc:838
+#: Merge.rc:2515A6BC
#, c-format
-msgid "(Private Build)"
-msgstr "(×àñòíûé áèëä)"
+msgid "About WinMerge"
+msgstr "О программе WinMerge"
-#: Merge.rc:839
+#: Merge.rc:1D44E628
#, c-format
msgid "Visit the WinMerge HomePage!"
-msgstr "Ïîñåòèòå äîìàøíþþ ñòðàíèöó WinMerge !"
-
-#: Merge.rc:841
-#: Merge.rc:879
-#: Merge.rc:1270
-#: Merge.rc:1302
-#: Merge.rc:1312
-#: Merge.rc:1470
-#: Merge.rc:1506
-#: Merge.rc:1600
-#: Merge.rc:1615
-#: Merge.rc:1838
-#: Merge.rc:1907
+msgstr "Посетите домашнюю страницу WinMerge !"
+
+#: Merge.rc:1326F
#, c-format
msgid "OK"
-msgstr "ÎÊ"
+msgstr "ОК"
-#: Merge.rc:842
+#: Merge.rc:CAEDA35
#, c-format
msgid "Contributors"
-msgstr "Ó÷àñòíèêè"
+msgstr "Участники"
-#: Merge.rc:847
+#: Merge.rc:58E210FA
#, c-format
msgid "Select Files or Folders"
-msgstr "Âûáåðèòå ôàéëû èëè ïàïêè..."
-
-#: Merge.rc:850
-#, c-format
-msgid "&1:"
-msgstr ""
-
-#: Merge.rc:855
-#: Merge.rc:923
-#: Merge.rc:1210
-#: Merge.rc:1232
-#, c-format
-msgid "&Browse..."
-msgstr "&Îáçîð..."
-
-#: Merge.rc:856
-#, c-format
-msgid "&2:"
-msgstr ""
-
-#: Merge.rc:861
-#: Merge.rc:1213
-#, c-format
-msgid "B&rowse..."
-msgstr "Îáçîð"
-
-#: Merge.rc:862
-#, c-format
-msgid "&3(Optional):"
-msgstr ""
-
-#: Merge.rc:867
-#: Merge.rc:1220
-#: Merge.rc:1236
-#, c-format
-msgid "Br&owse..."
-msgstr "Îáçîð..."
+msgstr "Выберите файлы или папки..."
-#: Merge.rc:868
+#: Merge.rc:6DE6F874
#, c-format
-msgid "Fi<er:"
-msgstr ""
+msgid "&1st File or Folder"
+msgstr "&1-й файл или папка"
-#: Merge.rc:871
-#: Merge.rc:1776
+#: Merge.rc:39174D96
#, c-format
-msgid "Select..."
-msgstr "Âûáðàòü..."
+msgid "Re&ad-only"
+msgstr "Только чтение"
-#: Merge.rc:872
+#: Merge.rc:56BD1FBA
#, c-format
-msgid "&Unpacker:"
-msgstr "&Ðàñïàêîâùèê:"
+msgid "Swap 1st | 2nd"
+msgstr "Поменять 1-й | 2-й"
-#: Merge.rc:875
+#: Merge.rc:68816EE7
#, c-format
-msgid "&Select..."
-msgstr "Âûáðàòü..."
+msgid "&Browse..."
+msgstr "&Обзор..."
-#: Merge.rc:876
-#: Merge.rc:1777
+#: Merge.rc:6DE6F875
#, c-format
-msgid "&Include Subfolders"
-msgstr "&Âêëþ÷àÿ ïîäïàïêè"
+msgid "&2nd File or Folder"
+msgstr "&2-й файл или папка"
-#: Merge.rc:878
-#, c-format
-msgid "Status:"
-msgstr "Ñòàòóñ:"
-
-#: Merge.rc:880
-#: Merge.rc:910
-#: Merge.rc:991
-#: Merge.rc:1010
-#: Merge.rc:1042
-#: Merge.rc:1052
-#: Merge.rc:1271
-#: Merge.rc:1303
-#: Merge.rc:1313
-#: Merge.rc:1363
-#: Merge.rc:1471
-#: Merge.rc:1507
-#: Merge.rc:1601
-#: Merge.rc:1616
-#: Merge.rc:1839
+#: Merge.rc:39174D97
#, c-format
-msgid "Cancel"
-msgstr "Îòìåíà"
+msgid "Rea&d-only"
+msgstr "Только для чтения"
-#: Merge.rc:881
-#: Merge.rc:1508
+#: Merge.rc:56BD1FBB
#, c-format
-msgid "Help"
-msgstr "Ïîìîùü"
+msgid "Swap 2nd | 3rd"
+msgstr "Поменять 2-й | 3-й"
-#: Merge.rc:882
+#: Merge.rc:78E0CE0E
#, c-format
-msgid "Files or Folders to Compare"
-msgstr "Ôàéëû èëè ïàïêè äëÿ ñðàâíåíèÿ"
+msgid "B&rowse..."
+msgstr "Обзор"
-#: Merge.rc:889
+#: Merge.rc:3C1ECDDA
#, c-format
-msgid "Visual SourceSafe"
-msgstr "Visual SourceSafe"
+msgid "&3rd File or Folder (Optional)"
+msgstr "&3-й файл или папка (Необязательно)"
-#: Merge.rc:894
+#: Merge.rc:39174D98
#, c-format
-msgid "Database:"
-msgstr "Áàçà äàííûõ:"
+msgid "Read-o&nly"
+msgstr "Только для чтения"
-#: Merge.rc:897
+#: Merge.rc:56BD1FBC
#, c-format
-msgid "Project:"
-msgstr "Ïðîåêò:"
+msgid "Swap 1st | 3rd"
+msgstr "Поменять 1-й | 3-й"
-#: Merge.rc:900
+#: Merge.rc:146A5938
#, c-format
-msgid "User:"
-msgstr "Ïîëüçîâàòåëü:"
+msgid "Browse..."
+msgstr "Обзор..."
-#: Merge.rc:902
+#: Merge.rc:22467E6E
#, c-format
-msgid "Password:"
-msgstr "Ïàðîëü:"
+msgid " Folder: Filter"
+msgstr ""
-#: Merge.rc:904
+#: Merge.rc:68816EE8
#, c-format
-msgid "Link to Destination VSS project"
-msgstr "Ïóòü ê ïðîåêòó VSS"
+msgid "&Select..."
+msgstr "Выбрать..."
-#: Merge.rc:906
-#: Merge.rc:1057
+#: Merge.rc:662470D5
#, c-format
-msgid "Apply to all items"
-msgstr "Ïðèìåíèòü êî âñåì ýëåìåíòàì"
+msgid " File: Unpacker Plugin"
+msgstr ""
-#: Merge.rc:908
+#: Merge.rc:751AB58F
#, c-format
-msgid "Check Out"
-msgstr "Âçÿòü ïîä êîíòðîëü"
+msgid "Se&lect..."
+msgstr "Выбрать"
-#: Merge.rc:909
-#: Merge.rc:1053
-#, c-format
-msgid "Save As..."
-msgstr "Ñîõðàíèòü êàê..."
+#: Merge.rc:4C3E0A2D
+msgid "Co&mpare"
+msgstr "Сравнить"
-#: Merge.rc:915
+#: Merge.rc:4E65D340
#, c-format
-msgid "Versioning System"
-msgstr "Ñèñòåìà êîíòðîëÿ âåðñèé"
+msgid "Cancel"
+msgstr "Отмена"
-#: Merge.rc:918
+#: Merge.rc:67019DCA
#, c-format
-msgid "&Versioning System:"
-msgstr "&Ñèñòåìà êîíòðîëÿ âåðñèé:"
+msgid "Status:"
+msgstr "Статус:"
-#: Merge.rc:921
-#: Merge.rc:2286
+#: Merge.rc:4186E48
#, c-format
-msgid "&Path to cleartool.exe:"
-msgstr "&Ïóòü ê cleartool.exe:"
+msgid "Help"
+msgstr "Помощь"
-#: Merge.rc:928
-#: Merge.rc:2169
-#: Merge.rc:2182
+#: Merge.rc:787FD72B
#, c-format
msgid "General"
-msgstr "Îñíîâíûå"
+msgstr "Основные"
-#: Merge.rc:931
+#: Merge.rc:237AB485
#, c-format
msgid "Automatically &scroll to first difference"
-msgstr "Àâòîìàòè÷åñêè &óñòàíîâèòü íà ïåðâîå îòëè÷èå"
+msgstr "Автоматически &установить на первое отличие"
-#: Merge.rc:934
+#: Merge.rc:69AD3BF8
#, c-format
msgid "Cl&ose windows with ESC"
-msgstr "Çà&êðûâàòü îêíà êëàâèøåé ESC"
+msgstr "За&крывать окна клавишей ESC"
-#: Merge.rc:936
+#: Merge.rc:6574B7FB
#, c-format
msgid "&Automatically verify paths in Open-dialog"
-msgstr "Àâòîìàòè÷åñêè ïðîâåðÿòü ïóòè â äèàëîãå îòðûòèÿ ôàéëîâ"
+msgstr "Автоматически проверять пути в диалоге отрытия файлов"
-#: Merge.rc:939
+#: Merge.rc:631E0F7B
#, c-format
msgid "All&ow only one instance to run"
-msgstr "&Ðàçðåøèòü çàïóñê òîëüêî îäíîé êîïèè"
+msgstr "&РазÑ\80еÑ\88иÑ\82Ñ\8c запÑ\83Ñ\81к Ñ\82олÑ\8cко одной копии"
-#: Merge.rc:941
+#: Merge.rc:672CD0E2
#, c-format
msgid "As&k when closing multiple windows"
-msgstr "Ñïðîñèòü ïåðåä çàêðûòèåì íåñêîëüêèõ îêîí"
+msgstr "Спросить перед закрытием нескольких окон"
-#: Merge.rc:943
+#: Merge.rc:6D5B7718
#, c-format
msgid "&Preserve file time in file compare"
-msgstr "Ñîõðàíÿòü âðåìÿ ôàéëà ïðè ñðàâíåíèè"
+msgstr "Сохранять время файла при сравнении"
-#: Merge.rc:946
+#: Merge.rc:17F0E759
#, c-format
msgid "Show \"Select Files or Folders\" Dialog on Startup"
-msgstr "Ïîêàçûâàòü äèàëîã \"Âûáðàòü ôàéëû èëè ïàïêè\" ïðè çàïóñêå"
+msgstr "Показывать диалог \"Выбрать файлы или папки\" при запуске"
-#: Merge.rc:948
+#: Merge.rc:1AD99579
#, c-format
msgid "Close \"Select Files or Folders\" Dialog on clicking OK button"
msgstr ""
-#: Merge.rc:950
+#: Merge.rc:44776ACE
#, c-format
msgid "O&pen-dialog Auto-Completion:"
-msgstr "Î&òêðûòü äèàëîã Àâòîäîïîëíåíèÿ:"
-
-#: Merge.rc:953
-#, c-format
-msgid "Enable multiple compare windows for"
-msgstr "Âêëþ÷èòü îêíà ìíîæåñòâåííîãî ñðàâíåíèÿ äëÿ"
-
-#: Merge.rc:955
-#: Merge.rc:1789
-#, c-format
-msgid "&Folder compare"
-msgstr "Ñðàâíåíèÿ &ïàïîê"
+msgstr "О&ткрыть диалог Автодополнения:"
-#: Merge.rc:957
-#: Merge.rc:1791
-#, c-format
-msgid "Fil&e compare"
-msgstr "Ñðàâíåíèÿ &ôàéëîâ"
-
-#: Merge.rc:959
+#: Merge.rc:1B63306F
#, c-format
msgid "Language:"
-msgstr ""
+msgstr "Язык:"
-#: Merge.rc:962
+#: Merge.rc:516450B
#, c-format
msgid "WinMerge allows hiding some common messageboxes. Press the Reset button to make all messageboxes visible again."
-msgstr "WinMerge íå ïîêàçûâàåò íåêîòîðûå ñîîáùåíèÿ. Íàæìèòå Ñáðîñ, ÷òîáû ïîêàçûâàëèñü âñå ñîîáùåíèÿ."
+msgstr "WinMerge позволяет скрывать некоторые сообщения. Нажмите кнопку Сброс, чтобы показывать все сообщения."
-#: Merge.rc:964
+#: Merge.rc:10976EC1
#, c-format
msgid "Reset"
-msgstr "Ñáðîñ"
+msgstr "Сброс"
-#: Merge.rc:971
-#: Merge.rc:997
+#: Merge.rc:3FB4EC6
#, c-format
msgid "Find"
-msgstr "Íàéòè"
+msgstr "Найти"
-#: Merge.rc:974
-#: Merge.rc:1000
-#: Merge.rc:1019
+#: Merge.rc:34DF506F
#, c-format
msgid "Fi&nd what:"
-msgstr "&Ïîèñê:"
+msgstr "Найти:"
-#: Merge.rc:977
-#: Merge.rc:1003
-#: Merge.rc:1025
+#: Merge.rc:39C7AF83
#, c-format
msgid "Match &whole word only"
-msgstr "Èñêàòü ñëîâà &öåëèêîì"
+msgstr "Искать слова &целиком"
-#: Merge.rc:979
-#: Merge.rc:1005
-#: Merge.rc:1027
+#: Merge.rc:13C27214
#, c-format
msgid "Match &case"
-msgstr "Ó÷èòûâàòü &ðåãèñòð"
+msgstr "Учитывать &регистр"
-#: Merge.rc:981
-#: Merge.rc:1007
-#: Merge.rc:1029
+#: Merge.rc:44BC83ED
#, c-format
msgid "Regular &expression"
-msgstr "Ðå&ãóëÿðíûå âûðàæåíèÿ"
+msgstr "Ре&гÑ\83лÑ\8fÑ\80нÑ\8bе вÑ\8bÑ\80ажениÑ\8f"
-#: Merge.rc:983
+#: Merge.rc:78A08947
#, c-format
msgid "D&on't wrap end of file"
-msgstr "Í&å ïåðåíîñèòü â êîíöå ôàéëà"
+msgstr "Н&е переносить в конце файла"
-#: Merge.rc:986
+#: Merge.rc:545FEEA2
#, c-format
msgid "&Don't close this dialog box"
-msgstr ""
+msgstr "Не закрывать это диалоговое окно"
-#: Merge.rc:989
+#: Merge.rc:68EE6DF0
#, c-format
msgid "Find &Prev"
-msgstr ""
+msgstr "Предыдущее"
-#: Merge.rc:990
-#: Merge.rc:1039
+#: Merge.rc:68816EE9
#, c-format
msgid "&Find Next"
-msgstr "&Äàëåå"
+msgstr "Соедующее"
-#: Merge.rc:1009
-#: Merge.rc:2143
+#: Merge.rc:11D980
#, c-format
msgid "&Ok"
msgstr "&Ok"
-#: Merge.rc:1016
+#: Merge.rc:4876CD3E
#, c-format
msgid "Replace"
-msgstr "Çàìåíà"
+msgstr "Замена"
-#: Merge.rc:1022
+#: Merge.rc:1B17601F
#, c-format
msgid "Re&place with:"
-msgstr "Çà&ìåíà: "
+msgstr "За&мена: "
-#: Merge.rc:1031
+#: Merge.rc:381D79E5
#, c-format
msgid "&Don't wrap end of file"
-msgstr "Íå îñòàíàâëèâàòüñÿ ïðè äîñòèæåíèè êîíöà ôàéëà"
+msgstr "Не останавливаться при достижении конца файла"
-#: Merge.rc:1034
+#: Merge.rc:39174D99
#, c-format
msgid "Replace in"
-msgstr "Çàìåíèòü"
+msgstr "Заменить"
-#: Merge.rc:1035
+#: Merge.rc:68816EEA
#, c-format
msgid "&Selection"
-msgstr "Â âû&äåëåííîì"
+msgstr "В вы&деленном"
-#: Merge.rc:1037
+#: Merge.rc:3FE25900
#, c-format
msgid "Wh&ole file"
-msgstr "Âî âñåì &ôàéëå"
+msgstr "Во всем &файле"
-#: Merge.rc:1040
+#: Merge.rc:AC3AA1E
#, c-format
msgid "&Replace"
-msgstr "&Çàìåíèòü"
+msgstr "&Заменить"
-#: Merge.rc:1041
+#: Merge.rc:507A4C04
#, c-format
msgid "Replace &All"
-msgstr "Ç&àìåíèòü âñå"
+msgstr "З&аменить все"
+
+#: Merge.rc:2FC0BA7B
+#, c-format
+msgid "Markers"
+msgstr ""
-#: Merge.rc:1048
-#: Merge.rc:2419
+#: Merge.rc:61E8009D
#, c-format
-msgid "Rational ClearCase"
-msgstr "Rational ClearCase"
+msgid "Enable &Markers"
+msgstr ""
-#: Merge.rc:1051
+#: Merge.rc:24A380
#, c-format
-msgid "CheckOut"
-msgstr "Ïðîâåðèòü"
+msgid "New"
+msgstr "Новый"
-#: Merge.rc:1056
-#: Merge.rc:1381
+#: Merge.rc:3938FFC4
#, c-format
-msgid "Comments"
-msgstr "Êîììåíòàðèè"
+msgid "&Background color:"
+msgstr "Цвет фона:"
-#: Merge.rc:1059
+#: Merge.rc:1D2E49FC
#, c-format
-msgid "CheckIn after checkout"
-msgstr "CheckIn ïîñëå checkout"
+msgid "&Apply"
+msgstr "&Применить"
-#: Merge.rc:1065
+#: Merge.rc:4F58DAFC
#, c-format
msgid "Linefilters"
-msgstr "Ñòðîêîâûå ôèëüòðû"
+msgstr "Строковые фильтры"
-#: Merge.rc:1068
+#: Merge.rc:36B79AB7
#, c-format
msgid "Enable Line Filters"
-msgstr "Ðàçðåøèòü ñòðîêîâûå ôèëüòðû"
+msgstr "РазÑ\80еÑ\88иÑ\82Ñ\8c Ñ\81Ñ\82Ñ\80оковÑ\8bе Ñ\84илÑ\8cÑ\82Ñ\80Ñ\8b"
-#: Merge.rc:1071
+#: Merge.rc:5E8200FF
#, c-format
msgid "Regular Expressions (one per line):"
-msgstr "Ðåãóëÿðíûå âûðàæåíèÿ (îäíî íà ñòðîêó):"
-
-#: Merge.rc:1076
-#, c-format
-msgid "New"
-msgstr "Íîâûé"
+msgstr "Регулярные выражения (одно на строку):"
-#: Merge.rc:1077
+#: Merge.rc:3ECBF05
#, c-format
msgid "Edit"
-msgstr "Ðåäàêòèðîâàòü"
+msgstr "Ð\98змениÑ\82Ñ\8c"
-#: Merge.rc:1078
+#: Merge.rc:25669B5
#, c-format
msgid "Remove"
-msgstr "Óäàëèòü"
+msgstr "Удалить"
-#: Merge.rc:1083
-#: Merge.rc:2172
+#: Merge.rc:4E65D341
#, c-format
msgid "Colors"
-msgstr "Öâåòà"
+msgstr "Цвета"
-#: Merge.rc:1086
+#: Merge.rc:78E0CE0F
#, c-format
-msgid "Difference:"
-msgstr "Îòëè÷èå:"
+msgid "Background"
+msgstr "Фон"
-#: Merge.rc:1090
+#: Merge.rc:1CDF6584
#, c-format
-msgid "Selected Difference:"
-msgstr "Âûäåëåííîå îòëè÷èå:"
+msgid "Deleted"
+msgstr "Удаленное"
-#: Merge.rc:1094
-#: Merge.rc:1741
+#: Merge.rc:4C72B54
#, c-format
-msgid "Background"
-msgstr "Ôîí"
+msgid "Text"
+msgstr "Текст"
-#: Merge.rc:1095
+#: Merge.rc:2C0C2240
#, c-format
-msgid "Deleted"
-msgstr "Óäàëåííîå"
+msgid "Difference:"
+msgstr "Отличие:"
-#: Merge.rc:1112
-#: Merge.rc:1534
-#: Merge.rc:1742
-#: Merge.rc:2173
+#: Merge.rc:1BA49C3B
#, c-format
-msgid "Text"
-msgstr "Òåêñò"
+msgid "Selected Difference:"
+msgstr "Выделенное отличие:"
-#: Merge.rc:1116
+#: Merge.rc:2756A765
#, c-format
msgid "Ignored Difference:"
-msgstr "Èãíîðèðóåìûå îòëè÷èÿ:"
+msgstr "Игнорируемые отличия:"
-#: Merge.rc:1128
+#: Merge.rc:7106378D
#, c-format
msgid "Moved:"
-msgstr "Ïåðåìåùåííûå:"
+msgstr "Перемещенные:"
-#: Merge.rc:1140
+#: Merge.rc:E6D7EF
#, c-format
msgid "Selected Moved:"
-msgstr "Âûáðàííûå ïåðåìåùåííûå:"
+msgstr "Выбранные перемещенные:"
-#: Merge.rc:1149
+#: Merge.rc:73FB246
#, c-format
-msgid "Same As The Next(3 panes):"
+msgid "Same As The Next (3 panes):"
msgstr ""
-#: Merge.rc:1161
+#: Merge.rc:60B696AF
#, c-format
-msgid "Same As The Next(Selected):"
+msgid "Same As The Next (Selected):"
msgstr ""
-#: Merge.rc:1173
+#: Merge.rc:40C55014
#, c-format
msgid "Word Difference:"
-msgstr "Ñëîâàðíîå îòëè÷èå:"
+msgstr "Словарное отличие:"
-#: Merge.rc:1185
+#: Merge.rc:E4471A
#, c-format
msgid "Selected Word Diff:"
-msgstr "Âûäåëåííîå ñëîâàðíîå îòëè÷èå:"
+msgstr "Выделенное словарное отличие:"
-#: Merge.rc:1197
+#: Merge.rc:7F0D4B46
#, c-format
-msgid "GitHub/Bitbucket"
-msgstr ""
+msgid "Defaults"
+msgstr "По умолчанию"
-#: Merge.rc:1198
-#: Merge.rc:1269
-#: Merge.rc:1301
-#: Merge.rc:1384
-#: Merge.rc:1580
-#: Merge.rc:1875
-#: Merge.rc:1889
-#: Merge.rc:1899
-#, c-format
-msgid "Defaults"
-msgstr "Ïî óìîë÷àíèþ"
-
-#: Merge.rc:1203
-#: Merge.rc:2175
+#: Merge.rc:39000D57
#, c-format
msgid "System"
-msgstr "Ñèñòåìà"
+msgstr "Система"
-#: Merge.rc:1206
+#: Merge.rc:51FAB141
#, c-format
msgid "&Send deleted files to Recycle Bin"
-msgstr "Ïîìåùàòü óäàëåííûå ôàéëû â êîðçèíó"
+msgstr "Помещать удаленные файлы в корзину"
-#: Merge.rc:1208
+#: Merge.rc:1A9EBDF0
#, c-format
msgid "&External editor:"
-msgstr "Âíåøíèé ðåäàêòîð:"
+msgstr "Внешний редактор:"
-#: Merge.rc:1211
+#: Merge.rc:78B3B626
#, c-format
msgid "&Filter folder:"
-msgstr "&Ôèëüòðû:"
+msgstr "&Фильтры:"
-#: Merge.rc:1214
+#: Merge.rc:1C1FA831
#, c-format
msgid "Temporary files folder"
-msgstr "Ïàïêà äëÿ âðåìåííûõ ôàéëîâ"
+msgstr "Папка для временных файлов"
-#: Merge.rc:1215
+#: Merge.rc:58EEEB80
#, c-format
msgid "S&ystem's temp folder"
-msgstr "Ñèñòåìíàÿ ïàïêà Temp"
+msgstr "Системная папка Temp"
-#: Merge.rc:1217
+#: Merge.rc:6FC398BB
#, c-format
msgid "C&ustom folder:"
-msgstr "Ñîáñòâåííàÿ ïàïêà:"
+msgstr "Собственная папка:"
+
+#: Merge.rc:78E0CE10
+#, c-format
+msgid "Br&owse..."
+msgstr "Обзор..."
-#: Merge.rc:1226
+#: Merge.rc:55B03C13
#, c-format
msgid "Patch Generator"
-msgstr "Ãåíåðàòîð ïàò÷åé"
+msgstr "Генератор патчей"
-#: Merge.rc:1229
+#: Merge.rc:59F5069E
#, c-format
msgid "File&1:"
-msgstr "Ôàéë 1:"
+msgstr "Файл&1:"
-#: Merge.rc:1233
+#: Merge.rc:59F5069F
#, c-format
msgid "File&2:"
-msgstr "Ôàéë 2:"
+msgstr "Файл&2:"
-#: Merge.rc:1237
+#: Merge.rc:43017E4E
#, c-format
msgid "&Swap"
-msgstr "Ïîìåíÿòü"
+msgstr "Поменять"
-#: Merge.rc:1238
+#: Merge.rc:4B91C2D2
#, c-format
msgid "&Append to existing file"
-msgstr "Äîáàâèòü â ñóùåñòâóþùèé ôàéë"
+msgstr "Добавить в существующий файл"
-#: Merge.rc:1240
+#: Merge.rc:AC3AA1F
#, c-format
msgid "&Result:"
-msgstr "Ðåçóëüòàò:"
+msgstr "РезÑ\83лÑ\8cÑ\82аÑ\82:"
-#: Merge.rc:1243
+#: Merge.rc:78E0CE11
#, c-format
msgid "Bro&wse..."
-msgstr "Îá&çîð..."
+msgstr "Об&зор..."
-#: Merge.rc:1244
+#: Merge.rc:89AF4FC
#, c-format
msgid "&Format"
-msgstr "Ôîðìàò"
+msgstr "Формат"
-#: Merge.rc:1245
+#: Merge.rc:67019DCB
#, c-format
msgid "St&yle:"
-msgstr "Ñòèëü:"
+msgstr "Стиль:"
-#: Merge.rc:1248
+#: Merge.rc:4DB19838
#, c-format
msgid "&Context:"
-msgstr "Êîíòåêñò:"
+msgstr "Контекст:"
-#: Merge.rc:1258
+#: Merge.rc:2756A766
#, c-format
msgid "Ignor&e blank lines"
-msgstr "Ïðîïóñêàòü ïóñòûå ñòðîêè"
+msgstr "Пропускать пустые строки"
-#: Merge.rc:1265
+#: Merge.rc:2C4A6C6C
#, c-format
msgid "Inclu&de command line"
-msgstr "Âêë&þ÷àÿ êîììàíäíóþ ñòðîêó"
+msgstr "Вкл&ючая коммандную строку"
-#: Merge.rc:1267
+#: Merge.rc:5869BBE
#, c-format
msgid "Open to e&xternal editor"
-msgstr "Îòêðûòü âî âíåøåì ðåäàêòîðå"
+msgstr "Открыть во внешем редакторе"
-#: Merge.rc:1292
+#: Merge.rc:28D5CCAA
#, c-format
msgid "Display Columns"
-msgstr "Îòîáðàæàòü êîëîíêè"
+msgstr "Отображать колонки"
-#: Merge.rc:1298
+#: Merge.rc:4856953D
#, fuzzy, c-format
msgid "Move &Up"
-msgstr "&Ââåðõ"
+msgstr "&Вверх"
-#: Merge.rc:1299
+#: Merge.rc:D0645BC
#, fuzzy, c-format
msgid "Move &Down"
-msgstr "Â&íèç"
+msgstr "В&низ"
-#: Merge.rc:1309
+#: Merge.rc:E6D7F0
#, c-format
msgid "Select Unpacker"
-msgstr "Âûáîð ðàñïàêîâùèêà"
+msgstr "Выбор распаковщика"
-#: Merge.rc:1314
+#: Merge.rc:4F5264C8
#, c-format
msgid "File unpacker:"
-msgstr "Ôàéë ðàñïàêîâùèêà:"
+msgstr "Файл распаковщика:"
-#: Merge.rc:1317
+#: Merge.rc:34C1157D
#, c-format
msgid "Display all unpackers, don't check the extension"
-msgstr "Ïîêàçûâàòü âñå ðàñïàêîâùèêè, íå ïðîâåðÿÿ ðàñøèðåíèÿ"
+msgstr "Показывать все распаковщики, не проверяя расширения"
-#: Merge.rc:1320
+#: Merge.rc:5B18135F
#, c-format
msgid "Extensions list:"
-msgstr "Ñïèñîê ðàñøèðåíèé:"
+msgstr "Список расширений:"
-#: Merge.rc:1321
+#: Merge.rc:5578260E
#, c-format
msgid "Description:"
-msgstr "Îïèñàíèå:"
+msgstr "Описание:"
-#: Merge.rc:1332
-#: Merge.rc:2122
+#: Merge.rc:4B89B94
#, c-format
msgid "Stop"
-msgstr "Îñòàíîâèòü"
+msgstr "Остановить"
+
+#: Merge.rc:D109E01
+#, c-format
+msgid "Pause"
+msgstr "Пауза"
-#: Merge.rc:1337
+#: Merge.rc:4C3E0A2E
+#, c-format
+msgid "Continue"
+msgstr "Продолжить"
+
+#: Merge.rc:1AC98D0A
#, c-format
msgid "Comparing items..."
-msgstr "Èäåò ñðàâíåíèå..."
+msgstr "Идет сравнение..."
-#: Merge.rc:1338
+#: Merge.rc:4630D06C
#, c-format
msgid "Items compared:"
-msgstr "Îáðàáîòàíî:"
+msgstr "Обработано:"
-#: Merge.rc:1339
+#: Merge.rc:4166A153
#, c-format
msgid "Items total:"
-msgstr "Âñåãî:"
+msgstr "Всего:"
-#: Merge.rc:1345
+#: Merge.rc:7D31F2A0
#, c-format
msgid "Go To"
-msgstr "Ïåðåéòè"
+msgstr "Перейти"
-#: Merge.rc:1348
+#: Merge.rc:290C61C5
#, c-format
msgid "G&oto:"
-msgstr "&Íà:"
+msgstr "&На:"
-#: Merge.rc:1350
+#: Merge.rc:3FB4EC7
#, c-format
msgid "File"
-msgstr "Ôàéë"
-
-#: Merge.rc:1353
-#: Merge.rc:1689
-#, c-format
-msgid "&Middle"
-msgstr ""
+msgstr "Файл"
-#: Merge.rc:1357
+#: Merge.rc:57E6C4D3
#, c-format
msgid "Goto what"
-msgstr "Íà ÷òî"
+msgstr "На что"
-#: Merge.rc:1358
+#: Merge.rc:602FC81
#, c-format
msgid "Li&ne"
-msgstr "&Ñòðîêó"
+msgstr "&Строку"
-#: Merge.rc:1360
+#: Merge.rc:27AC6D83
#, c-format
msgid "&Difference"
-msgstr "&Îòëè÷èå"
+msgstr "&Отличие"
-#: Merge.rc:1362
+#: Merge.rc:1D2E49FD
#, c-format
msgid "&Go To"
-msgstr "Ïåðåéò&è"
+msgstr "Перейт&и"
-#: Merge.rc:1368
-#: Merge.rc:2170
+#: Merge.rc:7E5494F6
#, c-format
msgid "Compare"
-msgstr "Ñðàâíåíèå"
+msgstr "Сравнение"
-#: Merge.rc:1371
+#: Merge.rc:65285570
#, c-format
msgid "Whitespace"
-msgstr "Íåâèäèìûå"
+msgstr "Невидимые"
-#: Merge.rc:1372
+#: Merge.rc:AC3AA20
#, c-format
msgid "&Compare"
-msgstr "Ó÷èòûâàòü &íåâèäèìûå"
+msgstr "Учитывать &невидимые"
-#: Merge.rc:1373
+#: Merge.rc:5A9A713E
#, c-format
msgid "&Ignore change"
-msgstr "Èãíîðèðîâàòü èçìåíåííûå íåâèäèìûå"
+msgstr "Игнорировать измененные невидимые"
-#: Merge.rc:1374
+#: Merge.rc:21C15B7
#, c-format
msgid "I&gnore all"
-msgstr "Èãíîðèðîâàòü &âñå íåâèäèìûå"
+msgstr "Игнорировать &все невидимые"
-#: Merge.rc:1375
+#: Merge.rc:2756A767
#, c-format
msgid "Ignore blan&k lines"
-msgstr "Èãíîðèðîâàòü ïóñò&ûå ëèíèè"
+msgstr "Игнорировать пуст&ые линии"
-#: Merge.rc:1376
+#: Merge.rc:4166A154
#, c-format
msgid "Ignore &case"
-msgstr "Èãíîðèðîâàòü ð&åãèñòð"
+msgstr "Игнорировать р&егистр"
+
+#: Merge.rc:6C318DC8
+#, c-format
+msgid "Ignore codepage &differences"
+msgstr "Игнорировать различия кодовых страниц"
-#: Merge.rc:1379
+#: Merge.rc:285B56CE
#, c-format
msgid "E&nable moved block detection"
-msgstr "Îáíàðóæåíèå ïåðåìå&ùåííûõ áëîêîâ"
+msgstr "Обнаружение переме&щенных блоков"
-#: Merge.rc:1380
+#: Merge.rc:4EF8162F
#, c-format
msgid "&Match similar lines"
-msgstr "Èñêàòü ïîõîæèå ñòðîêè"
+msgstr "Искать похожие строки"
-#: Merge.rc:1382
+#: Merge.rc:4C3E0A2F
+#, c-format
+msgid "Comments"
+msgstr "Комментарии"
+
+#: Merge.rc:1AFA3491
#, c-format
msgid "Filter Comments"
-msgstr "Ôèëüòð êîììåíòàðèåâ"
+msgstr "Фильтр комментариев"
-#: Merge.rc:1389
-#: Merge.rc:2171
+#: Merge.rc:3BB91A82
#, c-format
msgid "Editor"
-msgstr "Ðåäàêòîð"
+msgstr "РедакÑ\82оÑ\80"
-#: Merge.rc:1392
+#: Merge.rc:1A9EBDF1
#, c-format
msgid "&Highlight syntax"
-msgstr "Ïîäñâå÷èâàòü ñèíòàêñèñ"
+msgstr "Подсвечивать синтаксис"
-#: Merge.rc:1394
+#: Merge.rc:1A9EBDF2
#, c-format
msgid "&Automatic rescan"
-msgstr "Àâòî&ïåðåñêàíèðîâàíèå"
+msgstr "Авто&пересканирование"
-#: Merge.rc:1396
+#: Merge.rc:545FEEA3
#, c-format
msgid "&Preserve original EOL chars"
-msgstr "Îðèãèíàëüíûå ñèìâîëû EOL"
+msgstr "Сохранить оригинальные EOL символы"
-#: Merge.rc:1398
+#: Merge.rc:4C72B55
#, c-format
msgid "Tabs"
-msgstr "Îòñòóïû"
+msgstr "Отступы"
-#: Merge.rc:1399
+#: Merge.rc:68816EEB
#, c-format
msgid "&Tab size:"
-msgstr "Ðàçìåð &îòñòóïà:"
+msgstr "РазмеÑ\80 &оÑ\82Ñ\81Ñ\82Ñ\83па:"
-#: Merge.rc:1402
+#: Merge.rc:4DE14275
#, c-format
msgid "&Insert Tabs"
-msgstr "&Òàáóëÿöèè"
+msgstr "&Табуляции"
-#: Merge.rc:1404
+#: Merge.rc:243A39E
#, c-format
msgid "Insert &Spaces"
-msgstr "&Ïðîáåëû"
+msgstr "&Пробелы"
-#: Merge.rc:1406
+#: Merge.rc:172385A0
#, c-format
msgid "Line Difference Coloring"
-msgstr "Ïîäñâåòêà îòëè÷èé â ñòðîêå"
+msgstr "Подсветка отличий в строке"
-#: Merge.rc:1408
+#: Merge.rc:4CB9DE6A
#, c-format
msgid "View line differences"
-msgstr "Ïîêàçûâàòü îòëè÷èÿ â ñòðîêå"
+msgstr "Показывать отличия в строке"
-#: Merge.rc:1410
+#: Merge.rc:1DC30E66
#, c-format
msgid "&Character level"
-msgstr "Ïîñèìâîëüíî"
+msgstr "Посимвольно"
-#: Merge.rc:1412
+#: Merge.rc:4DE14276
#, c-format
msgid "&Word-level:"
-msgstr "Ïî ñëîâàì:"
+msgstr "По словам:"
-#: Merge.rc:1416
+#: Merge.rc:14AF463A
#, c-format
msgid "W&ord break characters:"
-msgstr ""
+msgstr "Символы разрыва слова:"
-#: Merge.rc:1429
+#: Merge.rc:34DF5070
#, c-format
msgid "Filefilters"
-msgstr "Ôèëüòðû ôàéëîâ"
+msgstr "Фильтры файлов"
-#: Merge.rc:1435
+#: Merge.rc:4C72B56
#, c-format
msgid "Test"
-msgstr "Òåñò"
+msgstr "Тест"
-#: Merge.rc:1436
+#: Merge.rc:1CF8A5DA
#, c-format
msgid "Install..."
-msgstr "Óñòàíîâèòü..."
+msgstr "Установить..."
-#: Merge.rc:1437
+#: Merge.rc:27AFDB2F
#, c-format
msgid "New..."
-msgstr "Íîâûé..."
+msgstr "Новый..."
-#: Merge.rc:1438
+#: Merge.rc:3B6A3611
#, c-format
msgid "Edit..."
-msgstr "Èçìåíèòü..."
+msgstr "Изменить..."
-#: Merge.rc:1439
+#: Merge.rc:629C1DDC
#, c-format
msgid "Delete..."
-msgstr "Óäàëèòü..."
+msgstr "Удалить..."
-#: Merge.rc:1445
+#: Merge.rc:1BA49C3C
#, c-format
msgid "Save modified files?"
-msgstr "Ñîõðàíèòü èçìåíåíèÿ â ôàéëàõ"
+msgstr "Сохранить измененные файлы?"
-#: Merge.rc:1448
+#: Merge.rc:3534E274
#, c-format
msgid "Left side file"
-msgstr "Ôàéë ñ ëåâîé ñòîðîíû"
+msgstr "Файл слева"
-#: Merge.rc:1451
+#: Merge.rc:6E470BEE
#, c-format
msgid "&Save changes"
-msgstr "&Ñîõðàíèòü èçìåíåíèÿ"
+msgstr "&Сохранить изменения"
-#: Merge.rc:1453
+#: Merge.rc:1DC30E67
#, c-format
msgid "&Discard changes"
-msgstr "&Îòêëîíèòü èçìåíåíèÿ"
+msgstr "&Отменить изменения"
-#: Merge.rc:1455
+#: Merge.rc:24BA673E
#, c-format
msgid "Middle side file"
-msgstr ""
+msgstr "Файл посередине"
-#: Merge.rc:1458
+#: Merge.rc:F2F641C
#, c-format
msgid "Sa&ve changes"
-msgstr ""
+msgstr "Сохранить изменения"
-#: Merge.rc:1460
+#: Merge.rc:71E3C8E4
#, c-format
msgid "Disca&rd changes"
-msgstr ""
+msgstr "Отменить изменения"
-#: Merge.rc:1462
+#: Merge.rc:47D4A3FB
#, c-format
msgid "Right side file"
-msgstr "Ôàéë ñ ïðàâîé ñòîðîíû"
+msgstr "Файл справа"
-#: Merge.rc:1465
+#: Merge.rc:F2F641D
#, c-format
msgid "S&ave changes"
-msgstr "Ñî&õðàíèòü èçìåíåíèÿ"
+msgstr "Со&хранить изменения"
-#: Merge.rc:1467
+#: Merge.rc:71E3C8E5
#, c-format
msgid "Dis&card changes"
-msgstr "Î&òêëîíèòü èçìåíåíèÿ"
+msgstr "О&тменить изменения"
-#: Merge.rc:1469
+#: Merge.rc:5578260F
#, c-format
msgid "Disca&rd All"
-msgstr ""
+msgstr "Отменить все"
-#: Merge.rc:1476
-#: Merge.rc:1682
-#: Merge.rc:2177
+#: Merge.rc:4C3E0A30
#, c-format
msgid "Codepage"
-msgstr "Êîäîâàÿ ñòðàíèöà"
+msgstr "Кодовая страница"
-#: Merge.rc:1479
+#: Merge.rc:71E3C8E6
#, c-format
msgid "Default Codepage"
-msgstr "Êîäîâàÿ ñòðàíèöà ïî óìîë÷àíèþ"
+msgstr "Кодовая страница по умолчанию"
-#: Merge.rc:1480
+#: Merge.rc:132D699F
#, c-format
msgid "Select the default codepage assumed when loading non-Unicode files:"
-msgstr "Âûáåðèòå êîäîâóþ ñòðàíèöó ïî óìîë÷àíèþ, äëÿ íå Þíèêîä-ôàéëîâ:"
+msgstr "Выберите кодовую страницу по умолчанию, для не Юникод-файлов:"
-#: Merge.rc:1482
+#: Merge.rc:5CC85DF4
#, c-format
msgid ""
"Detect codepage info for these files: .html, .rc, .xml \n"
"need to restart session"
msgstr ""
-"Îïðåäåëÿòü êîäèðîâêó äëÿ ýòèõ ôàéëîâ: .html, .rc, .xml \n"
-"Íåîáõîäèì ïåðåçàïóñê ñåññèè"
+"Определять кодировку для этих файлов: .html, .rc, .xml \n"
+"необходим перезапуск сессии"
-#: Merge.rc:1485
+#: Merge.rc:3BCD5104
#, c-format
msgid "Detect codepage for text files using mlang.dll\nneed to restart session"
-msgstr ""
+msgstr "Определять кодовую страницу для текстовых файлов с помощью mlang.dll\nнеобходим перезапуск сессии"
-#: Merge.rc:1490
+#: Merge.rc:E6D7F1
#, c-format
msgid "System codepage"
-msgstr "Ñèñòåìíàÿ êîäîâàÿ ñòðàíèöà"
+msgstr "Системная кодовая страница"
-#: Merge.rc:1492
+#: Merge.rc:4F3C2B88
#, c-format
msgid "According to WinMerge User Interface"
-msgstr "Â çàâèñèìîñòè îò èíòåðôåéñà ïîëüçîâàòåëÿ WinMerge"
+msgstr "Согласно пользовательского интерфейса WinMerge"
-#: Merge.rc:1494
+#: Merge.rc:8AF7E6A
#, c-format
msgid "Custom codepage:"
-msgstr "Êîäèðîâêà ïîëüçîâàòåëÿ:"
+msgstr "Пользовательская:"
-#: Merge.rc:1503
+#: Merge.rc:6CD65B95
#, c-format
msgid "Options"
-msgstr "Íàñòðîéêà"
+msgstr "Настройки"
-#: Merge.rc:1514
+#: Merge.rc:D32E2F1
#, c-format
msgid " Categories"
-msgstr " Êàòåãîðèè"
+msgstr " Категории"
-#: Merge.rc:1516
+#: Merge.rc:26188978
#, c-format
msgid "Import..."
-msgstr "Èìïîðò..."
+msgstr "Импорт..."
-#: Merge.rc:1517
+#: Merge.rc:9B5002F
#, c-format
msgid "Export..."
-msgstr "Ýêñïîðò..."
+msgstr "Экспорт..."
-#: Merge.rc:1522
-#: Merge.rc:1730
+#: Merge.rc:50F76E1
#, c-format
msgid "Dialog"
-msgstr "Äèàëîã"
+msgstr "Диалог"
-#: Merge.rc:1525
+#: Merge.rc:744A4E1C
#, c-format
msgid "Keywords:"
-msgstr "Êëþ÷åâûå ñëîâà:"
+msgstr "Ключевые слова:"
-#: Merge.rc:1526
+#: Merge.rc:1AFA3492
#, c-format
msgid "Function names:"
-msgstr "Èìåíà ôóíêöèé:"
+msgstr "Имена функций:"
-#: Merge.rc:1527
+#: Merge.rc:3B833B8A
#, c-format
msgid "Comments:"
-msgstr "Êîììåíòàðèè:"
+msgstr "Комментарии:"
-#: Merge.rc:1528
+#: Merge.rc:7B25D658
#, c-format
msgid "Numbers:"
-msgstr "×èñëà:"
+msgstr "Числа:"
-#: Merge.rc:1529
+#: Merge.rc:50D15AD
#, c-format
msgid "Operators:"
-msgstr "Îïåðàòîðû:"
+msgstr "Операторы:"
-#: Merge.rc:1530
+#: Merge.rc:79321BE2
#, c-format
msgid "Strings:"
-msgstr "Ñòðîêè:"
+msgstr "Строки:"
-#: Merge.rc:1531
+#: Merge.rc:1E0ED5B2
#, c-format
msgid "Preprocessor:"
-msgstr "Ïðåïðîöåññîð:"
+msgstr "Препроцессор:"
-#: Merge.rc:1532
+#: Merge.rc:24173EE5
#, c-format
msgid "User 1:"
-msgstr "Ïîëüçîâàòåëü 1:"
+msgstr "Пользователь 1:"
-#: Merge.rc:1533
+#: Merge.rc:24173EE6
#, c-format
msgid "User 2:"
-msgstr "Ïîëüçîâàòåëü 2:"
-
-#: Merge.rc:1538
-#: Merge.rc:1543
-#: Merge.rc:1548
-#: Merge.rc:1553
-#: Merge.rc:1558
-#: Merge.rc:1563
-#: Merge.rc:1568
-#: Merge.rc:1573
-#: Merge.rc:1578
+msgstr "Пользователь 2:"
+
+#: Merge.rc:3C10FC2
#, c-format
msgid "Bold"
-msgstr "Æèðíûé"
+msgstr "Жирный"
-#: Merge.rc:1586
+#: Merge.rc:2CEE4749
#, c-format
-msgid "Folder Compare Report"
-msgstr "Îò÷åò ñðàâíåíèÿ êàòàëîãîâ"
+msgid "Marker colors"
+msgstr ""
-#: Merge.rc:1589
+#: Merge.rc:56BD1FBD
#, c-format
-msgid "Report &File:"
-msgstr "&Ôàéë îò÷åòà:"
+msgid "Search Marker:"
+msgstr ""
-#: Merge.rc:1592
-#: Merge.rc:1768
-#: Merge.rc:1772
-#: Merge.rc:1799
+#: Merge.rc:7B76381B
#, c-format
-msgid "Browse..."
-msgstr "Îáçîð..."
+msgid "User Defined Marker1:"
+msgstr ""
-#: Merge.rc:1593
+#: Merge.rc:7B76381C
+#, c-format
+msgid "User Defined Marker2:"
+msgstr ""
+
+#: Merge.rc:7B76381D
+#, c-format
+msgid "User Defined Marker3:"
+msgstr ""
+
+#: Merge.rc:387F7980
+#, c-format
+msgid "Folder Compare Report"
+msgstr "Отчет сравнения папок"
+
+#: Merge.rc:3ECF34A3
+#, c-format
+msgid "Report &File:"
+msgstr "&Файл отчета:"
+
+#: Merge.rc:89AF4FD
#, c-format
msgid "&Style:"
-msgstr "&Ñòèëü:"
+msgstr "&Стиль:"
-#: Merge.rc:1596
+#: Merge.rc:545FEEA4
#, c-format
msgid "&Include File Compare Report"
-msgstr ""
+msgstr "Включить отчет сравнения файлов"
-#: Merge.rc:1598
+#: Merge.rc:3938FFC5
#, c-format
msgid "&Copy to Clipboard"
-msgstr "Êîïèðîâàòü â áóôåð îáìåíà"
+msgstr "Копировать в буфер обмена"
-#: Merge.rc:1606
+#: Merge.rc:43600E90
#, c-format
msgid "Shared or Private Filter"
-msgstr "Îáùèå è ëè÷íûå ôèëüòðû"
+msgstr "Общие и личные фильтры"
-#: Merge.rc:1609
+#: Merge.rc:74E96E1E
#, c-format
msgid "Which type of filter do you want to create?"
-msgstr "Êàêîé òèï ôèëüòðà âû õîòèòå ñîçäàòü?"
+msgstr "Какой тип фильтра вы хотите создать?"
-#: Merge.rc:1611
+#: Merge.rc:444EF527
#, c-format
msgid "Shared Filter (for all users on this machine)"
-msgstr "Îáùèé ôèëüòð (äëÿ âñåõ ïîëüçîâàòåëåé ýòîé ìàøèíû)"
+msgstr "Общий фильтр (для всех пользователей)"
-#: Merge.rc:1613
+#: Merge.rc:11304E6
#, c-format
msgid "Private Filter (only for current user)"
-msgstr "Ëè÷íûé ôèëüòð (òîëüêî äëÿ òåêóùåãî ïîëüçîâàòåëÿ)"
+msgstr "Личный фильтр (только для текущего пользователя)"
-#: Merge.rc:1621
-#: Merge.rc:2178
+#: Merge.rc:7D9F30CF
#, c-format
msgid "Archive Support"
-msgstr "Ïîääåðæêà àðõèâîâ"
+msgstr "Поддержка архивов"
-#: Merge.rc:1624
+#: Merge.rc:545FEEA5
#, c-format
msgid "&Enable archive file support"
-msgstr "&Âêëþ÷èòü ïîääåðæêó àðõèâîâ"
+msgstr "&Включить поддержку архивов"
-#: Merge.rc:1626
+#: Merge.rc:70C9C72D
#, c-format
msgid "&Detect archive type from file signature"
-msgstr "&Îïðåäåëÿòü òèï àðõèâà ïî ñèãíàòóðå/çàãîëîâêó ôàéëà"
+msgstr "&Определять тип архива по сигнатуре/заголовку файла"
-#: Merge.rc:1634
+#: Merge.rc:1AC98D0B
#, c-format
msgid "Compare Statistics"
-msgstr "Ñðàâíåíèå ñòàòèñòèêè"
+msgstr "Статистика сравнения"
-#: Merge.rc:1637
+#: Merge.rc:64ABCD7D
#, c-format
msgid "Folders:"
-msgstr "Ïàïêè:"
+msgstr "Папки:"
-#: Merge.rc:1638
+#: Merge.rc:7262BE23
#, c-format
msgid "Files:"
-msgstr "Ôàéëû:"
+msgstr "Файлы:"
-#: Merge.rc:1639
-#: Merge.rc:2581
+#: Merge.rc:629C1DDD
#, c-format
msgid "Different"
-msgstr "Îòëè÷àþòñÿ"
+msgstr "Отличаются"
-#: Merge.rc:1640
+#: Merge.rc:141E3F81
#, c-format
msgid "Text:"
-msgstr "Òåêñò:"
+msgstr "Текст:"
-#: Merge.rc:1643
-#: Merge.rc:1667
+#: Merge.rc:5FC9C469
#, c-format
msgid "Binary:"
-msgstr "Áèíàðíûå:"
+msgstr "Двоичный:"
-#: Merge.rc:1646
+#: Merge.rc:26535499
#, c-format
msgid "Unique"
-msgstr "Óíèêàëüíûå"
+msgstr "Уникальные"
-#: Merge.rc:1647
+#: Merge.rc:602FC82
#, c-format
msgid "Left:"
-msgstr "Ñëåâà:"
-
-#: Merge.rc:1652
-#, c-format
-msgid "Middle:"
-msgstr ""
+msgstr "Слева:"
-#: Merge.rc:1657
+#: Merge.rc:25669B6
#, c-format
msgid "Right:"
-msgstr "Ñïðàâà:"
+msgstr "Справа:"
-#: Merge.rc:1662
-#: Merge.rc:2571
+#: Merge.rc:26188979
#, c-format
msgid "Identical"
-msgstr "Îäèíàêîâûå"
+msgstr "Одинаковые"
-#: Merge.rc:1671
+#: Merge.rc:6FA9B0F7
#, c-format
msgid "Total:"
-msgstr "Âñåãî:"
+msgstr "Всего:"
-#: Merge.rc:1676
+#: Merge.rc:76245120
#, c-format
msgid "Close"
-msgstr "Çàêðûòü"
+msgstr "Закрыть"
+
+#: Merge.rc:2FC0BA7C
+#, c-format
+msgid "Middle:"
+msgstr "Посередине:"
+
+#: Merge.rc:2CEE474A
+#, c-format
+msgid "Missing Left:"
+msgstr "Отсутствует слева:"
+
+#: Merge.rc:2A79A039
+#, c-format
+msgid "Missing Middle:"
+msgstr "Отсутствует посередине:"
-#: Merge.rc:1685
+#: Merge.rc:70DAA20F
+#, c-format
+msgid "Missing Right:"
+msgstr "Отсутствует справа:"
+
+#: Merge.rc:413EF3DC
#, c-format
msgid "Affects"
-msgstr "Ïðèìåíèòü ê:"
+msgstr "Применить к:"
-#: Merge.rc:1688
-#: Merge.rc:1691
-#: Merge.rc:1694
+#: Merge.rc:1BE35CDC
#, c-format
msgid "(Affects)"
-msgstr "(ïðèìåíèòü)"
+msgstr "(применить)"
-#: Merge.rc:1695
+#: Merge.rc:E4471B
#, c-format
msgid "Select Codepage for"
-msgstr "Âûáðàòü êîäîâóþ ñòðàíèöó äëÿ"
+msgstr "Выбрать кодовую страницу для"
-#: Merge.rc:1696
+#: Merge.rc:5A9A713F
#, c-format
msgid "&File Loading:"
-msgstr "Çàãðóçêà ôàéëà:"
+msgstr "Загрузка файла:"
-#: Merge.rc:1699
+#: Merge.rc:7A4CFAFC
#, c-format
msgid "File &Saving:"
-msgstr "Ñîõðàíåíèå ôàéëà:"
+msgstr "Сохранение файла:"
-#: Merge.rc:1702
+#: Merge.rc:175DEEED
#, c-format
msgid "&Use same codepage for both"
-msgstr "Èñïîëüçîâàòü îäíó è òó æå êîäîâóþ ñòðàíèöó"
-
-#: Merge.rc:1705
-#, c-format
-msgid "&Apply"
-msgstr "&Ïðèìåíèòü"
+msgstr "Использовать одну и ту же кодовую страницу"
-#: Merge.rc:1706
-#: Merge.rc:2144
+#: Merge.rc:89AF4FE
#, c-format
msgid "&Cancel"
-msgstr "&Îòìåíà"
+msgstr "&Отмена"
-#: Merge.rc:1711
+#: Merge.rc:72A593B8
#, c-format
msgid "Test Filter"
-msgstr "Òåñò ôèëüòðà"
+msgstr "Тест фильтра"
-#: Merge.rc:1714
+#: Merge.rc:5CCED708
#, c-format
msgid "Testing filter ..."
-msgstr "Òåñòèðîâàòü ôèëüòð ..."
+msgstr "Тестировать фильтр ..."
-#: Merge.rc:1716
+#: Merge.rc:4EF81630
#, c-format
msgid "&Enter text to test:"
-msgstr "Ââåäèòå òåñòîâûé òåêñò:"
+msgstr "Введите тестовый текст:"
-#: Merge.rc:1718
+#: Merge.rc:4DE14277
#, c-format
msgid "&Folder Name"
-msgstr "Ïàïêà"
+msgstr "Папка"
-#: Merge.rc:1720
+#: Merge.rc:4876CD3F
#, c-format
msgid "Result:"
-msgstr "Ðåçóëüòàò:"
+msgstr "РезÑ\83лÑ\8cÑ\82аÑ\82:"
-#: Merge.rc:1724
+#: Merge.rc:43017E4F
#, c-format
msgid "&Test"
-msgstr "&Òåñòèðîâàòü"
+msgstr "&Тестировать"
-#: Merge.rc:1725
+#: Merge.rc:1D2E49FE
#, c-format
msgid "&Close"
-msgstr "&Çàêðûòü"
+msgstr "&Закрыть"
-#: Merge.rc:1733
+#: Merge.rc:175DEEEE
#, c-format
msgid "&Use customized text colors"
-msgstr "Èñïîëüçîâàòü îñîáûå öâåòà"
+msgstr "Использовать особые цвета"
-#: Merge.rc:1736
+#: Merge.rc:1AC98D0C
#, c-format
msgid "Custom text colors"
-msgstr "Íàñòðîèòü öâåòà"
+msgstr "Настроить цвета"
-#: Merge.rc:1738
+#: Merge.rc:3FE25901
#, c-format
msgid "Whitespace:"
-msgstr "Íåâèäèìûå:"
+msgstr "Невидимые:"
-#: Merge.rc:1739
+#: Merge.rc:3ECF34A4
#, c-format
msgid "Regular text:"
-msgstr "Îáû÷íûé òåêñò:"
+msgstr "Обычный текст:"
-#: Merge.rc:1740
+#: Merge.rc:751AB590
#, c-format
msgid "Selection:"
-msgstr "Âûäåëåííûé òåêñò:"
-
-#: Merge.rc:1763
-#, c-format
-msgid "Paths"
-msgstr "Ïóòè"
-
-#: Merge.rc:1766
-#, c-format
-msgid "&Left:"
-msgstr "&Ëåâûé:"
-
-#: Merge.rc:1769
-#, c-format
-msgid "R&ead-only"
-msgstr "Òîëüêî ÷òåíèå"
-
-#: Merge.rc:1770
-#, c-format
-msgid "&Right:"
-msgstr "&Ïðàâûé:"
-
-#: Merge.rc:1773
-#, c-format
-msgid "Re&ad-only"
-msgstr "Òîëüêî ÷òåíèå"
+msgstr "Выделенный текст:"
-#: Merge.rc:1774
+#: Merge.rc:2FC0BA7D
#, c-format
-msgid "&Filter:"
-msgstr "&Ôèëüòð:"
+msgid "Margin:"
+msgstr ""
-#: Merge.rc:1779
+#: Merge.rc:43E58E59
#, c-format
-msgid "Open..."
-msgstr "Îòêðûòü..."
+msgid "Backup Files"
+msgstr "Резервные копии"
-#: Merge.rc:1780
+#: Merge.rc:69AD3BF9
#, c-format
-msgid "Save..."
-msgstr "Ñîõðàíèòü..."
+msgid "Create backup files in:"
+msgstr "Создавать резервные файлы при:"
-#: Merge.rc:1785
-#: Merge.rc:2179
+#: Merge.rc:78B3B627
#, c-format
-msgid "Backup Files"
-msgstr "Ðåçåðâíûå êîïèè"
+msgid "&Folder compare"
+msgstr "СÑ\80авнении &папок"
-#: Merge.rc:1788
+#: Merge.rc:7A4CFAFD
#, c-format
-msgid "Create backup files in:"
-msgstr "Ñîçäàòü ðåçåðâíûå ôàéëû â:"
+msgid "Fil&e compare"
+msgstr "Сравнении &файлов"
-#: Merge.rc:1793
+#: Merge.rc:334E25B2
#, c-format
msgid "Create backup files into:"
-msgstr "Ñîçäàòü ðåçåðâíûå ôàéëû:"
+msgstr "Создавать резервные файлы в:"
-#: Merge.rc:1794
+#: Merge.rc:381D79E6
#, c-format
msgid "&Original file's folder"
-msgstr "â ïàïêå ñ îðèãèíàëüíûì ôàéëîì"
+msgstr "Папке оригинального файла"
-#: Merge.rc:1796
+#: Merge.rc:714B45FE
#, c-format
msgid "&Global backup folder:"
-msgstr "â îáùåé ïàïêå:"
+msgstr "Глобальной резервной папке:"
-#: Merge.rc:1800
+#: Merge.rc:1F7B33EC
#, c-format
msgid "Backup filename:"
-msgstr "Èìÿ ðåçåðâíîãî ôàéëà:"
+msgstr "Имя резервного файла:"
-#: Merge.rc:1801
+#: Merge.rc:381D79E7
#, c-format
msgid "&Append .bak -extension"
-msgstr "&Äîáàâèòü ðàñøèðåíèå .bak"
+msgstr "&Добавить расширение .bak"
-#: Merge.rc:1803
+#: Merge.rc:129644DE
#, c-format
msgid "A&ppend timestamp"
-msgstr "Äîáàâèòü äàòó"
+msgstr "Добавить дату"
-#: Merge.rc:1810
-#: Merge.rc:2474
+#: Merge.rc:CAEDA36
#, c-format
msgid "Confirm Copy"
-msgstr "Ïîäòâåðæäåíèÿ"
+msgstr "Подтверждения"
-#: Merge.rc:1814
+#: Merge.rc:36D268E9
#, c-format
msgid "Are you sure you want to copy XXX items?"
-msgstr "Âû äåéñòâèòåëüíî õîòèòå ñêîïèðîâàòü XXX ýëåìåíòîâ?"
+msgstr "Вы действительно хотите скопировать XXX элементов?"
-#: Merge.rc:1816
+#: Merge.rc:30CDE281
#, c-format
msgid "From left"
-msgstr "Ñëåâà"
+msgstr "Слева"
-#: Merge.rc:1819
+#: Merge.rc:2C015CFE
#, c-format
msgid "To right"
-msgstr "Íàïðàâî"
+msgstr "Направо"
-#: Merge.rc:1822
+#: Merge.rc:29CE40
#, c-format
msgid "Yes"
-msgstr "Äà"
+msgstr "Да"
-#: Merge.rc:1823
+#: Merge.rc:12E8E
#, c-format
msgid "No"
-msgstr "Íåò"
+msgstr "Нет"
-#: Merge.rc:1829
+#: Merge.rc:B612C23
#, c-format
msgid "Plugins"
-msgstr "Äîïîëíåíèÿ"
+msgstr "Плагины"
-#: Merge.rc:1832
+#: Merge.rc:78B3B628
#, c-format
msgid "&Enable plugins"
-msgstr "&Âêëþ÷èòü äîïîëíåíèÿ"
+msgstr "&Включить плагины"
-#: Merge.rc:1844
-#: Merge.rc:2180
+#: Merge.rc:62909ED6
#, c-format
msgid "Shell Integration"
-msgstr "Èíòåãðàöèÿ â îáîëî÷êó"
+msgstr "Интеграция в оболочку"
-#: Merge.rc:1847
+#: Merge.rc:31DC8C62
#, c-format
msgid "Explorer"
-msgstr "Ïðîâîäíèê"
+msgstr "Проводник"
-#: Merge.rc:1848
+#: Merge.rc:673BD331
#, c-format
msgid "E&nable advanced menu"
-msgstr "Â&êëþ÷èòü ðàñøèðåííîå ìåíþ"
+msgstr "В&ключить расширенное меню"
+
+#: Merge.rc:4EF81631
+#, c-format
+msgid "&Add to context menu"
+msgstr "&Добавить в контекстное меню"
-#: Merge.rc:1850
+#: Merge.rc:26A6974B
#, c-format
-msgid "In&clude subfolders by default"
-msgstr "Îáðàáàòûâàòü ïîäïàïêè ïî óìîë÷àíèþ"
+msgid "&Register shell extension"
+msgstr ""
-#: Merge.rc:1852
+#: Merge.rc:175DEEEF
#, c-format
-msgid "&Add to context menu"
-msgstr "&Äîáàâèòü â êîíòåêñòíîå ìåíþ"
+msgid "&Unregister shell extension"
+msgstr ""
-#: Merge.rc:1858
-#: Merge.rc:2183
-#: Merge.rc:2515
+#: Merge.rc:7262BE24
#, c-format
msgid "Folder"
-msgstr "Êàòàëîã"
+msgstr "Папка"
-#: Merge.rc:1863
+#: Merge.rc:60B696B0
#, c-format
msgid "S&top after first difference"
-msgstr "&Îñòàíàâëèâàòüñÿ ïîñëå ïåðâîãî îòëè÷èÿ"
+msgstr "&Останавливаться после первого отличия"
-#: Merge.rc:1865
+#: Merge.rc:7FF2B80B
#, c-format
msgid "Ign&ore time differences less than 3 seconds"
-msgstr "Èãíîðèðîâàòü ðàçíèöó âðåìåíè ìåíåå 3 ñåêóíä"
+msgstr "Игнорировать разницу времени менее 3 секунд"
-#: Merge.rc:1867
+#: Merge.rc:6D5B7719
#, c-format
msgid "&Include unique subfolders contents"
msgstr ""
-#: Merge.rc:1869
+#: Merge.rc:3E136C28
#, c-format
msgid "&Automatically expand all subfolders"
-msgstr ""
+msgstr "Автоматически развернуть все подпапки"
-#: Merge.rc:1871
+#: Merge.rc:5D032167
#, c-format
msgid "Ignore &Reparse Points"
-msgstr ""
+msgstr "Игнорировать точки повторной обработки"
-#: Merge.rc:1873
+#: Merge.rc:2E2C5208
#, c-format
msgid "&Quick compare limit (MB):"
-msgstr ""
+msgstr "Ограничение быстрого сравнения (МБ)"
-#: Merge.rc:1880
-#: Merge.rc:2185
-#: Merge.rc:2556
-#: Merge.rc:2771
+#: Merge.rc:2188DD49
+#, c-format
+msgid "&Number of compare threads (a negative value implies addition of the number of available CPU cores):"
+msgstr "Количество сравниваемых потоков (отрицательное значение подразумевает добавление количества доступных ядер ЦП):"
+
+#: Merge.rc:17BC2F9E
#, c-format
msgid "Binary"
-msgstr "Äâîè÷íûé"
+msgstr "Двоичный"
-#: Merge.rc:1883
+#: Merge.rc:7AAB28B8
#, c-format
msgid "Binary File &Patterns:"
-msgstr ""
+msgstr "Шаблоны двоичных файлов:"
-#: Merge.rc:1885
+#: Merge.rc:4F5264C9
#, c-format
msgid "Frhed settings"
-msgstr ""
+msgstr "Настройки Frhed"
-#: Merge.rc:1886
+#: Merge.rc:1A8FADD4
#, c-format
msgid "View &Settings..."
-msgstr ""
+msgstr "Параметры просмотра..."
-#: Merge.rc:1887
+#: Merge.rc:78B3B629
#, c-format
msgid "&Binary Mode..."
-msgstr ""
+msgstr "Двоичный режим..."
-#: Merge.rc:1888
+#: Merge.rc:1A9EBDF3
#, c-format
msgid "&Character Set..."
-msgstr ""
+msgstr "Набор символов..."
-#: Merge.rc:1894
-#: Merge.rc:2184
+#: Merge.rc:B8C361
#, c-format
msgid "Image"
msgstr ""
-#: Merge.rc:1897
+#: Merge.rc:2C4A6C6D
#, c-format
msgid "Image File &Patterns:"
msgstr ""
-#: Merge.rc:1910
+#: Merge.rc:4DB19839
#, c-format
msgid "&Hex View"
msgstr ""
-#. StringFileInfo.Block
-#: Merge.rc:1935
-#, c-format
-msgid "040904e4"
-msgstr "041904e3"
-
-#. VarFileInfo.Translation
-#: Merge.rc:1951
-#, c-format
-msgid "0x409, 1252"
-msgstr "0x419, 1251"
-
-#: Merge.rc:1966
-#, c-format
-msgid "Ready"
-msgstr "Ãîòîâî"
-
-#: Merge.rc:1972
+#: Merge.rc:206940
#, c-format
msgid "EXT"
msgstr "EXT"
-#: Merge.rc:1973
+#: Merge.rc:1F78C0
#, c-format
msgid "CAP"
msgstr "CAP"
-#: Merge.rc:1974
+#: Merge.rc:24A381
#, c-format
msgid "NUM"
msgstr "NUM"
-#: Merge.rc:1975
+#: Merge.rc:4B89B95
#, c-format
msgid "SCRL"
msgstr "SCRL"
-#: Merge.rc:1976
+#: Merge.rc:251BC0
#, c-format
msgid "OVR"
msgstr "OVR"
-#: Merge.rc:1977
+#: Merge.rc:268480
#, c-format
msgid "REC"
msgstr "REC"
-#: Merge.rc:1983
+#: Merge.rc:E8950E9
#, c-format
-msgid ""
-"Create empty documents\n"
-"New Documents (Ctrl+N)"
+msgid "\nNew Documents (Ctrl+N)"
msgstr ""
-"Ñîçäàòü ïóñòûå äîêóìåíòû\n"
-"New Documents (Ctrl-N)"
-#: Merge.rc:1984
+#: Merge.rc:28AAB7D
#, c-format
-msgid "Create empty documents (3 panes)\nNew Documents"
-msgstr ""
+msgid "\nOpen (Ctrl+O)"
+msgstr "\nОткрыть (Ctrl+O)"
-#: Merge.rc:1985
+#: Merge.rc:28AAB7E
#, c-format
-msgid ""
-"Open an existing document\n"
-"Open (Ctrl+O)"
-msgstr ""
-"Îòêðûòü ñóùåñòâóþùèé äîêóìåíò\n"
-"Open (Ctrl+O)"
+msgid "\nSave (Ctrl+S)"
+msgstr "\nСохранить (Ctrl+S)"
-#: Merge.rc:1986
+#: Merge.rc:524AB109
#, c-format
-msgid ""
-"Close the active document\n"
-"Close"
-msgstr ""
-"Çàêðûòü àêòèâíûé äîêóìåíò\n"
-"Close"
+msgid "Unknown error attempting to open project file"
+msgstr "Неизвестная ошибка при открытии файла проекта"
-#: Merge.rc:1987
+#: Merge.rc:524AB10A
#, c-format
-msgid ""
-"Save the active document\n"
-"Save (Ctrl+S)"
-msgstr ""
-"Ñîõðàíèòü àêòèâíûé äîêóìåíò\n"
-"Save (Ctrl+S)"
+msgid "Unknown error attempting to save project file"
+msgstr "Неизвестная ошибка при сохранении файла проекта"
-#: Merge.rc:1988
+#: Merge.rc:3FCEF5DC
#, c-format
-msgid ""
-"Save the active document with a new name\n"
-"Save As"
-msgstr ""
-"Ñîõðàíèòü àêòèâíûé äîêóìåíò ïîä íîâûì èìåíåì\n"
-"Save As"
+msgid "Project file successfully loaded."
+msgstr "Файл проекта успешно загружен."
-#: Merge.rc:1989
+#: Merge.rc:3BDD62C3
#, c-format
-msgid ""
-"Change the printing options\n"
-"Page Setup"
-msgstr ""
-"Èçìåíèòü íàñòðîéêè ïå÷àòè\n"
-"Page Setup"
+msgid "Project file successfully saved."
+msgstr "Файл проекта успешно сохранен."
-#: Merge.rc:1990
+#: Merge.rc:28AAB7F
#, c-format
-msgid ""
-"Change the printer and printing options\n"
-"Print Setup"
-msgstr ""
-"Èçìåíèòü íàñòðîéêè ïðèíòåðà è ïå÷àòè\n"
-"Print Setup"
+msgid "\nUndo (Ctrl+Z)"
+msgstr "\nОтменить (Ctrl+Z)"
+
+#: Merge.rc:28AAB80
+#, c-format
+msgid "\nRedo (Ctrl+Y)"
+msgstr "\nВернуть (Ctrl+Y)"
-#: Merge.rc:1991
+#: Merge.rc:2B78E95D
#, c-format
msgid ""
-"Print the active document\n"
-"Print"
+"\n"
+"FileCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FileCompare\n"
+"WinMerge File Compare"
msgstr ""
-"Ïå÷àòàòü àêòèâíûé äîêóìåíò\n"
-"Print"
+"\n"
+"FileCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FileCompare\n"
+"WinMerge Сравнение Файлов"
-#: Merge.rc:1992
+#: Merge.rc:293A824F
#, c-format
msgid ""
-"Display full pages\n"
-"Print Preview"
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge Folder Compare"
+msgstr ""
+"\n"
+"FolderCompare\n"
+"\n"
+"\n"
+"\n"
+"WinMerge.FolderCompare\n"
+"WinMerge Сравнение Папок"
+
+#: Merge.rc:74BA5C8C
+msgid "Developers:\nDean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaka, Gal Hammer, Alexander Skinner"
msgstr ""
-"Ïîêàçûâàòü ïîëíûå ñòðàíèöû\n"
-"Print Preview"
+"Разработчики:\n"
+"Дин Гримм (Dean Grimm), Кристиан Лист (Christian List), Киммо Варис (Kimmo Varis), Йохен Тухт (Jochen Tucht), Тим Герундт (Tim Gerundt), Такаши Саванака (Takashi Sawanaka), Гэл Хаммер (Gal Hammer), Александр Скиннер (Alexander Skinner)"
-#: Merge.rc:1997
+#: Merge.rc:3EF068BF
#, c-format
-msgid "Make all hidden items visible again"
-msgstr "Ïîêàçàòü âñå ñêðûòûå"
+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 в меню Помощь для более подробной информации."
-#: Merge.rc:1998
+#: Merge.rc:1D2E49FF
#, c-format
-msgid "Toggle tree mode"
-msgstr "Ïåðåêëþ÷èòü â ðåæèì äåðåâà"
+msgid "&Abort"
+msgstr "&Прервать"
-#: Merge.rc:1999
+#: Merge.rc:1D2E4A00
#, c-format
-msgid "Expand all subfolders"
-msgstr "Ðàçâåðíóòü âñå ïîäïàïêè"
+msgid "&Retry"
+msgstr "Ð\9fов&Ñ\82оÑ\80иÑ\82Ñ\8c"
-#: Merge.rc:2000
+#: Merge.rc:89AF4FF
#, c-format
-msgid "Collapse all subfolders"
-msgstr "Ñâåðíóòü âñå ïîäïàïêè"
+msgid "&Ignore"
+msgstr "&Игнорировать"
-#: Merge.rc:2006
+#: Merge.rc:21C15B8
#, c-format
-msgid ""
-"Open project file\n"
-"Project file (Ctrl+J)"
-msgstr ""
-"Îòêðûòü ôàéë ïðîåêòà\n"
-"Ôàéë ïðîåêòà (Ctrl+J)"
+msgid "Ignore &all"
+msgstr "Игнорировать &все"
-#: Merge.rc:2007
+#: Merge.rc:22956AA
#, c-format
-msgid "Unknown error attempting to open project file"
-msgstr "Íåèçâåñòíàÿ îøèáêà ïðè îòêðûòèè ôàéëà ïðîåêòà"
+msgid "&Yes"
+msgstr "&Да"
-#: Merge.rc:2008
+#: Merge.rc:48B5872E
#, c-format
-msgid "Unknown error attempting to save project file"
-msgstr "Íåèçâåñòíàÿ îøèáêà ïðè ñîõðàíåíèè ôàéëà ïðîåêòà"
+msgid "Yes to &all"
+msgstr "Д&а для всех"
-#: Merge.rc:2009
+#: Merge.rc:11D981
#, c-format
-msgid "Project File"
-msgstr "Ôàéë ïðîåêòà"
+msgid "&No"
+msgstr "&Нет"
-#: Merge.rc:2010
+#: Merge.rc:4909ADB4
#, c-format
-msgid "Project file successfully loaded."
-msgstr "Ôàéë ïðîåêòà óñïåøíî çàãðóæåí."
+msgid "No to a&ll"
+msgstr "Нет д&ля всех"
-#: Merge.rc:2011
+#: Merge.rc:4DB1983A
#, c-format
-msgid "Project file successfully saved."
-msgstr "Ôàéë ïðîåêòà óñïåøíî ñîõðàíåí."
+msgid "&Continue"
+msgstr "Про&должить"
-#: Merge.rc:2012
+#: Merge.rc:43017E50
#, c-format
-msgid ""
-"Save current paths and options to project file\n"
-"Save Project File"
-msgstr ""
-"Ñîõðàíèòü òåêóùèå ïóòè è íàñòðîéêè â ôàéë ïðîåêòà\n"
-"Ñîõðàíèòü ôàéë ïðîåêòà"
+msgid "&Skip"
+msgstr "П&ропустить"
-#: Merge.rc:2017
+#: Merge.rc:2D1160AF
#, c-format
-msgid ""
-"Display program information, version number and copyright\n"
-"About"
-msgstr ""
-"Ïîêàçàòü èíôîðìàöèþ î ïðîãðàììå, íîìåð âåðñèè è êîïèðàéò\n"
-"About"
+msgid "Skip &all"
+msgstr "Проп&устить все"
-#: Merge.rc:2018
+#: Merge.rc:77C09B82
#, c-format
-msgid ""
-"Quit the application; prompts to save documents\n"
-"Exit"
-msgstr ""
-"Âûéòè èç ïðîãðàììû; Ñïðîñèòü î ñîõðàíåíèè äîêóìåíòîâ\n"
-"Exit"
-
-#: Merge.rc:2024
-#: Merge.rc:2025
-#: Merge.rc:2026
-#: Merge.rc:2027
-#: Merge.rc:2028
-#: Merge.rc:2029
-#: Merge.rc:2030
-#: Merge.rc:2031
-#: Merge.rc:2032
-#: Merge.rc:2033
-#: Merge.rc:2034
-#: Merge.rc:2035
-#: Merge.rc:2036
-#: Merge.rc:2037
-#: Merge.rc:2038
-#: Merge.rc:2039
-#, c-format
-msgid "Open this document"
-msgstr "Îòêðûòü ýòîò äîêóìåíò"
-
-#: Merge.rc:2044
+msgid "Don't display this &message again."
+msgstr "Не показывать &больше это сообщение"
+
+#: Merge.rc:57F02FB4
#, c-format
-msgid ""
-"Switch to the next window pane\n"
-"Next Pane"
-msgstr ""
-"Ïåðåêëþ÷èòüñÿ íà ñëåäóþùþþ îêîííóþ ïàíåëü\n"
-"Next Pane"
+msgid "Don't ask this &question again."
+msgstr "Не задавать &больше этот вопрос"
-#: Merge.rc:2045
+#: Merge.rc:78ACB5DB
#, c-format
-msgid ""
-"Switch back to the previous window pane\n"
-"Previous Pane"
+msgid "To make this messagebox visible again, press the Reset button on the General page of the Options dialog."
msgstr ""
-"Ïåðåêëþ÷èòüñÿ íà ïðåäûäóùþþ îêîííóþ ïàíåëü\n"
-"Previous Pane"
-#: Merge.rc:2051
+#: Merge.rc:39000D58
#, c-format
-msgid ""
-"Arrange windows so they overlap\n"
-"Cascade Windows"
+msgid "Syntax"
msgstr ""
-"Ðàñïîëîæèòü îêíà êàñêàäîì ñ íàëîæåíèåì\n"
-"Cascade Windows"
-#: Merge.rc:2052
+#: Merge.rc:2C0C2241
#, c-format
-msgid ""
-"Arrange windows as non-overlapping tiles horizontally\n"
-"Tile Windows Horizontally"
-msgstr ""
-"Ðàñïîëîæèòü îêíà íåïåðåêðûâàþùåéñÿ ãîðèçîíòàëüíîé ÷åðåïèöåé\n"
-"Îêíà ÷åðåïèöåé ãîðèçîíòàëüíî"
+msgid "Differences"
+msgstr "Отличия"
-#: Merge.rc:2053
+#: Merge.rc:277500
#, c-format
-msgid ""
-"Arrange windows as non-overlapping tiles vertically\n"
-"Tile Windows Vertically"
-msgstr ""
-"Ðàñïîëîæèòü îêíà íåïåðåêðûâàþùåéñÿ âåðòèêàëüíîé ÷åðåïèöåé\n"
-"Îêíà ÷åðåïèöåé âåðòèêàëüíî"
+msgid "To:"
+msgstr "На:"
-#: Merge.rc:2059
+#: Merge.rc:68EE6DF1
#, c-format
-msgid ""
-"Copy the selection and put it on the Clipboard\n"
-"Copy"
-msgstr ""
-"Ñêîïèðîâàòü â áóôåð îáìåíà\n"
-"Copy"
+msgid "From left:"
+msgstr "Слева:"
-#: Merge.rc:2060
+#: Merge.rc:2C015CFF
#, c-format
-msgid ""
-"Cut the selection and put it on the Clipboard\n"
-"Cut"
-msgstr ""
-"Âûðåçàòü è ïîìåñòèòü â áóôåð îáìåíà\n"
-"Cut"
+msgid "To left:"
+msgstr "Налево:"
-#: Merge.rc:2061
+#: Merge.rc:34DF5071
#, c-format
-msgid ""
-"Find the specified text\n"
-"Find"
-msgstr ""
-"Íàéòè óêàçàííûé òåêñò\n"
-"Find"
+msgid "From right:"
+msgstr "Справа:"
-#: Merge.rc:2062
+#: Merge.rc:542A4301
#, c-format
-msgid ""
-"Insert Clipboard contents\n"
-"Paste"
-msgstr ""
-"Âñòàâèòü ñîäåðæèìîå áóôåðà îáìåíà\n"
-"Paste"
+msgid "To right:"
+msgstr "Направо:"
-#: Merge.rc:2063
+#: Merge.rc:2924ED78
#, c-format
-msgid ""
-"Repeat the last action\n"
-"Repeat"
-msgstr ""
-"Ïîâòîðèòü ïîñëåäíåå äåéñòâèå\n"
-"Repeat"
+msgid "Version %1"
+msgstr "Версия %1"
-#: Merge.rc:2064
+#: Merge.rc:24173EE7
#, c-format
-msgid ""
-"Replace specific text with different text\n"
-"Replace"
-msgstr ""
-"Çàìåíèòü óêàçàííûé òåêñò íà äðóãîé\n"
-"Replace"
+msgid "Unicode"
+msgstr "Юникод"
-#: Merge.rc:2065
+#: Merge.rc:295600
#, c-format
-msgid ""
-"Select the entire document\n"
-"Select All"
-msgstr ""
-"Âûáðàòü âåñü äîêóìåíò\n"
-"Select All"
+msgid "X64"
+msgstr "X64"
-#: Merge.rc:2066
+#: Merge.rc:761E6873
#, c-format
-msgid ""
-"Undo the last action\n"
-"Undo (Ctrl+Z)"
-msgstr ""
-"Îòìåíèòü ïîñëåäíåå äåéñòâèå\n"
-"Undo"
+msgid "Options (%1)"
+msgstr "Настройки (%1)"
-#: Merge.rc:2067
+#: Merge.rc:4BDBDC64
#, c-format
-msgid ""
-"Redo the previously undone action\n"
-"Redo (Ctrl+Y)"
-msgstr ""
-"Âåðíóòü îòìåíåííîå äåéñòâèå\n"
-"Redo"
+msgid "All message boxes are now displayed again."
+msgstr "Теперь все сообщения снова будут отображаться"
-#: Merge.rc:2073
+#: Merge.rc:37825D6A
#, c-format
msgid ""
-"Show or hide the toolbar\n"
-"Toggle ToolBar"
+"Value in Tab size -field is not in range WinMerge accepts.\n"
+"\n"
+"Please use values 1 - %1."
msgstr ""
-"Ïîêàçàòü èëè ñêðûòü ïàíåëü èíñòðóìåíòîâ\n"
-"Toggle ToolBar"
+"Размер таба выходит за границы приемлемых значений.\n"
+"\n"
+"Используйте значения 1 - %1."
-#: Merge.rc:2074
+#: Merge.rc:47E5C8F
#, c-format
-msgid ""
-"Show or hide the status bar\n"
-"Toggle StatusBar"
-msgstr ""
-"Ïîêàçàòü èëè ñêðûòü ñòðîêó ñîñòîÿíèé\n"
-"Toggle StatusBar"
+msgid "Open"
+msgstr "Открыть"
-#: Merge.rc:2075
+#: Merge.rc:3E105584
#, c-format
-msgid ""
-"Show or hide the tab bar\n"
-"Toggle TabBar"
-msgstr ""
-"Ïîêàçàòü èëè ñêðûòü ïàíåëü òàáîâ\n"
-"Toggle TabBar"
+msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
+msgstr "Программы|*.exe;*.bat;*.cmd|Все файлы (*.*)|*.*||"
-#: Merge.rc:2076
+#: Merge.rc:222D39F7
#, c-format
-msgid ""
-"Automatically resize panes\n"
-"Lock Panes"
-msgstr ""
-"Àâòîìàòè÷åñêè èçìåíÿòü ðàçìåð ïàíåëåé\n"
-"Çàáëîêèðîâàòü ïàíåëè"
+msgid "All Files (*.*)|*.*||"
+msgstr "Все файлы (*.*)|*.*||"
+
+#: Merge.rc:237E9033
+#, c-format
+msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
+msgstr "Файлы проектов WinMerge (*.WinMerge)|*.WinMerge||"
+
+#: Merge.rc:BEDA09D
+#, c-format
+msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
+msgstr "Файлы конфигурации (*.ini)|*.ini|Все файлы (*.*)|*.*||"
-#: Merge.rc:2082
+#: Merge.rc:3FF615A0
#, c-format
-msgid "Change the window size"
-msgstr "Èçìåíèòü ðàçìåð îêíà"
+msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
+msgstr "Текстовые файлы (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Все файлы (*.*)|*.*||"
-#: Merge.rc:2083
+#: Merge.rc:59814668
#, c-format
-msgid "Change the window position"
-msgstr "Èçìåíèòü ïîëîæåíèå îêíà"
+msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
+msgstr "Файлы HTML (*.htm,*.html)|*.htm;*.html|Все файлы (*.*)|*.*||"
-#: Merge.rc:2084
+#: Merge.rc:67444ADC
#, c-format
-msgid "Reduce the window to an icon"
-msgstr "Ñâåðíóòü îêíî â çíà÷îê"
+msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
+msgstr "Файлы XML (*.xml)|*.xml|Все файлы (*.*)|*.*||"
-#: Merge.rc:2085
+#: Merge.rc:46FCCCE
#, c-format
-msgid "Enlarge the window to full size"
-msgstr "Ðàñêðûòü îêíî äî ìàêñèìóìà"
+msgid "Name"
+msgstr "Ð\98мÑ\8f"
-#: Merge.rc:2086
+#: Merge.rc:15875422
#, c-format
-msgid "Switch to the next document window"
-msgstr "Ïåðåêëþ÷èòüñÿ íà ñëåäóþùèé äîêóìåíò"
+msgid "Location"
+msgstr "Местоположение"
-#: Merge.rc:2087
+#: Merge.rc:59F506A0
#, c-format
-msgid "Switch to the previous document window"
-msgstr "Ïåðåêëþ÷èòüñÿ íà ïðåäûäóùèé äîêóìåíò"
+msgid "Filters"
+msgstr "Фильтры"
-#: Merge.rc:2088
+#: Merge.rc:52D199B
#, c-format
-msgid "Close the active window and prompts to save the documents"
-msgstr "Çàêðûòü àêòèâíîå îêíî è ñïðîñèòü î ñîõðàíåíèè äîêóìåíòîâ"
+msgid "[F] "
+msgstr "[F] "
-#: Merge.rc:2093
+#: Merge.rc:2C0C2242
#, c-format
-msgid "Restore the window to normal size"
-msgstr "Âîññòàíîâèòü íîðìàëüíûå ðàçìåðû îêíà"
+msgid "Description"
+msgstr "Описание"
-#: Merge.rc:2094
+#: Merge.rc:D6BB425
#, c-format
-msgid "Activate Task List"
-msgstr "Àêòèâèðîâàòü ñïèñîê çàäà÷"
+msgid "Select filename for new filter"
+msgstr "Укажите имя файла для нового фильтра"
-#: Merge.rc:2095
+#: Merge.rc:764E4AD3
#, c-format
-msgid "Activate this window"
-msgstr "Àêòèâèðîâàòü ýòî îêíî"
+msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
+msgstr "Файлы фильтров (*.flt)|*.flt|Все файлы (*.*)|*.*||"
-#: Merge.rc:2101
+#: Merge.rc:24B5241A
#, c-format
msgid ""
-"Close print preview mode\n"
-"Cancel Preview"
+"Cannot find file filter template file!\n"
+"\n"
+"Please copy file %1 to WinMerge/Filters -folder:\n"
+"%2."
msgstr ""
-"Çàêðûòü îêíî ïðåäâàðèòåëüíîãî ïðîñìîòðà\n"
-"Cancel Preview"
+"Невозможно найти файл фильтра!\n"
+"\n"
+"Скопируйте файл %1 в папку с фильтрами:\n"
+"%2."
-#: Merge.rc:2108
+#: Merge.rc:2A045B49
#, c-format
msgid ""
+"Cannot copy filter template file to filter folder:\n"
+"%1\n"
"\n"
-"FileCompare\n"
+"Please make sure the folder exists and is writable."
+msgstr ""
+"Невозможно скопировать файл фильтра в папку с фильтрами:\n"
+"%1\n"
"\n"
-"\n"
-"\n"
-"WinMerge.FileCompare\n"
-"WinMerge File Compare"
-msgstr ""
-"\n"
-"FileCompare\n"
-"\n"
-"\n"
-"\n"
-"WinMerge.FileCompare\n"
-"WinMerge Ñðàâíåíèå Ôàéëîâ"
-
-#: Merge.rc:2109
-#, c-format
-msgid ""
-"\n"
-"FolderCompare\n"
-"\n"
-"\n"
-"\n"
-"WinMerge.FolderCompare\n"
-"WinMerge Folder Compare"
-msgstr ""
-"\n"
-"FolderCompare\n"
-"\n"
-"\n"
-"\n"
-"WinMerge.FolderCompare\n"
-"WinMerge Ñðàâíåíèå Ïàïîê"
-
-#: Merge.rc:2116
-#, c-format
-msgid "Preserve original EOL chars"
-msgstr "Ñîõðàíÿòü îðèãèíàëüíûå ñèìâîëû EOL"
-
-#: Merge.rc:2128
-#: Merge.rc:2129
-#: Merge.rc:2130
-#, c-format
-msgid "Right click on the path to copy"
-msgstr "Ïðàâûé êëèê íà ïóòè, ÷òîáû ñêîïèðîâàòü"
-
-#: Merge.rc:2136
-#, c-format
-msgid ""
-"Developers:\n"
-"Dean Grimm, Christian List, Kimmo Varis, Jochen Tucht, Tim Gerundt, Takashi Sawanaki, Gal Hammer, Alexander Skinner"
-msgstr ""
-"Ðàçðàáîò÷èêè:\n"
-"Äèí Ãðèìì (Dean Grimm), Êðèñòèàí Ëèñò (Christian List), Êèììî Âàðèñ (Kimmo Varis), Éîõåí Òóõò (Jochen Tucht), Òèì Ãåðóíäò (Tim Gerundt), Òàêàøè Ñàâàíàêè (Takashi Sawanaki), Ãýë Õàììåð (Gal Hammer), Àëåêñàíäð Ñêèííåð (Alexander Skinner)"
-
-#: Merge.rc:2137
-#, c-format
-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 â ìåíþ Ïîìîùü äëÿ áîëåå ïîäðîáíîé èíôîðìàöèè."
-
-#: Merge.rc:2145
-#, c-format
-msgid "&Abort"
-msgstr "&Ïðåðâàòü"
-
-#: Merge.rc:2146
-#, c-format
-msgid "&Retry"
-msgstr "Ïîâ&òîðèòü"
-
-#: Merge.rc:2147
-#, c-format
-msgid "&Ignore"
-msgstr "&Èãíîðèðîâàòü"
-
-#: Merge.rc:2148
-#, c-format
-msgid "Ignore &all"
-msgstr "Èãíîðèðîâàòü &âñå"
-
-#: Merge.rc:2149
-#, c-format
-msgid "&Yes"
-msgstr "&Äà"
-
-#: Merge.rc:2155
-#, c-format
-msgid "Yes to &all"
-msgstr "Ä&à äëÿ âñåõ"
-
-#: Merge.rc:2156
-#, c-format
-msgid "&No"
-msgstr "&Íåò"
-
-#: Merge.rc:2157
-#, c-format
-msgid "No to a&ll"
-msgstr "Íåò ä&ëÿ âñåõ"
-
-#: Merge.rc:2158
-#, c-format
-msgid "&Continue"
-msgstr "Ïðî&äîëæèòü"
-
-#: Merge.rc:2159
-#, c-format
-msgid "&Skip"
-msgstr "Ï&ðîïóñòèòü"
-
-#: Merge.rc:2160
-#, c-format
-msgid "Skip &all"
-msgstr "Ïðîï&óñòèòü âñå"
-
-#: Merge.rc:2162
-#, c-format
-msgid "Don't display this &message again."
-msgstr "Íå ïîêàçûâàòü &áîëüøå ýòî ñîîáùåíèå"
-
-#: Merge.rc:2163
-#, c-format
-msgid "Don't ask this &question again."
-msgstr "Íå çàäàâàòü &áîëüøå ýòîò âîïðîñ"
-
-#: Merge.rc:2174
-#, c-format
-msgid "Syntax"
-msgstr ""
-
-#: Merge.rc:2176
-#, c-format
-msgid "Version Control"
-msgstr "Êîíòðîëü âåðñèé"
-
-#: Merge.rc:2181
-#: Merge.rc:2555
-#, c-format
-msgid "Differences"
-msgstr "Îòëè÷èÿ"
-
-#: Merge.rc:2192
-#, c-format
-msgid "To:"
-msgstr "Íà:"
-
-#: Merge.rc:2193
-#, c-format
-msgid "From left:"
-msgstr "Ñëåâà:"
-
-#: Merge.rc:2194
-#, c-format
-msgid "To left:"
-msgstr "Íàëåâî:"
-
-#: Merge.rc:2195
-#, c-format
-msgid "From right:"
-msgstr "Ñïðàâà:"
-
-#: Merge.rc:2196
-#, c-format
-msgid "To right:"
-msgstr "Íàïðàâî:"
-
-#: Merge.rc:2202
-#, c-format
-msgid "Version %1"
-msgstr "Âåðñèÿ %1"
-
-#: Merge.rc:2203
-#, c-format
-msgid "Unicode"
-msgstr "Þíèêîä"
-
-#: Merge.rc:2204
-#, c-format
-msgid "X64"
-msgstr "X64"
-
-#: Merge.rc:2210
-#, c-format
-msgid "Options (%1)"
-msgstr "Íàñòðîéêè (%1)"
-
-#: Merge.rc:2211
-#, c-format
-msgid "All message boxes are now displayed again."
-msgstr "Òåïåðü âñå ñîîáùåíèÿ ñíîâà áóäóò îòîáðàæàòüñÿ"
-
-#: Merge.rc:2213
-#, c-format
-msgid ""
-"Value in Tab size -field is not in range WinMerge accepts.\n"
-"\n"
-"Please use values 1 - %1."
-msgstr ""
-"Ðàçìåð òàáà âûõîäèò çà ãðàíèöû ïðèåìëåìûõ çíà÷åíèé.\n"
-"\n"
-"Èñïîëüçóéòå çíà÷åíèÿ 1 - %1."
-
-#: Merge.rc:2219
-#, c-format
-msgid "Open"
-msgstr "Îòêðûòü"
-
-#: Merge.rc:2220
-#, c-format
-msgid "Programs|*.exe;*.bat;*.cmd|All Files (*.*)|*.*||"
-msgstr "Ïðîãðàììû|*.exe;*.bat;*.cmd|Âñå ôàéëû (*.*)|*.*||"
-
-#: Merge.rc:2221
-#, c-format
-msgid "All Files (*.*)|*.*||"
-msgstr "Âñå ôàéëû (*.*)|*.*||"
-
-#: Merge.rc:2222
-#, c-format
-msgid "WinMerge Project Files (*.WinMerge)|*.WinMerge||"
-msgstr "Ôàéëû ïðîåêòîâ WinMerge (*.WinMerge)|*.WinMerge||"
-
-#: Merge.rc:2224
-#, c-format
-msgid "Options files (*.ini)|*.ini|All Files (*.*)|*.*||"
-msgstr "Ôàéëû êîíôèãóðàöèè (*.ini)|*.ini|Âñå ôàéëû (*.*)|*.*||"
-
-#: Merge.rc:2230
-#, c-format
-msgid "Text Files (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|All Files (*.*)|*.*||"
-msgstr "Òåêñòîâûå ôàéëû (*.csv;*.asc;*.rpt;*.txt)|*.csv;*.asc;*.rpt;*.txt|Âñå ôàéëû (*.*)|*.*||"
-
-#: Merge.rc:2231
-#, c-format
-msgid "HTML Files (*.htm,*.html)|*.htm;*.html|All Files (*.*)|*.*||"
-msgstr "Ôàéëû HTML (*.htm,*.html)|*.htm;*.html|Âñå ôàéëû (*.*)|*.*||"
-
-#: Merge.rc:2232
-#, c-format
-msgid "XML Files (*.xml)|*.xml|All Files (*.*)|*.*||"
-msgstr "Ôàéëû XML (*.xml)|*.xml|Âñå ôàéëû (*.*)|*.*||"
-
-#: Merge.rc:2249
-#: Merge.rc:2791
-#, c-format
-msgid "Name"
-msgstr "Èìÿ"
-
-#: Merge.rc:2250
-#, c-format
-msgid "Location"
-msgstr "Ìåñòîïîëîæåíèå"
-
-#: Merge.rc:2251
-#, c-format
-msgid "Filters"
-msgstr "Ôèëüòðû"
-
-#: Merge.rc:2252
-#, c-format
-msgid "[F] "
-msgstr "[F] "
-
-#: Merge.rc:2253
-#: Merge.rc:2793
-#, c-format
-msgid "Description"
-msgstr "Îïèñàíèå"
-
-#: Merge.rc:2254
-#, c-format
-msgid "Select filename for new filter"
-msgstr "Óêàæèòå èìÿ ôàéëà äëÿ íîâîãî ôèëüòðà"
-
-#: Merge.rc:2255
-#, c-format
-msgid "File Filters (*.flt)|*.flt|All Files (*.*)|*.*||"
-msgstr "Ôàéëû ôèëüòðîâ (*.flt)|*.flt|Âñå ôàéëû (*.*)|*.*||"
-
-#: Merge.rc:2257
-#, c-format
-msgid ""
-"Cannot find file filter template file!\n"
-"\n"
-"Please copy file %1 to WinMerge/Filters -folder:\n"
-"%2."
-msgstr ""
-"Íåâîçìîæíî íàéòè ôàéë ôèëüòðà!\n"
-"\n"
-"Ñêîïèðóéòå ôàéë %1 â ïàïêó ñ ôèëüòðàìè:\n"
-"%2."
-
-#: Merge.rc:2259
-#, c-format
-msgid ""
-"Cannot copy filter template file to filter folder:\n"
-"%1\n"
-"\n"
-"Please make sure the folder exists and is writable."
-msgstr ""
-"Íåâîçìîæíî ñêîïèðîâàòü ôàéë ôèëüòðà â ïàïêó ñ ôèëüòðàìè:\n"
-"%1\n"
-"\n"
-"Óáåäèòåñü, ÷òî ïàïêà ñóùåñòâóåò è äîñòóïíà äëÿ çàïèñè."
+"Убедитесь, что папка существует и доступна для записи."
-#: Merge.rc:2261
+#: Merge.rc:4EA7BACD
#, c-format
msgid ""
"User's filter file folder is not defined!\n"
"\n"
"Please select filter folder in Options/System."
msgstr ""
-"Ïàïêà ñ ôèëüòðàìè ïîëüçîâàòåëÿ íå îïðåäåëåíà!\n"
+"Папка с фильтрами пользователя не определена!\n"
"\n"
-"Óêàæèòå ïàïêó ñ ôèëüòðàìè íà âêëàäêå Ñèñòåìà â Íàñòðîéêàõ."
+"Укажите папку с фильтрами на вкладке Система в Настройках."
-#: Merge.rc:2263
+#: Merge.rc:7DDEC9BD
#, c-format
msgid ""
"Failed to delete the filter file:\n"
"\n"
"Maybe the file is read-only?"
msgstr ""
-"Íåâîçìîæíî óäàëèòü ôàéë ôèëüòðà:\n"
+"Невозможно удалить файл фильтра:\n"
"%1\n"
"\n"
-"Âîçìîæíî ôàéë èñïîëüçóåòñÿ."
+"Возможно файл используется."
-#: Merge.rc:2264
+#: Merge.rc:6F3BCB34
#, c-format
msgid "Locate filter file to install"
-msgstr "Óêàçàòü ôàéë ôèëüòðà"
+msgstr "Указать файл фильтра"
-#: Merge.rc:2266
+#: Merge.rc:6858E820
#, c-format
msgid ""
"Installing filter file failed.\n"
"\n"
"Could not copy new filter file to filter folder."
msgstr ""
-"Îøèáêà óñòàíîâêè ôèëüòðà.\n"
+"Ошибка установки фильтра.\n"
"\n"
-"Íåâîçìîæíî ñêîïèðîâàòü ôàéë ôèëüòðà â ïàïêó ñ ôèëüòðàìè."
+"Невозможно скопировать файл фильтра в папку с фильтрами."
-#: Merge.rc:2268
+#: Merge.rc:5704C4AC
#, c-format
msgid "Filter file already exists. Overwrite existing filter?"
-msgstr "Ôèëüòð óæå ñóùåñòâóåò. Ïåðåçàïèñàòü?"
+msgstr "Фильтр уже существует. Перезаписать?"
-#: Merge.rc:2274
+#: Merge.rc:237A126
#, c-format
msgid "Regular expression"
-msgstr "Ðåãóëÿðíîå âûðàæåíèå"
+msgstr "РегÑ\83лÑ\8fÑ\80ное вÑ\8bÑ\80ажение"
-#: Merge.rc:2280
+#: Merge.rc:34BD4316
#, c-format
msgid ""
"Filters were updated. Do you want to refresh all open folder compares?\n"
"\n"
"If you do not want to refresh all compares now you can select No and refresh compares later."
msgstr ""
-"Ôèëüòðû áûëè îáíîâëåíû. Õîòèòå îáíîâèòü âñå îòêðûòûå ñðàâíèâàåìûå ïàïêè?\n"
-"Åñëè íå õîòèòå îáíîâëÿòü ñåé÷àñ, òî ìîæåòå íàæàòü \"Íåò\" è îáíîâèòü ïîçæå."
+"Фильтры были обновлены. Хотите обновить все открытые сравниваемые папки?\n"
+"Если не хотите обновлять сейчас, то можете нажать \"Нет\" и обновить позже."
-#: Merge.rc:2287
-#, c-format
-msgid "&Path to SS.EXE:"
-msgstr "&Ïóòü ê SS.EXE:"
-
-#: Merge.rc:2293
+#: Merge.rc:114DD351
#, c-format
msgid "Folder Comparison Results"
-msgstr "Ðåçóëüòàòû ñðàâíåíèÿ êàòàëîãîâ"
+msgstr "РезÑ\83лÑ\8cÑ\82аÑ\82Ñ\8b Ñ\81Ñ\80авнениÑ\8f каÑ\82алогов"
-#: Merge.rc:2294
+#: Merge.rc:1AFA3493
#, c-format
msgid "File Comparison"
-msgstr "Ñðàâíåíèå ôàéëîâ"
+msgstr "Сравнение файлов"
-#: Merge.rc:2295
+#: Merge.rc:2FEFC30D
#, c-format
msgid "Untitled left"
-msgstr "Áåçûìÿííûé ñëåâà"
+msgstr "Безымянный слева"
-#: Merge.rc:2296
+#: Merge.rc:730B3FD4
#, c-format
msgid "Untitled middle"
msgstr ""
-#: Merge.rc:2297
+#: Merge.rc:4E089EF3
#, c-format
msgid "Untitled right"
-msgstr "Áåçûìÿííûé ñïðàâà"
+msgstr "Безымянный справа"
-#: Merge.rc:2298
+#: Merge.rc:72A593B9
#, c-format
msgid "Theirs File"
-msgstr "Èõ ôàéë"
+msgstr "Их файл"
-#: Merge.rc:2299
+#: Merge.rc:427C12C1
#, c-format
msgid "Mine File"
-msgstr "Ìîé ôàéë"
-
-#: Merge.rc:2305
-#, c-format
-msgid "Scanning files..."
-msgstr "Ñêàíèðîâàíèå ôàéëîâ..."
-
-#: Merge.rc:2306
-#, c-format
-msgid "Opening selection"
-msgstr "Îòêðûâàþ âûáðàííîå"
-
-#: Merge.rc:2307
-#, c-format
-msgid "Copying Left to Right"
-msgstr "Êîïèðîâàíèå Ñëåâà Íàïðàâî"
-
-#: Merge.rc:2308
-#, c-format
-msgid "Copying Right to Left"
-msgstr "Êîïèðîâàíèå Ñïðàâà Íàëåâî"
-
-#: Merge.rc:2309
-#, c-format
-msgid "Copying Left to Middle"
-msgstr ""
-
-#: Merge.rc:2310
-#, c-format
-msgid "Copying Right to Middle"
-msgstr ""
-
-#: Merge.rc:2311
-#, c-format
-msgid "Copying From Left"
-msgstr ""
-
-#: Merge.rc:2312
-#, c-format
-msgid "Copying From Right"
-msgstr ""
-
-#: Merge.rc:2313
-#, c-format
-msgid "Copying All to Left"
-msgstr "Êîïèðîâàíèå âñåõ ôàéëîâ íàëåâî"
-
-#: Merge.rc:2314
-#, c-format
-msgid "Copying All to Right"
-msgstr "Êîïèðîâàíèå âñåõ ôàéëîâ íàïðàâî"
-
-#: Merge.rc:2315
-#, c-format
-msgid "Copying files..."
-msgstr "Êîïèðîâàíèå ôàéëîâ..."
-
-#: Merge.rc:2316
-#, c-format
-msgid "Deleting files..."
-msgstr "Óäàëåíèå ôàéëîâ..."
-
-#: Merge.rc:2317
-#, c-format
-msgid "Moving files..."
-msgstr "Ïåðåìåùåíèå ôàéëîâ..."
+msgstr "Мой файл"
-#: Merge.rc:2318
+#: Merge.rc:DD21174
#, c-format
-msgid "Creating the report..."
-msgstr "Ñîçäàåòñÿ îò÷åò..."
-
-#: Merge.rc:2319
-#, c-format
-msgid "Undoing the last operation..."
-msgstr "Îòìåíà ïîñëåäíåé îïåðàöèè"
-
-#: Merge.rc:2320
-#, c-format
-msgid "Redoing the previous operation..."
-msgstr "Ïîâòîðåíèå ïðåäûäóùåé îïåðàöèè"
-
-#: Merge.rc:2321
-#, c-format
-msgid "Doing Auto Merge..."
-msgstr ""
-
-#: Merge.rc:2327
-#, c-format
-msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s Cp: %d(%s)"
+msgid "Ln: %s Col: %d/%d Ch: %d/%d EOL: %s"
msgstr ""
-#: Merge.rc:2328
+#: Merge.rc:15875423
#, c-format
msgid "Line: %s"
-msgstr "Ñòðîêà: %s"
+msgstr "Строка: %s"
-#: Merge.rc:2329
+#: Merge.rc:6F3BCB35
#, c-format
-msgid "Ln: %s Col: %d/%d Ch: %d/%d Cp: %d(%s)"
+msgid "Ln: %s Col: %d/%d Ch: %d/%d"
msgstr ""
-#: Merge.rc:2330
+#: Merge.rc:7C664E1
#, c-format
msgid "Merge"
-msgstr "Îáúåäèíåíèå"
+msgstr "Объединение"
-#: Merge.rc:2331
+#: Merge.rc:7A8FD78B
#, c-format
msgid "Difference %1 of %2"
-msgstr "Îòëè÷èå %1 èç %2"
+msgstr "Отличие %1 из %2"
-#: Merge.rc:2332
+#: Merge.rc:62773E9
#, c-format
msgid "%1 Differences Found"
-msgstr "%1 îòëè÷èé íàéäåíî"
+msgstr "%1 отличий найдено"
-#: Merge.rc:2333
+#: Merge.rc:6B78A819
#, c-format
msgid "1 Difference Found"
-msgstr "Íàéäåíî âñåãî îäíî îòëè÷èå"
+msgstr "Найдено всего одно отличие"
#. Abbreviation from "Read Only"
-#: Merge.rc:2334
+#: Merge.rc:13E12
#, c-format
msgid "RO"
msgstr "RO"
-#: Merge.rc:2340
+#: Merge.rc:6B6D8965
#, c-format
msgid "Item %1 of %2"
-msgstr "Ýëåìåíò %1 èç %2"
+msgstr "Элемент %1 из %2"
-#: Merge.rc:2341
+#: Merge.rc:2618897A
#, c-format
msgid "Items: %1"
-msgstr "Ýëåìåíòîâ: %1"
+msgstr "Элементов: %1"
-#: Merge.rc:2347
+#: Merge.rc:6C6653C7
#, c-format
msgid "Select two existing folders or files to compare"
-msgstr "Âûáåðèòå äâà ÑÓÙÅÑÒÂÓÞÙÈÕ êàòàëîãà èëè ôàéëà äëÿ ñðàâíåíèÿ"
+msgstr "Выберите два СУЩЕСТВУЮЩИХ каталога или файла для сравнения"
-#: Merge.rc:2348
+#: Merge.rc:444C5DDC
#, c-format
msgid "Folder Selection"
-msgstr "Âûáîð êàòàëîãà"
+msgstr "Выбор каталога"
+
+#: Merge.rc:3080B693
+#, c-format
+msgid "Select two (or three) folders or two (or three) files to compare."
+msgstr ""
-#: Merge.rc:2349
+#: Merge.rc:2EBBDDD6
#, c-format
-msgid "Select two folders or two files to compare."
-msgstr "Âûáåðèòå äëÿ ñðàâíåíèÿ äâà êàòàëîãà èëè ôàéëà"
+msgid "Left (1st) path is invalid!"
+msgstr ""
-#: Merge.rc:2350
+#: Merge.rc:BA50069
#, c-format
-msgid "Left path is invalid!"
-msgstr "Ïóòü ñëåâà óêàçàí íåâåðíî"
+msgid "Middle (2nd) path is invalid!"
+msgstr ""
-#: Merge.rc:2351
+#: Merge.rc:21DC7C32
#, c-format
-msgid "Middle path is invalid!"
+msgid "Right (2nd) path is invalid!"
msgstr ""
-#: Merge.rc:2352
+#: Merge.rc:21DC7C33
#, c-format
-msgid "Right path is invalid!"
-msgstr "Ïóòü ñïðàâà óêàçàí íåâåðíî"
+msgid "Right (3rd) path is invalid!"
+msgstr ""
-#: Merge.rc:2353
+#: Merge.rc:5AB9EEA7
#, c-format
msgid "Both paths are invalid!"
-msgstr "Îáà ïóòè óêàçàíû íåâåðíî"
+msgstr "Оба пути указаны неверно"
-#: Merge.rc:2354
+#: Merge.rc:585E8EC0
#, c-format
-msgid "Left and middle path is invalid!"
+msgid "Left (1st) and Middle (2nd) paths are invalid!"
msgstr ""
-#: Merge.rc:2355
+#: Merge.rc:135DE390
#, c-format
-msgid "Left and right path is invalid!"
+msgid "Left (1st) and Right (3rd) paths are invalid!"
msgstr ""
-#: Merge.rc:2356
+#: Merge.rc:72716FA6
#, c-format
-msgid "Middle and right path is invalid!"
+msgid "Middle (2nd) and Right (3rd) paths are invalid!"
msgstr ""
-#: Merge.rc:2357
+#: Merge.rc:237A0533
#, c-format
msgid "All paths are invalid!"
msgstr ""
-#: Merge.rc:2358
+#: Merge.rc:1235F930
#, c-format
-msgid "Choose two files to enable unpacker selection."
-msgstr "Âûáåðèòå äâà ôàéëà, ÷òîáû âêëþ÷èòü âûáîð ðàñïàêîâùèêà"
+msgid "Only enabled for File comparisons"
+msgstr ""
-#: Merge.rc:2359
+#: Merge.rc:30FF7A4E
#, c-format
msgid "Cannot compare file and folder!"
-msgstr "Íåâîçìîæíî ñðàâíåíèå ôàéëà è êàòàëîãà!"
+msgstr "Невозможно сравнение файла и каталога!"
-#: Merge.rc:2365
+#: Merge.rc:62AC5DDB
#, c-format
msgid "File not found: %1"
-msgstr "Ôàéë íå íàéäåí: %1"
+msgstr "Файл не найден: %1"
-#: Merge.rc:2366
+#: Merge.rc:387F7981
#, c-format
msgid "File not unpacked: %1"
-msgstr "Ôàéë íå ðàñïàêîâàí: %1"
+msgstr "Файл не распакован: %1"
-#: Merge.rc:2367
+#: Merge.rc:3676909F
#, c-format
msgid ""
"Cannot open file\n"
"\n"
"%2"
msgstr ""
-"Íåâîçìîæíî îòêðûòü ôàéë\n"
+"Невозможно открыть файл\n"
"%1\n"
"\n"
"%2"
-#: Merge.rc:2368
+#: Merge.rc:53CCF475
#, c-format
msgid "Failed to parse conflict file."
-msgstr "Îøèáêà ðàçáîðà ôàéëà êîíôëèêòîâ"
+msgstr "Ошибка разбора файла конфликтов"
-#: Merge.rc:2369
+#: Merge.rc:5A765252
#, c-format
msgid ""
"The file\n"
"%1\n"
"is not a conflict file."
msgstr ""
-"Ôàéë\n"
+"Файл\n"
"%1\n"
-"íå ÿâëÿåòñÿ ôàéëîì êîíôëèêòîâ"
+"не является файлом конфликтов"
-#: Merge.rc:2375
+#: Merge.rc:67019DCC
#, c-format
msgid "Save As"
-msgstr "Ñîõðàíèòü êàê..."
+msgstr "Сохранить как..."
-#: Merge.rc:2376
+#: Merge.rc:E4471C
#, c-format
msgid "Save changes to %1?"
-msgstr "Ñîõðàíèòü èçìåíåíèÿ â %1?"
+msgstr "Сохранить изменения в %1?"
-#: Merge.rc:2377
+#: Merge.rc:6A1C6855
#, 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 ïîìå÷åí êàê òîëüêî äëÿ ÷òåíèÿ. Ñîãëàñíû ëè âû çàìåíèòü ýòîò ôàéë ? (Íåò ïîçâîëÿåò çàäàòü íîâîå èìÿ ôàéëà)"
+msgstr "%1 помечен как только для чтения. Согласны ли вы заменить этот файл ? (Нет позволяет задать новое имя файла)"
-#: Merge.rc:2378
+#: Merge.rc:673BD332
#, c-format
msgid "Error backing up file"
-msgstr "Îøèáêà ñîçäàíèÿ ðåçåðâíîé êîïèè"
+msgstr "Ошибка создания резервной копии"
-#: Merge.rc:2380
+#: Merge.rc:3958104B
#, c-format
msgid ""
"Unable to backup original file:\n"
"\n"
"Continue anyway?"
msgstr ""
-"Íåâîçìîæíî ñîçäàòü êîïèþ îðèãèíàëà:\n"
+"Невозможно создать копию оригинала:\n"
"%1\n"
"\n"
-"Ïðîäîëæèòü â ëþáîì ñëó÷àå?"
+"Продолжить в любом случае?"
-#: Merge.rc:2381
+#: Merge.rc:69020931
#, c-format
msgid ""
"Saving file failed.\n"
"\t-use a different filename (Press Ok)\n"
"\t-abort the current operation (Press Cancel)?"
msgstr ""
-"Ôàéë íå ñîõðàíåí.\n"
+"Файл не сохранен.\n"
"%1\n"
"%2\n"
-"Õîòèòå ëè:\n"
-"\t-èñïîëüçîâàòü äðóãîå èìÿ ôàéëà (Íàæìèòå Ok)\n"
-"\t-îòìåíèòü òåêóùóþ îïåðàöèþ (Íàæìèòå Îòìåíà)?"
+"Хотите ли:\n"
+"\t-использовать другое имя файла (Нажмите Ok)\n"
+"\t-отменить текущую операцию (Нажмите Отмена)?"
-#: Merge.rc:2382
+#: Merge.rc:3895053E
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the left file back into '%1'.\n"
"\n"
"Do you want to save the unpacked version to another file?"
msgstr ""
-"Äîïîëíåíèå '%2' íå ìîæåò çàïàêîâàòü âàøè èçìåíåíèÿ îáðàòíî â ôàéë ñëåâà '%1'.\n"
+"Дополнение '%2' не может запаковать ваши изменения обратно в файл слева '%1'.\n"
"\n"
-"Îðèãèíàë îñòàíåòñÿ íå èçìåíåííûì.\n"
+"Оригинал останется не измененным.\n"
"\n"
-"Õîòèòå ñîõðàíèòü ðàñïàêîâàííóþ âåðñèþ â äðóãîé ôàéë?"
+"Хотите сохранить распакованную версию в другой файл?"
-#: Merge.rc:2383
+#: Merge.rc:5A0BA2DF
#, c-format
msgid ""
"Plugin '%2' cannot pack your changes to the right file back into '%1'.\n"
"\n"
"Do you want to save the unpacked version to another file?"
msgstr ""
-"Äîïîëíåíèå '%2' íå ìîæåò çàïàêîâàòü âàøè èçìåíåíèÿ îáðàòíî â ôàéë ñïðàâà '%1'.\n"
+"Дополнение '%2' не может запаковать ваши изменения обратно в файл справа '%1'.\n"
"\n"
-"Îðèãèíàë îñòàíåòñÿ íå èçìåíåííûì.\n"
+"Оригинал останется не измененным.\n"
"\n"
-"Õîòèòå ñîõðàíèòü ðàñïàêîâàííóþ âåðñèþ â äðóãîé ôàéë?"
+"Хотите сохранить распакованную версию в другой файл?"
-#: Merge.rc:2384
+#: Merge.rc:78367A47
#, c-format
msgid ""
"Another application has updated file\n"
"\n"
"Overwrite changed file?"
msgstr ""
-"Äðóãîå ïðèëîæåíèå èçìåíèëî ôàéë\n"
+"Другое приложение изменило файл\n"
"%1\n"
-"óæå çàãðóæåííûé â WinMerge .\n"
+"уже загруженный в WinMerge .\n"
"\n"
-"Ïåðåçàïèñàòü èçìåíåííûé ôàéë?"
+"Перезаписать измененный файл?"
-#: Merge.rc:2385
+#: Merge.rc:462FB760
#, c-format
msgid ""
"%1\n"
"is marked read-only. Would you like to override the read-only item?"
-msgstr "%1 ïîìå÷åí êàê òîëüêî äëÿ ÷òåíèÿ. Ñîãëàñíû ëè âû çàìåíèòü ýòîò ôàéë?"
+msgstr "%1 помечен как только для чтения. Согласны ли вы заменить этот файл?"
-#: Merge.rc:2386
+#: Merge.rc:B9192B
#, c-format
msgid ""
"Another application has updated file\n"
"\n"
"Do you want to reload the file?"
msgstr ""
-"Äðóãîå ïðèëîæåíèå îáíîâèëî ôàéë\n"
+"Другое приложение обновило файл\n"
"%1\n"
-"òàê êàê WinMerge ñêàíèðîâàë åãî â ïîñëåäíèé ðàç.\n"
+"так как WinMerge сканировал его в последний раз.\n"
"\n"
-"Âû õîòèòå ïåðåçàãðóçèòü ôàéë?"
+"Вы хотите перезагрузить файл?"
-#: Merge.rc:2387
+#: Merge.rc:62909ED7
#, c-format
msgid "Save Left File As"
-msgstr "Ñîõðàíèòü ôàéë ñëåâà êàê..."
+msgstr "Сохранить файл слева как..."
-#: Merge.rc:2388
+#: Merge.rc:E4471D
#, c-format
msgid "Save Middle File As"
msgstr ""
-#: Merge.rc:2389
+#: Merge.rc:6F833C19
#, c-format
msgid "Save Right File As"
-msgstr "Ñîõðàíèòü ôàéë ñïðàâà êàê..."
+msgstr "Сохранить файл справа как..."
-#: Merge.rc:2390
+#: Merge.rc:3C4620F
#, c-format
msgid ""
"The file\n"
"%1\n"
"has disappeared. Please save a copy of the file to continue."
msgstr ""
-"Ôàéë\n"
+"Файл\n"
"%1\n"
-"óòðà÷åí. Ïîæàëóéñòà, ñîõðàíèòå êîïèþ ôàéëà, ÷òîáû ïðîäîëæèòü."
+"утрачен. Пожалуйста, сохраните копию файла, чтобы продолжить."
-#: Merge.rc:2396
+#: Merge.rc:4BFC8F0D
#, c-format
msgid ""
"Cannot merge differences when documents are not in synch.\n"
"\n"
"Refresh documents before continuing."
msgstr ""
-"Íåâîçìîæíî ñëèÿíèå îòëè÷èé êîãäà êîãäà äîêóìåíòû íå ñèíõðîíèçèðîâàííû.\n"
+"Невозможно слияние отличий когда когда документы не синхронизированны.\n"
"\n"
-"Îáíîâèòå äîêóìåíòû ïåðåä ïðîäîëæåíèåì."
+"Обновите документы перед продолжением."
-#: Merge.rc:2402
-#, c-format
-msgid "You must specify a SourceSafe project path in order to continue (ie: $/MyProject)"
-msgstr "×òîáû ïðîäîëæèòü, Âû äîëæíû óêàçàòü ïóòü ê ïðîåêòó SourceSafe (íàïðèìåð: $/MyProject)"
+#: Merge.rc:2405135
+msgid "Break at whitespace"
+msgstr "Разбивать по невидимым"
-#: Merge.rc:2403
-#, c-format
-msgid "Checkout files from VSS..."
-msgstr "Ïîëó÷àåì ôàéëû èç VSS..."
+#: Merge.rc:6CB369C2
+msgid "Break at whitespace or punctuation"
+msgstr "Разбивать по невидимым и знакам пунктуации"
-#: Merge.rc:2404
+#: Merge.rc:237A127
#, c-format
-msgid "Versioning System returned an error while attempting to check out the file. Unable to continue..."
-msgstr "Ñèñòåìà êîíòðîëÿ âåðñèé âåðíóëà îøèáêó ïðè ïîïûòêå âçÿòü ôàéë ïîä êîíòðîëü. Íåò âîçìîæíîñòè ïðîäîëæàòü..."
+msgid "Right to Left (%1)"
+msgstr "Скопировать на левую сторону %1 из %2 выбранных элементов"
-#: Merge.rc:2405
+#: Merge.rc:52D3F9F6
#, c-format
-msgid "Error executing versioning system command."
-msgstr "Îøèáêà âûïîëíåíèÿ ñèñòåìíîé êîìàíäû Ñèñòåìû êîíòðîëÿ âåðñèé."
+msgid "Right to Middle (%1)"
+msgstr ""
-#: Merge.rc:2406
+#: Merge.rc:17F5B413
#, c-format
-msgid "The VSS Working Folder and the location of the current file do not match. Continue?"
-msgstr "Ðàáî÷àÿ ïàïêà VSS è ìåñòîïîëîæåíèå òåêóùåãî ôàéëà íå ñîâïàäàþò. Ïðîäîëæèòü ?"
+msgid "Middle to Left (%1)"
+msgstr ""
-#: Merge.rc:2407
+#: Merge.rc:66C0CE9F
#, c-format
-msgid "No VSS database(s) found!"
-msgstr "Íå íàéäåíà áàçà äàííûõ VSS!"
+msgid "Middle to Right (%1)"
+msgstr ""
-#: Merge.rc:2408
+#: Merge.rc:7271FF80
#, c-format
-msgid "Error from VSS:"
-msgstr "Îøèáêà VSS:"
+msgid "Left to Right (%1)"
+msgstr "Скопировать на правую сторону %1 из %2 выбранных элементов"
-#: Merge.rc:2409
+#: Merge.rc:5BCDF0E7
#, c-format
-msgid ""
-"Versioning System returned an error while attempting to check in the file.\n"
-" Please, check config spec of used view.\n"
-" Undo checkout operation?"
+msgid "Left to Middle (%1)"
msgstr ""
-"VSS âåðíóëà îøèáêó ïðè ïîïûòêå ïðîâåðèòü ôàéë.\n"
-" Ïðîâåðüòå êîíôèãóðàöèþ.\n"
-" Ñäåëàòü îòêàò?"
-#: Merge.rc:2410
+#: Merge.rc:71676C48
#, c-format
-msgid ""
-"Versioning System returned an error while attempting to undo checkout the file.\n"
-" Please, check config spec of used view. "
-msgstr ""
-"VSS âåðíóëà îøèáêó ïðè ïîïûòêå îòêàòà èçìåíåíèé.\n"
-" Ïðîâåðüòå êîíôèãóðàöèþ. "
+msgid "Left to... (%1)"
+msgstr "Слева на... (%1)"
-#: Merge.rc:2416
-#: Merge.rc:2775
+#: Merge.rc:729280DB
#, c-format
-msgid "None"
-msgstr "Íåò"
+msgid "Middle to... (%1)"
+msgstr ""
-#: Merge.rc:2417
+#: Merge.rc:32BFDBAD
#, c-format
-msgid "Visual SourceSafe (less than 5.0)"
-msgstr "Visual SourceSafe (ìëàäøå, ÷åì 5.0)"
+msgid "Right to... (%1)"
+msgstr "Справа на... (%1)"
-#: Merge.rc:2418
+#: Merge.rc:36B164C5
#, c-format
-msgid "Visual SourceSafe (5.0 and above)"
-msgstr "Visual SourceSafe (5.0 è âûøå)"
-
-#: Merge.rc:2420
-#, c-format
-msgid "Break at whitespace"
-msgstr "Ðàçáèâàòü ïî íåâèäèìûì"
-
-#: Merge.rc:2421
-#, c-format
-msgid "Break at whitespace or punctuation"
-msgstr "Ðàçáèâàòü ïî íåâèäèìûì è çíàêàì ïóíêòóàöèè"
-
-#: Merge.rc:2427
-#: Merge.rc:2429
-#, c-format
-msgid "Copy selected item to named directory"
-msgstr "Ñêîïèðîâàòü âûáðàííûå ôàéëû â óêàçàííóþ ïàïêó"
-
-#: Merge.rc:2428
-#: Merge.rc:2430
-#, c-format
-msgid "Copy selected item to custom directory"
-msgstr "Ñêîïèðîâàòü âûáðàííûå ôàéëû â óêàçàííóþ ïàïêó"
-
-#: Merge.rc:2431
-#, c-format
-msgid "Delete selected item on left"
-msgstr "Óäàëèòü âûáðàííûé ýëåìåíò ñëåâà"
-
-#: Merge.rc:2432
-#, c-format
-msgid "Delete selected item on right"
-msgstr "Óäàëèòü âûáðàííûé ýëåìåíò ñïðàâà"
-
-#: Merge.rc:2433
-#, c-format
-msgid "Delete selected item(s) on both sides"
-msgstr "Óäàëèòü âûáðàííûå ýëåìåíòû ñ îáîèõ ñòîðîí"
-
-#: Merge.rc:2434
-#, c-format
-msgid "Hide selected item(s) (on the fly filter)"
-msgstr "Ñêðûòü âûáðàííûå ýëåìåíòû (áûñòðûé ôèëüòð)"
-
-#: Merge.rc:2435
-#, c-format
-msgid "Rename selected item on both sides"
-msgstr "Ïåðåèìåíîâàòü âûáðàííûå ýëåìåíòû íà îáîèõ ñòîðîíàõ"
-
-#: Merge.rc:2436
-#, c-format
-msgid "Right to Left (%1)"
-msgstr "Ñêîïèðîâàòü íà ëåâóþ ñòîðîíó %1 èç %2 âûáðàííûõ ýëåìåíòîâ"
-
-#: Merge.rc:2437
-#, c-format
-msgid "Left to Right (%1)"
-msgstr "Ñêîïèðîâàòü íà ïðàâóþ ñòîðîíó %1 èç %2 âûáðàííûõ ýëåìåíòîâ"
-
-#: Merge.rc:2438
-#, c-format
-msgid "Right to Left (%1 of %2)"
-msgstr "Ñïðàâà íàëåâî (%1 èç %2)"
-
-#: Merge.rc:2439
-#, c-format
-msgid "Left to Right (%1 of %2)"
-msgstr "Ñëåâà íàïðàâî (%1 èç %2)"
-
-#: Merge.rc:2440
-#: Merge.rc:2455
-#, c-format
-msgid "Left to... (%1)"
-msgstr "Ñëåâà íà... (%1)"
+msgid "Both to... (%1)"
+msgstr ""
-#: Merge.rc:2441
-#: Merge.rc:2456
+#: Merge.rc:2515A6BD
#, c-format
-msgid "Right to... (%1)"
-msgstr "Ñïðàâà íà... (%1)"
+msgid "All to... (%1)"
+msgstr ""
-#: Merge.rc:2442
-#: Merge.rc:2457
+#: Merge.rc:290D6FC6
#, c-format
-msgid "Left to... (%1 of %2)"
-msgstr "Ñëåâà íà... (%1 èç %2)"
+msgid "Differences to... (%1)"
+msgstr ""
-#: Merge.rc:2443
-#: Merge.rc:2458
+#: Merge.rc:1B633070
#, c-format
-msgid "Right to... (%1 of %2)"
-msgstr "Ñïðàâà íà... (%1 èç %2)"
+msgid "Left (%1)"
+msgstr "Слева (%1)"
-#: Merge.rc:2449
+#: Merge.rc:13C27215
#, c-format
-msgid "Left (%1)"
-msgstr "Ñëåâà (%1)"
+msgid "Middle (%1)"
+msgstr ""
-#: Merge.rc:2450
+#: Merge.rc:39174D9A
#, c-format
msgid "Right (%1)"
-msgstr "Óäàëèòü %1 èç %2 âûáðàííûõ ýëåìåíòîâ ñ ïðàâîé ñòîðîíû"
+msgstr "Удалить %1 из %2 выбранных элементов с правой стороны"
-#: Merge.rc:2451
+#: Merge.rc:146A5939
#, c-format
msgid "Both (%1)"
-msgstr "Óäàëèòü ñ îáåèõ ñòîðîí %1 èç %2 âûáðàííûõ ýëåìåíòîâ"
-
-#: Merge.rc:2452
-#, c-format
-msgid "Left (%1 of %2)"
-msgstr "Ñëåâà (%1 èç %2)"
+msgstr "Удалить с обеих сторон %1 из %2 выбранных элементов"
-#: Merge.rc:2453
+#: Merge.rc:669F87F5
#, c-format
-msgid "Right (%1 of %2)"
-msgstr "Ñïðàâà (%1 èç %2)"
+msgid "All (%1)"
+msgstr ""
-#: Merge.rc:2454
+#: Merge.rc:DD21175
#, c-format
-msgid "Both (%1 of %2)"
-msgstr "Âìåñòå (%1 èç %2)"
+msgid "Left side - select destination folder:"
+msgstr "Левая сторона - выбор папки назначения:"
-#: Merge.rc:2459
+#: Merge.rc:2B480620
#, c-format
-msgid "Left side - select destination folder:"
-msgstr "Ëåâàÿ ñòîðîíà - âûáîð ïàïêè íàçíà÷åíèÿ:"
+msgid "Middle side - select destination folder:"
+msgstr ""
-#: Merge.rc:2460
+#: Merge.rc:5BBC5591
#, c-format
msgid "Right side - select destination folder:"
-msgstr "Ïðàâàÿ ñòîðîíà - âûáîð ïàïêè íàçíà÷åíèÿ:"
+msgstr "Правая сторона - выбор папки назначения:"
-#: Merge.rc:2461
+#: Merge.rc:66367ECA
#, c-format
msgid "(%1 Files Affected)"
-msgstr "(%1 ôàéëîâ îáðàáîòàíî)"
+msgstr "(%1 файлов обработано)"
-#: Merge.rc:2462
+#: Merge.rc:65510B09
#, c-format
msgid "(%1 of %2 Files Affected)"
-msgstr "(%1 èç %2 ôàéëîâ îáðàáîòàíî)"
+msgstr "(%1 из %2 файлов обработано)"
-#: Merge.rc:2468
+#: Merge.rc:2B0F0BA2
#, c-format
msgid ""
"Are you sure you want to delete\n"
"\n"
"%1 ?"
msgstr ""
-"Âû óâåðåíû, ÷òî õîòèòå óäàëèòü\n"
+"Вы уверены, что хотите удалить\n"
"\n"
"%1 ?"
-#: Merge.rc:2469
+#: Merge.rc:2019BE6D
#, c-format
msgid "Are you sure you want to copy:"
-msgstr "Âû óâåðåíû, ÷òî õîòèòå ñêîïèðîâàòü:"
+msgstr "Вы уверены, что хотите скопировать:"
-#: Merge.rc:2470
+#: Merge.rc:2B0F0BA3
#, c-format
msgid "Are you sure you want to copy %d items:"
-msgstr "Âû óâåðåíû, ÷òî õîòèòå ñêîïèðîâàòü %d ýëåìåíòîâ:"
+msgstr "Вы уверены, что хотите скопировать %d элементов:"
-#: Merge.rc:2471
+#: Merge.rc:59B96CF
#, c-format
msgid ""
"Operation aborted!\n"
"\n"
"Please refresh the compare."
msgstr ""
-"Îïåðàöèÿ ïðåðâàíà!\n"
+"Операция прервана!\n"
"\n"
-"Ñîäåðæèìîå ïàïêè èçìåíåíî, ïóòü\n"
+"Содержимое папки изменено, путь\n"
"%1\n"
-"íå áûë íàéäåí.\n"
+"не был найден.\n"
"\n"
-"Îáíîâèòå ñðàâíåíèå."
+"Обновите сравнение."
-#: Merge.rc:2472
+#: Merge.rc:2019BE6E
#, c-format
msgid "Are you sure you want to move:"
-msgstr "Óâåðåíû, ÷òî õîòèòå ïåðåìåñòèòü:"
+msgstr "Уверены, что хотите переместить:"
-#: Merge.rc:2473
+#: Merge.rc:2B0F0BA4
#, c-format
msgid "Are you sure you want to move %d items:"
-msgstr "Óâåðåíû, ÷òî õîòèòå ïåðåìåñòèòü %d ýëåìåíòîâ:"
+msgstr "Уверены, что хотите переместить %d элементов:"
-#: Merge.rc:2475
+#: Merge.rc:CAEDA37
#, c-format
msgid "Confirm Move"
-msgstr "Ïîäòâåðäèòå ïåðåìåùåíèå"
+msgstr "Подтвердите перемещение"
-#: Merge.rc:2476
+#: Merge.rc:1E9E7AFF
#, c-format
msgid "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
msgstr ""
-#: Merge.rc:2482
-#, c-format
-msgid "Open left file"
-msgstr "Îòêðûòü ôàéë ñëåâà"
-
-#: Merge.rc:2483
-#, c-format
-msgid "Open the left file to external editor"
-msgstr "Îòêðûòü ôàéë ñëåâà âî âíåøíåì ðåäàêòîðå"
-
-#: Merge.rc:2484
-#, c-format
-msgid "Open left file with ..."
-msgstr "Îòêðûòü ôàéë ñëåâà ñ ïîìîùüþ..."
-
-#: Merge.rc:2485
-#, c-format
-msgid "Open right file"
-msgstr "Îòêðûòü ôàéë ñïðàâà"
-
-#: Merge.rc:2486
-#, c-format
-msgid "Open the right file to external editor"
-msgstr "Îòêðûòü ôàéë ñïðàâà âî âíåøíåì ðåäàêòîðå"
-
-#: Merge.rc:2487
-#, c-format
-msgid "Open right file with..."
-msgstr "Îòêðûòü ôàéë ñïðàâà ñ ïîìîùüþ..."
-
-#: Merge.rc:2488
+#: Merge.rc:4B6299EF
#, c-format
msgid "Failed to execute external editor: %1"
-msgstr "Íåâîçìîæíî âûïîëíèòü %1"
-
-#: Merge.rc:2489
-#, c-format
-msgid "Copy filenames to clipboard"
-msgstr "Ñêîïèðîâàòü èìåíà ôàéëîâ â áóôåð îáìåíà"
-
-#: Merge.rc:2490
-#, c-format
-msgid "Copy left side pathnames to clipboard"
-msgstr "Ñêîïèðîâàòü èìåíà ôàéëîâ èç ëåâîé ÷àñòè â áóôåð îáìåíà"
-
-#: Merge.rc:2491
-#, c-format
-msgid "Copy right side pathnames to clipboard"
-msgstr "Ñêîïèðîâàòü èìåíà ôàéëîâ èç ïðàâîé ÷àñòè â áóôåð îáìåíà"
-
-#: Merge.rc:2492
-#, c-format
-msgid "Copy both sides pathnames to clipboard"
-msgstr "Ñêîïèðîâàòü èìåíà ôàéëîâ ñ îáîèõ ïàíåëåé â áóôåð îáìåíà"
-
-#: Merge.rc:2493
-#, c-format
-msgid "Copy selected left item to clipboard"
-msgstr ""
+msgstr "Невозможно выполнить %1"
-#: Merge.rc:2494
-#, c-format
-msgid "Copy selected right item to clipboard"
-msgstr ""
-
-#: Merge.rc:2500
+#: Merge.rc:7350CBB7
#, c-format
msgid "Unknown archive format"
-msgstr "Íåèçâåñòíûé ôîðìàò àðõèâà"
-
-#: Merge.rc:2501
-#, c-format
-msgid "Add items from left side to archive"
-msgstr "Çààðõèâèðîâàòü ýëåìåíòû ñ ëåâîé ñòîðîíû"
-
-#: Merge.rc:2502
-#, c-format
-msgid "Add items from right side to archive"
-msgstr "Çààðõèâèðîâàòü ýëåìåíòû ñ ïðàâîé ñòîðîíû"
-
-#: Merge.rc:2503
-#, c-format
-msgid "Add items from both sides to archive"
-msgstr "Çààðõèâèðîâàòü ýëåìåíòû ñ îáîèõ ñòîðîí"
+msgstr "Неизвестный формат архива"
-#: Merge.rc:2504
-#, c-format
-msgid "Add different items to archive (both sides)"
-msgstr "Çààðõèâèðîâàòü ïðîèçâîëüíûå ýëåìåíòû ñ îáîèõ ñòîðîí"
-
-#: Merge.rc:2506
-#, c-format
-msgid "Move selected file on left to custom directory"
-msgstr "Ïåðåìåñòèòü âûáðàííûå ñëåâà ôàéëû â äðóãóþ ïàïêó"
-
-#: Merge.rc:2508
-#, c-format
-msgid "Move selected file on right to custom directory"
-msgstr "Ïåðåìåñòèòü âûáðàííûå ñïðàâà ôàéëû â äðóãóþ ïàïêó"
-
-#: Merge.rc:2514
+#: Merge.rc:64ABCD7E
#, c-format
msgid "Filename"
-msgstr "Èìÿ ôàéëà"
+msgstr "Имя файла"
-#: Merge.rc:2516
+#: Merge.rc:D404EDE
#, c-format
msgid "Comparison result"
-msgstr "Ðåçóëüòàò ñðàâíåíèÿ"
+msgstr "РезÑ\83лÑ\8cÑ\82аÑ\82 Ñ\81Ñ\80авнениÑ\8f"
-#: Merge.rc:2517
+#: Merge.rc:1B633071
#, c-format
msgid "Left Date"
-msgstr "Äàòà Ñëåâà"
+msgstr "Дата Слева"
-#: Merge.rc:2518
+#: Merge.rc:39174D9B
#, c-format
msgid "Right Date"
-msgstr "Äàòà Ñïðàâà"
+msgstr "Дата Справа"
-#: Merge.rc:2519
+#: Merge.rc:13C27216
#, c-format
msgid "Middle Date"
msgstr ""
-#: Merge.rc:2520
+#: Merge.rc:9B50030
#, c-format
msgid "Extension"
-msgstr "Ðàñøèðåíèå"
+msgstr "РаÑ\81Ñ\88иÑ\80ение"
-#: Merge.rc:2521
+#: Merge.rc:1B633072
#, c-format
msgid "Left Size"
-msgstr "Ðàçìåð ñëåâà"
+msgstr "РазмеÑ\80 Ñ\81лева"
-#: Merge.rc:2522
+#: Merge.rc:39174D9C
#, c-format
msgid "Right Size"
-msgstr "Ðàçìåð ñïðàâà"
+msgstr "РазмеÑ\80 Ñ\81пÑ\80ава"
-#: Merge.rc:2523
+#: Merge.rc:13C27217
#, c-format
msgid "Middle Size"
msgstr ""
-#: Merge.rc:2524
+#: Merge.rc:237A128
#, c-format
msgid "Right Size (Short)"
-msgstr "Ðàçìåð ñïðàâà (ñîêð.)"
+msgstr "РазмеÑ\80 Ñ\81пÑ\80ава (Ñ\81окÑ\80.)"
-#: Merge.rc:2525
+#: Merge.rc:353D7BD8
#, c-format
msgid "Left Size (Short)"
-msgstr "Ðàçìåð ñëåâà (ñîêð.)"
+msgstr "РазмеÑ\80 Ñ\81лева (Ñ\81окÑ\80.)"
-#: Merge.rc:2526
+#: Merge.rc:17F5B414
#, c-format
msgid "Middle Size (Short)"
msgstr ""
-#: Merge.rc:2532
+#: Merge.rc:7271FF81
#, c-format
msgid "Left Creation Time"
-msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñëåâà"
+msgstr "Время создания файла слева"
-#: Merge.rc:2533
+#: Merge.rc:44BC83EE
#, c-format
msgid "Right Creation Time"
-msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñïðàâà"
+msgstr "Время создания файла справа"
-#: Merge.rc:2534
+#: Merge.rc:66C0CEA0
#, c-format
msgid "Middle Creation Time"
msgstr ""
-#: Merge.rc:2535
+#: Merge.rc:4909ADB5
#, c-format
msgid "Newer File"
-msgstr "Áîëåå íîâûé ôàéë"
+msgstr "Более новый файл"
-#: Merge.rc:2536
+#: Merge.rc:353D7BD9
#, c-format
msgid "Left File Version"
-msgstr "Âåðñèÿ ôàéëà ñëåâà"
+msgstr "Версия файла слева"
-#: Merge.rc:2537
+#: Merge.rc:237A129
#, c-format
msgid "Right File Version"
-msgstr "Âåðñèÿ ôàéëà ñïðàâà"
+msgstr "Версия файла справа"
-#: Merge.rc:2538
+#: Merge.rc:17F5B415
#, c-format
msgid "Middle File Version"
msgstr ""
-#: Merge.rc:2539
+#: Merge.rc:194397DE
#, c-format
msgid "Short Result"
-msgstr "Óïðîùåííûé ðåçóëüòàò"
+msgstr "Упрощенный результат"
-#: Merge.rc:2540
+#: Merge.rc:71676C49
#, c-format
msgid "Left Attributes"
-msgstr "Àòðèáóòû ôàéëà ñëåâà"
+msgstr "Атрибуты файла слева"
-#: Merge.rc:2541
+#: Merge.rc:32BFDBAE
#, c-format
msgid "Right Attributes"
-msgstr "Àòðèáóòû ôàéëà ñïðàâà"
+msgstr "Атрибуты файла справа"
-#: Merge.rc:2542
+#: Merge.rc:729280DC
#, c-format
msgid "Middle Attributes"
msgstr ""
-#: Merge.rc:2543
+#: Merge.rc:15875424
#, c-format
msgid "Left EOL"
-msgstr "Ëåâûé EOL"
+msgstr "Левый EOL"
-#: Merge.rc:2544
+#: Merge.rc:D0645BD
#, c-format
msgid "Middle EOL"
msgstr ""
-#: Merge.rc:2545
+#: Merge.rc:5F87E5D
#, c-format
msgid "Right EOL"
-msgstr "Ïðàâûé EOL"
+msgstr "Правый EOL"
-#: Merge.rc:2551
+#: Merge.rc:5C8E17CF
#, c-format
msgid "Left Encoding"
-msgstr "Êîäèðîâàíèå ôàéëà ñëåâà"
+msgstr "Кодирование файла слева"
-#: Merge.rc:2552
+#: Merge.rc:1B176020
#, c-format
msgid "Right Encoding"
-msgstr "Êîäèðîâàíèå ôàéëà ñïðàâà"
+msgstr "Кодирование файла справа"
-#: Merge.rc:2553
+#: Merge.rc:2A79A03A
#, c-format
msgid "Middle Encoding"
msgstr ""
-#: Merge.rc:2554
+#: Merge.rc:6B6D8966
#, c-format
msgid "Ignored Diff."
-msgstr "Èãíîð. îòëè÷èÿ"
+msgstr "Игнор. отличия"
-#: Merge.rc:2562
+#: Merge.rc:76C8AB99
#, c-format
msgid "Unable to compare files"
-msgstr "Íåâîçìîæíî ñðàâíèòü ôàéëû"
+msgstr "Невозможно сравнить файлы"
-#: Merge.rc:2563
+#: Merge.rc:4166A155
#, c-format
msgid "Item aborted"
-msgstr "Ñðàâíåíèå ïðåðâàíî"
+msgstr "Сравнение прервано"
-#: Merge.rc:2564
+#: Merge.rc:670ABDC3
#, c-format
msgid "File skipped"
-msgstr "Ôàéë ïðîïóùåí"
+msgstr "Файл пропущен"
-#: Merge.rc:2565
+#: Merge.rc:4F5264CA
#, c-format
msgid "Folder skipped"
-msgstr "Êàòàëîã ïðîïóùåí"
+msgstr "Каталог пропущен"
-#: Merge.rc:2566
+#: Merge.rc:5C8E17D0
#, c-format
msgid "Left only: %1"
-msgstr "Òîëüêî ñëåâà: %1"
+msgstr "Только слева: %1"
-#: Merge.rc:2567
+#: Merge.rc:2A79A03B
#, c-format
msgid "Middle only: %1"
msgstr ""
-#: Merge.rc:2568
+#: Merge.rc:1B176021
#, c-format
msgid "Right only: %1"
-msgstr "Òîëüêî ñïðàâà: %1"
+msgstr "Только справа: %1"
-#: Merge.rc:2569
+#: Merge.rc:576B1A36
#, c-format
msgid "Does not exist in %1"
msgstr ""
-#: Merge.rc:2570
+#: Merge.rc:6B248E76
#, c-format
msgid "Binary files are identical"
-msgstr "Áèíàðíûå ôàéëû íå èìåþò îòëè÷èé"
+msgstr "Бинарные файлы не имеют отличий"
-#: Merge.rc:2572
+#: Merge.rc:6B248E77
#, c-format
msgid "Binary files are different"
-msgstr "Áèíàðíûå ôàéëû îòëè÷àþòñÿ"
+msgstr "Бинарные файлы отличаются"
-#: Merge.rc:2573
+#: Merge.rc:72DF5DE2
#, c-format
msgid "Files are different"
-msgstr "Ôàéëû îòëè÷àþòñÿ"
+msgstr "Файлы отличаются"
-#: Merge.rc:2574
+#: Merge.rc:387F7982
#, c-format
msgid "Folders are different"
-msgstr "Ïàïêè ðàçëè÷íû"
+msgstr "Папки различны"
-#: Merge.rc:2575
+#: Merge.rc:1B633073
#, c-format
msgid "Left Only"
-msgstr "Òîëüêî ñëåâà"
+msgstr "Только слева"
-#: Merge.rc:2576
+#: Merge.rc:39174D9D
#, c-format
msgid "Right Only"
-msgstr "Òîëüêî ñïðàâà"
+msgstr "Только справа"
-#: Merge.rc:2577
+#: Merge.rc:13C27218
#, c-format
msgid "Middle Only"
msgstr ""
-#: Merge.rc:2578
+#: Merge.rc:638BD42C
#, c-format
msgid "No item in left"
msgstr ""
-#: Merge.rc:2579
+#: Merge.rc:DEEB1BA
#, c-format
msgid "No item in right"
msgstr ""
-#: Merge.rc:2580
+#: Merge.rc:2FE785D7
#, c-format
msgid "No item in middle"
msgstr ""
-#: Merge.rc:2582
+#: Merge.rc:79AB21E1
#, c-format
msgid "Error"
-msgstr "Îøèáêà"
+msgstr "Ошибка"
-#: Merge.rc:2583
+#: Merge.rc:12D66B44
#, c-format
msgid "Text files are identical"
-msgstr "Òåêñòîâûå ôàéëû èäåíòè÷íû"
-
-#: Merge.rc:2588
-#, c-format
-msgid "Text files are different"
-msgstr "Òåêñòîâûå ôàéëû ðàçëè÷íû"
-
-#: Merge.rc:2594
-#, c-format
-msgid "Elapsed time: %ld ms"
-msgstr "Ïðîøëî âðåìåíè: %ld ìñ"
-
-#: Merge.rc:2595
-#, c-format
-msgid "1 item selected"
-msgstr "Âûáðàí 1 ýëåìåíò"
-
-#: Merge.rc:2596
-#, c-format
-msgid "%1 items selected"
-msgstr "Âûáðàíî ýëåìåíòîâ: %1"
-
-#: Merge.rc:2602
-#, c-format
-msgid "Filename or folder name."
-msgstr "Èìÿ ôàéëà èëè êàòàëîãà"
-
-#: Merge.rc:2603
-#, c-format
-msgid "Subfolder name when subfolders are included."
-msgstr "Èìåíà ïîäïàïîê, åñëè ïîäïàïêè âêëþ÷åíû"
-
-#: Merge.rc:2604
-#, c-format
-msgid "Comparison result, long form."
-msgstr "Ðåçóëüòàò ñðàâíåíèÿ, äëèííàÿ ôîðìà."
-
-#: Merge.rc:2605
-#, c-format
-msgid "Left side modification date."
-msgstr "Âðåìÿ èçìåíåíèÿ ôàéëà ñëåâà"
-
-#: Merge.rc:2606
-#, c-format
-msgid "Right side modification date."
-msgstr "Âðåìÿ èçìåíåíèÿ ôàéëà ñïðàâà"
-
-#: Merge.rc:2607
-#, c-format
-msgid "Middle side modification date."
-msgstr ""
-
-#: Merge.rc:2608
-#, c-format
-msgid "File's extension."
-msgstr "Ðàñøèðåíèå ôàéëà"
-
-#: Merge.rc:2609
-#, c-format
-msgid "Left file size in bytes."
-msgstr "Ðàçìåð ôàéëà ñëåâà â áàéòàõ"
-
-#: Merge.rc:2610
-#, c-format
-msgid "Right file size in bytes."
-msgstr "Ðàçìåð ôàéëà ñïðàâà â áàéòàõ"
-
-#: Merge.rc:2611
-#, c-format
-msgid "Middle file size in bytes."
-msgstr ""
-
-#: Merge.rc:2612
-#, c-format
-msgid "Left file size abbreviated."
-msgstr "Ðàçìåð ëåâîãî ôàéëà (ñîêð.)"
-
-#: Merge.rc:2613
-#, c-format
-msgid "Right file size abbreviated."
-msgstr "Ðàçìåð ïðàâîãî ôàéëà (ñîêð.)"
-
-#: Merge.rc:2614
-#, c-format
-msgid "Middle file size abbreviated."
-msgstr ""
-
-#: Merge.rc:2620
-#, c-format
-msgid "Left side creation time."
-msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñëåâà"
-
-#: Merge.rc:2621
-#, c-format
-msgid "Right side creation time."
-msgstr "Âðåìÿ ñîçäàíèÿ ôàéëà ñïðàâà"
-
-#: Merge.rc:2622
-#, c-format
-msgid "Middle side creation time."
-msgstr ""
-
-#: Merge.rc:2623
-#, c-format
-msgid "Tells which side has newer modification date."
-msgstr "Ïîêàçàòü ñ êàêîé èç ñòîðîí äàòà èçìåíåíèÿ ôàéëà íîâåå"
-
-#: Merge.rc:2624
-#, c-format
-msgid "Left side file version, only for some filetypes."
-msgstr "Âåðñèÿ ôàéëà ñëåâà, òîëüêî äëÿ íåêîòîðûõ òèïîâ ôàéëîâ."
-
-#: Merge.rc:2625
-#, c-format
-msgid "Right side file version, only for some filetypes."
-msgstr "Âåðñèÿ ôàéëà ñïðàâà, òîëüêî äëÿ íåêîòîðûõ òèïîâ ôàéëîâ."
+msgstr "Текстовые файлы идентичны"
-#: Merge.rc:2626
+#: Merge.rc:1DEEB161
#, c-format
-msgid "Middle side file version, only for some filetypes."
+msgid "(Middle and right are identical)"
msgstr ""
-#: Merge.rc:2627
-#, c-format
-msgid "Short comparison result."
-msgstr "Ðåçóëüòàò áûñòðîãî ñðàâíåíèÿ"
-
-#: Merge.rc:2628
+#: Merge.rc:1D99B043
#, c-format
-msgid "Left side attributes."
-msgstr "Àòðèáóòû ôàéëà ñëåâà"
-
-#: Merge.rc:2629
-#, c-format
-msgid "Right side attributes."
-msgstr "Àòðèáóòû ôàéëà ñïðàâà"
-
-#: Merge.rc:2630
-#, c-format
-msgid "Middle side attributes."
+msgid "(Left and right are identical)"
msgstr ""
-#: Merge.rc:2631
-#, c-format
-msgid "Left side file EOL type"
-msgstr "Ìàðêåð êîíöà ñòðîêè äëÿ ëåâîãî ôàéëà"
-
-#: Merge.rc:2632
+#: Merge.rc:159C584C
#, c-format
-msgid "Right side file EOL type"
-msgstr "Ìàðêåð êîíöà ñòðîêè äëÿ ïðàâîãî ôàéëà"
-
-#: Merge.rc:2633
-#, c-format
-msgid "Middle side file EOL type"
+msgid "(Left and middle are identical)"
msgstr ""
-#: Merge.rc:2639
-#, c-format
-msgid "Left side encoding."
-msgstr "Êîäèðîâàíèå ôàéëà ñëåâà"
-
-#: Merge.rc:2640
+#: Merge.rc:12D66B45
#, c-format
-msgid "Right side encoding."
-msgstr "Êîäèðîâàíèå ôàéëà ñïðàâà"
-
-#: Merge.rc:2641
-#, c-format
-msgid "Middle side encoding."
-msgstr ""
-
-#: Merge.rc:2642
-#, c-format
-msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
-msgstr "Êîëè÷åñòâî èãíîðèðîâàííûõ îòëè÷èé â ôàéëå. Ýòè îòëè÷èÿ áûëè èãíîðèðîâàííû WinMerge è íå ìîãóò áûòü îáðàáîòàíû."
-
-#: Merge.rc:2643
-#, c-format
-msgid "Number of differences in file. This number does not include ignored differences."
-msgstr "Êîëè÷åñòâî îòëè÷èé â ôàéëå. Ýòî ÷èñëî íå âêëþ÷àåò â ñåáÿ èãíîðèðîâàííûå îòëè÷èÿ."
-
-#: Merge.rc:2644
-#, c-format
-msgid "Shows an asterisk (*) if the file is binary."
-msgstr "Ïîêàçàòü çâåçäî÷êó (*) åñëè ôàéë áèíàðíûé."
-
-#: Merge.rc:2650
-#, c-format
-msgid "Compare %1 with %2"
-msgstr "Ñðàâíèâàíèå %1 ñ %2"
-
-#: Merge.rc:2651
-#, c-format
-msgid "Comma-separated list"
-msgstr "Ñïèñîê ñ ðàçäåëÿþùèìè çàïÿòûìè"
-
-#: Merge.rc:2652
-#, c-format
-msgid "Tab-separated list"
-msgstr "Ñïèñîê ñ ðàçäåëÿþùèìè òàáóëÿòîðàìè"
-
-#: Merge.rc:2653
-#, c-format
-msgid "Simple HTML"
-msgstr "Ïðîñòîé HTML"
-
-#: Merge.rc:2654
-#, c-format
-msgid "Simple XML"
-msgstr "Ïðîñòîé XML"
-
-#: Merge.rc:2656
-#, c-format
-msgid "The report file already exists. Do you want to overwrite existing file?"
-msgstr "Ôàéë îò÷åòà óæå ñóùåñòâóåò. Ïåðåçàïèñàòü??"
-
-#: Merge.rc:2657
-#, c-format
-msgid ""
-"Error creating the report:\n"
-"%1"
-msgstr ""
-"Îøèáêà ïðè ñîçäàíèè îò÷åòà:\n"
-"%1"
-
-#: Merge.rc:2658
-#, c-format
-msgid "The report has been created successfully."
-msgstr "Îò÷åò óñïåøíî ñîçäàí"
-
-#: Merge.rc:2664
-#, c-format
-msgid "The same file is opened in both panels."
-msgstr "Íà îáîèõ ïàíåëÿõ îòêðûò îäèí è òîò æå ôàéë"
-
-#: Merge.rc:2665
-#, c-format
-msgid "The selected files are identical."
-msgstr "Âûáðàííûå ôàéëû íå èìåþò îòëè÷èé"
-
-#: Merge.rc:2666
-#, c-format
-msgid "An error occurred while comparing the files."
-msgstr "Ïðè ñðàâíåíèè ôàéëîâ ïðîèçîøëà îøèáêà."
-
-#: Merge.rc:2667
-#, c-format
-msgid "Temporary files could not be created. Check your temporary path settings."
-msgstr "Âðåìåííûå ôàéëû íå ìîãóò áûòü ñîçäàíû. Ïðîâåðüòå íàñòðîéêè ïóòåé äëÿ âðåìåííûõ ôàéëîâ"
-
-#: Merge.rc:2668
-#, c-format
-msgid ""
-"These files use different carriage return types.\n"
-"\n"
-"Do you want to treat all carriage return types as equivalent for this comparison?\n"
-"\n"
-"Note: 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, óñòàíîâèòå îïöèþ 'Èãíîðèðîâàòü ðàçëè÷èÿ â EOL' íà âêëàäêå Ñðàâíåíèå â Íàñòðîéêàõ."
-
-#: Merge.rc:2669
-#, c-format
-msgid "The selected folder is invalid."
-msgstr "Íåâîçìîæíî îòêðûòü âûáðàííóþ ïàïêó."
-
-#: Merge.rc:2670
-#, c-format
-msgid "Cannot open a binary file to editor."
-msgstr "Íåâîçìîæíî îòîáðàçèòü áèíàðíûé ôàéë â ðåäàêòîðå."
-
-#: Merge.rc:2671
-#, c-format
-msgid ""
-"The folder exists only in other side and cannot be opened.\n"
-"\n"
-"Do you want to create a matching folder:\n"
-"%1\n"
-"to the other side and open these folders?"
-msgstr ""
-"Ïàïêà ñóùåñòâóåò òîëüêî íà îäíîé ñòîðîíå è íå ìîæåò áûòü îòêðûòà.\n"
-"\n"
-"Õîòèòå ñîçäàòü ñîîòâåòñòâóþùóþ ïàïêó:\n"
-"%1\n"
-"íà äðóãîé ñòîðîíå è îáå îòêðûòü èõ?"
-
-#: Merge.rc:2677
-#, c-format
-msgid ""
-"Different codepages found in left (cp%d) and right (cp%d) files. \n"
-"Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n"
-"Would you like to treat both files as being in the default windows codepage (recommended)?"
-msgstr ""
-"Ðàçëè÷íûå êîäèðîâêè: ëåâûé - (cp%d), ïðàâûé - (cp%d). \n"
-"Êàæäûé èç ôàéëîâ ìîæåò áûòü îòîáðàæåí â ñâîåé êîäèðîâêå, íî èõ ñëèÿíèå èëè êîïèðîâàíèå ìîæåò ïîâðåäèòü èíôîðìàöèþ.\n"
-"Îòîáðàçèòü îáà ôàéëà â ñèñòåìíîé êîäèðîâêå (ðåêîìåíäóåòñÿ)?"
-
-#: Merge.rc:2678
-#, c-format
-msgid "Information lost due to encoding errors: both files"
-msgstr "Èíôîðìàöèÿ ïîòåðÿíà èç-çà îøèáî÷íîé êîäèðîâêè: îáà ôàéëà"
-
-#: Merge.rc:2679
-#, c-format
-msgid "Information lost due to encoding errors: first file"
-msgstr ""
-
-#: Merge.rc:2680
-#, c-format
-msgid "Information lost due to encoding errors: second file"
-msgstr ""
-
-#: Merge.rc:2681
-#, c-format
-msgid "Information lost due to encoding errors: third file"
-msgstr ""
-
-#: Merge.rc:2687
-#, c-format
-msgid "No difference"
-msgstr "Íåò îòëè÷èé"
-
-#: Merge.rc:2688
-#, c-format
-msgid "Line difference"
-msgstr "Ñòðîêà îòëè÷èé"
-
-#: Merge.rc:2694
-#, c-format
-msgid "Replaced %1 string(s)."
-msgstr "Çàìåíåíî %1 ñòðîê."
-
-#: Merge.rc:2695
-#, c-format
-msgid "Cannot find string \"%s\""
-msgstr "Íåâîçìîæíî íàéòè ñòðîêó \"%s\""
-
-#: Merge.rc:2701
-#, c-format
-msgid "Copy Full Path"
-msgstr "Ñêîïèðîâàòü ïîëíûé ïóòü"
-
-#: Merge.rc:2702
-#, c-format
-msgid "Copy Filename"
-msgstr "Ñêîïèðîâàòü èìÿ ôàéëà"
-
-#: Merge.rc:2708
-#, c-format
-msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
-msgstr ""
-
-#: Merge.rc:2715
-#, c-format
-msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2"
-msgstr ""
-
-#: Merge.rc:2716
-#, c-format
-msgid "The change of codepage has been merged"
-msgstr ""
-
-#: Merge.rc:2717
-#, c-format
-msgid "The changes of codepage are conflicting"
-msgstr ""
-
-#: Merge.rc:2718
-#, c-format
-msgid "The change of EOL has been merged"
-msgstr ""
-
-#: Merge.rc:2719
-#, c-format
-msgid "The changes of EOL are conflicting"
-msgstr ""
-
-#: Merge.rc:2725
-#, c-format
-msgid "Location Pane"
-msgstr "Ìåñòîïîëîæåíèÿ"
-
-#: Merge.rc:2726
-#, c-format
-msgid "Diff Pane"
-msgstr "Îòëè÷èÿ"
-
-#: Merge.rc:2732
-#, c-format
-msgid "Patch file successfully written."
-msgstr "Ïàò÷ óñïåøíî çàïèñàí."
-
-#: Merge.rc:2733
-#, c-format
-msgid "1. item is not found or is directory!"
-msgstr "1. Ýëåìåíò íå íàéäåí èëè ýòî êàòàëîã"
-
-#: Merge.rc:2734
-#, c-format
-msgid "2. item is not found or is directory!"
-msgstr "2. Ýëåìåíò íå íàéäåí èëè ýòî êàòàëîã"
-
-#: Merge.rc:2735
-#, c-format
-msgid "The patch file already exists. Do you want to overwrite it?"
-msgstr "Ïàò÷ óæå ñóùåñòâóåò. Õîòèòå ïåðåçàïèñàòü åãî ?"
-
-#: Merge.rc:2736
-#, c-format
-msgid "[%1 files selected]"
-msgstr "[%1 ôàéëîâ âûáðàíî]"
-
-#: Merge.rc:2737
-#, c-format
-msgid "Normal"
-msgstr "Íîðìàëüíûé"
-
-#: Merge.rc:2738
-#, c-format
-msgid "Context"
-msgstr "Êîíòåêñò"
-
-#: Merge.rc:2739
-#, c-format
-msgid "Unified"
-msgstr "Óíèôèöèðîâàííûé"
-
-#: Merge.rc:2740
-#: Merge.rc:2990
-#, c-format
-msgid "HTML"
-msgstr "HTML"
-
-#: Merge.rc:2741
-#, c-format
-msgid "Could not write to file %1."
-msgstr "Íåò âîçìîæíîñòè çàïèñàòü â ôàéë %1."
-
-#: Merge.rc:2742
-#, c-format
-msgid "The specified output path is not an absolute path: %1"
-msgstr "Óêàçàííûé ïóòü äëÿ âûâîäà íå ÿâëÿåòñÿ àáñîëþòíûì: %1"
-
-#: Merge.rc:2743
-#, c-format
-msgid "Specify an output file"
-msgstr "Óêàçàòü âûõîäíîé ôàéë"
-
-#: Merge.rc:2744
-#, c-format
-msgid "Cannot create a patch file from binary files."
-msgstr "Íåâîçìîæíî ñîçäàòü ïàò÷ èç áèíàðíûõ ôàéëîâ"
-
-#: Merge.rc:2745
-#, c-format
-msgid "Cannot create a patch file from directories."
-msgstr "Íåâîçìîæíî ñîçäàòü ïàò÷ èç êàòàëîãîâ"
-
-#: Merge.rc:2746
-#, c-format
-msgid ""
-"Please save all files first.\n"
-"\n"
-"Creating a patch requires that there are no unsaved changes in files."
-msgstr ""
-"Ñíà÷àëà ñîõðàíèòå âñå ôàéëû.\n"
-"\n"
-"Ñîçäàíèå ïàò÷à òðåáóåò ÷òîáû â ôàéëàõ íå áûëî íåñîõðàíåííûõ èçìåíåíèé"
-
-#: Merge.rc:2747
-#, c-format
-msgid "Folder does not exist."
-msgstr "Ïàïêà íå ñóùåñòâóåò"
-
-#: Merge.rc:2752
-#, c-format
-msgid ""
-"Archive support is not enabled.\n"
-"All needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\n"
-"See manual for more info about archive support and how to enable it."
-msgstr ""
-"Ïîääåðæêà àðõèâîâ íå âêëþ÷åíà.\n"
-" \n"
-"Íå íàéäåíû âñå íåîáõîäèìûå êîìïîíåíòû (7-zip è/èëè Merge7z*.dll) . \n"
-"Ïîñìîòðèòå èíñòðóêöèþ, ÷òî áû óçíàòü áîëüøå ïðî ïîääåðæêó àðõèâîâ è êàê åå âêëþ÷èòü."
-
-#: Merge.rc:2753
-#, c-format
-msgid ""
-"\n"
-"Note: 7-Zip integration is disabled in WinMerge settings."
-msgstr ""
-"\n"
-"Âíèìàíèå: Èíòåãðàöèÿ ñ 7-Zip îòêëþ÷åíà â íàñòðîéêàõ WinMerge."
-
-#: Merge.rc:2754
-#, c-format
-msgid ""
-"\n"
-"Note: 7-Zip integration is restricted to standalone operation in WinMerge settings."
-msgstr ""
-"\n"
-"Âíèìàíèå: Çàäåéñòâîâàí òîëüêî ëîêàëüíûé ìîäóëü 7-Zip."
-
-#: Merge.rc:2755
-#, c-format
-msgid "Select file for export"
-msgstr "Âûáðàòü ôàéë äëÿ ýêñïîðòà"
-
-#: Merge.rc:2756
-#, c-format
-msgid "Select file for import"
-msgstr "Âûáðàòü ôàéë äëÿ èìïîðòà"
-
-#: Merge.rc:2757
-#, c-format
-msgid "Options imported from the file."
-msgstr "Îïöèè, èìïîðòèðîâàííûå èç ôàéëà."
-
-#: Merge.rc:2758
-#, c-format
-msgid "Options exported to the file."
-msgstr "Îïöèè, ýêñïîðòèðóåìûå â ôàéë."
-
-#: Merge.rc:2759
-#, c-format
-msgid "Failed to import options from the file."
-msgstr "Îøèáêà èìïîðòà îïöèé èç ôàéëà."
-
-#: Merge.rc:2760
-#, c-format
-msgid "Failed to write options to the file."
-msgstr "Îøèáêà ýêñïîðòà îïöèé â ôàéë."
-
-#: Merge.rc:2761
-#, c-format
-msgid ""
-"You are about to close several compare windows.\n"
-"\n"
-"Do you want to continue?"
-msgstr ""
-"Âû õîòèòå çàêðûòü çàêðûòü ñðàçó íåñêîëüêî îêîí ñðàâíåíèÿ.\n"
-"\n"
-"Ïðîäîëæèòü?"
-
-#: Merge.rc:2767
-#, c-format
-msgid "Win"
-msgstr "Win"
-
-#: Merge.rc:2768
-#, c-format
-msgid "Mac"
-msgstr "Mac"
-
-#: Merge.rc:2769
-#, c-format
-msgid "Unix"
-msgstr "Unix"
-
-#: Merge.rc:2770
-#, c-format
-msgid "Mixed"
-msgstr "Ñìåøàííûé"
-
-#: Merge.rc:2772
-#, c-format
-msgid "LF"
-msgstr "LF"
-
-#: Merge.rc:2773
-#, c-format
-msgid "CR"
-msgstr "CR"
-
-#: Merge.rc:2774
-#, c-format
-msgid "CRLF"
-msgstr "CRLF"
-
-#: Merge.rc:2781
-#, c-format
-msgid " B"
-msgstr " Á"
-
-#: Merge.rc:2782
-#, c-format
-msgid " KB"
-msgstr "Êá"
-
-#: Merge.rc:2783
-#, c-format
-msgid " MB"
-msgstr "Ìá"
-
-#: Merge.rc:2784
-#, c-format
-msgid " GB"
-msgstr "Ãá"
-
-#: Merge.rc:2785
-#, c-format
-msgid " TB"
-msgstr "Òá"
-
-#: Merge.rc:2786
-#, c-format
-msgid " PB"
-msgstr "Ïá"
-
-#: Merge.rc:2792
-#, c-format
-msgid "Type"
-msgstr "Òèï"
-
-#: Merge.rc:2794
-#, c-format
-msgid "Unpacker"
-msgstr "Ðàñïàêîâùèê"
-
-#: Merge.rc:2795
-#, c-format
-msgid "Prediffer"
-msgstr "Ïðåäñðàâíåíèå"
-
-#: Merge.rc:2796
-#, c-format
-msgid "Editor script"
-msgstr "Ðåäàêòîð ñêðèïòîâ"
-
-#: Merge.rc:2803
-#, c-format
-msgid "Save the left file"
-msgstr "Ñîõðàíèòü ôàéë ñëåâà"
-
-#: Merge.rc:2804
-#, c-format
-msgid "Save the middle file"
-msgstr ""
-
-#: Merge.rc:2805
-#, c-format
-msgid "Save the right file"
-msgstr "Ñîõðàíèòü ôàéë ñïðàâà"
-
-#: Merge.rc:2806
-#, c-format
-msgid "Save the left file with name..."
-msgstr "Ñîõðàíèòü ôàéë ñëåâà êàê..."
-
-#: Merge.rc:2807
-#, c-format
-msgid "Save the middle file with name..."
-msgstr ""
-
-#: Merge.rc:2808
-#, c-format
-msgid "Save the right file with name..."
-msgstr "Ñîõðàíèòü ôàéë ñïðàâà êàê..."
-
-#: Merge.rc:2809
-#, c-format
-msgid "Change left file/folder read-only status"
-msgstr ""
-
-#: Merge.rc:2810
-#, c-format
-msgid "Change middle file/folder read-only status"
-msgstr ""
+msgid "Text files are different"
+msgstr "Текстовые файлы различны"
-#: Merge.rc:2811
+#: Merge.rc:203BBC7B
#, c-format
-msgid "Change right file/folder read-only status"
-msgstr ""
+msgid "Elapsed time: %ld ms"
+msgstr "Прошло времени: %ld мс"
-#: Merge.rc:2812
+#: Merge.rc:6C7BF198
#, c-format
-msgid "Convert EOL to Windows mode"
-msgstr "Ïðåîáðàçîâàòü EOL ê ïðèíÿòûì â Windows"
+msgid "1 item selected"
+msgstr "Выбран 1 элемент"
-#: Merge.rc:2813
+#: Merge.rc:5D49B8EC
#, c-format
-msgid "Convert EOL to Unix mode"
-msgstr "Ïðåîáðàçîâàòü EOL ê ïðèíÿòûì â Unix"
+msgid "%1 items selected"
+msgstr "Выбрано элементов: %1"
-#: Merge.rc:2814
+#: Merge.rc:3A5D5963
#, c-format
-msgid "Convert EOL to Mac mode"
-msgstr "Ïðåîáðàçîâàòü EOL ê ïðèíÿòûì â Mac"
+msgid "Filename or folder name."
+msgstr "Имя файла или каталога"
-#: Merge.rc:2815
+#: Merge.rc:A7628EE
#, c-format
-msgid "Switch between editing and merging modes"
-msgstr "Ïåðåêëþ÷åíèå ìåæäó ðåæèìàìè ðåäàêòèðîâàíèÿ è ñëèÿíèÿ"
+msgid "Subfolder name when subfolders are included."
+msgstr "Имена подпапок, если подпапки включены"
-#: Merge.rc:2816
+#: Merge.rc:6F88EC68
#, c-format
-msgid ""
-"View and adjust file encoding properties\n"
-"File encoding properties"
-msgstr ""
-"Ïðîñìîòðåòü è îòðåäàêòèðîâàòü êîäèðîâêó\n"
-"File encoding properties"
+msgid "Comparison result, long form."
+msgstr "Результат сравнения, длинная форма."
-#: Merge.rc:2817
+#: Merge.rc:28BFDD41
#, c-format
-msgid "Open and resolve conflict file"
-msgstr "Îòêðûòü è ðåøèòü êîíôëèêòíûé ôàéë"
+msgid "Left side modification date."
+msgstr "Время изменения файла слева"
-#: Merge.rc:2823
+#: Merge.rc:19B30A68
#, c-format
-msgid ""
-"Select difference area in the current line\n"
-"Difference in the Current Line"
-msgstr ""
-"Âûäåëèòü îòëè÷èå â òåêóùåé ñòðîêå\n"
-"Difference in the Current Line"
+msgid "Right side modification date."
+msgstr "Время изменения файла справа"
-#: Merge.rc:2824
+#: Merge.rc:68FB0CE7
#, c-format
-msgid ""
-"Go to line or difference\n"
-"Go to (Ctrl+G)"
+msgid "Middle side modification date."
msgstr ""
-"Ïåðåéòè íà ñòðîêó èëè îòëè÷èå\n"
-"Go to (Ctrl+G)"
-#: Merge.rc:2825
+#: Merge.rc:453F5DDC
#, c-format
-msgid ""
-"Set program options\n"
-"Options"
-msgstr ""
-"Óñòàíîâèòü ïðîãðàììíûå íàñòðîéêè\n"
-"Íàñòðîéêè"
+msgid "File's extension."
+msgstr "Расширение файла"
-#: Merge.rc:2826
+#: Merge.rc:172385A1
#, c-format
-msgid ""
-"Refresh display\n"
-"Refresh (F5)"
-msgstr ""
-"Îáíîâèòü ýêðàí\n"
-"Refresh (F5)"
+msgid "Left file size in bytes."
+msgstr "Размер файла слева в байтах"
-#: Merge.rc:2827
+#: Merge.rc:94C89D4
#, c-format
-msgid "Copy selected lines to clipboard adding linenumbers to line begin"
-msgstr "Ñêîïèðîâàòü âûáðàííûå ñòðîêè â áóôåð îáìåíà, äîáàâëÿÿ â íà÷àëå ñòðîêè åå íîìåð"
+msgid "Right file size in bytes."
+msgstr "Размер файла справа в байтах"
-#: Merge.rc:2828
+#: Merge.rc:27AAA636
#, c-format
-msgid "Refresh/Reload selected items"
+msgid "Middle file size in bytes."
msgstr ""
-#: Merge.rc:2829
+#: Merge.rc:2EBBDDD7
#, c-format
-msgid "Toggle bookmark"
-msgstr "Çàêëàäêà"
+msgid "Left file size abbreviated."
+msgstr "Размер левого файла (сокр.)"
-#: Merge.rc:2830
+#: Merge.rc:21DC7C34
#, c-format
-msgid "Go to next bookmark"
-msgstr "Ïåðåéòè ê ñëåäóþùåé çàêëàäêå"
+msgid "Right file size abbreviated."
+msgstr "Размер правого файла (сокр.)"
-#: Merge.rc:2831
+#: Merge.rc:BA5006A
#, c-format
-msgid "Go to previous bookmark"
-msgstr "Ïåðåéòè ê ïðåäûäóùåé çàêëàäêå"
+msgid "Middle file size abbreviated."
+msgstr ""
-#: Merge.rc:2832
+#: Merge.rc:172385A2
#, c-format
-msgid "Clear all bookmarks"
-msgstr "Óäàëèòü âñå çàêëàäêè"
+msgid "Left side creation time."
+msgstr "Время создания файла слева"
-#: Merge.rc:2838
+#: Merge.rc:94C89D5
#, c-format
-msgid ""
-"Displays items that are exactly the same\n"
-"Show Identical Items"
-msgstr ""
-"Ïîêàçûâàòü îäèíàêîâûå\n"
-"Show Identical Items"
+msgid "Right side creation time."
+msgstr "Время создания файла справа"
-#: Merge.rc:2839
+#: Merge.rc:27AAA637
#, c-format
-msgid ""
-"Displays items that have differences\n"
-"Show Different Items"
+msgid "Middle side creation time."
msgstr ""
-"Ïîêàçûâàòü ðàçëè÷àþùèåñÿ\n"
-"Show Different Items"
-#: Merge.rc:2840
+#: Merge.rc:4B4CD318
#, c-format
-msgid ""
-"Displays items that exist in only on the left side\n"
-"Show Left Unique Items"
-msgstr ""
-"Ïîêàçûâàòü ïðèñóòñòâóþùèå òîëüêî ñëåâà\n"
-"Show Left Unique Items"
+msgid "Tells which side has newer modification date."
+msgstr "Показать с какой из сторон дата изменения файла новее"
-#: Merge.rc:2841
+#: Merge.rc:3AF5EAD7
#, c-format
-msgid ""
-"Displays items that exist in only on the right side\n"
-"Show Right Unique Items"
-msgstr ""
-"Ïîêàçûâàòü ïðèñóòñòâóþùèå òîëüêî ñïðàâà\n"
-"Show Right Unique Items"
+msgid "Left side file version, only for some filetypes."
+msgstr "Версия файла слева, только для некоторых типов файлов."
-#: Merge.rc:2842
+#: Merge.rc:7413D0D6
#, c-format
-msgid ""
-"Displays binary files\n"
-"Show Binary Files"
-msgstr ""
-"Ïîêàçûâàòü áèíàðíûå ôàéëû\n"
-"Show Binary Files"
+msgid "Right side file version, only for some filetypes."
+msgstr "Версия файла справа, только для некоторых типов файлов."
-#: Merge.rc:2843
+#: Merge.rc:5EB13952
#, c-format
-msgid ""
-"Displays skipped items\n"
-"Show Skipped Items"
+msgid "Middle side file version, only for some filetypes."
msgstr ""
-"Ïîêàçûâàòü ïðîïóùåííûå\n"
-"Show Skipped Items"
-#: Merge.rc:2849
+#: Merge.rc:43600E91
#, c-format
-msgid ""
-"Select the font for the view\n"
-"Select View Font"
-msgstr ""
-"Âûáðàòü øðèôò äëÿ îòîáðàæåíèÿ îòëè÷èé\n"
-"Select Diff Font"
+msgid "Short comparison result."
+msgstr "Результат быстрого сравнения"
-#: Merge.rc:2850
+#: Merge.rc:20155F59
#, c-format
-msgid ""
-"Revert to using the default system font for view\n"
-"Default Font"
-msgstr ""
-"Èñïîëüçîâàòü ñèñòåìíûé øðèôò ïî óìîë÷àíèþ äëÿ îòîáðàæåíèÿ îòëè÷èé \n"
-"Default Font"
+msgid "Left side attributes."
+msgstr "Атрибуты файла слева"
-#: Merge.rc:2851
+#: Merge.rc:6DBD6124
#, c-format
-msgid "Shows whitespace characters"
-msgstr "Ïîêàçûâàòü íåâèäèìûå çíàêè ðàçìåòêè"
+msgid "Right side attributes."
+msgstr "Атрибуты файла справа"
-#: Merge.rc:2852
+#: Merge.rc:7F2E4119
#, c-format
-msgid "Toggle Diff Pane"
-msgstr "Ïåðåêëþ÷èòü ïàíåëü îòëè÷èé"
+msgid "Middle side attributes."
+msgstr ""
-#: Merge.rc:2853
+#: Merge.rc:703AF3C8
#, c-format
-msgid "Location pane shows overall picture from files"
-msgstr "Ïàíåëü ëîêàöèé ïîêàçûâàåò ïîëíóþ êàðòèíó îòëè÷èé ìåæäó ôàéëàìè"
+msgid "Left side file EOL type"
+msgstr "Маркер конца строки для левого файла"
-#: Merge.rc:2854
+#: Merge.rc:73E9B1DC
#, c-format
-msgid "Show folder compare statistics dialog"
-msgstr "Ïîêàçàòü äèàëîã ñðàâíåíèÿ ñòàòèñòèê ïàïîê"
+msgid "Right side file EOL type"
+msgstr "Маркер конца строки для правого файла"
-#: Merge.rc:2855
+#: Merge.rc:6CA26873
#, c-format
-msgid ""
-"Shows differences inside lines with different colors\n"
-"Show Line Difference"
+msgid "Middle side file EOL type"
msgstr ""
-"Ïîêàçàòü îòëè÷èÿ âíóòðè ñòðîê äðóãèìè öâåòàìè\n"
-"Ïîêàçàòü îòëè÷èÿ â ñòðîêå"
-#: Merge.rc:2856
+#: Merge.rc:5BCDF0E8
#, c-format
-msgid "Swap the positions of the two panes"
-msgstr "Ïîìåíÿòü ïàíåëè ìåñòàìè"
+msgid "Left side encoding."
+msgstr "Кодирование файла слева"
-#: Merge.rc:2857
+#: Merge.rc:52D3F9F7
#, c-format
-msgid ""
-"Shows line numbers\n"
-"Show Line Numbers"
-msgstr ""
-"Ïîêàçûâàòü íîìåðà ñòðîê\n"
-"Show Line Numbers"
+msgid "Right side encoding."
+msgstr "Кодирование файла справа"
-#: Merge.rc:2858
+#: Merge.rc:715905A6
#, c-format
-msgid ""
-"Enable word wrap\n"
-"Wrap Lines"
+msgid "Middle side encoding."
msgstr ""
-"Âêëþ÷èòü ïåðåíîñ ñòðîê\n"
-"Wrap Lines"
-#: Merge.rc:2859
+#: Merge.rc:58398DFF
#, c-format
-msgid ""
-"Shows selection margins for both panes\n"
-"Show Selection Margins"
-msgstr ""
-"Ïîêàçàòü ïîëÿ íà îáåèõ ïàíåëÿõ\n"
-"Show Selection Margins"
+msgid "Number of ignored differences in file. These differences are ignored by WinMerge and cannot be merged."
+msgstr "Количество игнорированных отличий в файле. Эти отличия были игнорированны WinMerge и не могут быть обработаны."
-#: Merge.rc:2860
+#: Merge.rc:6A6D5CB6
#, c-format
-msgid "Increase text size"
-msgstr "Óâåëè÷èòü ðàçìåð òåêñòà"
+msgid "Number of differences in file. This number does not include ignored differences."
+msgstr "Количество отличий в файле. Это число не включает в себя игнорированные отличия."
-#: Merge.rc:2861
+#: Merge.rc:A7628EF
#, c-format
-msgid "Decrease text size"
-msgstr "Óìåíüøèòü ðàçìåð òåêñòà"
+msgid "Shows an asterisk (*) if the file is binary."
+msgstr "Показать звездочку (*) если файл бинарный."
-#: Merge.rc:2862
+#: Merge.rc:1AC98D0D
#, c-format
-msgid "Reset text zoom to default size"
-msgstr "Ñáðîñèòü ìàñøòàá òåêñòà ê çíà÷åíèþ ïî óìîë÷àíèþ"
+msgid "Compare %1 with %2"
+msgstr "Сравнивание %1 с %2"
-#: Merge.rc:2868
+#: Merge.rc:E9A77F2
#, c-format
-msgid ""
-"Scroll to the previous difference\n"
-"Previous Difference (Alt+Up)"
-msgstr ""
-"Ïåðåéòè ê ïðåäûäóùåìó îòëè÷èþ\n"
-"Ïðåäûäóþùåå îòëè÷èå (Alt+Up)"
+msgid "Comma-separated list"
+msgstr "Список с разделяющими запятыми"
-#: Merge.rc:2869
+#: Merge.rc:5CCED709
#, c-format
-msgid ""
-"Scroll to the next difference\n"
-"Next Difference (Alt+Down)"
-msgstr ""
-"Ïåðåéòè ê ñëåäóþùåìó îòëè÷èþ\n"
-"Ñëåäóþùåå îòëè÷èå (Alt+Down)"
+msgid "Tab-separated list"
+msgstr "Список с разделяющими табуляторами"
-#: Merge.rc:2870
+#: Merge.rc:2E3BFCA3
#, c-format
-msgid "Scroll to the previous conflict\nPrevious Conflict (Alt+Shift+Up)"
-msgstr ""
+msgid "Simple HTML"
+msgstr "Простой HTML"
-#: Merge.rc:2871
+#: Merge.rc:751AB591
#, c-format
-msgid "Scroll to the next conflict\nNext Conflict (Alt+Shift+Down)"
-msgstr ""
+msgid "Simple XML"
+msgstr "Простой XML"
-#: Merge.rc:2872
+#: Merge.rc:67FDA050
#, c-format
-msgid "Scroll to the previous difference between left and middle\nPrevious Difference Between Left And Middle(Alt+Shift+1)"
-msgstr ""
+msgid "The report file already exists. Do you want to overwrite existing file?"
+msgstr "Файл отчета уже существует. Перезаписать??"
-#: Merge.rc:2873
+#: Merge.rc:630F8340
#, c-format
-msgid "Scroll to the next difference between left and middle\nNext Difference Between Left And Middle(Alt+1)"
+msgid ""
+"Error creating the report:\n"
+"%1"
msgstr ""
+"Ошибка при создании отчета:\n"
+"%1"
-#: Merge.rc:2874
+#: Merge.rc:37B243DF
#, c-format
-msgid "Scroll to the previous difference between left and right\nPrevious Difference Between Left And Middle(Alt+Shift+2)"
-msgstr ""
+msgid "The report has been created successfully."
+msgstr "Отчет успешно создан"
-#: Merge.rc:2875
+#: Merge.rc:162B12F9
#, c-format
-msgid "Scroll to the next difference between left and right\nNext Difference Between Left And Middle (Alt+2)"
-msgstr ""
+msgid "The same file is opened in both panels."
+msgstr "На обоих панелях открыт один и тот же файл"
-#: Merge.rc:2876
+#: Merge.rc:7632E88D
#, c-format
-msgid "Scroll to the previous difference between middle and right\nPrevious Difference Between Middle And Right (Alt+Shift+3)"
-msgstr ""
+msgid "The selected files are identical."
+msgstr "Выбранные файлы не имеют отличий"
-#: Merge.rc:2877
+#: Merge.rc:44565DBD
#, c-format
-msgid "Scroll to the next difference between middle and Difference\nNext Difference Between Middle And Right (Alt+3)"
-msgstr ""
+msgid "An error occurred while comparing the files."
+msgstr "При сравнении файлов произошла ошибка."
-#: Merge.rc:2878
+#: Merge.rc:5F16D9DC
#, c-format
-msgid "Scroll to the previous left only difference\nPrevious Left Only Difference (Alt+Shift+7)"
-msgstr ""
+msgid "Temporary files could not be created. Check your temporary path settings."
+msgstr "Временные файлы не могут быть созданы. Проверьте настройки путей для временных файлов"
-#: Merge.rc:2879
+#: Merge.rc:11E6F584
#, c-format
-msgid "Scroll to the next left only difference\nNext Left Only Difference (Alt+7)"
+msgid ""
+"These files use different carriage return types.\n"
+"\n"
+"Do you want to treat all carriage return types as equivalent for this comparison?\n"
+"\n"
+"Note: 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, установите опцию 'Игнорировать различия в EOL' на вкладке Сравнение в Настройках."
-#: Merge.rc:2880
+#: Merge.rc:46FB8639
#, c-format
-msgid "Scroll to the previous middle only difference\nPrevious Middle Only Difference (Alt+Shift+8)"
-msgstr ""
+msgid "The selected folder is invalid."
+msgstr "Невозможно открыть выбранную папку."
-#: Merge.rc:2881
+#: Merge.rc:4BC3EDDB
#, c-format
-msgid "Scroll to the next middle only difference\nNext Middle Only Difference (Alt+8)"
-msgstr ""
+msgid "Cannot open a binary file to editor."
+msgstr "Невозможно отобразить бинарный файл в редакторе."
-#: Merge.rc:2882
+#: Merge.rc:279EB840
#, c-format
-msgid "Scroll to the previous right only difference\nPrevious Right Difference (Alt+Shift+9)"
+msgid ""
+"The folder exists only in other side and cannot be opened.\n"
+"\n"
+"Do you want to create a matching folder:\n"
+"%1\n"
+"to the other side and open these folders?"
msgstr ""
+"Папка существует только на одной стороне и не может быть открыта.\n"
+"\n"
+"Хотите создать соответствующую папку:\n"
+"%1\n"
+"на другой стороне и обе открыть их?"
-#: Merge.rc:2883
+#: Merge.rc:36F211E1
#, c-format
-msgid "Scroll to the next right only difference\nNext Right Only Difference (Alt+9)"
+msgid "Do you want to move to the next file?"
msgstr ""
-#: Merge.rc:2884
+#: Merge.rc:6A0A36F1
#, c-format
-msgid ""
-"Scroll to the first difference\n"
-"First Difference (Alt+Home)"
+msgid "Do you want to move to the previous file?"
msgstr ""
-"Ïåðåéòè ê ïåðâîìó îòëè÷èþ\n"
-"Ïåðâîå îòëè÷èå (Alt+Home)"
-#: Merge.rc:2885
+#: Merge.rc:36F211E2
#, c-format
-msgid ""
-"Scroll to the current difference\n"
-"Current Difference (Alt+Enter)"
+msgid "Do you want to move to the next page?"
msgstr ""
-"Ïåðåéòè ê òåêóùåìó îòëè÷èþ\n"
-"Òåêóùåå îòëè÷èå (Alt+Enter)"
-#: Merge.rc:2886
+#: Merge.rc:6A0A36F2
#, c-format
-msgid ""
-"Scroll to the last difference\n"
-"Last Difference (Alt+End)"
+msgid "Do you want to move to the previous page?"
msgstr ""
-"Ïåðåéòè ê ïîñëåäíåìó îòëè÷èþ\n"
-"Ïîñëåäíåå îòëè÷èå (Alt+End)"
-#: Merge.rc:2887
+#: Merge.rc:4A700AB0
#, c-format
msgid ""
-"Copy the selected text to the right file\n"
-"Copy Right (Alt+Right)"
+"Different codepages found in left (cp%d) and right (cp%d) files. \n"
+"Displaying each file in its codepage will give a better display but merging/copying will be dangerous.\n"
+"Would you like to treat both files as being in the default Windows codepage (recommended)?"
msgstr ""
-"Ñêîïèðîâàòü âûáðàííûé òåêñò â ôàéë ñïðàâà\n"
-"Copy Right (Alt Right)"
+"Различные кодировки: левый - (cp%d), правый - (cp%d). \n"
+"Каждый из файлов может быть отображен в своей кодировке, но их слияние или копирование может повредить информацию.\n"
+"Отобразить оба файла в системной кодировке (рекомендуется)?"
-#: Merge.rc:2888
+#: Merge.rc:5851E4C8
#, c-format
-msgid ""
-"Copy the selected text to the left file\n"
-"Copy Left (Alt+Left)"
-msgstr ""
-"Ñêîïèðîâàòü âûáðàííûé òåêñò â ôàéë ñëåâà\n"
-"Copy Left (Alt Left)"
+msgid "Information lost due to encoding errors: both files"
+msgstr "Информация потеряна из-за ошибочной кодировки: оба файла"
-#: Merge.rc:2889
+#: Merge.rc:5851E4C9
#, c-format
-msgid ""
-"Copy difference to right and advance to next\n"
-"Copy Right and Advance (Ctrl+Alt+Right)"
+msgid "Information lost due to encoding errors: first file"
msgstr ""
-"Ñêîïèðîâàòü îòëè÷èå íà ëåâóþ ïàíåëü è ïåðåéòè ê ñëåäóþùåìó\n"
-"Copy Right and advance (Ctrl Alt Right)"
-#: Merge.rc:2890
+#: Merge.rc:31EAB496
#, c-format
-msgid ""
-"Copy difference to left and advance to next\n"
-"Copy Left and Advance (Ctrl+Alt+Left)"
+msgid "Information lost due to encoding errors: second file"
msgstr ""
-"Ñêîïèðîâàòü îòëè÷èå íà ïðàâóþ ïàíåëü è ïåðåéòè ê ñëåäóþùåìó\n"
-"Copy Left and advance (Ctrl Alt Left)"
-#: Merge.rc:2891
+#: Merge.rc:5851E4CA
#, c-format
-msgid ""
-"Copy all differences to the right file\n"
-"All Right"
+msgid "Information lost due to encoding errors: third file"
msgstr ""
-"Ñêîïèðîâàòü âñå îòëè÷èÿ â ôàéë ñïðàâà\n"
-"All Right"
-#: Merge.rc:2892
+#: Merge.rc:7D4E76C0
#, c-format
-msgid ""
-"Copy all differences to the left file\n"
-"All Left"
-msgstr ""
-"Ñêîïèðîâàòü âñå îòëè÷èÿ â ôàéë ñëåâà\n"
-"All Left"
+msgid "No difference"
+msgstr "Нет отличий"
+
+#: Merge.rc:71676C4A
+#, c-format
+msgid "Line difference"
+msgstr "Строка отличий"
-#: Merge.rc:2893
+#: Merge.rc:6DBD6125
#, c-format
-msgid "Delete selected items from both directories"
-msgstr "Óäàëèòü âûáðàííûå ýëåìåíòû èç îáîèõ êàòàëîãîâ"
+msgid "Replaced %1 string(s)."
+msgstr "Заменено %1 строк."
-#: Merge.rc:2894
+#: Merge.rc:334E25B3
#, c-format
-msgid "Compare selected item (compare first item if multiple items selected)"
-msgstr "Ñðàâíèòü âûäåëåííûå ýëåìåíòû (ñðàâíèòü ïåðâûé ýë-ò, åñëè âûäåëåíî áîëåå îäíîãî)"
+msgid "Cannot find string \"%s\""
+msgstr "Невозможно найти строку \"%s\""
-#: Merge.rc:2895
+#: Merge.rc:34855CF1
#, c-format
-msgid "Add a manual point for synchronization of changes between files"
+msgid "You are now entering Merge Mode. If you want to turn off Merge Mode, press F9 key"
msgstr ""
-#: Merge.rc:2896
+#: Merge.rc:5E0C549
#, c-format
-msgid "Clear manual change synchronization points "
+msgid "The number of automatically merged changes: %1\nThe number of unresolved conflicts: %2"
msgstr ""
-#: Merge.rc:2897
+#: Merge.rc:7453F857
#, c-format
-msgid "Automatically merge changes\nAuto Merge (Ctrl+Alt+M)"
+msgid "The change of codepage has been merged"
msgstr ""
-#: Merge.rc:2903
+#: Merge.rc:162B12FA
#, c-format
-msgid "Select and reorder directory compare columns"
-msgstr "Âûáðàòü è ïåðåñòàâèòü ìåñòàìè êîëîíêè ñðàâíåíèÿ êàòàëîãîâ"
+msgid "The changes of codepage are conflicting"
+msgstr ""
-#: Merge.rc:2904
+#: Merge.rc:7632E88E
#, c-format
-msgid "Generate a patch-file"
-msgstr "Ñîçäàòü ïàò÷"
+msgid "The change of EOL has been merged"
+msgstr ""
-#: Merge.rc:2905
+#: Merge.rc:502A2983
#, c-format
-msgid "Select and modify filters"
-msgstr "Âûáîð è ðåäàêòèðîâàíèå ôèëüòðîâ"
+msgid "The changes of EOL are conflicting"
+msgstr ""
-#: Merge.rc:2906
+#: Merge.rc:5C8E17D1
#, c-format
-msgid "Generates a report from compare results"
-msgstr "Ñîçäàòü îò÷åò èç ðåçóëüòàòîâ ñðàâíåíèÿ"
+msgid "Location Pane"
+msgstr "Местоположения"
-#: Merge.rc:2912
+#: Merge.rc:629C1DDE
#, c-format
-msgid "Shows a list of available plugins"
-msgstr "Ïîêàçàòü ñïèñîê äîñòóïíûõ äîïîëíåíèé"
+msgid "Diff Pane"
+msgstr "Отличия"
-#: Merge.rc:2913
+#: Merge.rc:3BDD62C4
#, c-format
-msgid "The user selects the unpacker (no unpacking when comparing dir)"
-msgstr "Âûáðàííûé ïîëüçîâàòåëåì ðàñïàêîâùèê (íå äåéñòâóåò ïðè ñðàâíåíèè êàòàëîãîâ)"
+msgid "Patch file successfully written."
+msgstr "Патч успешно записан."
-#: Merge.rc:2914
+#: Merge.rc:74C5055A
#, c-format
-msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
-msgstr "Àâòîìàòè÷åñêèé ïîäîáîð ðàñïàêîâùèêà (óêàæèòå ðàñøèðåíèå õîòÿ áû ó îäíîãî èç ôàéëîâ)"
+msgid "1. item is not found or is directory!"
+msgstr "1. Элемент не найден или это каталог"
-#: Merge.rc:2915
+#: Merge.rc:7EFD4961
#, c-format
-msgid "Select an unpacker to edit this file"
-msgstr "Âûáåðèòå ðàñïàêîâùèê äëÿ ðåäàêòèðîâàíèÿ ýòîãî ôàéëà"
+msgid "2. item is not found or is directory!"
+msgstr "2. Элемент не найден или это каталог"
-#: Merge.rc:2916
+#: Merge.rc:E611488
#, c-format
-msgid "No prediffer (normal)"
-msgstr "Áåç ïðåäñðàâíåíèÿ (normal)"
+msgid "The patch file already exists. Do you want to overwrite it?"
+msgstr "Патч уже существует. Хотите перезаписать его ?"
-#: Merge.rc:2917
+#: Merge.rc:62226073
#, c-format
-msgid "Suggested plugins"
-msgstr "Ñîâåòóåìûå äîïîëíåíèÿ"
+msgid "[%1 files selected]"
+msgstr "[%1 файлов выбрано]"
-#: Merge.rc:2918
+#: Merge.rc:27AFDB30
#, c-format
-msgid "Other plugins"
-msgstr "Äðóãèå äîïîëíåíèÿ"
+msgid "Normal"
+msgstr "Нормальный"
-#: Merge.rc:2919
+#: Merge.rc:7E5494F7
#, c-format
-msgid "Unload all plugins and reload them (for developers)"
-msgstr "Âûãðóçèòü âñå äîïîëíåíèÿ è çàãðóçèòü èõ ñíîâà (äëÿ ðàçðàáîò÷èêîâ)"
+msgid "Context"
+msgstr "Контекст"
-#: Merge.rc:2925
+#: Merge.rc:24173EE8
#, c-format
-msgid ""
-"Activates next visible file\n"
-"Activate next File"
-msgstr ""
-"Àêòèâèðóåò ñëåäóþùèé âèäèìûé ôàéë\n"
-"Àêòèâèðîâàòü ñëåäóþùèé ôàéë"
+msgid "Unified"
+msgstr "Унифицированный"
-#: Merge.rc:2926
+#: Merge.rc:185B8391
#, c-format
-msgid "Closes all open windows"
-msgstr "Çàêðûòü âñå îòêðûòûå îêíà"
+msgid "Could not write to file %1."
+msgstr "Нет возможности записать в файл %1."
-#: Merge.rc:2932
+#: Merge.rc:64D049AA
#, c-format
-msgid ""
-"Opens the WinMerge Help\n"
-"WinMerge Help"
-msgstr ""
-"Îòêðûòü ñïðàâêó WinMerge\n"
-"Ñïðàâêà WinMerge"
+msgid "The specified output path is not an absolute path: %1"
+msgstr "Указанный путь для вывода не является абсолютным: %1"
-#: Merge.rc:2933
+#: Merge.rc:44EE84AA
#, c-format
-msgid "Outputs current WinMerge version info and configuration to text file"
-msgstr "Âûâåñòè èíôîðìàöèþ î òåêóùåé âåðñèè WinMerge è íàñòðîéêàõ â òåêñòîâûé ôàéë"
+msgid "Specify an output file"
+msgstr "Указать выходной файл"
-#: Merge.rc:2934
+#: Merge.rc:54711616
#, c-format
-msgid "Display the GNU General Public License"
-msgstr "Ïîêàçàòü ëèöåíçèþ GNU General Public License"
+msgid "Cannot create a patch file from binary files."
+msgstr "Невозможно создать патч из бинарных файлов"
-#: Merge.rc:2935
+#: Merge.rc:133D7451
#, c-format
-msgid "Private Build: %1"
-msgstr "×àñòíûé áèëä: %1"
+msgid "Cannot create a patch file from directories."
+msgstr "Невозможно создать патч из каталогов"
-#: Merge.rc:2936
+#: Merge.rc:34FF26C7
#, c-format
msgid ""
-"Opens the release notes document\n"
-"Release Notes"
+"Please save all files first.\n"
+"\n"
+"Creating a patch requires that there are no unsaved changes in files."
msgstr ""
-"Îòêðûòü äîêóìåíò ñ çàìå÷àíèÿìè ê ðåëèçó\n"
-"Çàìå÷àíèÿ ê ðåëèçó"
+"Сначала сохраните все файлы.\n"
+"\n"
+"Создание патча требует чтобы в файлах не было несохраненных изменений"
+
+#: Merge.rc:576FB6D3
+#, c-format
+msgid "Folder does not exist."
+msgstr "Папка не существует"
-#: Merge.rc:2937
+#: Merge.rc:3377B7B5
#, c-format
msgid ""
-"Opens the translations website\n"
-"Translations"
+"Archive support is not enabled.\n"
+"All needed components (7-zip and/or Merge7z*.dll) for archive support cannot be found.\n"
+"See manual for more info about archive support and how to enable it."
msgstr ""
-"Ïåðåéòè íà ñòðàíèöó ñ ïåðåâîäàìè\n"
-"Ïåðåâîäû"
+"Поддержка архивов не включена.\n"
+" \n"
+"Не найдены все необходимые компоненты (7-zip и/или Merge7z*.dll) . \n"
+"Посмотрите инструкцию, что бы узнать больше про поддержку архивов и как ее включить."
-#: Merge.rc:2943
+#: Merge.rc:44EE84AB
#, c-format
-msgid "Plugin Settings"
-msgstr "Íàñòðîéêè äîïîëíåíèÿ"
+msgid "Select file for export"
+msgstr "Выбрать файл для экспорта"
-#: Merge.rc:2944
+#: Merge.rc:44EE84AC
#, c-format
-msgid "No prediffer"
-msgstr "Ïðåäñðàâíåíèå îòñóòñòâóåò"
+msgid "Select file for import"
+msgstr "Выбрать файл для импорта"
-#: Merge.rc:2945
+#: Merge.rc:447FB30
#, c-format
-msgid "Prediff if possible"
-msgstr "Åñëè âîçìîæíî, òî ïðåäñðàâíåíèå áóäåò ïðîèçâåäåíî"
+msgid "Options imported from the file."
+msgstr "Опции, импортированные из файла."
-#: Merge.rc:2947
+#: Merge.rc:44776ACF
#, c-format
-msgid "WSH not found - .sct scripts disabled"
-msgstr "WSH íå íàéäåí - .sct ñêðèïòû îòêëþ÷åíû"
+msgid "Options exported to the file."
+msgstr "Опции, экспортируемые в файл."
-#: Merge.rc:2948
+#: Merge.rc:7D23E524
#, c-format
-msgid "<None>"
-msgstr "<Íåò>"
+msgid "Failed to import options from the file."
+msgstr "Ошибка импорта опций из файла."
-#: Merge.rc:2949
+#: Merge.rc:68F9158
#, c-format
-msgid "<Automatic>"
-msgstr "<Àâòîìàòè÷åñêè>"
+msgid "Failed to write options to the file."
+msgstr "Ошибка экспорта опций в файл."
-#: Merge.rc:2955
+#: Merge.rc:404DAD7D
#, c-format
-msgid "Open the file with registered application"
-msgstr "Îòêðûòü ôàéë çàðåãèñòðèðîâàííûì ïðèëîæåíèåì"
+msgid ""
+"You are about to close several compare windows.\n"
+"\n"
+"Do you want to continue?"
+msgstr ""
+"Вы хотите закрыть закрыть сразу несколько окон сравнения.\n"
+"\n"
+"Продолжить?"
-#: Merge.rc:2956
+#: Merge.rc:7C664E2
#, c-format
-msgid "Open the file with external editor"
-msgstr "Îòêðûòü ôàéë âíåøíèì ðåäàêòîðîì"
+msgid "Mixed"
+msgstr "Смешанный"
-#: Merge.rc:2957
+#: Merge.rc:46FCCCF
#, c-format
-msgid "Open the file with a particular program"
-msgstr "Îòêðûòü ôàéë âûáðàííîé ïðîãðàììîé"
+msgid "None"
+msgstr "Нет"
-#: Merge.rc:2963
+#: Merge.rc:4C72B57
#, c-format
-msgid "Do not display moved blocks"
-msgstr "Íå îòîáðàæàòü ïåðåìåùåííûå áëîêè"
+msgid "Type"
+msgstr "Тип"
-#: Merge.rc:2964
+#: Merge.rc:5ED09E18
#, c-format
-msgid "Display all moved blocks"
-msgstr "Îòîáðàæàòü âñå ïåðåìåùåííûå áëîêè"
+msgid "Unpacker"
+msgstr "Распаковщик"
-#: Merge.rc:2965
+#: Merge.rc:37C6B9B8
#, c-format
-msgid "Display moved blocks only from current diff"
-msgstr "Îòîáðàæàòü ïåðåìåùåííûå áëîêè äëÿ òåêóùåãî îòëè÷èÿ"
+msgid "Prediffer"
+msgstr "Предсравнение"
-#: Merge.rc:2966
+#: Merge.rc:29ECCB83
#, c-format
-msgid "Go to diff under cursor"
-msgstr "Ïåðåéòè ê îòëè÷èþ ïîä êóðñîðîì"
+msgid "Editor script"
+msgstr "Редактор скриптов"
-#: Merge.rc:2967
+#: Merge.rc:51A4FE5F
#, c-format
-msgid "G&oto Line %1"
-msgstr "Ïåðåéòè ê &ñòðîêå %1"
+msgid "\nDifference in the Current Line"
+msgstr ""
-#: Merge.rc:2973
+#: Merge.rc:CF15594
#, c-format
-msgid "Disabled"
-msgstr "Îòêëþ÷åíî"
+msgid "\nOptions"
+msgstr ""
-#: Merge.rc:2974
+#: Merge.rc:6F90DC3A
#, c-format
-msgid "From file system"
-msgstr "Êàê íà äèñêå"
+msgid "\nRefresh (F5)"
+msgstr ""
-#: Merge.rc:2975
+#: Merge.rc:414AF01
#, c-format
-msgid "From MRU list"
-msgstr "Êàê â ñïèñêå íåäàâíèõ äîêóìåíòîâ"
+msgid "\nPrevious Difference (Alt+Up)"
+msgstr "\nПредыдущее отличие (Alt+Up)"
-#: Merge.rc:2981
+#: Merge.rc:16618519
#, c-format
-msgid "No Highlighting"
-msgstr "Íåò âûäåëåííîãî"
+msgid "\nNext Difference (Alt+Down)"
+msgstr "\nСледующее отличие (Alt+Down)"
-#: Merge.rc:2982
+#: Merge.rc:7C5EF083
#, c-format
-msgid "ASP"
-msgstr "ASP"
+msgid "\nPrevious Conflict (Alt+Shift+Up)"
+msgstr "\nПредыдущий конфликт (Alt+Shift+Up)"
-#: Merge.rc:2983
+#: Merge.rc:51A4FE60
#, c-format
-msgid "Basic"
-msgstr "Áåéñèê"
+msgid "\nNext Conflict (Alt+Shift+Down)"
+msgstr "\nСледующий конфликт (Alt+Shift+Down)"
-#: Merge.rc:2984
+#: Merge.rc:35CF1E68
#, c-format
-msgid "Batch"
-msgstr "Batch"
+msgid "\nFirst Difference (Alt+Home)"
+msgstr "\nПервое отличие (Alt+Home)"
-#: Merge.rc:2985
+#: Merge.rc:51A4FE61
#, c-format
-msgid "C/C++"
-msgstr "C/C++"
+msgid "\nCurrent Difference (Alt+Enter)"
+msgstr "\nТекущее отличие (Alt+Enter)"
-#: Merge.rc:2986
+#: Merge.rc:1DA00C8A
#, c-format
-msgid "C#"
-msgstr "C#"
+msgid "\nLast Difference (Alt+End)"
+msgstr "\nПоследнее отличие (Alt+End)"
-#: Merge.rc:2987
+#: Merge.rc:E8950EA
#, c-format
-msgid "CSS"
-msgstr "CSS"
+msgid "\nCopy Right (Alt+Right)"
+msgstr ""
-#: Merge.rc:2988
+#: Merge.rc:55A8C466
#, c-format
-msgid "DCL"
-msgstr "DCL"
+msgid "\nCopy Left (Alt+Left)"
+msgstr ""
-#: Merge.rc:2989
+#: Merge.rc:1E864A56
#, c-format
-msgid "Fortran"
-msgstr "Ôîðòðàí"
+msgid "\nCopy Right and Advance (Ctrl+Alt+Right)"
+msgstr ""
-#: Merge.rc:2991
+#: Merge.rc:7FE60896
#, c-format
-msgid "INI"
-msgstr "INI"
+msgid "\nCopy Left and Advance (Ctrl+Alt+Left)"
+msgstr ""
-#: Merge.rc:2992
+#: Merge.rc:15F24C75
#, c-format
-msgid "InnoSetup"
-msgstr "InnoSetup"
+msgid "\nAll Right"
+msgstr ""
-#: Merge.rc:2993
+#: Merge.rc:11395D4B
#, c-format
-msgid "InstallShield"
-msgstr "InstallShield"
+msgid "\nAll Left"
+msgstr ""
-#: Merge.rc:2994
+#: Merge.rc:42A0CC96
#, c-format
-msgid "Java"
-msgstr "Java"
+msgid "\nAuto Merge (Ctrl+Alt+M)"
+msgstr ""
-#: Merge.rc:2995
+#: Merge.rc:6107F02B
#, c-format
-msgid "AutoLISP"
-msgstr "AutoLISP"
+msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
+msgstr "Автоматический подобор распаковщика (укажите расширение хотя бы у одного из файлов)"
-#: Merge.rc:2996
+#: Merge.rc:429CABF5
#, c-format
-msgid "NSIS"
-msgstr "NSIS"
+msgid "No prediffer (normal)"
+msgstr "Без предсравнения (normal)"
-#: Merge.rc:2997
+#: Merge.rc:62909ED8
#, c-format
-msgid "Pascal"
-msgstr "Ïàñêàëü"
+msgid "Suggested plugins"
+msgstr "Советуемые дополнения"
-#: Merge.rc:2998
+#: Merge.rc:4DAEA639
#, c-format
-msgid "Perl"
-msgstr "Perl"
+msgid "Other plugins"
+msgstr "Другие дополнения"
-#: Merge.rc:2999
+#: Merge.rc:2A918FD6
#, c-format
-msgid "PHP"
-msgstr "PHP"
+msgid "Private Build: %1"
+msgstr "Частный билд: %1"
-#: Merge.rc:3000
+#: Merge.rc:40D543C8
#, c-format
-msgid "Portable Object"
-msgstr "Portable Object"
+msgid "Your software is up to date"
+msgstr ""
-#: Merge.rc:3001
+#: Merge.rc:43B4B204
#, c-format
-msgid "PowerShell"
-msgstr "PowerShell"
+msgid "A new version of WinMerge is available.\n%1 is now available (you have %2). Would you like to download it now?"
+msgstr ""
-#: Merge.rc:3002
+#: Merge.rc:696AAFE9
#, c-format
-msgid "Python"
-msgstr "Python"
+msgid "Failed to download latest version information"
+msgstr "Не удалось загрузить сведения о последней версии"
-#: Merge.rc:3003
+#: Merge.rc:55B03C14
#, c-format
-msgid "REXX"
-msgstr "REXX"
+msgid "Plugin Settings"
+msgstr "Настройки дополнения"
-#: Merge.rc:3004
+#: Merge.rc:791F1E67
#, c-format
-msgid "Resources"
-msgstr "Ðåñóðñû"
+msgid "WSH not found - .sct scripts disabled"
+msgstr "WSH не найден - .sct скрипты отключены"
-#: Merge.rc:3005
+#: Merge.rc:4FC259D5
#, c-format
-msgid "Ruby"
-msgstr "Ruby"
+msgid "<None>"
+msgstr "<Нет>"
-#: Merge.rc:3006
+#: Merge.rc:8BF6984
#, c-format
-msgid "SGML"
-msgstr "SGML"
+msgid "<Automatic>"
+msgstr "<Автоматически>"
-#: Merge.rc:3007
+#: Merge.rc:4AAD2A74
#, c-format
-msgid "Shell"
-msgstr "Shell"
+msgid "G&oto Line %1"
+msgstr "Перейти к &строке %1"
-#: Merge.rc:3008
+#: Merge.rc:7F0D4B47
#, c-format
-msgid "SIOD"
-msgstr "SIOD"
+msgid "Disabled"
+msgstr "Отключено"
-#: Merge.rc:3009
+#: Merge.rc:444C5DDD
#, c-format
-msgid "SQL"
-msgstr "SQL"
+msgid "From file system"
+msgstr "Как на диске"
-#: Merge.rc:3010
+#: Merge.rc:7A4CFAFE
#, c-format
-msgid "TCL"
-msgstr "TCL"
+msgid "From MRU list"
+msgstr "Как в списке недавних документов"
-#: Merge.rc:3011
+#: Merge.rc:638BD42D
#, c-format
-msgid "TEX"
-msgstr "TEX"
+msgid "No Highlighting"
+msgstr "Нет выделенного"
-#: Merge.rc:3012
+#: Merge.rc:7460E8C0
#, c-format
-msgid "Verilog"
-msgstr ""
+msgid "Batch"
+msgstr "Batch"
-#: Merge.rc:3013
+#: Merge.rc:55B03C15
#, c-format
-msgid "XML"
-msgstr "XML"
+msgid "Portable Object"
+msgstr "Portable Object"
-#: Merge.rc:3018
+#: Merge.rc:5F87E5E
#, c-format
-msgid "Hide the toolbar"
-msgstr "Ñêðûòü ïàíåëü èíñòðóìåíòîâ"
+msgid "Resources"
+msgstr "Ресурсы"
-#: Merge.rc:3019
+#: Merge.rc:125AD722
#, c-format
-msgid "Show small toolbar"
-msgstr "Ìàëåíüêèå çíà÷êè"
+msgid "Shell"
+msgstr "Shell"
-#: Merge.rc:3020
+#: Merge.rc:4E44AD6
#, c-format
-msgid "Show big toolbar"
+msgid "VHDL"
msgstr ""
-#: Merge.rc:3025
+#: Merge.rc:8AF7E6B
#, c-format
msgid "Close &Left Tabs"
msgstr ""
-#: Merge.rc:3026
+#: Merge.rc:D404EDF
#, c-format
msgid "Close R&ight Tabs"
msgstr ""
-#: Merge.rc:3027
+#: Merge.rc:D404EE0
#, c-format
msgid "Close &Other Tabs"
msgstr ""
-#: Merge.rc:3028
+#: Merge.rc:3E934E
#, c-format
msgid "Enable &Auto Max Width"
msgstr ""
-#: Merge.rc:3033
+#: Merge.rc:3D9427A9
#, c-format
-msgid "&Image"
-msgstr ""
+msgid "frhed is not installed"
+msgstr "frhed не установлен"
+
+#: Merge.rc:73B321AA
+#, c-format
+msgid "%1 does not exist. Do you want to create it?"
+msgstr "%1 не существует. Создать?"
+
+#: Merge.rc:3A5D5964
+#, c-format
+msgid "Failed to create folder."
+msgstr "Не удалось создать папку."
-#: Merge.rc:3038
+#: Merge.rc:64F70DD6
#, c-format
-msgid "frhed(http://frhed.sourceforge.net/) not installed"
+msgid "You can specify the following parameters to the path:\n$file: Path name of the current file\n$linenum: Line number of the current cursor position"
msgstr ""