--- a/i18n/eric5_ru.ts Tue Mar 18 19:23:35 2014 +0100 +++ b/i18n/eric5_ru.ts Wed Mar 19 18:42:09 2014 +0100 @@ -24787,17 +24787,17 @@ <translation type="unfinished">Commit сообщение</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="101"/> <source>Process Generation Error</source> <translation type="unfinished">Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="101"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="192"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="189"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -24905,42 +24905,42 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="189"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="189"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="224"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="50"/> + <source>applied</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> - <source>applied</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="54"/> <source>guarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="55"/> - <source>missing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="300"/> - <source>unknown</source> - <translation>неизвестный</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> + <source>missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="298"/> + <source>unknown</source> + <translation>неизвестный</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> <source>not applied</source> <translation type="unfinished"></translation> </message> @@ -25954,7 +25954,7 @@ <context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="251"/> <source>Mercurial Status</source> <translation>Mercurial Status</translation> </message> @@ -26036,102 +26036,102 @@ <translation>Зафиксировать изменения в репозитории...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="87"/> <source>Add to repository</source> <translation>Добавить в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="113"/> <source>Adjust column sizes</source> <translation>Подстроить размеры колонок</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="145"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="152"/> <source>added</source> <translation>добавлено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="155"/> <source>modified</source> <translation>изменено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="156"/> <source>removed</source> <translation>удалено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="157"/> <source>not tracked</source> <translation>не отслеживается</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="153"/> <source>normal</source> <translation>нормальный</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="154"/> <source>ignored</source> <translation>игнорировано</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="158"/> <source>missing</source> <translation>отсутствует</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="307"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="300"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="307"/> <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/HgStatusDialog.py" line="628"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="647"/> <source>Commit</source> <translation>Зафиксировать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="794"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="813"/> <source>There are no uncommitted changes available/selected.</source> <translation>Нет доступных/выбранных неотправленных изменений.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="711"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="692"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="711"/> <source>There are no unversioned entries available/selected.</source> <translation>Нет/не выбраны неверсионные элементы.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="775"/> <source>Revert</source> <translation>Откатить</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> <source>Remove from repository</source> - <translation>Удалить из репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="715"/> + <translation type="obsolete">Удалить из репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="734"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="775"/> <source>There are no missing entries available/selected.</source> <translation>Нет/не выбраны пропущенных элементы.</translation> </message> @@ -26206,17 +26206,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> <source>Restore missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="515"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="522"/> <source>all</source> <translation type="unfinished"></translation> </message> @@ -26226,27 +26226,27 @@ <translation type="obsolete">Различие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="774"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="793"/> <source>Differences</source> <translation>Различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="628"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="647"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="80"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="81"/> <source>Select all for commit</source> <translation>Выбрать все для фиксации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="82"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="83"/> <source>Deselect all from commit</source> <translation>Снять выделение</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="241"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="248"/> <source>Mercurial Queue Repository Status</source> <translation type="unfinished"></translation> </message> @@ -26261,30 +26261,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="820"/> <source>Side-by-Side Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="801"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="820"/> <source>Only one file with uncommitted changes must be selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="121"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="128"/> <source>Add as Large File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="131"/> <source>Add as Normal File</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <source>Forget missing</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgStatusMonitorThread</name> @@ -54649,12 +54654,12 @@ <translation>Символы</translation> </message> <message> - <location filename="../UI/SymbolsWidget.ui" line="85"/> + <location filename="../UI/SymbolsWidget.ui" line="82"/> <source>Symbol code:</source> <translation>Код символа:</translation> </message> <message> - <location filename="../UI/SymbolsWidget.ui" line="92"/> + <location filename="../UI/SymbolsWidget.ui" line="89"/> <source>Enter the symbol code</source> <translation>Введите код символа</translation> </message>