|
|
|
|
|
# KDE3 - kdiff3.pot Russian translation.
|
|
|
|
|
|
# KDE3 - kdeextragear-1/kdiff3.po Russian translation.
|
|
|
|
|
|
# Nick Shaforostoff <shafff@ukr.net>, 2004-2005.
|
|
|
|
|
|
#
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Project-Id-Version: kdiff3\n"
|
|
|
|
|
|
"POT-Creation-Date: 2006-11-05 08:45+0100\n"
|
|
|
|
|
|
"PO-Revision-Date: 2005-02-01 10:56+0200\n"
|
|
|
|
|
|
"Last-Translator: Nick Shaforostoff <shafff@ukr.net>\n"
|
|
|
|
|
|
"Language-Team: <kde-russian@lists.kde.ru>\n"
|
|
|
|
|
|
"MIME-Version: 1.0\n"
|
|
|
|
|
|
"Content-Type: text/plain; charset=UTF-8\n"
|
|
|
|
|
|
"Content-Transfer-Encoding: 8bit\n"
|
|
|
|
|
|
"X-Generator: KBabel 1.9.1\n"
|
|
|
|
|
|
|
|
|
|
|
|
#: _translatorinfo.cpp:1
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"_: NAME OF TRANSLATORS\n"
|
|
|
|
|
|
"Your names"
|
|
|
|
|
|
msgstr "Николай Шафоростов"
|
|
|
|
|
|
|
|
|
|
|
|
#: _translatorinfo.cpp:3
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"_: EMAIL OF TRANSLATORS\n"
|
|
|
|
|
|
"Your emails"
|
|
|
|
|
|
msgstr "linux@l10n.org.ua"
|
|
|
|
|
|
|
|
|
|
|
|
#: diff.cpp:246
|
|
|
|
|
|
msgid "Writing clipboard data to temp file failed."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: diff.cpp:250
|
|
|
|
|
|
msgid "From Clipboard"
|
|
|
|
|
|
msgstr "Из буфера обмена"
|
|
|
|
|
|
|
|
|
|
|
|
#: diff.cpp:491
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Preprocessing possibly failed. Check this command:\n"
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
" %1\n"
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"The preprocessing command will be disabled now."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: diff.cpp:526
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"The line-matching-preprocessing possibly failed. Check this command:\n"
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
" %1\n"
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"The line-matching-preprocessing command will be disabled now."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: diff.cpp:1631 diff.cpp:1645
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Data loss error:\n"
|
|
|
|
|
|
"If it is reproducable please contact the author.\n"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Потеря данных.\n"
|
|
|
|
|
|
|
|
|
|
|
|
#: diff.cpp:1633 diff.cpp:1647
|
|
|
|
|
|
msgid "Severe Internal Error"
|
|
|
|
|
|
msgstr "Внутренняя ошибка"
|
|
|
|
|
|
|
|
|
|
|
|
#: difftextwindow.cpp:1643 kdiff3.cpp:753
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid "Top line"
|
|
|
|
|
|
msgstr "Первая строка %1"
|
|
|
|
|
|
|
|
|
|
|
|
#: difftextwindow.cpp:1653
|
|
|
|
|
|
msgid "End"
|
|
|
|
|
|
msgstr "Конец"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:142
|
|
|
|
|
|
msgid "Mix of links and normal files."
|
|
|
|
|
|
msgstr "Совмещение ссылок и обычных файлов"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:149
|
|
|
|
|
|
msgid "Link: "
|
|
|
|
|
|
msgstr "Ссылка: "
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:157
|
|
|
|
|
|
msgid "Size. "
|
|
|
|
|
|
msgstr "Размер. "
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:170
|
|
|
|
|
|
msgid "Date & Size: "
|
|
|
|
|
|
msgstr "Дата и размер: "
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:179 directorymergewindow.cpp:185
|
|
|
|
|
|
msgid "Creating temp copy of %1 failed."
|
|
|
|
|
|
msgstr "Не удалось создать временную копию %1."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:196 directorymergewindow.cpp:204
|
|
|
|
|
|
msgid "Opening %1 failed."
|
|
|
|
|
|
msgstr "Не удалось открыть %1."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:208
|
|
|
|
|
|
msgid "Comparing file..."
|
|
|
|
|
|
msgstr "Сравнивание файла..."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:218 directorymergewindow.cpp:224
|
|
|
|
|
|
#, c-format
|
|
|
|
|
|
msgid "Error reading from %1"
|
|
|
|
|
|
msgstr "Ошибка чтения из %1"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:282
|
|
|
|
|
|
msgid "Name"
|
|
|
|
|
|
msgstr "Имя"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:286
|
|
|
|
|
|
msgid "Operation"
|
|
|
|
|
|
msgstr "Действие"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:287
|
|
|
|
|
|
msgid "Status"
|
|
|
|
|
|
msgstr "Состояние"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:288
|
|
|
|
|
|
msgid "Unsolved"
|
|
|
|
|
|
msgstr "Неразрешённый"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:289
|
|
|
|
|
|
msgid "Solved"
|
|
|
|
|
|
msgstr "Разрешённый"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:290
|
|
|
|
|
|
msgid "Nonwhite"
|
|
|
|
|
|
msgstr "Чёрный"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:291
|
|
|
|
|
|
msgid "White"
|
|
|
|
|
|
msgstr "Белый"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:319
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"You are currently doing a directory merge. Are you sure, you want to abort the "
|
|
|
|
|
|
"merge and rescan the directory?"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Сейчас программа работает в режиме объединения каталогов. Вы действительно "
|
|
|
|
|
|
"хотите отменить все изменения и обновить содержание каталогов?"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:320 directorymergewindow.cpp:2868
|
|
|
|
|
|
msgid "Rescan"
|
|
|
|
|
|
msgstr "Обновить"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:320 kdiff3.cpp:603 pdiff.cpp:979
|
|
|
|
|
|
msgid "Continue Merging"
|
|
|
|
|
|
msgstr "Продолжить"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:462
|
|
|
|
|
|
msgid "Opening of directories failed:"
|
|
|
|
|
|
msgstr "Не удалось открыть каталоги:"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:465
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Dir A \"%1\" does not exist or is not a directory.\n"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Каталог A \"%1\" не существует.\n"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:468
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Dir B \"%1\" does not exist or is not a directory.\n"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Каталог B \"%1\" не существует.\n"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:471
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Dir C \"%1\" does not exist or is not a directory.\n"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Каталог C \"%1\" не существует.\n"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:473
|
|
|
|
|
|
msgid "Directory Open Error"
|
|
|
|
|
|
msgstr "Ошибка чтения каталога"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:481
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"The destination directory must not be the same as A or B when three directories "
|
|
|
|
|
|
"are merged.\n"
|
|
|
|
|
|
"Check again before continuing."
|
|
|
|
|
|
msgstr "Путь к конечному каталогу не должен совпадать с A или B."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:483
|
|
|
|
|
|
msgid "Parameter Warning"
|
|
|
|
|
|
msgstr "Неправильный параметр"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:488
|
|
|
|
|
|
msgid "Scanning directories..."
|
|
|
|
|
|
msgstr "Сканирование каталогов..."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:537
|
|
|
|
|
|
msgid "Reading Directory A"
|
|
|
|
|
|
msgstr "Чтение каталога A"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:559
|
|
|
|
|
|
msgid "Reading Directory B"
|
|
|
|
|
|
msgstr "Чтение каталога B"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:581
|
|
|
|
|
|
msgid "Reading Directory C"
|
|
|
|
|
|
msgstr "Чтение каталога C"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:607
|
|
|
|
|
|
msgid "Some subdirectories were not readable in"
|
|
|
|
|
|
msgstr "Не удалось почитать некоторые подкаталоги в"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:612
|
|
|
|
|
|
msgid "Check the permissions of the subdirectories."
|
|
|
|
|
|
msgstr "Проверьте права этих каталогов."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:646 kdiff3.cpp:552 kdiff3.cpp:636 kdiff3.cpp:661
|
|
|
|
|
|
#: kdiff3.cpp:934 kdiff3.cpp:955 pdiff.cpp:1059 pdiff.cpp:1131 pdiff.cpp:1169
|
|
|
|
|
|
#: pdiff.cpp:1185 pdiff.cpp:1215 pdiff.cpp:1226
|
|
|
|
|
|
msgid "Ready."
|
|
|
|
|
|
msgstr "Готово."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:660
|
|
|
|
|
|
msgid "Directory Comparison Status"
|
|
|
|
|
|
msgstr "Состояние сравнения каталогов"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:661
|
|
|
|
|
|
msgid "Number of subdirectories:"
|
|
|
|
|
|
msgstr "Количество подкаталогов:"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:662
|
|
|
|
|
|
msgid "Number of equal files:"
|
|
|
|
|
|
msgstr "Количество одинаковых файлов:"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:663
|
|
|
|
|
|
msgid "Number of different files:"
|
|
|
|
|
|
msgstr "Количество разных файлов:"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:666
|
|
|
|
|
|
msgid "Number of manual merges:"
|
|
|
|
|
|
msgstr "Количество объединений вручную:"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:802
|
|
|
|
|
|
msgid "This affects all merge operations."
|
|
|
|
|
|
msgstr "Это влияет на все объединения"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:803
|
|
|
|
|
|
msgid "Changing All Merge Operations"
|
|
|
|
|
|
msgstr "Изменение всех объединений"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:803 mergeresultwindow.cpp:287
|
|
|
|
|
|
msgid "C&ontinue"
|
|
|
|
|
|
msgstr "&Продолжить"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1169
|
|
|
|
|
|
msgid "Processing "
|
|
|
|
|
|
msgstr "Обработка "
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1647 directorymergewindow.cpp:1653
|
|
|
|
|
|
msgid "To do."
|
|
|
|
|
|
msgstr "Осталось сделать."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1756 directorymergewindow.cpp:2899
|
|
|
|
|
|
msgid "Copy A to B"
|
|
|
|
|
|
msgstr "Копировать A в B"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1757 directorymergewindow.cpp:2900
|
|
|
|
|
|
msgid "Copy B to A"
|
|
|
|
|
|
msgstr "Копировать B в A"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1758 directorymergewindow.cpp:2901
|
|
|
|
|
|
msgid "Delete A"
|
|
|
|
|
|
msgstr "Удалить A"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1759 directorymergewindow.cpp:2902
|
|
|
|
|
|
msgid "Delete B"
|
|
|
|
|
|
msgstr "Удалить B"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1760
|
|
|
|
|
|
msgid "Delete A & B"
|
|
|
|
|
|
msgstr "Удалить A и B"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1761 directorymergewindow.cpp:2904
|
|
|
|
|
|
msgid "Merge to A"
|
|
|
|
|
|
msgstr "Объединить в A"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1762 directorymergewindow.cpp:2905
|
|
|
|
|
|
msgid "Merge to B"
|
|
|
|
|
|
msgstr "Объединить в B"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1763
|
|
|
|
|
|
msgid "Merge to A & B"
|
|
|
|
|
|
msgstr "Объединить в A & B"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1767 directorymergewindow.cpp:2896
|
|
|
|
|
|
msgid "Delete (if exists)"
|
|
|
|
|
|
msgstr "Удалить (если существует)"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769
|
|
|
|
|
|
#: directorymergewindow.cpp:2895 optiondialog.cpp:809 smalldialogs.cpp:102
|
|
|
|
|
|
msgid "Merge"
|
|
|
|
|
|
msgstr "Объединить"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1768 directorymergewindow.cpp:1769
|
|
|
|
|
|
msgid "Merge (manual)"
|
|
|
|
|
|
msgstr "Объединить (вручную)"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1770
|
|
|
|
|
|
msgid "Error: Conflicting File Types"
|
|
|
|
|
|
msgstr "Ошибка: Несовместимые типы файлов"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1771
|
|
|
|
|
|
msgid "Error: Dates are equal but files are not."
|
|
|
|
|
|
msgstr "Ошибка: Время совпадает, а содержимое файлов - нет."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824
|
|
|
|
|
|
#: directorymergewindow.cpp:1849
|
|
|
|
|
|
msgid "This operation is currently not possible."
|
|
|
|
|
|
msgstr "Пока невозможно"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1795 directorymergewindow.cpp:1824
|
|
|
|
|
|
#: directorymergewindow.cpp:1849 directorymergewindow.cpp:2106
|
|
|
|
|
|
msgid "Operation Not Possible"
|
|
|
|
|
|
msgstr "Пока невозможно"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1888
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"This should never happen: \n"
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"mergeResultSaved: m_pMFI=0\n"
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"If you know how to reproduce this, please contact the program author."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"mergeResultSaved: m_pMFI=0\n"
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"Если вы знаете в чём причина, сообщите автору."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1888
|
|
|
|
|
|
msgid "Program Error"
|
|
|
|
|
|
msgstr "Ошибка программы"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1899
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"An error occurred while copying.\n"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Ошибка копирования.\n"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1900 directorymergewindow.cpp:2306
|
|
|
|
|
|
msgid "Merge Error"
|
|
|
|
|
|
msgstr "Ошибка объединения"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1905 directorymergewindow.cpp:2311
|
|
|
|
|
|
msgid "Error."
|
|
|
|
|
|
msgstr "Ошибка."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1910 directorymergewindow.cpp:2202
|
|
|
|
|
|
#: directorymergewindow.cpp:2242
|
|
|
|
|
|
msgid "Done."
|
|
|
|
|
|
msgstr "Готово."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1933
|
|
|
|
|
|
msgid "Not saved."
|
|
|
|
|
|
msgstr "Не сохранено."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:1968
|
|
|
|
|
|
msgid "Unknown merge operation. (This must never happen!)"
|
|
|
|
|
|
msgstr "Неизвестное объединение"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2000
|
|
|
|
|
|
msgid "Unknown merge operation."
|
|
|
|
|
|
msgstr "Неизвестное объединение"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2015
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"The merge is about to begin.\n"
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"Choose \"Do it\" if you have read the instructions and know what you are "
|
|
|
|
|
|
"doing.\n"
|
|
|
|
|
|
"Choosing \"Simulate it\" will tell you what would happen.\n"
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"Be aware that this program still has beta status and there is NO WARRANTY "
|
|
|
|
|
|
"whatsoever! Make backups of your vital data!"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Сейчас начнётся объединения.\n"
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"Нажмите \"Выполнить\" после прочтения инструкций.\n"
|
|
|
|
|
|
"Нажмите \"Эмулировать\" чтобы увидеть, что должно произойти.\n"
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"Мы советуем всегда делать резервные копии данных перед объединением!"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2020
|
|
|
|
|
|
msgid "Starting Merge"
|
|
|
|
|
|
msgstr "Начало объединения"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2020
|
|
|
|
|
|
msgid "Do It"
|
|
|
|
|
|
msgstr "Выполнить"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2020
|
|
|
|
|
|
msgid "Simulate It"
|
|
|
|
|
|
msgstr "Эмулировать"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2046
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"The highlighted item has a different type in the different directories. Select "
|
|
|
|
|
|
"what to do."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Выделенный файл имеет разный тип в каждом каталоге. Выберите что делать."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2055
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"The modification dates of the file are equal but the files are not. Select what "
|
|
|
|
|
|
"to do."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Даты последнего изменения файлов одинаковы, о содержимое - нет. Выберите что "
|
|
|
|
|
|
"делать."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2106
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"This operation is currently not possible because directory merge is currently "
|
|
|
|
|
|
"running."
|
|
|
|
|
|
msgstr "Сейчас выполняется объединение каталогов"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2166
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"There was an error in the last step.\n"
|
|
|
|
|
|
"Do you want to continue with the item that caused the error or do you want to "
|
|
|
|
|
|
"skip this item?"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"На текущем этапе произошла ошибка.\n"
|
|
|
|
|
|
"Продолжить или пропустить?"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2168
|
|
|
|
|
|
msgid "Continue merge after an error"
|
|
|
|
|
|
msgstr "Продолжить после ошибки"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2168
|
|
|
|
|
|
msgid "Continue With Last Item"
|
|
|
|
|
|
msgstr "Продолжить"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2168
|
|
|
|
|
|
msgid "Skip Item"
|
|
|
|
|
|
msgstr "Пропустить"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2202
|
|
|
|
|
|
msgid "Skipped."
|
|
|
|
|
|
msgstr "Пропущено."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2209 directorymergewindow.cpp:2435
|
|
|
|
|
|
msgid "In progress..."
|
|
|
|
|
|
msgstr "Идёт работа..."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2257
|
|
|
|
|
|
msgid "Merge operation complete."
|
|
|
|
|
|
msgstr "Объединение завершено."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2257 directorymergewindow.cpp:2260
|
|
|
|
|
|
msgid "Merge Complete"
|
|
|
|
|
|
msgstr "Объединение завершено"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2269
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Simulated merge complete: Check if you agree with the proposed operations."
|
|
|
|
|
|
msgstr "Объединение завершено. Вы согласны с предлагаемыми изменениями?"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2305
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"An error occurred. Press OK to see detailed information.\n"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Произошла ошибка. Нажмите OK для подробностей.\n"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2348
|
|
|
|
|
|
msgid "Error: While deleting %1: Creating backup failed."
|
|
|
|
|
|
msgstr "Не удалось создать резервную копию %1."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2355
|
|
|
|
|
|
msgid "delete directory recursively( %1 )"
|
|
|
|
|
|
msgstr "удалить каталог рекурсивно(%1 )"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2357
|
|
|
|
|
|
msgid "delete( %1 )"
|
|
|
|
|
|
msgstr "удалить( %1 )"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2372
|
|
|
|
|
|
msgid "Error: delete dir operation failed while trying to read the directory."
|
|
|
|
|
|
msgstr "Не удалось удалить каталог"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2391
|
|
|
|
|
|
msgid "Error: rmdir( %1 ) operation failed."
|
|
|
|
|
|
msgstr "Ошибка rmdir( %1 )."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2401
|
|
|
|
|
|
msgid "Error: delete operation failed."
|
|
|
|
|
|
msgstr "Не удалось удалить."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2427
|
|
|
|
|
|
msgid "manual merge( %1, %2, %3 -> %4)"
|
|
|
|
|
|
msgstr "объединение вручную( %1, %2, %3 -> %4)"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2430
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
" Note: After a manual merge the user should continue by pressing F7."
|
|
|
|
|
|
msgstr " После завершения объединения вручную нажмите F7."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2453
|
|
|
|
|
|
msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Не удалось скопировать %1 в %2. Не удалось удалить существующее назначение."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2463
|
|
|
|
|
|
msgid "copyLink( %1 -> %2 )"
|
|
|
|
|
|
msgstr "символическая ссылка( %1 -> %2 )"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2474
|
|
|
|
|
|
msgid "Error: copyLink failed: Remote links are not yet supported."
|
|
|
|
|
|
msgstr "Ошибка: Удалённые ссылки не поддерживаются."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2480
|
|
|
|
|
|
msgid "Error: copyLink failed."
|
|
|
|
|
|
msgstr "Не удалось создать ссылку."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2500
|
|
|
|
|
|
msgid "copy( %1 -> %2 )"
|
|
|
|
|
|
msgstr "копировать( %1 -> %2 )"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2526
|
|
|
|
|
|
msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Не удалось переименовать %1 в%2. Не удалось удалить существующее назначение."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2532
|
|
|
|
|
|
msgid "rename( %1 -> %2 )"
|
|
|
|
|
|
msgstr "переименовать( %1 -> %2 )"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2541
|
|
|
|
|
|
msgid "Error: Rename failed."
|
|
|
|
|
|
msgstr "Не удалось переименовать"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2559
|
|
|
|
|
|
msgid "Error during makeDir of %1. Cannot delete existing file."
|
|
|
|
|
|
msgstr "Не удалось создать каталог %1. Не удалось удалить существующий файл."
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2575
|
|
|
|
|
|
msgid "makeDir( %1 )"
|
|
|
|
|
|
msgstr "создать каталог( %1 )"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2585
|
|
|
|
|
|
msgid "Error while creating directory."
|
|
|
|
|
|
msgstr "Не удалось создать каталог"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2608 directorymergewindow.cpp:2725
|
|
|
|
|
|
msgid "Dest"
|
|
|
|
|
|
msgstr "Назначение"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2612 directorymergewindow.cpp:2650
|
|
|
|
|
|
msgid "Dir"
|
|
|
|
|
|
msgstr "Каталог"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2613
|
|
|
|
|
|
msgid "Type"
|
|
|
|
|
|
msgstr "Тип"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2614
|
|
|
|
|
|
msgid "Size"
|
|
|
|
|
|
msgstr "Размер"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2615
|
|
|
|
|
|
msgid "Attr"
|
|
|
|
|
|
msgstr "Атрибуты"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2616
|
|
|
|
|
|
msgid "Last Modification"
|
|
|
|
|
|
msgstr "Последнее изменение"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2617
|
|
|
|
|
|
msgid "Link-Destination"
|
|
|
|
|
|
msgstr "Объект ссылки"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2667
|
|
|
|
|
|
msgid "not available"
|
|
|
|
|
|
msgstr "не доступно"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2687
|
|
|
|
|
|
msgid "A (Dest): "
|
|
|
|
|
|
msgstr "A (назначение): "
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2690
|
|
|
|
|
|
msgid "A (Base): "
|
|
|
|
|
|
msgstr "A (исходное): "
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2696
|
|
|
|
|
|
msgid "B (Dest): "
|
|
|
|
|
|
msgstr "B (назначение): "
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2704
|
|
|
|
|
|
msgid "C (Dest): "
|
|
|
|
|
|
msgstr "C (назначение): "
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2710
|
|
|
|
|
|
msgid "Dest: "
|
|
|
|
|
|
msgstr "Назначение: "
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2775
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid "Save Directory Merge State As..."
|
|
|
|
|
|
msgstr "Объединение каталогов"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2862
|
|
|
|
|
|
msgid "Start/Continue Directory Merge"
|
|
|
|
|
|
msgstr "Начать/продолжить объединение каталогов"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2863
|
|
|
|
|
|
msgid "Run Operation for Current Item"
|
|
|
|
|
|
msgstr "Выполнить для текущего пункта"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2864
|
|
|
|
|
|
msgid "Compare Selected File"
|
|
|
|
|
|
msgstr "Сравнить выделенный файл"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2865
|
|
|
|
|
|
msgid "Merge Current File"
|
|
|
|
|
|
msgstr "Объединить текущий файл"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2866
|
|
|
|
|
|
msgid "Fold All Subdirs"
|
|
|
|
|
|
msgstr "Включая все подкаталоги"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2867
|
|
|
|
|
|
msgid "Unfold All Subdirs"
|
|
|
|
|
|
msgstr "Исключая все подкаталоги"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2871
|
|
|
|
|
|
msgid "Choose A for All Items"
|
|
|
|
|
|
msgstr "Выбрать A для всех"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2872
|
|
|
|
|
|
msgid "Choose B for All Items"
|
|
|
|
|
|
msgstr "Выбрать B для всех"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2873
|
|
|
|
|
|
msgid "Choose C for All Items"
|
|
|
|
|
|
msgstr "Выбрать C для всех"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2874
|
|
|
|
|
|
msgid "Auto-Choose Operation for All Items"
|
|
|
|
|
|
msgstr "Автоматически выбирать тип действия для всех"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2875
|
|
|
|
|
|
msgid "No Operation for All Items"
|
|
|
|
|
|
msgstr "Убрать действия для всех"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2880
|
|
|
|
|
|
msgid "Show Identical Files"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2881
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid "Show Different Files"
|
|
|
|
|
|
msgstr "Количество разных файлов:"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2882
|
|
|
|
|
|
msgid "Show Files only in A"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2883
|
|
|
|
|
|
msgid "Show Files only in B"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2884
|
|
|
|
|
|
msgid "Show Files only in C"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2888
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid "Compare Explicitly Selected Files"
|
|
|
|
|
|
msgstr "Сравнить выделенный файл"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2889
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid "Merge Explicitly Selected Files"
|
|
|
|
|
|
msgstr "Сравнить выделенный файл"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2891 directorymergewindow.cpp:2898
|
|
|
|
|
|
msgid "Do Nothing"
|
|
|
|
|
|
msgstr "Ничего"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2892
|
|
|
|
|
|
msgid "A"
|
|
|
|
|
|
msgstr "A"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2893
|
|
|
|
|
|
msgid "B"
|
|
|
|
|
|
msgstr "B"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2894
|
|
|
|
|
|
msgid "C"
|
|
|
|
|
|
msgstr "C"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2903
|
|
|
|
|
|
msgid "Delete A && B"
|
|
|
|
|
|
msgstr "Удалить A и B"
|
|
|
|
|
|
|
|
|
|
|
|
#: directorymergewindow.cpp:2906
|
|
|
|
|
|
msgid "Merge to A && B"
|
|
|
|
|
|
msgstr "Объединить в A & B"
|
|
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:595
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"While trying to make a backup, deleting an older backup failed. \n"
|
|
|
|
|
|
"Filename: "
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Не удалось удалить старую резервную копию. \n"
|
|
|
|
|
|
"Файл: "
|
|
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:602
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"While trying to make a backup, renaming failed. \n"
|
|
|
|
|
|
"Filenames: "
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Не удалось выполнить переименование. \n"
|
|
|
|
|
|
"Файлы: "
|
|
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:624
|
|
|
|
|
|
#, c-format
|
|
|
|
|
|
msgid "Getting file status: %1"
|
|
|
|
|
|
msgstr "Получение состояния файла: %1"
|
|
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:667
|
|
|
|
|
|
#, c-format
|
|
|
|
|
|
msgid "Reading file: %1"
|
|
|
|
|
|
msgstr "Чтение файла: %1"
|
|
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:703
|
|
|
|
|
|
#, c-format
|
|
|
|
|
|
msgid "Writing file: %1"
|
|
|
|
|
|
msgstr "Запись в файл: %1"
|
|
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:731
|
|
|
|
|
|
msgid "Out of memory"
|
|
|
|
|
|
msgstr "Вне памяти"
|
|
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:766
|
|
|
|
|
|
#, c-format
|
|
|
|
|
|
msgid "Making directory: %1"
|
|
|
|
|
|
msgstr "Создание каталога: %1"
|
|
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:786
|
|
|
|
|
|
#, c-format
|
|
|
|
|
|
msgid "Removing directory: %1"
|
|
|
|
|
|
msgstr "Удаление каталога: %1"
|
|
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:801
|
|
|
|
|
|
#, c-format
|
|
|
|
|
|
msgid "Removing file: %1"
|
|
|
|
|
|
msgstr "Удаление файла: %1"
|
|
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:817
|
|
|
|
|
|
msgid "Creating symbolic link: %1 -> %2"
|
|
|
|
|
|
msgstr "Создание символической ссылки: %1 -> %2"
|
|
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:843
|
|
|
|
|
|
msgid "Renaming file: %1 -> %2"
|
|
|
|
|
|
msgstr "Переименование файла: %1 -> %2"
|
|
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:879
|
|
|
|
|
|
msgid "Copying file: %1 -> %2"
|
|
|
|
|
|
msgstr "Копирование файла: %1 -> %2"
|
|
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:893
|
|
|
|
|
|
#, c-format
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Error during file copy operation: Opening file for reading failed. Filename: %1"
|
|
|
|
|
|
msgstr "Не удалось открыть для чтения файл %1"
|
|
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:899
|
|
|
|
|
|
#, c-format
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Error during file copy operation: Opening file for writing failed. Filename: %1"
|
|
|
|
|
|
msgstr "Не удалось открыть для записи файл %1"
|
|
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:914
|
|
|
|
|
|
#, c-format
|
|
|
|
|
|
msgid "Error during file copy operation: Reading failed. Filename: %1"
|
|
|
|
|
|
msgstr "Не удалось прочитать файл %1"
|
|
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:923
|
|
|
|
|
|
#, c-format
|
|
|
|
|
|
msgid "Error during file copy operation: Writing failed. Filename: %1"
|
|
|
|
|
|
msgstr "Не удалось записать в файл %1"
|
|
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:1219
|
|
|
|
|
|
msgid "Reading directory: "
|
|
|
|
|
|
msgstr "Чтение каталога: "
|
|
|
|
|
|
|
|
|
|
|
|
#: fileaccess.cpp:1348
|
|
|
|
|
|
#, c-format
|
|
|
|
|
|
msgid "Listing directory: %1"
|
|
|
|
|
|
msgstr "Вывод содержимого каталога: %1"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:142
|
|
|
|
|
|
msgid "Current Configuration:"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:147
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid "Config Option Error:"
|
|
|
|
|
|
msgstr "Ошибка открытия файлов"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:187
|
|
|
|
|
|
msgid "Option --auto used, but no output file specified."
|
|
|
|
|
|
msgstr "Ключ --auto использован, но не указаны выходные файлы."
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:323
|
|
|
|
|
|
msgid "Option --auto ignored for directory comparison."
|
|
|
|
|
|
msgstr "Ключ --auto игнорируется для каталогов"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:359
|
|
|
|
|
|
msgid "Saving failed."
|
|
|
|
|
|
msgstr "Не удалось произвести сохранение."
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:386 pdiff.cpp:1041 pdiff.cpp:1112
|
|
|
|
|
|
msgid "Opening of these files failed:"
|
|
|
|
|
|
msgstr "Не удалось открыть файлы:"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:395
|
|
|
|
|
|
msgid "File Open Error"
|
|
|
|
|
|
msgstr "Ошибка открытия файлов"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:418
|
|
|
|
|
|
msgid "Opens documents for comparison..."
|
|
|
|
|
|
msgstr "Открыть файлы для сравнения..."
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:423
|
|
|
|
|
|
msgid "Saves the merge result. All conflicts must be solved!"
|
|
|
|
|
|
msgstr "Сохранить результат объединения. Все конфликты должны быть разрешены!"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:425
|
|
|
|
|
|
msgid "Saves the current document as..."
|
|
|
|
|
|
msgstr "Сохранить с другим именем..."
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:427
|
|
|
|
|
|
msgid "Print the differences"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:429
|
|
|
|
|
|
msgid "Quits the application"
|
|
|
|
|
|
msgstr "Выйти"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:431
|
|
|
|
|
|
msgid "Cuts the selected section and puts it to the clipboard"
|
|
|
|
|
|
msgstr "Вырезать в буфер обмена"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:433
|
|
|
|
|
|
msgid "Copies the selected section to the clipboard"
|
|
|
|
|
|
msgstr "Скопировать в буфер обмена"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:435
|
|
|
|
|
|
msgid "Pastes the clipboard contents to actual position"
|
|
|
|
|
|
msgstr "Вставить из буфера обмена"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:437
|
|
|
|
|
|
msgid "Select everything in current window"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:439
|
|
|
|
|
|
msgid "Search for a string"
|
|
|
|
|
|
msgstr "Искать текст"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:441
|
|
|
|
|
|
msgid "Search again for the string"
|
|
|
|
|
|
msgstr "Продолжить поиск текста"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:443
|
|
|
|
|
|
msgid "Enables/disables the toolbar"
|
|
|
|
|
|
msgstr "Отобразить/скрыть панель инструментов"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:445
|
|
|
|
|
|
msgid "Enables/disables the statusbar"
|
|
|
|
|
|
msgstr "Отобразить/скрыть панель состояния"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:449
|
|
|
|
|
|
msgid "Configure KDiff3..."
|
|
|
|
|
|
msgstr "Настроить KDiff3..."
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:470
|
|
|
|
|
|
msgid "Go to Current Delta"
|
|
|
|
|
|
msgstr "Перейти к текущему различию"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:471
|
|
|
|
|
|
msgid "Go to First Delta"
|
|
|
|
|
|
msgstr "Перейти к первому различию"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:472
|
|
|
|
|
|
msgid "Go to Last Delta"
|
|
|
|
|
|
msgstr "Перейти к последнему различию"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:473
|
|
|
|
|
|
msgid "(Skips white space differences when \"Show White Space\" is disabled.)"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:474
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"(Does not skip white space differences even when \"Show White Space\" is "
|
|
|
|
|
|
"disabled.)"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:475
|
|
|
|
|
|
msgid "Go to Previous Delta"
|
|
|
|
|
|
msgstr "Перейти к предыдущему различию"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:477
|
|
|
|
|
|
msgid "Go to Next Delta"
|
|
|
|
|
|
msgstr "Перейти к следующему различию"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:479
|
|
|
|
|
|
msgid "Go to Previous Conflict"
|
|
|
|
|
|
msgstr "Перейти к предыдущему конфликту"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:481
|
|
|
|
|
|
msgid "Go to Next Conflict"
|
|
|
|
|
|
msgstr "Перейти к следующему конфликту"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:483
|
|
|
|
|
|
msgid "Go to Previous Unsolved Conflict"
|
|
|
|
|
|
msgstr "Перейти к предыдущему неразрешённому конфликту"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:485
|
|
|
|
|
|
msgid "Go to Next Unsolved Conflict"
|
|
|
|
|
|
msgstr "Перейти к следующему неразрешённому конфликту"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:487
|
|
|
|
|
|
msgid "Select Line(s) From A"
|
|
|
|
|
|
msgstr "Выбрать строки из A"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:488
|
|
|
|
|
|
msgid "Select Line(s) From B"
|
|
|
|
|
|
msgstr "Выбрать строки из B"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:489
|
|
|
|
|
|
msgid "Select Line(s) From C"
|
|
|
|
|
|
msgstr "Выбрать строки из C"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:490
|
|
|
|
|
|
msgid "Automatically Go to Next Unsolved Conflict After Source Selection"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Перейти к следующему неразрешённому конфликту после выделения исходника"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:492
|
|
|
|
|
|
msgid "Show Space && Tabulator Characters for Differences"
|
|
|
|
|
|
msgstr "Отображать пробелы и табуляции в различиях"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:493
|
|
|
|
|
|
msgid "Show White Space"
|
|
|
|
|
|
msgstr "Отображать пустые промежутки"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:495
|
|
|
|
|
|
msgid "Show Line Numbers"
|
|
|
|
|
|
msgstr "Отображать номера строк"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:496
|
|
|
|
|
|
msgid "Choose A Everywhere"
|
|
|
|
|
|
msgstr "Выбрать A везде"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:497
|
|
|
|
|
|
msgid "Choose B Everywhere"
|
|
|
|
|
|
msgstr "Выбрать B везде"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:498
|
|
|
|
|
|
msgid "Choose C Everywhere"
|
|
|
|
|
|
msgstr "Выбрать C везде"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:499
|
|
|
|
|
|
msgid "Choose A for All Unsolved Conflicts"
|
|
|
|
|
|
msgstr "Выбрать A для всех неразрешённых конфликтов"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:500
|
|
|
|
|
|
msgid "Choose B for All Unsolved Conflicts"
|
|
|
|
|
|
msgstr "Выбрать B для всех неразрешённых конфликтов"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:501
|
|
|
|
|
|
msgid "Choose C for All Unsolved Conflicts"
|
|
|
|
|
|
msgstr "Выбрать C для всех неразрешённых конфликтов"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:502
|
|
|
|
|
|
msgid "Choose A for All Unsolved Whitespace Conflicts"
|
|
|
|
|
|
msgstr "Выбрать A для всех неразрешённых конфликтов пустых промежутков"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:503
|
|
|
|
|
|
msgid "Choose B for All Unsolved Whitespace Conflicts"
|
|
|
|
|
|
msgstr "Выбрать B для всех неразрешённых конфликтов пустых промежутков"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:504
|
|
|
|
|
|
msgid "Choose C for All Unsolved Whitespace Conflicts"
|
|
|
|
|
|
msgstr "Выбрать C для всех неразрешённых конфликтов пустых промежутков"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:505
|
|
|
|
|
|
msgid "Automatically Solve Simple Conflicts"
|
|
|
|
|
|
msgstr "Разрешать простые конфликты автоматически"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:506
|
|
|
|
|
|
msgid "Set Deltas to Conflicts"
|
|
|
|
|
|
msgstr "Определить различия как конфликты"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:507
|
|
|
|
|
|
msgid "Run Regular Expression Auto Merge"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:508
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid "Automatically Solve History Conflicts"
|
|
|
|
|
|
msgstr "Разрешать простые конфликты автоматически"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:509
|
|
|
|
|
|
msgid "Split Diff At Selection"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:510
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid "Join Selected Diffs"
|
|
|
|
|
|
msgstr "Сравнить выделенный файл"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:512
|
|
|
|
|
|
msgid "Show Window A"
|
|
|
|
|
|
msgstr "Отобразить окно A"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:513
|
|
|
|
|
|
msgid "Show Window B"
|
|
|
|
|
|
msgstr "Отобразить окно B"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:514
|
|
|
|
|
|
msgid "Show Window C"
|
|
|
|
|
|
msgstr "Отобразить окно C"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:515 kdiff3.cpp:526
|
|
|
|
|
|
msgid "Focus Next Window"
|
|
|
|
|
|
msgstr "Активировать следующее окно"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:517
|
|
|
|
|
|
msgid "Normal Overview"
|
|
|
|
|
|
msgstr "Обычнный обзор "
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:518
|
|
|
|
|
|
msgid "A vs. B Overview"
|
|
|
|
|
|
msgstr "Обзор A vs. B"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:519
|
|
|
|
|
|
msgid "A vs. C Overview"
|
|
|
|
|
|
msgstr "Обзор A vs. C "
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:520
|
|
|
|
|
|
msgid "B vs. C Overview"
|
|
|
|
|
|
msgstr "Обзор B vs. C"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:521
|
|
|
|
|
|
msgid "Word Wrap Diff Windows"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:522
|
|
|
|
|
|
msgid "Add Manual Diff Alignment"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:523
|
|
|
|
|
|
msgid "Clear All Manual Diff Alignments"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:528
|
|
|
|
|
|
msgid "Focus Prev Window"
|
|
|
|
|
|
msgstr "Активировать предыдущее окно"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:529
|
|
|
|
|
|
msgid "Toggle Split Orientation"
|
|
|
|
|
|
msgstr "Поменять ориентация разделения"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:531
|
|
|
|
|
|
msgid "Dir && Text Split Screen View"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:533
|
|
|
|
|
|
msgid "Toggle Between Dir && Text View"
|
|
|
|
|
|
msgstr "Каталоги/текст"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:582 pdiff.cpp:1712
|
|
|
|
|
|
msgid "The merge result hasn't been saved."
|
|
|
|
|
|
msgstr "Результат объединения не сохранён"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:583
|
|
|
|
|
|
msgid "Save && Quit"
|
|
|
|
|
|
msgstr "Сохранить и выйти"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:583
|
|
|
|
|
|
msgid "Quit Without Saving"
|
|
|
|
|
|
msgstr "Выйти без сохранения"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:591 pdiff.cpp:1721
|
|
|
|
|
|
msgid "Saving the merge result failed."
|
|
|
|
|
|
msgstr "Не удалось сохранить результат объединения"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:602 pdiff.cpp:978
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"You are currently doing a directory merge. Are you sure, you want to abort?"
|
|
|
|
|
|
msgstr "Остановить объединение каталогов?"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:625
|
|
|
|
|
|
msgid "Saving file..."
|
|
|
|
|
|
msgstr "Сохранение файла..."
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:642
|
|
|
|
|
|
msgid "Saving file with a new filename..."
|
|
|
|
|
|
msgstr "Сохранение файла с новым именем..."
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:732
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid "Printing..."
|
|
|
|
|
|
msgstr "Выход..."
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:738 kdiff3.cpp:900
|
|
|
|
|
|
msgid "Printing aborted."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:870
|
|
|
|
|
|
msgid "Selection"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:896
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid "Printing completed."
|
|
|
|
|
|
msgstr "Объединение завершено."
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:906
|
|
|
|
|
|
msgid "Exiting..."
|
|
|
|
|
|
msgstr "Выход..."
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:918
|
|
|
|
|
|
msgid "Toggling toolbar..."
|
|
|
|
|
|
msgstr "Отображение/скрытие панели инструментов..."
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3.cpp:939
|
|
|
|
|
|
msgid "Toggle the statusbar..."
|
|
|
|
|
|
msgstr "Отображение/скрытие панели состояния..."
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3_part.cpp:155 kdiff3_part.cpp:224
|
|
|
|
|
|
msgid "Couldn't find files for comparison."
|
|
|
|
|
|
msgstr "Не удалось найти файлы для сравнения."
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3_part.cpp:291
|
|
|
|
|
|
msgid "KDiff3Part"
|
|
|
|
|
|
msgstr "KDiff3Part"
|
|
|
|
|
|
|
|
|
|
|
|
#: kdiff3_shell.cpp:78
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Could not find our part!\n"
|
|
|
|
|
|
"This usually happens due to an installation problem. Please read the "
|
|
|
|
|
|
"README-file in the source package for details."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: main.cpp:35
|
|
|
|
|
|
msgid "Tool for Comparison and Merge of Files and Directories"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: main.cpp:40
|
|
|
|
|
|
msgid "Merge the input."
|
|
|
|
|
|
msgstr "Объединить ввод."
|
|
|
|
|
|
|
|
|
|
|
|
#: main.cpp:42
|
|
|
|
|
|
msgid "Explicit base file. For compatibility with certain tools."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: main.cpp:44
|
|
|
|
|
|
msgid "Output file. Implies -m. E.g.: -o newfile.txt"
|
|
|
|
|
|
msgstr "Выходной файл. Подразумевет наличие также -m. Например: -o newfile.txt"
|
|
|
|
|
|
|
|
|
|
|
|
#: main.cpp:45
|
|
|
|
|
|
msgid "Output file, again. (For compatibility with certain tools.)"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: main.cpp:46
|
|
|
|
|
|
msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Не выводить гафический интерфейс если все конфликты удалось разрешить "
|
|
|
|
|
|
"автоматически. (треубет также ключа -o)"
|
|
|
|
|
|
|
|
|
|
|
|
#: main.cpp:47
|
|
|
|
|
|
msgid "Don't solve conflicts automatically. (For compatibility...)"
|
|
|
|
|
|
msgstr "Не разрешить конфликты автоматически (для совместимости)"
|
|
|
|
|
|
|
|
|
|
|
|
#: main.cpp:48
|
|
|
|
|
|
msgid "Visible name replacement for input file 1 (base)."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: main.cpp:49
|
|
|
|
|
|
msgid "Visible name replacement for input file 2."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: main.cpp:50
|
|
|
|
|
|
msgid "Visible name replacement for input file 3."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: main.cpp:52
|
|
|
|
|
|
msgid "Alternative visible name replacement. Supply this once for every input."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: main.cpp:53
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Override a config setting. Use once for every setting. E.g.: --cs "
|
|
|
|
|
|
"\"AutoAdvance=1\""
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: main.cpp:54
|
|
|
|
|
|
msgid "Show list of config settings and current values."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: main.cpp:55
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid "Use a different config file."
|
|
|
|
|
|
msgstr "Количество разных файлов:"
|
|
|
|
|
|
|
|
|
|
|
|
#: main.cpp:59
|
|
|
|
|
|
msgid "file1 to open (base, if not specified via --base)"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: main.cpp:60
|
|
|
|
|
|
msgid "file2 to open"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: main.cpp:61
|
|
|
|
|
|
msgid "file3 to open"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: main.cpp:93
|
|
|
|
|
|
msgid "Ignored. (User defined.)"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#. i18n: file kdiff3_part.rc line 16
|
|
|
|
|
|
#: main.cpp:173 rc.cpp:9
|
|
|
|
|
|
#, no-c-format
|
|
|
|
|
|
msgid "KDiff3"
|
|
|
|
|
|
msgstr "KDiff3"
|
|
|
|
|
|
|
|
|
|
|
|
#: main.cpp:186
|
|
|
|
|
|
msgid "+ Many thanks to those who reported bugs and contributed ideas!"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Благодарю всех, кто отправлях отчёты об ошибках и предлагал новые идеи!"
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:136 mergeresultwindow.cpp:939
|
|
|
|
|
|
#: mergeresultwindow.cpp:953 mergeresultwindow.cpp:965
|
|
|
|
|
|
#: mergeresultwindow.cpp:977
|
|
|
|
|
|
msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Неразрешённых конфликтов осталось: %1 (%2 из которых - конфликты пустых "
|
|
|
|
|
|
"промежутков)"
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:285
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"The output has been modified.\n"
|
|
|
|
|
|
"If you continue your changes will be lost."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Вывод был изменён.\n"
|
|
|
|
|
|
"Если вы продолжите, изменения будут утеряны."
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:797 pdiff.cpp:511
|
|
|
|
|
|
msgid "All input files are binary equal."
|
|
|
|
|
|
msgstr "Все входные файлы одинаковы бинарно"
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:799
|
|
|
|
|
|
msgid "All input files contain the same text."
|
|
|
|
|
|
msgstr "Все входные файлы содержт одинаковый текст"
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:801
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Files A and B are binary equal.\n"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Файлы A и B бинарно одинаковы.\n"
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:802
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Files A and B have equal text. \n"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Файлы A и B содержат одинаковый текст. \n"
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:803
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Files A and C are binary equal.\n"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Файлы A и C бинарно одинаковы.\n"
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:804
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Files A and C have equal text. \n"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Файлы A и C содержат одинаковый текст. \n"
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:805
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Files B and C are binary equal.\n"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Файлы B и C бинарно одинаковы.\n"
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:806
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Files B and C have equal text. \n"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Файлы B и C содержат одинаковый текст. \n"
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:812
|
|
|
|
|
|
msgid "Total number of conflicts: "
|
|
|
|
|
|
msgstr "Общее количество конфликтов: "
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:813
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"Nr of automatically solved conflicts: "
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"Количество разрешённых автоматически конфликтов: "
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:814
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"Nr of unsolved conflicts: "
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"Количество неразрешённых конфликтов: "
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:816
|
|
|
|
|
|
msgid "Conflicts"
|
|
|
|
|
|
msgstr "Конфликты"
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:1652
|
|
|
|
|
|
msgid "<No src line>"
|
|
|
|
|
|
msgstr "<Нет исходной строки>"
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:1660
|
|
|
|
|
|
msgid "<Merge Conflict (Whitespace only)>"
|
|
|
|
|
|
msgstr "<Конфликт объединения (пустые промежутки)>"
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:1662 mergeresultwindow.cpp:2427
|
|
|
|
|
|
msgid "<Merge Conflict>"
|
|
|
|
|
|
msgstr "<Конфликт объединения>"
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:2635
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Not all conflicts are solved yet.\n"
|
|
|
|
|
|
"File not saved.\n"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Не все конфликты разрешены.\n"
|
|
|
|
|
|
"Файл не сохранён.\n"
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:2637
|
|
|
|
|
|
msgid "Conflicts Left"
|
|
|
|
|
|
msgstr "Осталось конфликтов"
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:2649
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"Creating backup failed. File not saved."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:2649 mergeresultwindow.cpp:2689
|
|
|
|
|
|
msgid "File Save Error"
|
|
|
|
|
|
msgstr "Ошибка сохранения файла"
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:2689
|
|
|
|
|
|
msgid "Error while writing."
|
|
|
|
|
|
msgstr "Ошибка записи"
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:3020
|
|
|
|
|
|
msgid "Output"
|
|
|
|
|
|
msgstr "Вывод"
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:3032 mergeresultwindow.cpp:3139
|
|
|
|
|
|
msgid "[Modified]"
|
|
|
|
|
|
msgstr "[Изменён]"
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:3039
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid "Encoding for saving"
|
|
|
|
|
|
msgstr "Кодировка файла C:"
|
|
|
|
|
|
|
|
|
|
|
|
#: mergeresultwindow.cpp:3075 mergeresultwindow.cpp:3081
|
|
|
|
|
|
#: mergeresultwindow.cpp:3087
|
|
|
|
|
|
msgid "Codec from"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:362
|
|
|
|
|
|
msgid "Unicode, 8 bit"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:363
|
|
|
|
|
|
msgid "Unicode"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:364
|
|
|
|
|
|
msgid "Latin1"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:383
|
|
|
|
|
|
msgid "Change this if non-ASCII characters are not displayed correctly."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:510
|
|
|
|
|
|
msgid "Editor & Diff Output Font"
|
|
|
|
|
|
msgstr "Шрифт редактора и вывода различий"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:531
|
|
|
|
|
|
msgid "Italic font for deltas"
|
|
|
|
|
|
msgstr "Различия курсивом"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:534
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Selects the italic version of the font for differences.\n"
|
|
|
|
|
|
"If the font doesn't support italic characters, then this does nothing."
|
|
|
|
|
|
msgstr "Если шрифт не содержит курсива, этот параметр не работает."
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:542
|
|
|
|
|
|
msgid "Color"
|
|
|
|
|
|
msgstr "Цвет"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:542
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid "Colors Settings"
|
|
|
|
|
|
msgstr "Региональные настройки"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:556
|
|
|
|
|
|
msgid "Editor and Diff Views:"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:564
|
|
|
|
|
|
msgid "Foreground color:"
|
|
|
|
|
|
msgstr "Цвет текста:"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:570
|
|
|
|
|
|
msgid "Background color:"
|
|
|
|
|
|
msgstr "Цвет фона:"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:578
|
|
|
|
|
|
msgid "Diff background color:"
|
|
|
|
|
|
msgstr "Цвет фона различий:"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:585
|
|
|
|
|
|
msgid "Color A:"
|
|
|
|
|
|
msgstr "Цвет A:"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:592
|
|
|
|
|
|
msgid "Color B:"
|
|
|
|
|
|
msgstr "Цвет B:"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:599
|
|
|
|
|
|
msgid "Color C:"
|
|
|
|
|
|
msgstr "Цвет C:"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:605
|
|
|
|
|
|
msgid "Conflict color:"
|
|
|
|
|
|
msgstr "Цвет конфликтов:"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:612
|
|
|
|
|
|
msgid "Current range background color:"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:619
|
|
|
|
|
|
msgid "Current range diff background color:"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:625
|
|
|
|
|
|
msgid "Color for manually aligned difference ranges:"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:630
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid "Directory Comparison View:"
|
|
|
|
|
|
msgstr "Состояние сравнения каталогов"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:636
|
|
|
|
|
|
msgid "Newest file color:"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:639
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Changing this color will only be effective when starting the next directory "
|
|
|
|
|
|
"comparison."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:644
|
|
|
|
|
|
msgid "Oldest file color:"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:651
|
|
|
|
|
|
msgid "Middle age file color:"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:658
|
|
|
|
|
|
msgid "Color for missing files:"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:670
|
|
|
|
|
|
msgid "Editor"
|
|
|
|
|
|
msgstr "Редактор"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:670
|
|
|
|
|
|
msgid "Editor Behavior"
|
|
|
|
|
|
msgstr "Поведение редактора"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:680
|
|
|
|
|
|
msgid "Tab inserts spaces"
|
|
|
|
|
|
msgstr "Заменять табуляцию пробелами"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:683
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"On: Pressing tab generates the appropriate number of spaces.\n"
|
|
|
|
|
|
"Off: A Tab-character will be inserted."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:689
|
|
|
|
|
|
msgid "Tab size:"
|
|
|
|
|
|
msgstr "Табуляция:"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:694
|
|
|
|
|
|
msgid "Auto indentation"
|
|
|
|
|
|
msgstr "Проставлять отступы автоматически"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:697
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"On: The indentation of the previous line is used for a new line.\n"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:701
|
|
|
|
|
|
msgid "Auto copy selection"
|
|
|
|
|
|
msgstr "Копировать выделение в буфер обмена автоматически"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:704
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"On: Any selection is immediately written to the clipboard.\n"
|
|
|
|
|
|
"Off: You must explicitely copy e.g. via Ctrl-C."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:709
|
|
|
|
|
|
msgid "Line end style:"
|
|
|
|
|
|
msgstr "Конец строки:"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:721
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Sets the line endings for when an edited file is saved.\n"
|
|
|
|
|
|
"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:732
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid "Diff"
|
|
|
|
|
|
msgstr "KDiff3"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:732
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid "Diff Settings"
|
|
|
|
|
|
msgstr "Настройки сравнения и объединения"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:743
|
|
|
|
|
|
msgid "Preserve carriage return"
|
|
|
|
|
|
msgstr "Отображать символ перевода каретки"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:746
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Show carriage return characters '\\r' if they exist.\n"
|
|
|
|
|
|
"Helps to compare files that were modified under different operating systems."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:751
|
|
|
|
|
|
msgid "Ignore numbers"
|
|
|
|
|
|
msgstr "Пропускать цифры"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:754
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Ignore number characters during line matching phase. (Similar to Ignore white "
|
|
|
|
|
|
"space.)\n"
|
|
|
|
|
|
"Might help to compare files with numeric data."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:759
|
|
|
|
|
|
msgid "Ignore C/C++ comments"
|
|
|
|
|
|
msgstr "Пропускать комментарии C/C++"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:761
|
|
|
|
|
|
msgid "Treat C/C++ comments like white space."
|
|
|
|
|
|
msgstr "Обрабатывать комментарии C/C++ как пробелы."
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:765
|
|
|
|
|
|
msgid "Ignore case"
|
|
|
|
|
|
msgstr "Без учёта регистра"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:768
|
|
|
|
|
|
msgid "Treat case differences like white space changes. ('a'<=>'A')"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:772
|
|
|
|
|
|
msgid "Preprocessor command:"
|
|
|
|
|
|
msgstr "Предварительная команда:"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:776
|
|
|
|
|
|
msgid "User defined pre-processing. (See the docs for details.)"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Предварительная обработка, определяемая пользователем (для подробностей см. "
|
|
|
|
|
|
"документацию)."
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:779
|
|
|
|
|
|
msgid "Line-matching preprocessor command:"
|
|
|
|
|
|
msgstr "Предварительная команда для сравнения строк:"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:783
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"This pre-processor is only used during line matching.\n"
|
|
|
|
|
|
"(See the docs for details.)"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:786
|
|
|
|
|
|
msgid "Try hard (slower)"
|
|
|
|
|
|
msgstr "Задействовать все алгоритмы (медленно)"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:789
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Enables the --minimal option for the external diff.\n"
|
|
|
|
|
|
"The analysis of big files will be much slower."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:794
|
|
|
|
|
|
msgid "Auto advance delay (ms):"
|
|
|
|
|
|
msgstr "Задержка перед переходом, мс:"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:799
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"When in Auto-Advance mode the result of the current selection is shown \n"
|
|
|
|
|
|
"for the specified time, before jumping to the next conflict. Range: 0-2000 ms"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Показывать результат текущего выбора на некоторое время, а затем переходить к "
|
|
|
|
|
|
"следующему конфликту. Диапазон: 0..2000 мс"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:809
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid "Merge Settings"
|
|
|
|
|
|
msgstr "Настройки сравнения и объединения"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:822
|
|
|
|
|
|
msgid "White space 2-file merge default:"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:826 optiondialog.cpp:839
|
|
|
|
|
|
msgid "Manual Choice"
|
|
|
|
|
|
msgstr "Выбор вручную"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:830 optiondialog.cpp:844
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Allow the merge algorithm to automatically select an input for white-space-only "
|
|
|
|
|
|
"changes."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:835
|
|
|
|
|
|
msgid "White space 3-file merge default:"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:849
|
|
|
|
|
|
msgid "Automatic Merge Regular Expression"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:858 smalldialogs.cpp:397
|
|
|
|
|
|
msgid "Auto merge regular expression:"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:862
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Regular expression for lines where KDiff3 should automatically choose one "
|
|
|
|
|
|
"source.\n"
|
|
|
|
|
|
"When a line with a conflict matches the regular expression then\n"
|
|
|
|
|
|
"- if available - C, otherwise B will be chosen."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:868
|
|
|
|
|
|
msgid "Run regular expression auto merge on merge start"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:870
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Run the merge for auto merge regular expressions\n"
|
|
|
|
|
|
"immediately when a merge starts.\n"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:875
|
|
|
|
|
|
msgid "Version Control History Merging"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:884 smalldialogs.cpp:424
|
|
|
|
|
|
msgid "History start regular expression:"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:888
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Regular expression for the start of the version control history entry.\n"
|
|
|
|
|
|
"Usually this line contains the \"$Log$\"-keyword.\n"
|
|
|
|
|
|
"Default value: \".*\\$Log.*\\$.*\""
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:894 smalldialogs.cpp:453
|
|
|
|
|
|
msgid "History entry start regular expression:"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:906
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"A version control history entry consists of several lines.\n"
|
|
|
|
|
|
"Specify the regular expression to detect the first line (without the leading "
|
|
|
|
|
|
"comment).\n"
|
|
|
|
|
|
"Use parentheses to group the keys you want to use for sorting.\n"
|
|
|
|
|
|
"If left empty, then KDiff3 assumes that empty lines separate history entries.\n"
|
|
|
|
|
|
"See the documentation for details."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:914
|
|
|
|
|
|
msgid "History merge sorting"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:916
|
|
|
|
|
|
msgid "Sort version control history by a key."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:926
|
|
|
|
|
|
msgid "History entry start sort key order:"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:930
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Each parentheses used in the regular expression for the history start entry\n"
|
|
|
|
|
|
"groups a key that can be used for sorting.\n"
|
|
|
|
|
|
"Specify the list of keys (that are numbered in order of occurrence\n"
|
|
|
|
|
|
"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n"
|
|
|
|
|
|
"If left empty, then no sorting will be done.\n"
|
|
|
|
|
|
"See the documentation for details."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:941
|
|
|
|
|
|
msgid "Merge version control history on merge start"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:943
|
|
|
|
|
|
msgid "Run version control history automerge on merge start."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:947
|
|
|
|
|
|
msgid "Test your regular expressions"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:952
|
|
|
|
|
|
msgid "Irrelevant merge command:"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:956
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"If specified this script is run after automerge\n"
|
|
|
|
|
|
"when no other relevant changes were detected.\n"
|
|
|
|
|
|
"Called with the parameters: filename1 filename2 filename3"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:966
|
|
|
|
|
|
msgid "Directory Merge"
|
|
|
|
|
|
msgstr "Объединение каталогов"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:975
|
|
|
|
|
|
msgid "Recursive directories"
|
|
|
|
|
|
msgstr "Рекурсия"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:977
|
|
|
|
|
|
msgid "Whether to analyze subdirectories or not."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:979
|
|
|
|
|
|
msgid "File pattern(s):"
|
|
|
|
|
|
msgstr "Маски файлов:"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:984
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Pattern(s) of files to be analyzed. \n"
|
|
|
|
|
|
"Wildcards: '*' and '?'\n"
|
|
|
|
|
|
"Several Patterns can be specified by using the separator: ';'"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:990
|
|
|
|
|
|
msgid "File-anti-pattern(s):"
|
|
|
|
|
|
msgstr "Пропускать файлы по маске:"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:995
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Pattern(s) of files to be excluded from analysis. \n"
|
|
|
|
|
|
"Wildcards: '*' and '?'\n"
|
|
|
|
|
|
"Several Patterns can be specified by using the separator: ';'"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1001
|
|
|
|
|
|
msgid "Dir-anti-pattern(s):"
|
|
|
|
|
|
msgstr "Пропускать каталоги по маске:"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1006
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Pattern(s) of directories to be excluded from analysis. \n"
|
|
|
|
|
|
"Wildcards: '*' and '?'\n"
|
|
|
|
|
|
"Several Patterns can be specified by using the separator: ';'"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1012
|
|
|
|
|
|
msgid "Use .cvsignore"
|
|
|
|
|
|
msgstr "Использовать .cvsignore"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1015
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Extends the antipattern to anything that would be ignored by CVS.\n"
|
|
|
|
|
|
"Via local \".cvsignore\"-files this can be directory specific."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1020
|
|
|
|
|
|
msgid "Find hidden files and directories"
|
|
|
|
|
|
msgstr "Учитывать скрытые файлы и каталоги"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1023
|
|
|
|
|
|
msgid "Finds files and directories with the hidden attribute."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1025
|
|
|
|
|
|
msgid "Finds files and directories starting with '.'."
|
|
|
|
|
|
msgstr "Учитывать файлы и каталоги, начинающиеся с '.'."
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1029
|
|
|
|
|
|
msgid "Follow file links"
|
|
|
|
|
|
msgstr "Следовать по ссылкам на файлы"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1032
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"On: Compare the file the link points to.\n"
|
|
|
|
|
|
"Off: Compare the links."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1037
|
|
|
|
|
|
msgid "Follow directory links"
|
|
|
|
|
|
msgstr "Следовать по ссылкам на каталоги"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1040
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"On: Compare the directory the link points to.\n"
|
|
|
|
|
|
"Off: Compare the links."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1056
|
|
|
|
|
|
msgid "Case sensitive filename comparison"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1059
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"The directory comparison will compare files or directories when their names "
|
|
|
|
|
|
"match.\n"
|
|
|
|
|
|
"Set this option if the case of the names must match. (Default for Windows is "
|
|
|
|
|
|
"off, otherwise on.)"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1063
|
|
|
|
|
|
msgid "File Comparison Mode"
|
|
|
|
|
|
msgstr "Режим сравнивания файлов"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1067
|
|
|
|
|
|
msgid "Binary comparison"
|
|
|
|
|
|
msgstr "Бинарное сравнение"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1068
|
|
|
|
|
|
msgid "Binary comparison of each file. (Default)"
|
|
|
|
|
|
msgstr "Бинарное сравнение каждого файла (по умолчанию)"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1070
|
|
|
|
|
|
msgid "Full analysis"
|
|
|
|
|
|
msgstr "Полный анализ"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1071
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Do a full analysis and show statistics information in extra columns.\n"
|
|
|
|
|
|
"(Slower than a binary comparison, much slower for binary files.)"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1074
|
|
|
|
|
|
msgid "Trust the modification date (unsafe)"
|
|
|
|
|
|
msgstr "Сравнивать по дате изменения (неточно)"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1075
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Assume that files are equal if the modification date and file length are "
|
|
|
|
|
|
"equal.\n"
|
|
|
|
|
|
"Useful for big directories or slow networks."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Считать файлы одинаковыми, если время изменения и размер совпадают.\n"
|
|
|
|
|
|
"Полезно для больших каталогов или медленных сетей."
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1078
|
|
|
|
|
|
msgid "Trust the size (unsafe)"
|
|
|
|
|
|
msgstr "Сравнивать по размеру (неточно)"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1079
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Assume that files are equal if their file lengths are equal.\n"
|
|
|
|
|
|
"Useful for big directories or slow networks when the date is modified during "
|
|
|
|
|
|
"download."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1083
|
|
|
|
|
|
msgid "Synchronize directories"
|
|
|
|
|
|
msgstr "Синхронизировать каталоги"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1086
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Offers to store files in both directories so that\n"
|
|
|
|
|
|
"both directories are the same afterwards.\n"
|
|
|
|
|
|
"Works only when comparing two directories without specifying a destination."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1092
|
|
|
|
|
|
msgid "White space differences considered equal"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1095
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"If files differ only by white space consider them equal.\n"
|
|
|
|
|
|
"This is only active when full analysis is chosen."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1101
|
|
|
|
|
|
msgid "Copy newer instead of merging (unsafe)"
|
|
|
|
|
|
msgstr "Принимать сразу новые файлы вместо объединения (небезопасно)"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1104
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Don't look inside, just take the newer file.\n"
|
|
|
|
|
|
"(Use this only if you know what you are doing!)\n"
|
|
|
|
|
|
"Only effective when comparing two directories."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1109
|
|
|
|
|
|
msgid "Backup files (.orig)"
|
|
|
|
|
|
msgstr "Сохранить резервные копии (.orig)"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1112
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"When a file would be saved over an old file, then the old file\n"
|
|
|
|
|
|
"will be renamed with a '.orig'-extension instead of being deleted."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1176
|
|
|
|
|
|
msgid "Regional Settings"
|
|
|
|
|
|
msgstr "Региональные настройки"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1272
|
|
|
|
|
|
msgid "Language (restart required)"
|
|
|
|
|
|
msgstr "Язык (требуется перезапуск)"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1304
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Choose the language of the GUI-strings or \"Auto\".\n"
|
|
|
|
|
|
"For a change of language to take place, quit and restart KDiff3."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1322
|
|
|
|
|
|
msgid "Use the same encoding for everything:"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1325
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Enable this allows to change all encodings by changing the first only.\n"
|
|
|
|
|
|
"Disable this if different individual settings are needed."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1330
|
|
|
|
|
|
msgid "Note: Local Encoding is "
|
|
|
|
|
|
msgstr "Кодировку локали - "
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1334
|
|
|
|
|
|
msgid "File Encoding for A:"
|
|
|
|
|
|
msgstr "Кодировка файла A:"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1340
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n"
|
|
|
|
|
|
"If the file encoding is not detected then the selected encoding will be used as "
|
|
|
|
|
|
"fallback.\n"
|
|
|
|
|
|
"(Unicode detection depends on the first bytes of a file - the byte order mark "
|
|
|
|
|
|
"\"BOM\".)"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1344 optiondialog.cpp:1353 optiondialog.cpp:1362
|
|
|
|
|
|
msgid "Auto Detect Unicode"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1349
|
|
|
|
|
|
msgid "File Encoding for B:"
|
|
|
|
|
|
msgstr "Кодировка файла B:"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1358
|
|
|
|
|
|
msgid "File Encoding for C:"
|
|
|
|
|
|
msgstr "Кодировка файла C:"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1367
|
|
|
|
|
|
msgid "File Encoding for Merge Output and Saving:"
|
|
|
|
|
|
msgstr "Кодировка для объединения и сохранения:"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1371
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid "Auto Select"
|
|
|
|
|
|
msgstr "Копировать выделение в буфер обмена автоматически"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1374
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"If enabled then the encoding from the input files is used.\n"
|
|
|
|
|
|
"In ambiguous cases a dialog will ask the user to choose the encoding for "
|
|
|
|
|
|
"saving."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1378
|
|
|
|
|
|
msgid "File Encoding for Preprocessor Files:"
|
|
|
|
|
|
msgstr "Кодировка препроцессора:"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1389
|
|
|
|
|
|
msgid "Right To Left Language"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1392
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Some languages are read from right to left.\n"
|
|
|
|
|
|
"This setting will change the viewer and editor accordingly."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1402
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid "Integration"
|
|
|
|
|
|
msgstr "Действие"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1402
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid "Integration Settings"
|
|
|
|
|
|
msgstr "Региональные настройки"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1412
|
|
|
|
|
|
msgid "Command line options to ignore:"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1417
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"List of command line options that should be ignored when KDiff3 is used by "
|
|
|
|
|
|
"other tools.\n"
|
|
|
|
|
|
"Several values can be specified if separated via ';'\n"
|
|
|
|
|
|
"This will suppress the \"Unknown option\"-error."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1480
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"You selected a variable width font.\n"
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"Because this program doesn't handle variable width fonts\n"
|
|
|
|
|
|
"correctly, you might experience problems while editing.\n"
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"Do you want to continue or do you want to select another font."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1484
|
|
|
|
|
|
msgid "Incompatible Font"
|
|
|
|
|
|
msgstr "Несовместимый шрифт"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1485
|
|
|
|
|
|
msgid "Continue at Own Risk"
|
|
|
|
|
|
msgstr "Продолжить"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1485
|
|
|
|
|
|
msgid "Select Another Font"
|
|
|
|
|
|
msgstr "Выбрать другой шрифт"
|
|
|
|
|
|
|
|
|
|
|
|
#: optiondialog.cpp:1521
|
|
|
|
|
|
msgid "This resets all options. Not only those of the current topic."
|
|
|
|
|
|
msgstr "Это сбросит абсолютно все параметры, а не только текущей вкладки."
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:258
|
|
|
|
|
|
msgid "PreprocessorCmd: "
|
|
|
|
|
|
msgstr "Предварительная команда:"
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:263
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"The following option(s) you selected might change data:\n"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:264
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"\n"
|
|
|
|
|
|
"Most likely this is not wanted during a merge.\n"
|
|
|
|
|
|
"Do you want to disable these settings or continue with these settings active?"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:266
|
|
|
|
|
|
msgid "Option Unsafe for Merging"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:267
|
|
|
|
|
|
msgid "Use These Options During Merge"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:267
|
|
|
|
|
|
msgid "Disable Unsafe Options"
|
|
|
|
|
|
msgstr "Отключить небезопасные"
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:297
|
|
|
|
|
|
msgid "Loading A"
|
|
|
|
|
|
msgstr "Загрузка A"
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:301
|
|
|
|
|
|
msgid "Loading B"
|
|
|
|
|
|
msgstr "Загрузка B"
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:318 pdiff.cpp:344
|
|
|
|
|
|
msgid "Diff: A <-> B"
|
|
|
|
|
|
msgstr "Различие: A <-> B"
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:324 pdiff.cpp:366
|
|
|
|
|
|
msgid "Linediff: A <-> B"
|
|
|
|
|
|
msgstr "Построчное сравнение: A <-> B"
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:335
|
|
|
|
|
|
msgid "Loading C"
|
|
|
|
|
|
msgstr "Загрузка C"
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:347
|
|
|
|
|
|
msgid "Diff: B <-> C"
|
|
|
|
|
|
msgstr "Различие: B <-> C"
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:350
|
|
|
|
|
|
msgid "Diff: A <-> C"
|
|
|
|
|
|
msgstr "Различие: A <-> C"
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:369
|
|
|
|
|
|
msgid "Linediff: B <-> C"
|
|
|
|
|
|
msgstr "Построчное сравнение: B <-> C"
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:372
|
|
|
|
|
|
msgid "Linediff: A <-> C"
|
|
|
|
|
|
msgstr "Построчное сравнение: A <-> C"
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:513
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid "All input files contain the same text, but are not binary equal."
|
|
|
|
|
|
msgstr "Все входные файлы содержт одинаковый текст"
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:515 pdiff.cpp:517 pdiff.cpp:519
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Files %1 and %2 are binary equal.\n"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Файлы B и C бинарно одинаковы.\n"
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:516 pdiff.cpp:518 pdiff.cpp:520
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Files %1 and %2 have equal text, but are not binary equal. \n"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
"Файлы A и B бинарно одинаковы.\n"
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:530
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Some inputfiles don't seem to be pure textfiles.\n"
|
|
|
|
|
|
"Note that the KDiff3-merge was not meant for binary data.\n"
|
|
|
|
|
|
"Continue at your own risk."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:979
|
|
|
|
|
|
msgid "Abort"
|
|
|
|
|
|
msgstr "Стоп"
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:985 pdiff.cpp:1073
|
|
|
|
|
|
msgid "Opening files..."
|
|
|
|
|
|
msgstr "Открытие файлов..."
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:1050 pdiff.cpp:1121
|
|
|
|
|
|
msgid "File open error"
|
|
|
|
|
|
msgstr "Ошибка открытия файла"
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:1153
|
|
|
|
|
|
msgid "Cutting selection..."
|
|
|
|
|
|
msgstr "Вырезание в буфер обмена..."
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:1174
|
|
|
|
|
|
msgid "Copying selection to clipboard..."
|
|
|
|
|
|
msgstr "Копирование в буфер обмена..."
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:1190
|
|
|
|
|
|
msgid "Inserting clipboard contents..."
|
|
|
|
|
|
msgstr "Вставка из буфера обмена..."
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:1713
|
|
|
|
|
|
msgid "Save && Continue"
|
|
|
|
|
|
msgstr "Сохранить и продолжить"
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:1713
|
|
|
|
|
|
msgid "Continue Without Saving"
|
|
|
|
|
|
msgstr "Продолжить без сохранения"
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:1920
|
|
|
|
|
|
msgid "Search complete."
|
|
|
|
|
|
msgstr "Поиск завершён."
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:1920
|
|
|
|
|
|
msgid "Search Complete"
|
|
|
|
|
|
msgstr "Поиск завершён"
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:2144
|
|
|
|
|
|
msgid "Nothing is selected in either diff input window."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: pdiff.cpp:2144
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid "Error while adding manual diff range"
|
|
|
|
|
|
msgstr "Не удалось создать каталог"
|
|
|
|
|
|
|
|
|
|
|
|
#. i18n: file kdiff3_part.rc line 4
|
|
|
|
|
|
#: rc.cpp:3
|
|
|
|
|
|
#, no-c-format
|
|
|
|
|
|
msgid "&KDiff3"
|
|
|
|
|
|
msgstr "&KDiff3"
|
|
|
|
|
|
|
|
|
|
|
|
#. i18n: file kdiff3_part.rc line 13
|
|
|
|
|
|
#: rc.cpp:6
|
|
|
|
|
|
#, no-c-format
|
|
|
|
|
|
msgid "Configure KDiff3"
|
|
|
|
|
|
msgstr "Настроить KDiff3"
|
|
|
|
|
|
|
|
|
|
|
|
#. i18n: file kdiff3_shell.rc line 7
|
|
|
|
|
|
#: rc.cpp:15
|
|
|
|
|
|
#, no-c-format
|
|
|
|
|
|
msgid "&Directory"
|
|
|
|
|
|
msgstr "&Каталог"
|
|
|
|
|
|
|
|
|
|
|
|
#. i18n: file kdiff3_shell.rc line 30
|
|
|
|
|
|
#: rc.cpp:18
|
|
|
|
|
|
#, no-c-format
|
|
|
|
|
|
msgid "Current Item Merge Operation"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#. i18n: file kdiff3_shell.rc line 38
|
|
|
|
|
|
#: rc.cpp:21
|
|
|
|
|
|
#, no-c-format
|
|
|
|
|
|
msgid "Current Item Sync Operation"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#. i18n: file kdiff3_shell.rc line 50
|
|
|
|
|
|
#: rc.cpp:24
|
|
|
|
|
|
#, no-c-format
|
|
|
|
|
|
msgid "&Movement"
|
|
|
|
|
|
msgstr "&Перемещение"
|
|
|
|
|
|
|
|
|
|
|
|
#. i18n: file kdiff3_shell.rc line 61
|
|
|
|
|
|
#: rc.cpp:27
|
|
|
|
|
|
#, no-c-format
|
|
|
|
|
|
msgid "D&iffview"
|
|
|
|
|
|
msgstr "D&iff"
|
|
|
|
|
|
|
|
|
|
|
|
#. i18n: file kdiff3_shell.rc line 73
|
|
|
|
|
|
#: rc.cpp:30
|
|
|
|
|
|
#, no-c-format
|
|
|
|
|
|
msgid "&Merge"
|
|
|
|
|
|
msgstr "&Объединение"
|
|
|
|
|
|
|
|
|
|
|
|
#. i18n: file kdiff3_shell.rc line 95
|
|
|
|
|
|
#: rc.cpp:33
|
|
|
|
|
|
#, no-c-format
|
|
|
|
|
|
msgid "&Window"
|
|
|
|
|
|
msgstr "&Окно"
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:53
|
|
|
|
|
|
msgid "A (Base):"
|
|
|
|
|
|
msgstr "A (исходное):"
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:59 smalldialogs.cpp:75 smalldialogs.cpp:91
|
|
|
|
|
|
#: smalldialogs.cpp:134
|
|
|
|
|
|
msgid "File..."
|
|
|
|
|
|
msgstr "Файл..."
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:61 smalldialogs.cpp:77 smalldialogs.cpp:93
|
|
|
|
|
|
#: smalldialogs.cpp:136
|
|
|
|
|
|
msgid "Dir..."
|
|
|
|
|
|
msgstr "Каталог..."
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:86
|
|
|
|
|
|
msgid "C (Optional):"
|
|
|
|
|
|
msgstr "С (необязательно):"
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:108
|
|
|
|
|
|
msgid "Swap/Copy Names ..."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:114 smalldialogs.cpp:115 smalldialogs.cpp:116
|
|
|
|
|
|
msgid "Swap %1<->%2"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:117 smalldialogs.cpp:118 smalldialogs.cpp:119
|
|
|
|
|
|
msgid "Copy %1->Output"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:120 smalldialogs.cpp:121 smalldialogs.cpp:122
|
|
|
|
|
|
msgid "Swap %1<->Output"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:129
|
|
|
|
|
|
msgid "Output (optional):"
|
|
|
|
|
|
msgstr "Вывод (необязательно):"
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:158
|
|
|
|
|
|
msgid "Configure..."
|
|
|
|
|
|
msgstr "Настроить..."
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:347
|
|
|
|
|
|
msgid "Search text:"
|
|
|
|
|
|
msgstr "Найти:"
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:354
|
|
|
|
|
|
msgid "Case sensitive"
|
|
|
|
|
|
msgstr "С учётом регистра"
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:357
|
|
|
|
|
|
msgid "Search A"
|
|
|
|
|
|
msgstr "Поиск в A"
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:362
|
|
|
|
|
|
msgid "Search B"
|
|
|
|
|
|
msgstr "Поиск в B"
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:367
|
|
|
|
|
|
msgid "Search C"
|
|
|
|
|
|
msgstr "Поиск в C"
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:372
|
|
|
|
|
|
msgid "Search output"
|
|
|
|
|
|
msgstr "Поиск в выводе"
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:377
|
|
|
|
|
|
msgid "&Search"
|
|
|
|
|
|
msgstr "&Искать"
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:394
|
|
|
|
|
|
msgid "Regular Expression Tester"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:405
|
|
|
|
|
|
msgid "Example auto merge line:"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:407
|
|
|
|
|
|
msgid "For auto merge test copy a line as used in your files."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:413 smalldialogs.cpp:442 smalldialogs.cpp:479
|
|
|
|
|
|
msgid "Match result:"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:432
|
|
|
|
|
|
msgid "Example history start line (with leading comment):"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:435
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Copy a history start line as used in your files,\n"
|
|
|
|
|
|
"including the leading comment."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:461
|
|
|
|
|
|
msgid "History sort key order:"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:469
|
|
|
|
|
|
msgid "Example history entry start line (without leading comment):"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:471
|
|
|
|
|
|
msgid ""
|
|
|
|
|
|
"Copy a history entry start line as used in your files,\n"
|
|
|
|
|
|
"but omit the leading comment."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:486
|
|
|
|
|
|
msgid "Sort key result:"
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:537 smalldialogs.cpp:547 smalldialogs.cpp:568
|
|
|
|
|
|
msgid "Match success."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:541 smalldialogs.cpp:551 smalldialogs.cpp:574
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
msgid "Match failed."
|
|
|
|
|
|
msgstr "Не удалось произвести сохранение."
|
|
|
|
|
|
|
|
|
|
|
|
#: smalldialogs.cpp:559
|
|
|
|
|
|
msgid "Opening and closing parentheses don't match in regular expression."
|
|
|
|
|
|
msgstr ""
|
|
|
|
|
|
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
#~ msgid "Diff and Merge"
|
|
|
|
|
|
#~ msgstr "Сравнить и объединить"
|
|
|
|
|
|
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
#~ msgid "Save Directory Merge State ..."
|
|
|
|
|
|
#~ msgstr "Объединение каталогов"
|
|
|
|
|
|
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
#~ msgid "Load Directory Merge State ..."
|
|
|
|
|
|
#~ msgstr "Объединение каталогов"
|
|
|
|
|
|
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
#~ msgid "Synchronize Directories"
|
|
|
|
|
|
#~ msgstr "Синхронизировать каталоги"
|
|
|
|
|
|
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
#~ msgid "Copy Newer Files Instead of Merging"
|
|
|
|
|
|
#~ msgstr "Принимать сразу новые файлы вместо объединения (небезопасно)"
|
|
|
|
|
|
|
|
|
|
|
|
#~ msgid "List only deltas"
|
|
|
|
|
|
#~ msgstr "Только различия"
|
|
|
|
|
|
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
#~ msgid "no selection"
|
|
|
|
|
|
#~ msgstr "Копировать выделение в буфер обмена автоматически"
|
|
|
|
|
|
|
|
|
|
|
|
#, fuzzy
|
|
|
|
|
|
#~ msgid "Manually match lines"
|
|
|
|
|
|
#~ msgstr "Выбор вручную"
|
|
|
|
|
|
|
|
|
|
|
|
#~ msgid "Has no effect. For compatibility with certain tools."
|
|
|
|
|
|
#~ msgstr "Для совместимости с некоторыми средствами."
|
|
|
|
|
|
|
|
|
|
|
|
#~ msgid "For compatibility with certain tools."
|
|
|
|
|
|
#~ msgstr "Для совместимости с некоторыми средствами."
|
|
|
|
|
|
|
|
|
|
|
|
#~ msgid "Colors in Editor & Diff Output"
|
|
|
|
|
|
#~ msgstr "Цвета редактора и вывода различий"
|
