--- a/i18n/eric5_ru.ts Tue Sep 13 18:39:41 2011 +0200
+++ b/i18n/eric5_ru.ts Tue Sep 13 19:41:54 2011 +0200
@@ -13660,42 +13660,42 @@
<translation>Разрешить плагины</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="329"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="346"/>
<source>Browser Cache</source>
<translation>Кэш просмотрщика</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="335"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="352"/>
<source>Enable disk cache</source>
<translation>Запретить кэш на диске</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="381"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="398"/>
<source>Cache size:</source>
<translation>Размер кэша:</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="388"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="405"/>
<source>Enter the maximum size of the disk cache</source>
<translation>Максимальный размер кэша на диске</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="394"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="411"/>
<source> MB</source>
<translation>MB</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="462"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="479"/>
<source>Printing</source>
<translation>Печать</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="468"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="485"/>
<source>Select to print background colours and images</source>
<translation>Печатать фон и изображения</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="471"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="488"/>
<source>Print background colours and images</source>
<translation>Печатать фон и изображения</translation>
</message>
@@ -13755,52 +13755,52 @@
<translation>По умолчанию</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="265"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="282"/>
<source>History</source>
<translation>История</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="271"/>
- <source>Remove history items:</source>
- <translation>Удалить историю:</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="284"/>
- <source>Select the period for expiration of history entries</source>
- <translation>Задайте срок хранения для истории</translation>
- </message>
- <message>
<location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="288"/>
+ <source>Remove history items:</source>
+ <translation>Удалить историю:</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="301"/>
+ <source>Select the period for expiration of history entries</source>
+ <translation>Задайте срок хранения для истории</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="305"/>
<source>After one day</source>
<translation>Через день</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="293"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="310"/>
<source>After one week</source>
<translation>Через неделю</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="298"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="315"/>
<source>After two weeks</source>
<translation>Через две недели</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="303"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="320"/>
<source>After one month</source>
<translation>Через месяц</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="308"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="325"/>
<source>After one year</source>
<translation>Через год</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="313"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="330"/>
<source>Manually</source>
<translation>Вручную</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="318"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="335"/>
<source>On application exit</source>
<translation>При выходе из приложения</translation>
</message>
@@ -13850,37 +13850,37 @@
<translation type="obsolete">Использовать прелзагрузку DNS для улучшения загрузки страниц</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="342"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="359"/>
<source>Policy</source>
<translation>Правила</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="348"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="365"/>
<source>Select to prefer the network</source>
<translation>Предпочитать сеть</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="351"/>
- <source>Keep cache in sync</source>
- <translation>Держать кэш синхронизированным</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="358"/>
- <source>Select to prefer cached data</source>
- <translation>Предпочитать данные из кэша</translation>
- </message>
- <message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="361"/>
- <source>Use cache whenever possible</source>
- <translation>По возможности использовать данные из кэша</translation>
- </message>
- <message>
<location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="368"/>
+ <source>Keep cache in sync</source>
+ <translation>Держать кэш синхронизированным</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="375"/>
+ <source>Select to prefer cached data</source>
+ <translation>Предпочитать данные из кэша</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="378"/>
+ <source>Use cache whenever possible</source>
+ <translation>По возможности использовать данные из кэша</translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="385"/>
<source>Select to use cached data only</source>
<translation>Использовать данные только из кэша</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="371"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="388"/>
<source>Offline browsing mode</source>
<translation>Offline режим</translation>
</message>
@@ -13905,20 +13905,30 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="423"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="440"/>
<source>Web Search</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="429"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="446"/>
<source>Language:</source>
<translation type="unfinished">Язык:</translation>
</message>
<message>
- <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="436"/>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="453"/>
<source>Select the language to be used for web searches</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="269"/>
+ <source>Select to enabled the "Do Not Track" feature</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Preferences/ConfigurationPages/HelpWebBrowserPage.ui" line="272"/>
+ <source>Tell web sites I do not want to be tracked</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HelpWebPage</name>
@@ -15502,42 +15512,42 @@
<context>
<name>Hg</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="244"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="245"/>
<source>The hg process finished with the exit code {0}</source>
<translation>Процесс hg завершился с кодом возврата {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="247"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="248"/>
<source>The hg process did not finish within 30s.</source>
<translation>Процесс hg не завершился в течение 30 секунд.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="249"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="250"/>
<source>Could not start the hg executable.</source>
<translation>Невозможно запустить исполняемый файл hg.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/>
<source>Create project repository</source>
<translation>Создать репозиторий проекта</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="276"/>
<source>The project repository could not be created.</source>
<translation>Не могу создать репозиторий проекта.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="304"/>
<source>Creating Mercurial repository</source>
<translation>Создание репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="318"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="319"/>
<source>Initial commit to Mercurial repository</source>
<translation>Первичная подача в репозиторий</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="364"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="365"/>
<source>Cloning project from a Mercurial repository</source>
<translation>Создание копии репозитория</translation>
</message>
@@ -15547,32 +15557,32 @@
<translation type="obsolete">Подача изменений в репозиторий</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="519"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="520"/>
<source>Synchronizing with the Mercurial repository</source>
<translation>Синхронизация с репозиторием</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="571"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="572"/>
<source>Adding files/directories to the Mercurial repository</source>
<translation>Добавление файлов/каталогов в репозиторий</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="635"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="636"/>
<source>Removing files/directories from the Mercurial repository</source>
<translation>Удаление файлов/каталогов из репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="699"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="700"/>
<source>Renaming {0}</source>
<translation>Переименование {0}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="911"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="912"/>
<source>Merging</source>
<translation>Слияние</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1340"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1341"/>
<source>Copying {0}</source>
<translation>Копирование {0}</translation>
</message>
@@ -15587,190 +15597,195 @@
<translation type="obsolete">Задайте количество элементов для отображения.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1585"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1586"/>
<source>Pulling from a remote Mercurial repository</source>
<translation>Загрузка изменений из удалённого репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1638"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1639"/>
<source>Pushing to a remote Mercurial repository</source>
<translation>Загрузка изменений в удалённый репозиторий</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1757"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1758"/>
<source>Resolving files/directories</source>
<translation>Разрешение конфликтов</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="828"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="829"/>
<source>Taging in the Mercurial repository</source>
<translation>Создание меток в репозитории</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="861"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="862"/>
<source>Reverting changes</source>
<translation>Отмена изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1150"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1151"/>
<source>Mercurial command</source>
<translation>Mercurial команда</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779"/>
<source>Create Branch</source>
<translation>Создать ветвь</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1778"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1779"/>
<source>Enter branch name</source>
<translation>Введите имя ветви</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1789"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1790"/>
<source>Creating branch in the Mercurial repository</source>
<translation>Создание ветвив репозитории</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1870"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1871"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation>Проверка целостности репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1895"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/>
<source>Showing the combined configuration settings</source>
<translation>Показ комбинированных настроек</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1918"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1919"/>
<source>Showing aliases for remote repositories</source>
<translation>Алиасы для удалённых репозиториев</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1941"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1942"/>
<source>Recovering from interrupted transaction</source>
<translation>Восстановление после прерванной транзакции</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2179"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/>
<source>Shall the working directory be updated?</source>
<translation>Обновить рабочий каталог?</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1813"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1814"/>
<source>Showing current branch</source>
<translation>Текущая ветвь</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2088"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2089"/>
<source>Create changegroup</source>
<translation>Создать группу изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2191"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2192"/>
<source>Apply changegroups</source>
<translation>Применить группу изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2208"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2209"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation>Неправильная подкоманда ({0}) для Bisect.</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2242"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/>
<source>Mercurial Bisect ({0})</source>
<translation>Mercurial Bisect ({0})</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2141"/>
<source>Preview changegroup</source>
<translation>Предпросмотр группы изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1964"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1965"/>
<source>Identifying project directory</source>
<translation>Каталог проекта</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/>
<source>Create .hgignore file</source>
<translation>Создать файл .hgignore</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1996"/>
<source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source>
<translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2274"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2275"/>
<source>Removing files from the Mercurial repository only</source>
<translation>Удаление файлов только из репозитория</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2046"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2047"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation>Mercurial файлы изменений (*.hg)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2173"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2174"/>
<source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
<translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2151"/>
<source>Identifying changegroup file</source>
<translation>Файлы изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2331"/>
<source>Backing out changeset</source>
<translation>Отмена изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2310"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2311"/>
<source>No revision given. Aborting...</source>
<translation>Не задана ревизия. Отмена...</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2063"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2064"/>
<source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation><p>Файл группы изменений<b>{0}</b> уже существует. Переписать?</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2355"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2356"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2350"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2351"/>
<source>Are you sure you want to rollback the last transaction?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="467"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="468"/>
<source>Committing changes to Mercurial repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/>
<source>Mercurial Command Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2448"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/>
<source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2561"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/>
<source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2422"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2423"/>
<source>Import Patch</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="2470"/>
+ <source>Export Patches</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgAnnotateDialog</name>
@@ -16845,6 +16860,82 @@
</message>
</context>
<context>
+ <name>HgExportDialog</name>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py" line="73"/>
+ <source>Export Patches</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="25"/>
+ <source>Export Directory:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="35"/>
+ <source>Press to select the export directory via a directory selection dialog</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="45"/>
+ <source>File Name Pattern:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="52"/>
+ <source>Enter the file name pattern for the export files</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="55"/>
+ <source><b>File Name Pattern</b>
+<p>Enter the file name pattern to be used to generate the export files
+here. Valid recognized patterns are:</p>
+<table>
+<tr><td>%%</td><td>literal "%" character</td></tr>
+<tr><td>%H</td><td>changeset hash (40 hexadecimal digits)</td></tr>
+<tr><td>%N</td><td>number of patches being generated</td></tr>
+<tr><td>%R</td><td>changeset revision number</td></tr>
+<tr><td>%b</td><td>basename of the exporting repository</td></tr>
+<tr><td>%h</td><td>short-form changeset hash (12 hexadecimal digits)</td></tr>
+<tr><td>%n</td><td>zero-padded sequence number, starting at 1</td></tr>
+<tr><td>%r</td><td>zero-padded changeset revision number</td></tr>
+</table>
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="75"/>
+ <source>Changesets:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="82"/>
+ <source>Enter changesets by number, id, range or revset expression one per line</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="100"/>
+ <source>Compare Against Second Parent</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="110"/>
+ <source>Treat all Files as Text</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="117"/>
+ <source>Omit Dates</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="124"/>
+ <source>Use Git extended Diff-Format</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
<name>HgFetchDialog</name>
<message>
<location filename="Plugins/VcsPlugins/vcsMercurial/FetchExtension/HgFetchDialog.ui" line="14"/>
@@ -18803,7 +18894,7 @@
<translation><b>Восстановить</b><p>Восстановить после прерванной транзакции.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="849"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="862"/>
<source>Repository Administration</source>
<translation>Администрирование репозитория</translation>
</message>
@@ -18838,7 +18929,7 @@
<translation>Создать файл коллекции изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1197"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1211"/>
<source>Apply changegroups</source>
<translation>Применить группу изменений</translation>
</message>
@@ -18853,7 +18944,7 @@
<translation>Применить файл(ы) группы изменений</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="879"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/>
<source>Changegroup Management</source>
<translation>Менеджмент группы изменений</translation>
</message>
@@ -18943,7 +19034,7 @@
<translation><b>Сбросить</b><p>Сбросить данные двоичного поиска.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="906"/>
<source>Bisect</source>
<translation>Двоичный поиск</translation>
</message>
@@ -19048,7 +19139,7 @@
<translation><b>Послать изменения (принудительно)</b><p>Послать изменения в удалённый репозиторий (принудительно).</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="885"/>
<source>Specials</source>
<translation>Специфический</translation>
</message>
@@ -19073,12 +19164,12 @@
<translation><b>Запустить сервер для репозитория проекта</b><p>Запустить сервер для репозитория проекта.</p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1035"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1049"/>
<source>Pull</source>
<translation>Загрузить</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/>
<source>The project should be reread. Do this now?</source>
<translation>Необходимо перезагрузить проект. Сделать это?</translation>
</message>
@@ -19113,7 +19204,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="914"/>
<source>Extensions</source>
<translation type="unfinished"></translation>
</message>
@@ -19193,7 +19284,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1252"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1266"/>
<source>Import Patch</source>
<translation type="unfinished"></translation>
</message>
@@ -19213,15 +19304,35 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="900"/>
<source>Patch Management</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1265"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1285"/>
<source>Revert Changes</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/>
+ <source>Export Patches</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="839"/>
+ <source>Export Patches...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="842"/>
+ <source>Export revisions to patch files</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="845"/>
+ <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgPurgeListDialog</name>
@@ -25251,52 +25362,52 @@
<context>
<name>NetworkAccessManager</name>
<message>
- <location filename="Helpviewer/Network/NetworkAccessManager.py" line="170"/>
+ <location filename="Helpviewer/Network/NetworkAccessManager.py" line="176"/>
<source><b>Enter username and password for '{0}'</b></source>
<translation><b>Введите имя пользователя и пароль для '{0}'</b></translation>
</message>
<message>
- <location filename="Helpviewer/Network/NetworkAccessManager.py" line="173"/>
+ <location filename="Helpviewer/Network/NetworkAccessManager.py" line="179"/>
<source><b>Enter username and password for '{0}', realm '{1}'</b></source>
<translation><b>Введите имя пользователя и пароль для '{0}'; realm '{1}'</b></translation>
</message>
<message>
- <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/>
+ <location filename="Helpviewer/Network/NetworkAccessManager.py" line="233"/>
<source>SSL Errors</source>
<translation>Ошибки SSL</translation>
</message>
<message>
- <location filename="Helpviewer/Network/NetworkAccessManager.py" line="227"/>
+ <location filename="Helpviewer/Network/NetworkAccessManager.py" line="233"/>
<source><p>SSL Errors for <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Do you want to ignore these errors?</p></source>
<translation><p>Ошибки SSL для <br /><b>{0}</b><ul><li>{1}</li></ul></p><p>Игнорировать?</p></translation>
</message>
<message>
- <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/>
+ <location filename="Helpviewer/Network/NetworkAccessManager.py" line="246"/>
<source>Certificates</source>
<translation>Сертификаты</translation>
</message>
<message>
- <location filename="Helpviewer/Network/NetworkAccessManager.py" line="240"/>
+ <location filename="Helpviewer/Network/NetworkAccessManager.py" line="246"/>
<source><p>Certificates:<br/>{0}<br/>Do you want to accept all these certificates?</p></source>
<translation><p>Сертификаты:<br/>{0}<br/>Принять?</p></translation>
</message>
<message>
- <location filename="Helpviewer/Network/NetworkAccessManager.py" line="294"/>
+ <location filename="Helpviewer/Network/NetworkAccessManager.py" line="300"/>
<source><br/>Issuer: {0}</source>
<translation><br/>Эмитент: {0}</translation>
</message>
<message>
- <location filename="Helpviewer/Network/NetworkAccessManager.py" line="298"/>
+ <location filename="Helpviewer/Network/NetworkAccessManager.py" line="304"/>
<source><br/>Not valid before: {0}<br/>Valid Until: {1}</source>
<translation><br/>Не действительны ранее: {0}<br/>Действительны до: {1}</translation>
</message>
<message>
- <location filename="Helpviewer/Network/NetworkAccessManager.py" line="286"/>
+ <location filename="Helpviewer/Network/NetworkAccessManager.py" line="292"/>
<source>Name: {0}</source>
<translation>Имя: {0}</translation>
</message>
<message>
- <location filename="Helpviewer/Network/NetworkAccessManager.py" line="290"/>
+ <location filename="Helpviewer/Network/NetworkAccessManager.py" line="296"/>
<source><br/>Organization: {0}</source>
<translation><br/>Организация: {0}</translation>
</message>
@@ -27267,27 +27378,27 @@
<context>
<name>Preferences</name>
<message>
- <location filename="Preferences/__init__.py" line="944"/>
+ <location filename="Preferences/__init__.py" line="945"/>
<source>Export Preferences</source>
<translation>Экспорт предпочтений</translation>
</message>
<message>
- <location filename="Preferences/__init__.py" line="971"/>
+ <location filename="Preferences/__init__.py" line="972"/>
<source>Import Preferences</source>
<translation>Импорт предпочтений</translation>
</message>
<message>
- <location filename="Preferences/__init__.py" line="971"/>
+ <location filename="Preferences/__init__.py" line="972"/>
<source>Properties File (*.ini);;All Files (*)</source>
<translation>Файлы свойств (*.ini);;Все файлы (*)</translation>
</message>
<message>
- <location filename="Preferences/__init__.py" line="1064"/>
+ <location filename="Preferences/__init__.py" line="1065"/>
<source>Select Python2 Interpreter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="Preferences/__init__.py" line="1064"/>
+ <location filename="Preferences/__init__.py" line="1065"/>
<source>Select the Python2 interpreter to be used:</source>
<translation type="unfinished"></translation>
</message>
@@ -49435,17 +49546,17 @@
<context>
<name>mercurial</name>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1707"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1708"/>
<source><tr><td><b>Tags</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Метки</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1715"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1716"/>
<source><tr><td><b>Branches</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Ветви</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1722"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1723"/>
<source><tr><td><b>Last author</b></td><td>{0}</td></tr>
<tr><td><b>Committed date</b></td><td>{1}</td></tr>
<tr><td><b>Committed time</b></td><td>{2}</td></tr>
@@ -49456,30 +49567,30 @@
</table></p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1701"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1702"/>
<source><tr><td><b>Tip</b></td><td></td></tr>
</source>
<translation><tr><td><b>Tip</b></td><td></td></tr></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1703"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1704"/>
<source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Изменения</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1719"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1720"/>
<source><tr><td><b>Parents</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1210"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1211"/>
<source><tr><td><b>Parent #{0}</b></td><td></td></tr>
<tr><td><b>Changeset</b></td><td>{1}</td></tr></source>
<translation><tr><td><b>Предок #{0}</b></td><td></td></tr>
<tr><td><b>Изменения</b></td><td>{1}</td></tr></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1226"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1227"/>
<source><tr><td><b>Last author</b></td><td>{0}</td></tr>
<tr><td><b>Committed date</b></td><td>{1}</td></tr>
<tr><td><b>Committed time</b></td><td>{2}</td></tr></source>
@@ -49489,7 +49600,7 @@
</table></p></translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1256"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1257"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
@@ -49506,7 +49617,7 @@
{2}</translation>
</message>
<message>
- <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1711"/>
+ <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1712"/>
<source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source>
<translation type="unfinished"></translation>
</message>
