--- a/i18n/eric5_ru.ts Sat Mar 31 15:22:50 2012 +0200 +++ b/i18n/eric5_ru.ts Sat Mar 31 19:15:17 2012 +0200 @@ -18130,37 +18130,37 @@ <translation>Alt+П</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="191"/> <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="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="216"/> <source>There is no difference.</source> <translation>Различий нет.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> <source>Save Diff</source> <translation>Сохранить изменения</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="395"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="396"/> <source>Patch Files (*.diff)</source> <translation>Файлы изменений (*.diff)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="427"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="428"/> <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="412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="413"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл изменений <b>{0}</b> уже существует. Переписать?</p></translation> </message> @@ -18170,12 +18170,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> <source><Start></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="230"/> <source><End></source> <translation type="unfinished"></translation> </message> @@ -19094,111 +19094,111 @@ <translation>Версия (ревизия)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="183"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="184"/> <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/HgLogDialog.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="267"/> <source>No log available for '{0}'</source> <translation>Отсутствует журнальная записть для '{0}'</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="300"/> <source>diff to {0}</source> <translation>Сравнить с {0}</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="310"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="311"/> <source>Branches: {0}<br /> </source> <translation>Ветви: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="313"/> <source>Tags: {0}<br /> </source> <translation>Метки: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="318"/> <source>Parents: {0}<br /> </source> <translation>Предки: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="319"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="320"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Автор: {0}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="322"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="323"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Дата: {0}, {1}</i><br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="336"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="337"/> <source>Added {0}<br /> </source> <translation>Добавлено: {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="343"/> <source>Modified {0}<br /> </source> <translation>Изменено {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="348"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="349"/> <source>Deleted {0}<br /> </source> <translation>Удалено {0}<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="234"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="236"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="239"/> <source>Mercurial Error</source> <translation>Ошибка Mercurial</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="333"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Добавлено {0} (скопировано из {1})<br /> </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="316"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="309"/> <source>Phase: {0}<br /> </source> <translation type="unfinished"></translation> @@ -34085,55 +34085,75 @@ <context> <name>QtHelpFiltersDialog</name> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="13"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="14"/> <source>Manage QtHelp Filters</source> <translation>Управлять фильтрами документации QtHelp</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="21"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="25"/> <source>Filters:</source> <translation>Фильтры:</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="28"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="32"/> <source>Attributes:</source> <translation>Атрибуты:</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="42"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="46"/> <source>1</source> <translation>1</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="50"/> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="54"/> <source>Press to add a new filter</source> <translation>Добавить новый фильтр</translation> </message> <message> <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="53"/> <source>Add...</source> - <translation>Добавить...</translation> - </message> - <message> - <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="60"/> + <translation type="obsolete">Добавить...</translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="64"/> <source>Press to remove the selected filter</source> <translation>Удалить подсвеченный фильтр</translation> </message> <message> <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="63"/> <source>Remove</source> - <translation>Удалить</translation> - </message> - <message> - <location filename="Helpviewer/QtHelpFiltersDialog.py" line="103"/> + <translation type="obsolete">Удалить</translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.py" line="106"/> <source>Add Filter</source> <translation>Добавить фильтр</translation> </message> <message> - <location filename="Helpviewer/QtHelpFiltersDialog.py" line="103"/> + <location filename="Helpviewer/QtHelpFiltersDialog.py" line="106"/> <source>Filter name:</source> <translation>Название фильтра:</translation> </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="57"/> + <source>Add Filter ...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="67"/> + <source>Remove Filter</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="74"/> + <source>Press to remove the selected attribute</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="77"/> + <source>Remove Attribute</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QtPage</name> @@ -38279,12 +38299,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="98"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -38520,7 +38540,7 @@ <context> <name>SvnDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="140"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> @@ -38598,7 +38618,7 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="133"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDialog.py" line="140"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -38714,7 +38734,7 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="174"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> @@ -38731,7 +38751,7 @@ </translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="172"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py" line="174"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -38902,12 +38922,12 @@ <translation>Журнал Subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="550"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="555"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="547"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="552"/> <source>Author</source> <translation>Автор</translation> </message> @@ -39048,12 +39068,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="246"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="246"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -40628,12 +40648,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="251"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="250"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py" line="251"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -41026,7 +41046,7 @@ <translation>Подстроить размеры колонок</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="385"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> @@ -41061,7 +41081,7 @@ <translation>Откатить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="384"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="385"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -41402,12 +41422,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="151"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py" line="151"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message>