2020-02-04 12:40:05 +00:00
|
|
|
|
# Russian translations for diffuse package.
|
2015-11-21 17:57:32 +00:00
|
|
|
|
# This is an alpha release.
|
|
|
|
|
# Copyright (C) 2009 Derrick Moser
|
|
|
|
|
# This file is distributed under the same license as the diffuse package.
|
|
|
|
|
# Henri Menke <henrimenke4@aim.com>, 2009.
|
|
|
|
|
#
|
|
|
|
|
msgid ""
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Project-Id-Version: diffuse-svn\n"
|
|
|
|
|
"Report-Msgid-Bugs-To: \n"
|
2021-11-24 15:57:55 +00:00
|
|
|
|
"POT-Creation-Date: 2021-11-24 10:26-0500\n"
|
2020-06-29 19:05:21 +00:00
|
|
|
|
"PO-Revision-Date: 2020-06-29 14:49-0400\n"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
"Last-Translator: Oleg Pakhtusov <opakhtusov@gmail.com>\n"
|
|
|
|
|
"Language-Team: Russian <opakhtusov@gmail.com>\n"
|
2020-06-29 19:05:21 +00:00
|
|
|
|
"Language: ru\n"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
"MIME-Version: 1.0\n"
|
|
|
|
|
"Content-Type: text/plain; charset=UTF-8\n"
|
|
|
|
|
"Content-Transfer-Encoding: 8bit\n"
|
|
|
|
|
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
|
|
|
|
"X-Poedit-Language: Russian\n"
|
|
|
|
|
"X-Poedit-Country: RUSSIAN FEDERATION\n"
|
|
|
|
|
"X-Poedit-SourceCharset: utf-8\n"
|
|
|
|
|
|
2021-11-18 20:37:02 +00:00
|
|
|
|
#: data/io.github.mightycreak.Diffuse.desktop.in:3
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: data/io.github.mightycreak.Diffuse.appdata.xml.in:4
|
2020-12-08 19:08:43 +00:00
|
|
|
|
msgid "Diffuse Merge Tool"
|
|
|
|
|
msgstr "Diffuse Инструмент Слияния"
|
|
|
|
|
|
2021-11-18 20:37:02 +00:00
|
|
|
|
#: data/io.github.mightycreak.Diffuse.desktop.in:4
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: data/io.github.mightycreak.Diffuse.appdata.xml.in:5
|
2020-12-08 19:08:43 +00:00
|
|
|
|
msgid "Graphical tool for merging and comparing text files"
|
|
|
|
|
msgstr "Графический инструмент для слияния и сравнения текстовых файлов"
|
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: data/io.github.mightycreak.Diffuse.appdata.xml.in:7
|
2021-11-24 16:41:46 +00:00
|
|
|
|
msgid ""
|
|
|
|
|
"Diffuse is a graphical tool for comparing and merging text files. It can "
|
|
|
|
|
"retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, "
|
|
|
|
|
"Monotone, RCS, Subversion, and SVK repositories."
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgstr ""
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: data/io.github.mightycreak.Diffuse.appdata.xml.in:21
|
2021-11-18 20:37:02 +00:00
|
|
|
|
msgid "Main window: diff between two files"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/constants.py.in:23
|
2021-11-18 20:37:02 +00:00
|
|
|
|
msgid "Copyright"
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:77
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Close Tab"
|
|
|
|
|
msgstr "Закрыть Вкладку"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:120
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Open File..."
|
|
|
|
|
msgstr "Открыть Файл..."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:121
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Reload File"
|
|
|
|
|
msgstr "Перезагрузить Файл"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:122
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Save File"
|
|
|
|
|
msgstr "Сохранить Файл"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:123
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Save File As..."
|
|
|
|
|
msgstr "Сохранить Файл Как..."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:268
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Save changes before loading the new file?"
|
|
|
|
|
msgstr "Сохранить изменения перед загрузкой нового файла?"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:377
|
2020-12-08 18:18:02 +00:00
|
|
|
|
#, python-format
|
|
|
|
|
msgid "Error reading revision %(rev)s of %(file)s."
|
|
|
|
|
msgstr "Ошибка считывания ревизии %(rev)s из %(file)s."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:379 src/diffuse/main.py:1712
|
2020-12-08 18:18:02 +00:00
|
|
|
|
#, python-format
|
|
|
|
|
msgid "Error reading %s."
|
|
|
|
|
msgstr "Ошибка чтения %s."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:400
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Open File"
|
|
|
|
|
msgstr "Открыть Файл"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:450
|
2020-12-08 18:18:02 +00:00
|
|
|
|
#, python-format
|
|
|
|
|
msgid "The file %s changed on disk. Do you want to reload the file?"
|
|
|
|
|
msgstr "Файл %s изменен на диске. Вы хотите перезагрузить этот файл?"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:470
|
2020-12-08 18:18:02 +00:00
|
|
|
|
#, python-format
|
|
|
|
|
msgid "Save %(title)s Pane %(pane)d"
|
|
|
|
|
msgstr "Сохранить %(title)s Субокно %(pane)d"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:496
|
2020-12-08 18:18:02 +00:00
|
|
|
|
#, python-format
|
|
|
|
|
msgid "A file named %s already exists. Do you want to overwrite it?"
|
|
|
|
|
msgstr "Файл под именем %s уже существует. Вы хотите перезаписать его?"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:501
|
2020-12-08 18:18:02 +00:00
|
|
|
|
#, python-format
|
2021-11-24 16:41:46 +00:00
|
|
|
|
msgid ""
|
|
|
|
|
"The file %s has been modified by another process since reading it. If you "
|
|
|
|
|
"save, all the external changes could be lost. Save anyways?"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Файл %s был изменен другим процессом после его прочтения. На сохранении все "
|
|
|
|
|
"внешние изменения будут потеряны. Сохранить все равно?"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:540
|
2020-12-08 18:18:02 +00:00
|
|
|
|
#, python-format
|
|
|
|
|
msgid "Error encoding to %s."
|
|
|
|
|
msgstr "Ошибка кодирования в %s."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:542
|
|
|
|
|
#, python-format
|
|
|
|
|
msgid "Error writing %s."
|
|
|
|
|
msgstr "Ошибка записи %s."
|
|
|
|
|
|
|
|
|
|
#: src/diffuse/main.py:570
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Go To Line..."
|
|
|
|
|
msgstr "Перейти на Строку..."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:570
|
2015-11-21 17:57:32 +00:00
|
|
|
|
msgid "Line Number: "
|
|
|
|
|
msgstr "Номер строки: "
|
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:596
|
2021-11-24 16:41:46 +00:00
|
|
|
|
msgid ""
|
|
|
|
|
"Press the enter key or double click to edit. Press the space bar or use the "
|
|
|
|
|
"RMB menu to manually align."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Нажатие Enter или двойной щелчок для редактирования. Нажатие Space или меню "
|
|
|
|
|
"правого щелчка для выравнивания вручную."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:598
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Press the escape key to finish editing."
|
|
|
|
|
msgstr "Нажмите клавишу Escape, чтобы закончить редактирование."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:600
|
2021-11-24 16:41:46 +00:00
|
|
|
|
msgid ""
|
|
|
|
|
"Select target line and press the space bar to align. Press the escape key "
|
|
|
|
|
"to cancel."
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Выберите целевую строку и нажмите клавишу Space, чтобы выровнять. Нажмите "
|
|
|
|
|
"Еscape для отмены."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:711
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_File"
|
|
|
|
|
msgstr "Фа_йл"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:712
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Open File..."
|
|
|
|
|
msgstr "О_ткрыть Файл..."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:713
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Open File In New _Tab..."
|
|
|
|
|
msgstr "Открыт_ь Файл в Новой Вкладке..."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:714
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Open _Modified Files..."
|
|
|
|
|
msgstr "Открыть И_змененные Файлы..."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:715
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Open Commi_t..."
|
|
|
|
|
msgstr "Открыть Зафи_ксированные..."
|
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:716
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Reload File"
|
|
|
|
|
msgstr "Пер_езагрузить Файл"
|
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:718
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Save File"
|
|
|
|
|
msgstr "С_охранить Файл"
|
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:719
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Save File _As..."
|
|
|
|
|
msgstr "Сохра_нить Файл Как..."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:720
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Save A_ll"
|
|
|
|
|
msgstr "Сохран_ить Все"
|
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:722
|
2015-11-21 17:57:32 +00:00
|
|
|
|
msgid "New _2-Way File Merge"
|
|
|
|
|
msgstr "Новое _2-Оконное Слияние Файлов"
|
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:723
|
2015-11-21 17:57:32 +00:00
|
|
|
|
msgid "New _3-Way File Merge"
|
|
|
|
|
msgstr "Новое _3-Оконное Слияние Файлов"
|
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:724
|
2015-11-21 17:57:32 +00:00
|
|
|
|
msgid "New _N-Way File Merge..."
|
|
|
|
|
msgstr "Новое _Многооконное Слияние Файлов..."
|
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:726
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Close Tab"
|
|
|
|
|
msgstr "З_акрыть Вкладку"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:727
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Undo Close Tab"
|
|
|
|
|
msgstr "От_менить Закрытие Вкладки"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:728
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Quit"
|
|
|
|
|
msgstr "В_ыход"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:730
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Edit"
|
|
|
|
|
msgstr "Пра_вка"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:731
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Undo"
|
|
|
|
|
msgstr "От_менить"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:732
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Redo"
|
|
|
|
|
msgstr "Вер_нуть"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:734
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Cu_t"
|
|
|
|
|
msgstr "Выре_зать"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:735
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Copy"
|
|
|
|
|
msgstr "Ко_пировать"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:736
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Paste"
|
|
|
|
|
msgstr "В_ставить"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:738
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Select _All"
|
|
|
|
|
msgstr "В_ыбрать Все"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:739
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "C_lear Edits"
|
|
|
|
|
msgstr "Оч_истить Правки"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:740
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Dismiss All Edits"
|
|
|
|
|
msgstr "Сбр_осить Все Правки"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:742
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Find..."
|
|
|
|
|
msgstr "На_йти..."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:743
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Find _Next"
|
|
|
|
|
msgstr "Н_айти Следующее"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:744
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Find Pre_vious"
|
|
|
|
|
msgstr "Най_ти Предыдущее"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:745
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Go To Line..."
|
|
|
|
|
msgstr "Пер_ейти на Строку..."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:747
|
2015-11-21 17:57:32 +00:00
|
|
|
|
msgid "Pr_eferences..."
|
|
|
|
|
msgstr "Предпо_чтения..."
|
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:749
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "None"
|
|
|
|
|
msgstr "Нет"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:757
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_View"
|
|
|
|
|
msgstr "В_ид"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:758
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Syntax Highlighting"
|
|
|
|
|
msgstr "Подсве_тка Синтаксиса"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:760
|
2015-11-21 17:57:32 +00:00
|
|
|
|
msgid "Re_align All"
|
|
|
|
|
msgstr "Пере_строить Все"
|
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:761
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Isolate"
|
|
|
|
|
msgstr "И_золировать"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:763
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_First Difference"
|
|
|
|
|
msgstr "Пер_вое Различие"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:764
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Previous Difference"
|
|
|
|
|
msgstr "Предыдуще_е Различие"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:765
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Next Difference"
|
|
|
|
|
msgstr "Следу_ющее Различие"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:766
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Last Difference"
|
|
|
|
|
msgstr "П_оследнее Различие"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:768
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Fir_st Tab"
|
|
|
|
|
msgstr "Перв_ая Вкладка"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:769
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Pre_vious Tab"
|
|
|
|
|
msgstr "Предыдуща_я Вкладка"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:770
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Next _Tab"
|
|
|
|
|
msgstr "С_ледующая Вкладка"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:771
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Las_t Tab"
|
|
|
|
|
msgstr "Послед_няя Вкладка"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:773
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Shift Pane _Right"
|
|
|
|
|
msgstr "Пере_местить Субокно Вправо"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:774
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Shift Pane _Left"
|
|
|
|
|
msgstr "Перемест_ить Субокно Влево"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:776
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "F_ormat"
|
|
|
|
|
msgstr "Фор_мат"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:777
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Convert To _Upper Case"
|
|
|
|
|
msgstr "Пр_еобразовать в Верхний Регистр"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:778
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Convert To _Lower Case"
|
|
|
|
|
msgstr "Пре_образовать в Нижний Регистр"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:780
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Sort Lines In _Ascending Order"
|
|
|
|
|
msgstr "Сор_тировать Строки в Порядке Возрастания"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:781
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Sort Lines In D_escending Order"
|
|
|
|
|
msgstr "Сорт_ировать Строки в Порядке Убывания"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:783
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Remove Trailing _White Space"
|
|
|
|
|
msgstr "Уда_лить Замыкающие Пробелы"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:784
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Convert Tabs To _Spaces"
|
|
|
|
|
msgstr "Преобр_азовать Табуляторы в Пробелы"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:785
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Convert Leading Spaces To _Tabs"
|
|
|
|
|
msgstr "Преобра_зовать Вводные Пробелы в Табуляторы"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:787
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Increase Indenting"
|
|
|
|
|
msgstr "У_величить Отступ"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:788
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "De_crease Indenting"
|
|
|
|
|
msgstr "У_меньшить Отступ"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:790
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Convert To _DOS Format"
|
|
|
|
|
msgstr "Преобразоват_ь в DOS Формат"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:791
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Convert To _Mac Format"
|
|
|
|
|
msgstr "Преобразовать в Ma_с Формат"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:792
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Convert To Uni_x Format"
|
|
|
|
|
msgstr "Преобразовать в Uni_х Формат"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:794
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Merge"
|
|
|
|
|
msgstr "С_лияние"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:795
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Copy Selection _Right"
|
|
|
|
|
msgstr "К_опировать Выборку Вправо"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:796
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Copy Selection _Left"
|
|
|
|
|
msgstr "Ко_пировать Выборку Влево"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:798
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Copy Left _Into Selection"
|
|
|
|
|
msgstr "Копиро_вать Слева в Выборку"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:799
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Copy Right I_nto Selection"
|
|
|
|
|
msgstr "Копиров_ать Справа в Выборку"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:800
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Merge From Left Then Right"
|
|
|
|
|
msgstr "С_лияние Слева Затем Справа"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:801
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "M_erge From Right Then Left"
|
|
|
|
|
msgstr "Сл_ияние Справа Затем Слева"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:803
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Help"
|
|
|
|
|
msgstr "Спр_авка"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:804
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_Help Contents..."
|
|
|
|
|
msgstr "Содер_жание Справки..."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:806
|
2015-11-21 17:57:32 +00:00
|
|
|
|
#, python-format
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "_About %s..."
|
|
|
|
|
msgstr "О пр_ограмме %s..."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:820
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "New 2-Way File Merge"
|
|
|
|
|
msgstr "Новое 2-Оконное Слияние Файлов"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:821
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "New 3-Way File Merge"
|
|
|
|
|
msgstr "Новое 3-Оконное Слияние Файлов"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:823
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Realign All"
|
|
|
|
|
msgstr "Перестроить Все"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:824
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "First Difference"
|
|
|
|
|
msgstr "Первое Различие"
|
2020-06-29 19:05:21 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:825
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Previous Difference"
|
|
|
|
|
msgstr "Предыдущее Различие"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:826
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Next Difference"
|
|
|
|
|
msgstr "Следующее Различие"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:827
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Last Difference"
|
|
|
|
|
msgstr "Последнее Различие"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:829
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Copy Selection Right"
|
|
|
|
|
msgstr "Копировать Выборку Вправо"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:830
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Copy Selection Left"
|
|
|
|
|
msgstr "Копировать Выборку Влево"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:831
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Copy Left Into Selection"
|
|
|
|
|
msgstr "Копировать Слева в Выборку"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:832
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Copy Right Into Selection"
|
|
|
|
|
msgstr "Копировать Справа в Выборку"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:833
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Merge From Left Then Right"
|
|
|
|
|
msgstr "Слияние Слева Затем Справа"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:834
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Merge From Right Then Left"
|
|
|
|
|
msgstr "Слияние Справа Затем Слева"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:836
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Undo"
|
|
|
|
|
msgstr "Отменить"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:837
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Redo"
|
|
|
|
|
msgstr "Вернуть"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:838
|
|
|
|
|
msgid "Cut"
|
|
|
|
|
msgstr "Вырезать"
|
|
|
|
|
|
|
|
|
|
#: src/diffuse/main.py:839
|
|
|
|
|
msgid "Copy"
|
|
|
|
|
msgstr "Копировать"
|
|
|
|
|
|
|
|
|
|
#: src/diffuse/main.py:840
|
|
|
|
|
msgid "Paste"
|
|
|
|
|
msgstr "Вставить"
|
|
|
|
|
|
|
|
|
|
#: src/diffuse/main.py:841
|
|
|
|
|
msgid "Clear Edits"
|
|
|
|
|
msgstr "Очистить Правки"
|
|
|
|
|
|
|
|
|
|
#: src/diffuse/main.py:961
|
2021-11-24 16:41:46 +00:00
|
|
|
|
msgid ""
|
|
|
|
|
"Some files have unsaved changes. Select the files to save before closing."
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgstr ""
|
|
|
|
|
"Некоторые файлы имеют несохраненные изменения.\n"
|
|
|
|
|
"Выберите файлы для сохранения перед закрытием."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:974
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Tab"
|
|
|
|
|
msgstr "Вкладка"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:979
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Pane"
|
|
|
|
|
msgstr "Субокно"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:990
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Close _Without Saving"
|
|
|
|
|
msgstr "Закр_ыть Без Сохранения"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:1026
|
|
|
|
|
#, python-format
|
|
|
|
|
msgid "Closing this tab will quit %s."
|
|
|
|
|
msgstr "Закрытие этой вкладки закроет %s."
|
|
|
|
|
|
|
|
|
|
#: src/diffuse/main.py:1108
|
2020-12-08 18:18:02 +00:00
|
|
|
|
#, python-format
|
|
|
|
|
msgid "File Merge %d"
|
|
|
|
|
msgstr "Слияние Файлов %d"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:1211
|
2020-12-08 18:18:02 +00:00
|
|
|
|
#, python-format
|
|
|
|
|
msgid "Error retrieving commits for %s."
|
|
|
|
|
msgstr "Ошибка извлечения фиксаций для %s."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:1240
|
2020-12-08 18:18:02 +00:00
|
|
|
|
#, python-format
|
|
|
|
|
msgid "Error retrieving modifications for %s."
|
|
|
|
|
msgstr "Ошибка извлечения модификаций для %s."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:1270
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Open File In New Tab"
|
|
|
|
|
msgstr "Открыть Файл в Новой Вкладке"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:1286
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Choose Folder With Modified Files"
|
|
|
|
|
msgstr "Выбрать Папку с Измененными Файлами"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:1299
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "No modified files found."
|
|
|
|
|
msgstr "Модифицированные файлы не найдены."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:1304
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Choose Folder With Commit"
|
|
|
|
|
msgstr "Выбрать Папку с Зафиксированными Изменениями"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:1317
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "No committed files found."
|
|
|
|
|
msgstr "Файлы с фиксациями не найдены."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:1351
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "New N-Way File Merge..."
|
|
|
|
|
msgstr "Новое Многооконное Слияние Файлов..."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:1351
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Number of panes: "
|
|
|
|
|
msgstr "Количество субокна: "
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:1416
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Phrase not found. Continue from the end of the file?"
|
|
|
|
|
msgstr "Фраза не найдена. Продолжить с конца файла?"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:1418
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Phrase not found. Continue from the start of the file?"
|
|
|
|
|
msgstr "Фраза не найдена. Продолжить с начала файла?"
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:1631
|
2021-11-18 20:37:02 +00:00
|
|
|
|
msgid ""
|
|
|
|
|
"Usage:\n"
|
|
|
|
|
" diffuse [ [OPTION...] [FILE...] ]...\n"
|
|
|
|
|
" diffuse ( -h | -? | --help | -v | --version )\n"
|
|
|
|
|
"\n"
|
2021-11-24 16:41:46 +00:00
|
|
|
|
"Diffuse is a graphical tool for merging and comparing text files. Diffuse "
|
|
|
|
|
"is\n"
|
|
|
|
|
"able to compare an arbitrary number of files side-by-side and gives users "
|
|
|
|
|
"the\n"
|
|
|
|
|
"ability to manually adjust line matching and directly edit files. Diffuse "
|
|
|
|
|
"can\n"
|
2021-11-18 20:37:02 +00:00
|
|
|
|
"also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial,\n"
|
|
|
|
|
"Monotone, RCS, Subversion, and SVK repositories for comparison and merging.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Help Options:\n"
|
|
|
|
|
" ( -h | -? | --help ) Display this usage information\n"
|
2021-11-24 16:41:46 +00:00
|
|
|
|
" ( -v | --version ) Display version and copyright "
|
|
|
|
|
"information\n"
|
2021-11-18 20:37:02 +00:00
|
|
|
|
"\n"
|
|
|
|
|
"Configuration Options:\n"
|
|
|
|
|
" --no-rcfile Do not read any resource files\n"
|
|
|
|
|
" --rcfile <file> Specify explicit resource file\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"General Options:\n"
|
|
|
|
|
" ( -c | --commit ) <rev> File revisions <rev-1> and <rev>\n"
|
|
|
|
|
" ( -D | --close-if-same ) Close all tabs with no differences\n"
|
|
|
|
|
" ( -e | --encoding ) <codec> Use <codec> to read and write files\n"
|
|
|
|
|
" ( -L | --label ) <label> Display <label> instead of the file name\n"
|
|
|
|
|
" ( -m | --modified ) Create a new tab for each modified file\n"
|
|
|
|
|
" ( -r | --revision ) <rev> File revision <rev>\n"
|
|
|
|
|
" ( -s | --separate ) Create a new tab for each file\n"
|
|
|
|
|
" ( -t | --tab ) Start a new tab\n"
|
|
|
|
|
" ( -V | --vcs ) <vcs-list> Version control system search order\n"
|
|
|
|
|
" --line <line> Start with line <line> selected\n"
|
|
|
|
|
" --null-file Create a blank file comparison pane\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Display Options:\n"
|
|
|
|
|
" ( -b | --ignore-space-change ) Ignore changes to white space\n"
|
|
|
|
|
" ( -B | --ignore-blank-lines ) Ignore changes in blank lines\n"
|
|
|
|
|
" ( -E | --ignore-end-of-line ) Ignore end of line differences\n"
|
|
|
|
|
" ( -i | --ignore-case ) Ignore case differences\n"
|
|
|
|
|
" ( -w | --ignore-all-space ) Ignore white space differences"
|
|
|
|
|
msgstr ""
|
|
|
|
|
"Использование:\n"
|
|
|
|
|
" diffuse [ [ОПЦИИ...] [ФАЙЛ...] ]...\n"
|
|
|
|
|
" diffuse ( -h | -? | --help | -v | --version )\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Diffuse является графическим инструментом для слияния и сравнения текстовых\n"
|
|
|
|
|
"файлов. Может сравнить произвольное число файлов в представлении бок о бок,\n"
|
|
|
|
|
"предоставляет пользователям возможность вручную корректировать соответствие\n"
|
|
|
|
|
"строк и редактировать файлы напрямую. Diffuse может также извлекать ревизии\n"
|
2021-11-24 16:41:46 +00:00
|
|
|
|
"файлов из Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion и "
|
|
|
|
|
"SVK\n"
|
2021-11-18 20:37:02 +00:00
|
|
|
|
"репозиториев для их сравнения и слияния.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Параметры Справки:\n"
|
|
|
|
|
" ( -h | -? | --help ) Отобразить информацию по использованию\n"
|
2021-11-24 16:41:46 +00:00
|
|
|
|
" ( -v | --version ) Отобразить номер версии и авторские "
|
|
|
|
|
"права\n"
|
2021-11-18 20:37:02 +00:00
|
|
|
|
"\n"
|
|
|
|
|
"Параметры Конфигурации:\n"
|
|
|
|
|
" --no-rcfile Не читать файлы инициализации\n"
|
|
|
|
|
" --rcfile <file> Определить явный файл ресурса\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Общие Параметры:\n"
|
|
|
|
|
" ( -c | --commit ) <rev> Ревизии файла <rev-1> и <rev>\n"
|
|
|
|
|
" ( -D | --close-if-same ) Закрыть все не имеющие различий вкладки\n"
|
2021-11-24 16:41:46 +00:00
|
|
|
|
" ( -e | --encoding ) <codec> Использовать <codec> для чтения и записи "
|
|
|
|
|
"файлов\n"
|
|
|
|
|
" ( -L | --label ) <label> Отображать <label> ярлык вместо имени "
|
|
|
|
|
"файла\n"
|
|
|
|
|
" ( -m | --modified ) Создавать новую вкладку для каждого "
|
|
|
|
|
"измененного файла\n"
|
2021-11-18 20:37:02 +00:00
|
|
|
|
" ( -r | --revision ) <rev> Файл ревизии <rev>\n"
|
2021-11-24 16:41:46 +00:00
|
|
|
|
" ( -s | --separate ) Создавать новую вкладку для каждого "
|
|
|
|
|
"файла\n"
|
2021-11-18 20:37:02 +00:00
|
|
|
|
" ( -t | --tab ) Запустить новую вкладку\n"
|
|
|
|
|
" ( -V | --vcs ) <vcs-list> Version control system search order\n"
|
|
|
|
|
" --line <line> Начать с выбранной <line> строки\n"
|
|
|
|
|
" --null-file Создать пустое субокно сравнения файла\n"
|
|
|
|
|
"\n"
|
|
|
|
|
"Параметры Отображения:\n"
|
|
|
|
|
" ( -b | --ignore-space-change ) Игнорировать изменения свободного места\n"
|
|
|
|
|
" ( -B | --ignore-blank-lines ) Игнорировать изменения в пустых строках\n"
|
|
|
|
|
" ( -E | --ignore-end-of-line ) Игнорировать различия окончания строк\n"
|
|
|
|
|
" ( -i | --ignore-case ) Игнорировать различия регистра символов\n"
|
|
|
|
|
" ( -w | --ignore-all-space ) Игнорировать различия свободного места"
|
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:1802
|
2020-12-08 18:18:02 +00:00
|
|
|
|
msgid "Error parsing line number."
|
|
|
|
|
msgstr "Ошибка анализа номера строки."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:1812
|
2020-12-08 18:18:02 +00:00
|
|
|
|
#, python-format
|
|
|
|
|
msgid "Skipping unknown argument \"%s\"."
|
|
|
|
|
msgstr "Пропуск неизвестного параметра \"%s\"."
|
2015-11-21 17:57:32 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/main.py:1819
|
2020-12-08 18:18:02 +00:00
|
|
|
|
#, python-format
|
|
|
|
|
msgid "Error processing argument \"%s\". Directory not expected."
|
|
|
|
|
msgstr "Ошибка обработки параметра \"%s\". Каталог не ожидался."
|
2020-06-29 19:05:21 +00:00
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/vcs/cvs.py:51 src/diffuse/vcs/rcs.py:60
|
|
|
|
|
#: src/diffuse/vcs/svn.py:93
|
2021-11-18 20:37:02 +00:00
|
|
|
|
#, python-format
|
|
|
|
|
msgid "Error parsing revision %s."
|
|
|
|
|
msgstr "Ошибка анализа ревизии %s."
|
|
|
|
|
|
2021-11-24 15:57:55 +00:00
|
|
|
|
#: src/diffuse/vcs/vcs_registry.py:231
|
2021-11-18 20:37:02 +00:00
|
|
|
|
#, python-format
|
|
|
|
|
msgid "Error parsing %s."
|
|
|
|
|
msgstr "Ошибка анализа %s."
|