--- a/i18n/eric6_ru.ts Fri Jun 23 18:46:40 2017 +0200
+++ b/i18n/eric6_ru.ts Sat Jun 24 12:15:03 2017 +0200
@@ -4311,32 +4311,32 @@
<translation>Выполнить сравнение двух файлов</translation>
</message>
<message>
- <location filename="../UI/CompareDialog.py" line="358"/>
+ <location filename="../UI/CompareDialog.py" line="369"/>
<source>Total: {0}</source>
<translation>Всего: {0}</translation>
</message>
<message>
- <location filename="../UI/CompareDialog.py" line="360"/>
+ <location filename="../UI/CompareDialog.py" line="371"/>
<source>Changed: {0}</source>
<translation>Изменено: {0}</translation>
</message>
<message>
- <location filename="../UI/CompareDialog.py" line="361"/>
+ <location filename="../UI/CompareDialog.py" line="372"/>
<source>Added: {0}</source>
<translation>Добавлено: {0}</translation>
</message>
<message>
- <location filename="../UI/CompareDialog.py" line="362"/>
+ <location filename="../UI/CompareDialog.py" line="373"/>
<source>Deleted: {0}</source>
<translation>Удалено: {0}</translation>
</message>
<message>
- <location filename="../UI/CompareDialog.py" line="253"/>
+ <location filename="../UI/CompareDialog.py" line="262"/>
<source>Compare Files</source>
<translation>Сравнить файлы</translation>
</message>
<message>
- <location filename="../UI/CompareDialog.py" line="253"/>
+ <location filename="../UI/CompareDialog.py" line="262"/>
<source><p>The file <b>{0}</b> could not be read.</p></source>
<translation><p>Невозможно прочитать файл: <b>{0}</b></p></translation>
</message>
@@ -4387,297 +4387,302 @@
<translation>CORBA</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="144"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="147"/>
<source>Email</source>
<translation>Email</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="147"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="150"/>
<source>Graphics</source>
<translation>Графика</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="153"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="156"/>
<source>Icons</source>
<translation>Пиктограммы</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="437"/>
- <source>Network</source>
- <translation>Сеть</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="172"/>
- <source>Plugin Manager</source>
- <translation>Менеджер плагинов</translation>
- </message>
- <message>
<location filename="../Preferences/ConfigurationDialog.py" line="440"/>
+ <source>Network</source>
+ <translation>Сеть</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="175"/>
+ <source>Plugin Manager</source>
+ <translation>Менеджер плагинов</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="443"/>
<source>Printer</source>
<translation>Печать</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="211"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="214"/>
<source>Python</source>
<translation>Python</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="182"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="185"/>
<source>Qt</source>
<translation>Qt</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="188"/>
- <source>Shell</source>
- <translation>Оболочка</translation>
- </message>
- <message>
<location filename="../Preferences/ConfigurationDialog.py" line="191"/>
- <source>Tasks</source>
- <translation>Задачи</translation>
+ <source>Shell</source>
+ <translation>Оболочка</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationDialog.py" line="194"/>
+ <source>Tasks</source>
+ <translation>Задачи</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="197"/>
<source>Templates</source>
<translation>Шаблоны</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="200"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="203"/>
<source>Version Control Systems</source>
<translation>Системы контроля версий</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="205"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="208"/>
<source>Debugger</source>
<translation>Отладка</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
- <source>General</source>
- <translation>Основные параметры</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="214"/>
- <source>Python3</source>
- <translation>Python3</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="218"/>
- <source>Editor</source>
- <translation>Редактор</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
- <source>APIs</source>
- <translation>APIs</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
- <source>Autocompletion</source>
- <translation>Автодополнение</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="235"/>
- <source>QScintilla</source>
- <translation>QScintilla</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="232"/>
- <source>Calltips</source>
- <translation>Подсказки</translation>
- </message>
- <message>
<location filename="../Preferences/ConfigurationDialog.py" line="241"/>
+ <source>General</source>
+ <translation>Основные параметры</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="217"/>
+ <source>Python3</source>
+ <translation>Python3</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="221"/>
+ <source>Editor</source>
+ <translation>Редактор</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="224"/>
+ <source>APIs</source>
+ <translation>APIs</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="227"/>
+ <source>Autocompletion</source>
+ <translation>Автодополнение</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="238"/>
+ <source>QScintilla</source>
+ <translation>QScintilla</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="235"/>
+ <source>Calltips</source>
+ <translation>Подсказки</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="244"/>
<source>Filehandling</source>
<translation>Работа с файлами</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="245"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="248"/>
<source>Searching</source>
<translation>Поиск</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="468"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="471"/>
<source>Spell checking</source>
<translation>Проверка орфографии</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="252"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
<source>Style</source>
<translation>Стиль</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
- <source>Typing</source>
- <translation>Набор текста</translation>
- </message>
- <message>
<location filename="../Preferences/ConfigurationDialog.py" line="261"/>
+ <source>Typing</source>
+ <translation>Набор текста</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="264"/>
<source>Exporters</source>
<translation>Экспортёры</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="265"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="268"/>
<source>Highlighters</source>
<translation>Подсветка синтаксиса</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="269"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="272"/>
<source>Filetype Associations</source>
<translation>Ассоциации типа файлов</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="273"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="276"/>
<source>Styles</source>
<translation>Стили</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="277"/>
- <source>Keywords</source>
- <translation>Ключевые слова</translation>
- </message>
- <message>
<location filename="../Preferences/ConfigurationDialog.py" line="280"/>
+ <source>Keywords</source>
+ <translation>Ключевые слова</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="283"/>
<source>Properties</source>
<translation>Свойства</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="289"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="292"/>
<source>Help</source>
<translation>Справка</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="452"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="455"/>
<source>Appearance</source>
<translation>Стили</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="447"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="450"/>
<source>Help Documentation</source>
<translation>Справочная документация</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="296"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="299"/>
<source>Help Viewers</source>
<translation>Просмотр справки</translation>
</message>
<message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="310"/>
+ <source>Project</source>
+ <translation>Проект</translation>
+ </message>
+ <message>
<location filename="../Preferences/ConfigurationDialog.py" line="307"/>
- <source>Project</source>
- <translation>Проект</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="304"/>
<source>Project Viewer</source>
<translation>Просмотр проектов</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="310"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="313"/>
<source>Multiproject</source>
<translation>Мультипроект</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="434"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="437"/>
<source>Interface</source>
<translation>Интерфейс</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="321"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="324"/>
<source>Viewmanager</source>
<translation>Менеджер видов</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="636"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="639"/>
<source>Preferences</source>
<translation>Предпочтения</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="641"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="644"/>
<source>Please select an entry of the list
to display the configuration page.</source>
<translation>Выберите элемент в списке слева,
чтобы отобразить страницу настройки.</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="714"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="717"/>
<source>Configuration Page Error</source>
<translation>Ошибка страницы конфигурации</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="714"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="717"/>
<source><p>The configuration page <b>{0}</b> could not be loaded.</p></source>
<translation><p>Страница конфигурации <b>{0}</b> не может быть загружена.</p></translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="484"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="487"/>
<source>Tray Starter</source>
<translation>Tray Starter</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="463"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="466"/>
<source>VirusTotal Interface</source>
<translation>Интерфейс VirusTotal</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="443"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="446"/>
<source>Security</source>
<translation>Безопасность</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="168"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="171"/>
<source>Notifications</source>
<translation>Уведомления</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="156"/>
- <source>IRC</source>
- <translation>IRC</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="255"/>
- <source>Code Checkers</source>
- <translation>Проверка кода</translation>
- </message>
- <message>
- <location filename="../Preferences/ConfigurationDialog.py" line="455"/>
- <source>eric6 Web Browser</source>
- <translation>Eric6 Web браузер</translation>
- </message>
- <message>
<location filename="../Preferences/ConfigurationDialog.py" line="159"/>
- <source>Log-Viewer</source>
- <translation>Просмотр журнала</translation>
+ <source>IRC</source>
+ <translation>IRC</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="258"/>
+ <source>Code Checkers</source>
+ <translation>Проверка кода</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="458"/>
+ <source>eric6 Web Browser</source>
+ <translation>Eric6 Web браузер</translation>
</message>
<message>
<location filename="../Preferences/ConfigurationDialog.py" line="162"/>
+ <source>Log-Viewer</source>
+ <translation>Просмотр журнала</translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="165"/>
<source>Mimetypes</source>
<translation>Mimetypes</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="574"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="577"/>
<source>Enter search text...</source>
<translation>Введите искомый текст...</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="284"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="287"/>
<source>Mouse Click Handlers</source>
<translation>Обработка кликов мышки</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="459"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="462"/>
<source>Flash Cookie Manager</source>
<translation>Менеджер флэш-куки</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="497"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="500"/>
<source>Hex Editor</source>
<translation>Hex-редактор</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationDialog.py" line="354"/>
+ <location filename="../Preferences/ConfigurationDialog.py" line="357"/>
<source>Web Browser</source>
<translation>Web браузер</translation>
</message>
+ <message>
+ <location filename="../Preferences/ConfigurationDialog.py" line="144"/>
+ <source>Diff</source>
+ <translation type="unfinished">Diff</translation>
+ </message>
</context>
<context>
<name>Connection</name>
@@ -7067,6 +7072,114 @@
</message>
</context>
<context>
+ <name>DiffColoursPage</name>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="17"/>
+ <source><b>Configure Diff colours</b></source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="39"/>
+ <source>Select the background colour for header lines</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="42"/>
+ <source>Header Colour</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="52"/>
+ <source>Header Line</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="65"/>
+ <source>Select the background colour for bad whitespace</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="68"/>
+ <source>Whitespace Colour</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="88"/>
+ <source>Select the text foreground colour</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="91"/>
+ <source>Text Colour</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="101"/>
+ <source>Normal Text</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="114"/>
+ <source>Select the background colour for additions</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="117"/>
+ <source>Added Colour</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="127"/>
+ <source>Added Text</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="140"/>
+ <source>Select the background colour for removed text</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="143"/>
+ <source>Removed Colour</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="153"/>
+ <source>Removed Text</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="166"/>
+ <source>Select the background colour for replaced text</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="169"/>
+ <source>Replaced Colour</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="179"/>
+ <source>Replaced Text</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="192"/>
+ <source>Select the background colour for context lines</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="195"/>
+ <source>Context Colour</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Preferences/ConfigurationPages/DiffColoursPage.ui" line="205"/>
+ <source>Context Line</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>DiffDialog</name>
<message>
<location filename="../UI/DiffDialog.ui" line="14"/>
@@ -7174,7 +7287,7 @@
<translation><p>Невозможно прочитать файл: <b>{0}</b></p></translation>
</message>
<message>
- <location filename="../UI/DiffDialog.py" line="447"/>
+ <location filename="../UI/DiffDialog.py" line="448"/>
<source>There is no difference.</source>
<translation>Различий нет.</translation>
</message>
@@ -23724,52 +23837,52 @@
<translation>Ошибки</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/>
<source>Process Generation Error</source>
<translation>Ошибка при запуске процесса</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="106"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="107"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="126"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="127"/>
<source>There is no difference.</source>
<translation>Различий нет.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/>
<source>Save Diff</source>
<translation>Сохранить различия</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="221"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="222"/>
<source>Patch Files (*.diff)</source>
<translation>Файлы патчей (*.diff)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="238"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="239"/>
<source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation><p>Файл патч <b>{0}</b> уже существует. Переписать?</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="254"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="255"/>
<source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source>
<translation><p>Невозможно сохранить патч в файл <b>{0}</b>:<br>Причина: {1}.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="97"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="98"/>
<source>Patch Contents</source>
<translation>Содержание патча</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="145"/>
- <source><Start></source>
- <translation><Начало></translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="146"/>
+ <source><Start></source>
+ <translation><Начало></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="147"/>
<source><End></source>
<translation><Конец></translation>
</message>
@@ -25187,37 +25300,37 @@
<translation>Различия</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2584"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2585"/>
<source>Differences to Parent {0}</source>
<translation>Различия с предком {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2600"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2601"/>
<source>Diff to Parent {0}{1}</source>
<translation>Различия с предком {0}{1}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2625"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2626"/>
<source>There is no difference.</source>
<translation>Различий нет.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
<source>Save Diff</source>
<translation>Сохранить различия</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2735"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2736"/>
<source>Patch Files (*.diff)</source>
<translation>Файлы патчей (*.diff)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2752"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2753"/>
<source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation><p>Патч файл <b>{0}</b> уже существует. Переписать?</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2768"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2769"/>
<source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source>
<translation><p>Невозможно сохранить патч в файл <b>{0}</b>:<br>Причина: {1}.</p></translation>
</message>
@@ -40040,27 +40153,27 @@
<context>
<name>Preferences</name>
<message>
- <location filename="../Preferences/__init__.py" line="1552"/>
+ <location filename="../Preferences/__init__.py" line="1563"/>
<source>Export Preferences</source>
<translation>Экспорт предпочтений</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1580"/>
+ <location filename="../Preferences/__init__.py" line="1591"/>
<source>Import Preferences</source>
<translation>Импорт предпочтений</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1580"/>
+ <location filename="../Preferences/__init__.py" line="1591"/>
<source>Properties File (*.ini);;All Files (*)</source>
<translation>Файлы свойств (*.ini);;Все файлы (*)</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1682"/>
+ <location filename="../Preferences/__init__.py" line="1693"/>
<source>Select Python{0} Interpreter</source>
<translation>Задайте интерпретатор Python{0}</translation>
</message>
<message>
- <location filename="../Preferences/__init__.py" line="1682"/>
+ <location filename="../Preferences/__init__.py" line="1693"/>
<source>Select the Python{0} interpreter to be used:</source>
<translation>Задайте интерпретатор Python{0}:</translation>
</message>
@@ -54283,7 +54396,7 @@
<context>
<name>SvnDiffDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/>
<source>Subversion Diff</source>
<translation>Subversion: Отображение различий</translation>
</message>
@@ -54343,59 +54456,59 @@
<translation>Alt+P</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="192"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/>
<source>Process Generation Error</source>
<translation>Ошибка при запуске процесса</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="192"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="193"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="212"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="213"/>
<source>There is no difference.</source>
<translation>Различий нет.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="405"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/>
<source>Save Diff</source>
<translation>Сохранить различия</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="372"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="373"/>
<source>Patch Files (*.diff)</source>
<translation>Файлы патчей (*.diff)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="389"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="390"/>
<source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation><p>Файл патч <b>{0}</b> уже существует. Переписать?</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="405"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="406"/>
<source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source>
<translation><p>Невозможно сохранить патч-файл <b>{0}</b>:<br>Причина: {1}.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="172"/>
<source>There is no temporary directory available.</source>
<translation>Недоступна временная директория.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="214"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="215"/>
<source>Processing file '{0}'...
</source>
<translation>Обработка файла '{0}'...
</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="225"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="226"/>
<source><Start></source>
<translation><Начало></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="226"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="227"/>
<source><End></source>
<translation><Конец></translation>
</message>
