--- a/i18n/eric5_ru.ts Sat May 21 22:22:17 2011 +0200 +++ b/i18n/eric5_ru.ts Sat May 21 23:41:25 2011 +0200 @@ -18247,6 +18247,109 @@ </message> </context> <context> + <name>HgQueuesDefineGuardsDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.ui" line="14"/> + <source>Define Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.ui" line="23"/> + <source>Select patch (leave empty for current patch):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.ui" line="30"/> + <source>Select the patch to show the guards of</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.ui" line="46"/> + <source>Patch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.ui" line="59"/> + <source>Shows the name of the patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.ui" line="71"/> + <source>This shows the list of guards to be defined for the selected patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.ui" line="86"/> + <source>Select to define a positive guard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.ui" line="99"/> + <source>Select to define a negative guard</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.ui" line="115"/> + <source>Enter the guard name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.ui" line="128"/> + <source>Press to add the guard to the list or change it</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.ui" line="131"/> + <source>Add/Change</source> + <translation type="unfinished">Добавить/изменить</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.ui" line="140"/> + <source>Press to remove the selected guards from the list</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.ui" line="143"/> + <source>Remove</source> + <translation type="unfinished">Удалить</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="106"/> + <source>Unsaved Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="106"/> + <source>The guards list has been changed. Shall the changes be applied?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="223"/> + <source>Remove Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="223"/> + <source>Do you really want to remove the selected guards?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="288"/> + <source>Apply Guard Definitions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="281"/> + <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="288"/> + <source>The Mercurial process did not finish in time.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgQueuesFoldDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.ui" line="14"/> @@ -18295,6 +18398,19 @@ </message> </context> <context> + <name>HgQueuesGuardsSelectionDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesGuardsSelectionDialog.ui" line="14"/> + <source>Select Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesGuardsSelectionDialog.py" line="42"/> + <source>Active Guards</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgQueuesHeaderDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.ui" line="14"/> @@ -18318,6 +18434,29 @@ </message> </context> <context> + <name>HgQueuesListAllGuardsDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.ui" line="14"/> + <source>List All Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.ui" line="23"/> + <source>Show all guards of all patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="99"/> + <source>Unguarded</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="104"/> + <source>no patches found</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgQueuesListDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.ui" line="14"/> @@ -18412,17 +18551,55 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="253"/> <source>applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="253"/> <source>not applied</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>HgQueuesListGuardsDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.ui" line="14"/> + <source>List Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.ui" line="23"/> + <source>Select patch (leave empty for current patch):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.ui" line="30"/> + <source>Select the patch to show the guards of</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.ui" line="46"/> + <source>Patch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.ui" line="59"/> + <source>Shows the name of the patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.ui" line="71"/> + <source>This shows the list of guards defined for the selected patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="111"/> + <source>Unguarded</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgQueuesNewPatchDialog</name> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.ui" line="14"/> @@ -26020,187 +26197,187 @@ <translation>Создать каталог проекта</translation> </message> <message> - <location filename="Project/Project.py" line="2874"/> + <location filename="Project/Project.py" line="2875"/> <source>Open project</source> <translation>Открыть проект</translation> </message> <message> - <location filename="Project/Project.py" line="2908"/> + <location filename="Project/Project.py" line="2909"/> <source>Save project as</source> <translation>Сохранить проект как</translation> </message> <message> - <location filename="Project/Project.py" line="2416"/> + <location filename="Project/Project.py" line="2417"/> <source>Save File</source> <translation>Сохранить файл</translation> </message> <message> - <location filename="Project/Project.py" line="2453"/> + <location filename="Project/Project.py" line="2454"/> <source>Close Project</source> <translation>Закрыть проект</translation> </message> <message> - <location filename="Project/Project.py" line="2453"/> + <location filename="Project/Project.py" line="2454"/> <source>The current project has unsaved changes.</source> <translation>Изменения в текущем проекте не сохранены.</translation> </message> <message> - <location filename="Project/Project.py" line="3051"/> + <location filename="Project/Project.py" line="3052"/> <source>&Save</source> <translation>&Сохранить</translation> </message> <message> - <location filename="Project/Project.py" line="2861"/> + <location filename="Project/Project.py" line="2862"/> <source>New project</source> <translation>Новый проект</translation> </message> <message> - <location filename="Project/Project.py" line="2861"/> + <location filename="Project/Project.py" line="2862"/> <source>&New...</source> <translation>&Новый...</translation> </message> <message> - <location filename="Project/Project.py" line="2865"/> - <source>Generate a new project</source> - <translation>Создать новый проект</translation> - </message> - <message> <location filename="Project/Project.py" line="2866"/> + <source>Generate a new project</source> + <translation>Создать новый проект</translation> + </message> + <message> + <location filename="Project/Project.py" line="2867"/> <source><b>New...</b><p>This opens a dialog for entering the info for a new project.</p></source> <translation><b>Новый...</b><p>Открыть диалог для ввода информации о новом проекте.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2874"/> + <location filename="Project/Project.py" line="2875"/> <source>&Open...</source> <translation>&Открыть...</translation> </message> <message> - <location filename="Project/Project.py" line="2878"/> - <source>Open an existing project</source> - <translation>Открыть существующий проект</translation> - </message> - <message> <location filename="Project/Project.py" line="2879"/> + <source>Open an existing project</source> + <translation>Открыть существующий проект</translation> + </message> + <message> + <location filename="Project/Project.py" line="2880"/> <source><b>Open...</b><p>This opens an existing project.</p></source> <translation><b>Открыть...</b><p>Открыть существующий проект.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2886"/> + <location filename="Project/Project.py" line="2887"/> <source>Close project</source> <translation>Закрыть проект</translation> </message> <message> - <location filename="Project/Project.py" line="2886"/> + <location filename="Project/Project.py" line="2887"/> <source>&Close</source> <translation>&Закрыть</translation> </message> <message> - <location filename="Project/Project.py" line="2889"/> - <source>Close the current project</source> - <translation>Закрыть текущий проект</translation> - </message> - <message> <location filename="Project/Project.py" line="2890"/> + <source>Close the current project</source> + <translation>Закрыть текущий проект</translation> + </message> + <message> + <location filename="Project/Project.py" line="2891"/> <source><b>Close</b><p>This closes the current project.</p></source> <translation><b>Закрыть</b><p>Закрыть текущий проект.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2897"/> + <location filename="Project/Project.py" line="2898"/> <source>Save project</source> <translation>Сохранить проект</translation> </message> <message> - <location filename="Project/Project.py" line="2900"/> - <source>Save the current project</source> - <translation>Сохранить текущий проект</translation> - </message> - <message> <location filename="Project/Project.py" line="2901"/> + <source>Save the current project</source> + <translation>Сохранить текущий проект</translation> + </message> + <message> + <location filename="Project/Project.py" line="2902"/> <source><b>Save</b><p>This saves the current project.</p></source> <translation><b>Сохранить</b><p>Сохранить текущий проект.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2908"/> + <location filename="Project/Project.py" line="2909"/> <source>Save &as...</source> <translation>Сохранить &как...</translation> </message> <message> - <location filename="Project/Project.py" line="2911"/> - <source>Save the current project to a new file</source> - <translation>Сохранить текущий проект в новый файл</translation> - </message> - <message> <location filename="Project/Project.py" line="2912"/> + <source>Save the current project to a new file</source> + <translation>Сохранить текущий проект в новый файл</translation> + </message> + <message> + <location filename="Project/Project.py" line="2913"/> <source><b>Save as</b><p>This saves the current project to a new file.</p></source> <translation><b>Сохранить как</b><p> Сохранить текущий проект в новый файл.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2949"/> + <location filename="Project/Project.py" line="2950"/> <source>Add translation to project</source> <translation>Добавить перевод в проект</translation> </message> <message> - <location filename="Project/Project.py" line="2949"/> + <location filename="Project/Project.py" line="2950"/> <source>Add &translation...</source> <translation>Добавить &перевод...</translation> </message> <message> - <location filename="Project/Project.py" line="2953"/> + <location filename="Project/Project.py" line="2954"/> <source>Add a translation to the current project</source> <translation>Добавить перевод в текущий проект</translation> </message> <message> - <location filename="Project/Project.py" line="2955"/> + <location filename="Project/Project.py" line="2956"/> <source><b>Add translation...</b><p>This opens a dialog for add a translation to the current project.</p></source> <translation><b>Добавить перевод...</b><p>Открыть диалог для добавления перевода в текущий проект.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2963"/> + <location filename="Project/Project.py" line="2964"/> <source>Search new files</source> <translation>Поиск новых файлов</translation> </message> <message> - <location filename="Project/Project.py" line="2963"/> + <location filename="Project/Project.py" line="2964"/> <source>Searc&h new files...</source> <translation>Поис&к новых файлов...</translation> </message> <message> - <location filename="Project/Project.py" line="2966"/> + <location filename="Project/Project.py" line="2967"/> <source>Search new files in the project directory.</source> <translation>Поиск новых файлов в каталоге проекта.</translation> </message> <message> - <location filename="Project/Project.py" line="2975"/> + <location filename="Project/Project.py" line="2976"/> <source>Project properties</source> <translation>Свойства проекта</translation> </message> <message> - <location filename="Project/Project.py" line="2975"/> + <location filename="Project/Project.py" line="2976"/> <source>&Properties...</source> <translation>&Свойства...</translation> </message> <message> - <location filename="Project/Project.py" line="2978"/> - <source>Show the project properties</source> - <translation>Показать свойства проекта</translation> - </message> - <message> <location filename="Project/Project.py" line="2979"/> + <source>Show the project properties</source> + <translation>Показать свойства проекта</translation> + </message> + <message> + <location filename="Project/Project.py" line="2980"/> <source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source> <translation><b>Свойства...</b><p>Показать диалог для редактирования свойств проекта.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3087"/> + <location filename="Project/Project.py" line="3088"/> <source>Load session</source> <translation>Загрузить сессию</translation> </message> <message> - <location filename="Project/Project.py" line="3090"/> - <source>Load the projects session file.</source> - <translation>Загрузить файл с сессией проекта.</translation> - </message> - <message> <location filename="Project/Project.py" line="3091"/> + <source>Load the projects session file.</source> + <translation>Загрузить файл с сессией проекта.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3092"/> <source><b>Load session</b><p>This loads the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Загрузить сессию</b> <p>Загрузить файл с сессией проекта. Сессия содержит следующие данные:<br> @@ -26212,17 +26389,17 @@ </p></translation> </message> <message> - <location filename="Project/Project.py" line="3104"/> + <location filename="Project/Project.py" line="3105"/> <source>Save session</source> <translation>Сохранить сессию</translation> </message> <message> - <location filename="Project/Project.py" line="3107"/> - <source>Save the projects session file.</source> - <translation>Сохранить файл с сессией проекта.</translation> - </message> - <message> <location filename="Project/Project.py" line="3108"/> + <source>Save the projects session file.</source> + <translation>Сохранить файл с сессией проекта.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3109"/> <source><b>Save session</b><p>This saves the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Сохранить сессию</b> <p>Сохранить файл с сессией проекта. Сессия содержит следующие данные:<br> @@ -26234,137 +26411,137 @@ </p></translation> </message> <message> - <location filename="Project/Project.py" line="3134"/> + <location filename="Project/Project.py" line="3135"/> <source>Code Metrics</source> <translation>Статистика кода</translation> </message> <message> - <location filename="Project/Project.py" line="3134"/> + <location filename="Project/Project.py" line="3135"/> <source>&Code Metrics...</source> <translation>&Статистика кода...</translation> </message> <message> - <location filename="Project/Project.py" line="3137"/> + <location filename="Project/Project.py" line="3138"/> <source>Show some code metrics for the project.</source> <translation>Отображает статистику кода для проекта.</translation> </message> <message> - <location filename="Project/Project.py" line="3139"/> + <location filename="Project/Project.py" line="3140"/> <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> <translation><b>Статистика кода...</b><p>Отображает статистику кода для проекта.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3146"/> + <location filename="Project/Project.py" line="3147"/> <source>Python Code Coverage</source> <translation>Охват кода Python</translation> </message> <message> - <location filename="Project/Project.py" line="3146"/> + <location filename="Project/Project.py" line="3147"/> <source>Code Co&verage...</source> <translation>&Заключения по коду...</translation> </message> <message> - <location filename="Project/Project.py" line="3149"/> + <location filename="Project/Project.py" line="3150"/> <source>Show code coverage information for the project.</source> <translation>Показать заключение охвата по коду проекта.</translation> </message> <message> - <location filename="Project/Project.py" line="3151"/> + <location filename="Project/Project.py" line="3152"/> <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> <translation><b>Заключение охвата по коду...</b><p>Показать заключение охвата по коду всех файлов проекта.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3831"/> + <location filename="Project/Project.py" line="3832"/> <source>Profile Data</source> <translation>Данные профайлера</translation> </message> <message> - <location filename="Project/Project.py" line="3159"/> + <location filename="Project/Project.py" line="3160"/> <source>&Profile Data...</source> <translation>&Данные профайлера...</translation> </message> <message> - <location filename="Project/Project.py" line="3162"/> + <location filename="Project/Project.py" line="3163"/> <source>Show profiling data for the project.</source> <translation>Отображает результаты профилирования проекта.</translation> </message> <message> - <location filename="Project/Project.py" line="3164"/> + <location filename="Project/Project.py" line="3165"/> <source><b>Profile Data...</b><p>This shows the profiling data for the project.</p></source> <translation><b>Данные профайлера...</b><p>Отображает результаты профилирования проекта.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3249"/> - <source>Open &Recent Projects</source> - <translation>Открыть &недавние проекты</translation> - </message> - <message> - <location filename="Project/Project.py" line="3253"/> - <source>Chec&k</source> - <translation>&Проверки</translation> - </message> - <message> - <location filename="Project/Project.py" line="3255"/> - <source>Sho&w</source> - <translation>По&казать</translation> - </message> - <message> - <location filename="Project/Project.py" line="3258"/> - <source>Source &Documentation</source> - <translation>&Документация исходников</translation> - </message> - <message> - <location filename="Project/Project.py" line="3534"/> - <source>Search New Files</source> - <translation>Поиск новых файлов</translation> - </message> - <message> - <location filename="Project/Project.py" line="3534"/> - <source>There were no new files found to be added.</source> - <translation>Не найдено файлов для добавления.</translation> - </message> - <message> - <location filename="Project/Project.py" line="3672"/> - <source>Version Control System</source> - <translation>Система контроля версий</translation> - </message> - <message> - <location filename="Project/Project.py" line="3810"/> - <source>There is no main script defined for the current project. Aborting</source> - <translation>Для текущего проекта не определён главный сценарий. Отмена</translation> - </message> - <message> <location filename="Project/Project.py" line="3250"/> - <source>&Version Control</source> - <translation>Контроль &версий</translation> - </message> - <message> - <location filename="Project/Project.py" line="3764"/> - <source>Coverage Data</source> - <translation>Данные охвата</translation> - </message> - <message> - <location filename="Project/Project.py" line="3884"/> - <source>Application Diagram</source> - <translation>Диаграмма приложения</translation> - </message> - <message> - <location filename="Project/Project.py" line="3171"/> - <source>&Application Diagram...</source> - <translation>&Диаграмма приложения...</translation> - </message> - <message> - <location filename="Project/Project.py" line="3174"/> - <source>Show a diagram of the project.</source> - <translation>Показать диаграмму проекта.</translation> - </message> - <message> - <location filename="Project/Project.py" line="3176"/> - <source><b>Application Diagram...</b><p>This shows a diagram of the project.</p></source> - <translation><b>Диаграмма приложения...</b><p>Отображает диаграмму проекта.</p></translation> + <source>Open &Recent Projects</source> + <translation>Открыть &недавние проекты</translation> + </message> + <message> + <location filename="Project/Project.py" line="3254"/> + <source>Chec&k</source> + <translation>&Проверки</translation> </message> <message> <location filename="Project/Project.py" line="3256"/> + <source>Sho&w</source> + <translation>По&казать</translation> + </message> + <message> + <location filename="Project/Project.py" line="3259"/> + <source>Source &Documentation</source> + <translation>&Документация исходников</translation> + </message> + <message> + <location filename="Project/Project.py" line="3535"/> + <source>Search New Files</source> + <translation>Поиск новых файлов</translation> + </message> + <message> + <location filename="Project/Project.py" line="3535"/> + <source>There were no new files found to be added.</source> + <translation>Не найдено файлов для добавления.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3673"/> + <source>Version Control System</source> + <translation>Система контроля версий</translation> + </message> + <message> + <location filename="Project/Project.py" line="3811"/> + <source>There is no main script defined for the current project. Aborting</source> + <translation>Для текущего проекта не определён главный сценарий. Отмена</translation> + </message> + <message> + <location filename="Project/Project.py" line="3251"/> + <source>&Version Control</source> + <translation>Контроль &версий</translation> + </message> + <message> + <location filename="Project/Project.py" line="3765"/> + <source>Coverage Data</source> + <translation>Данные охвата</translation> + </message> + <message> + <location filename="Project/Project.py" line="3885"/> + <source>Application Diagram</source> + <translation>Диаграмма приложения</translation> + </message> + <message> + <location filename="Project/Project.py" line="3172"/> + <source>&Application Diagram...</source> + <translation>&Диаграмма приложения...</translation> + </message> + <message> + <location filename="Project/Project.py" line="3175"/> + <source>Show a diagram of the project.</source> + <translation>Показать диаграмму проекта.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3177"/> + <source><b>Application Diagram...</b><p>This shows a diagram of the project.</p></source> + <translation><b>Диаграмма приложения...</b><p>Отображает диаграмму проекта.</p></translation> + </message> + <message> + <location filename="Project/Project.py" line="3257"/> <source>&Diagrams</source> <translation>&Диаграммы</translation> </message> @@ -26374,37 +26551,37 @@ <translation>Сохранить файл проекта</translation> </message> <message> - <location filename="Project/Project.py" line="3785"/> + <location filename="Project/Project.py" line="3786"/> <source>Code Coverage</source> <translation>Заключения охвата по коду</translation> </message> <message> - <location filename="Project/Project.py" line="3785"/> + <location filename="Project/Project.py" line="3786"/> <source>Please select a coverage file</source> <translation>Пожалуйста, выберите файл для информации охвата</translation> </message> <message> - <location filename="Project/Project.py" line="3831"/> + <location filename="Project/Project.py" line="3832"/> <source>Please select a profile file</source> <translation>Пожалуйста, выберите файл профиля</translation> </message> <message> - <location filename="Project/Project.py" line="2935"/> + <location filename="Project/Project.py" line="2936"/> <source>Add directory to project</source> <translation>Добавить каталог в проект</translation> </message> <message> - <location filename="Project/Project.py" line="2935"/> + <location filename="Project/Project.py" line="2936"/> <source>Add directory...</source> <translation>Добавить каталог...</translation> </message> <message> - <location filename="Project/Project.py" line="2939"/> + <location filename="Project/Project.py" line="2940"/> <source>Add a directory to the current project</source> <translation>Добавить каталог в текущий проект</translation> </message> <message> - <location filename="Project/Project.py" line="2941"/> + <location filename="Project/Project.py" line="2942"/> <source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source> <translation><b>Добавить каталог...</b> <p>Открыть диалог для добавления каталога в текущий проект.</p></translation> @@ -26425,7 +26602,7 @@ <translation>Добавить файл проекта в репозиторий?</translation> </message> <message> - <location filename="Project/Project.py" line="2282"/> + <location filename="Project/Project.py" line="2283"/> <source>New Project</source> <translation>Новый проект</translation> </message> @@ -26470,7 +26647,7 @@ <translation><p>Невозможно удалить выбранный файл с переводом: <b>{0}</b>.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2416"/> + <location filename="Project/Project.py" line="2417"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже сущеструет. Переписать?</p></translation> </message> @@ -26495,17 +26672,17 @@ <translation><p>Невозможно удалить выбранный файл с сессией: <b>{0}</b>.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3121"/> + <location filename="Project/Project.py" line="3122"/> <source>Delete session</source> <translation>Удалить сессию</translation> </message> <message> - <location filename="Project/Project.py" line="3124"/> - <source>Delete the projects session file.</source> - <translation>Удалить файл с сессией проекта.</translation> - </message> - <message> <location filename="Project/Project.py" line="3125"/> + <source>Delete the projects session file.</source> + <translation>Удалить файл с сессией проекта.</translation> + </message> + <message> + <location filename="Project/Project.py" line="3126"/> <source><b>Delete session</b><p>This deletes the projects session file</p></source> <translation><b>Удалить сессию</b><p>Удалить файл с сессией проекта</p></translation> </message> @@ -26515,7 +26692,7 @@ <translation>Исходники на Ruby (*.rb);;</translation> </message> <message> - <location filename="Project/Project.py" line="2967"/> + <location filename="Project/Project.py" line="2968"/> <source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl) in the project directory and registered subdirectories.</p></source> <translation><b>Искать новые файлы...</b><p>Поиск новых файлов (исходников, *.ui, *.idl) в каталоге проекта и зарегистрированных подкаталогах.</p></translation> </message> @@ -26530,7 +26707,7 @@ <translation>Другое</translation> </message> <message> - <location filename="Project/Project.py" line="3884"/> + <location filename="Project/Project.py" line="3885"/> <source>Include module names?</source> <translation>Включать имена модулей?</translation> </message> @@ -26595,155 +26772,155 @@ <translation><p>Невозможно удалить файл свойств отладчика <b>{0}</b>.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3029"/> + <location filename="Project/Project.py" line="3030"/> <source>Debugger Properties</source> <translation>Свойства отладчика</translation> </message> <message> - <location filename="Project/Project.py" line="3029"/> + <location filename="Project/Project.py" line="3030"/> <source>Debugger &Properties...</source> <translation>&Свойства отладчика...</translation> </message> <message> - <location filename="Project/Project.py" line="3032"/> - <source>Show the debugger properties</source> - <translation>Показать свойства отладчика</translation> - </message> - <message> <location filename="Project/Project.py" line="3033"/> + <source>Show the debugger properties</source> + <translation>Показать свойства отладчика</translation> + </message> + <message> + <location filename="Project/Project.py" line="3034"/> <source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source> <translation><b>Свойства отладчика...</b> <p>Показать диалог для редактирования свойств отладчика, специфичных для данного проекта.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3040"/> + <location filename="Project/Project.py" line="3041"/> <source>Load</source> <translation>Загрузить</translation> </message> <message> - <location filename="Project/Project.py" line="3040"/> + <location filename="Project/Project.py" line="3041"/> <source>&Load</source> <translation>&Загрузить</translation> </message> <message> - <location filename="Project/Project.py" line="3043"/> - <source>Load the debugger properties</source> - <translation>Загрузить свойства отладчика</translation> - </message> - <message> - <location filename="Project/Project.py" line="3051"/> - <source>Save</source> - <translation>Сохранить</translation> - </message> - <message> - <location filename="Project/Project.py" line="3054"/> - <source>Save the debugger properties</source> - <translation>Сохранить свойства отладчика</translation> - </message> - <message> - <location filename="Project/Project.py" line="3062"/> - <source>Delete</source> - <translation>Удалить</translation> - </message> - <message> - <location filename="Project/Project.py" line="3062"/> - <source>&Delete</source> - <translation>&Удалить</translation> - </message> - <message> - <location filename="Project/Project.py" line="3065"/> - <source>Delete the debugger properties</source> - <translation>Удалить свойства отладчика</translation> - </message> - <message> - <location filename="Project/Project.py" line="3074"/> - <source>Reset</source> - <translation>Сбросить</translation> - </message> - <message> - <location filename="Project/Project.py" line="3074"/> - <source>&Reset</source> - <translation>&Сбросить</translation> - </message> - <message> - <location filename="Project/Project.py" line="3077"/> - <source>Reset the debugger properties</source> - <translation>Сбросить свойства отладчика</translation> - </message> - <message> - <location filename="Project/Project.py" line="3260"/> - <source>Debugger</source> - <translation>Отладчик</translation> - </message> - <message> - <location filename="Project/Project.py" line="3257"/> - <source>Session</source> - <translation>Сессия</translation> - </message> - <message> <location filename="Project/Project.py" line="3044"/> - <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> - <translation><b>Загрузить свойства отладчика</b> -<p>Загрузить свойства отладчика, специфичные для данного проекта.</p></translation> + <source>Load the debugger properties</source> + <translation>Загрузить свойства отладчика</translation> + </message> + <message> + <location filename="Project/Project.py" line="3052"/> + <source>Save</source> + <translation>Сохранить</translation> </message> <message> <location filename="Project/Project.py" line="3055"/> - <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> - <translation><b>Сохранить свойства отладчика</b><p>Сохранить свойства отладчика, специфичные для данного проекта.</p></translation> + <source>Save the debugger properties</source> + <translation>Сохранить свойства отладчика</translation> + </message> + <message> + <location filename="Project/Project.py" line="3063"/> + <source>Delete</source> + <translation>Удалить</translation> + </message> + <message> + <location filename="Project/Project.py" line="3063"/> + <source>&Delete</source> + <translation>&Удалить</translation> </message> <message> <location filename="Project/Project.py" line="3066"/> - <source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source> - <translation><b>Удалить свойства отладчика</b><p>Удалить свойства отладчика, специфичные для данного проекта.</p></translation> + <source>Delete the debugger properties</source> + <translation>Удалить свойства отладчика</translation> + </message> + <message> + <location filename="Project/Project.py" line="3075"/> + <source>Reset</source> + <translation>Сбросить</translation> + </message> + <message> + <location filename="Project/Project.py" line="3075"/> + <source>&Reset</source> + <translation>&Сбросить</translation> </message> <message> <location filename="Project/Project.py" line="3078"/> + <source>Reset the debugger properties</source> + <translation>Сбросить свойства отладчика</translation> + </message> + <message> + <location filename="Project/Project.py" line="3261"/> + <source>Debugger</source> + <translation>Отладчик</translation> + </message> + <message> + <location filename="Project/Project.py" line="3258"/> + <source>Session</source> + <translation>Сессия</translation> + </message> + <message> + <location filename="Project/Project.py" line="3045"/> + <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> + <translation><b>Загрузить свойства отладчика</b> +<p>Загрузить свойства отладчика, специфичные для данного проекта.</p></translation> + </message> + <message> + <location filename="Project/Project.py" line="3056"/> + <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> + <translation><b>Сохранить свойства отладчика</b><p>Сохранить свойства отладчика, специфичные для данного проекта.</p></translation> + </message> + <message> + <location filename="Project/Project.py" line="3067"/> + <source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source> + <translation><b>Удалить свойства отладчика</b><p>Удалить свойства отладчика, специфичные для данного проекта.</p></translation> + </message> + <message> + <location filename="Project/Project.py" line="3079"/> <source><b>Reset Debugger Properties</b><p>This resets the project specific debugger settings.</p></source> <translation><b>Сбросить свойства отладчика</b><p>Сбросить свойства отладчика, специфичные для данного проекта.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2998"/> + <location filename="Project/Project.py" line="2999"/> <source>Filetype Associations</source> <translation>Ассоциации для типа файла</translation> </message> <message> - <location filename="Project/Project.py" line="2998"/> + <location filename="Project/Project.py" line="2999"/> <source>Filetype Associations...</source> <translation>Ассоциации для типа файла...</translation> </message> <message> - <location filename="Project/Project.py" line="3001"/> + <location filename="Project/Project.py" line="3002"/> <source>Show the project filetype associations</source> <translation>Показать ассоциации типов файлов для проекта</translation> </message> <message> - <location filename="Project/Project.py" line="3003"/> + <location filename="Project/Project.py" line="3004"/> <source><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.</p></source> <translation><b>Ассоциации типов файлов...</b> <p>Показать диалог для редактирования ассоциаций типов файлов для проекта. Эти ассоциации связывают тип файла (исходник, форма, интерфейс и т.д.) с шаблоном имени. Они используются при добавлении файлов в проект и при поиске новых файлов.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3261"/> + <location filename="Project/Project.py" line="3262"/> <source>Pac&kagers</source> <translation>У&паковщики</translation> </message> <message> - <location filename="Project/Project.py" line="2921"/> + <location filename="Project/Project.py" line="2922"/> <source>Add files to project</source> <translation>Добавить файлы в проект</translation> </message> <message> - <location filename="Project/Project.py" line="2921"/> + <location filename="Project/Project.py" line="2922"/> <source>Add &files...</source> <translation>Добавить &файлы...</translation> </message> <message> - <location filename="Project/Project.py" line="2925"/> - <source>Add files to the current project</source> - <translation>Добавить файлы в текущий проект</translation> - </message> - <message> <location filename="Project/Project.py" line="2926"/> + <source>Add files to the current project</source> + <translation>Добавить файлы в текущий проект</translation> + </message> + <message> + <location filename="Project/Project.py" line="2927"/> <source><b>Add files...</b><p>This opens a dialog for adding files to the current project. The place to add is determined by the file extension.</p></source> <translation><b>Добавить файлы</b> <p>Открывает диалог для добавления файлов в текущий проект. Место добавления определяется расширением файла.</p></translation> @@ -26764,22 +26941,22 @@ <translation><p>Невозможно переименовать файл <b>{0}</b>:<br>Причина: {1}.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2401"/> + <location filename="Project/Project.py" line="2402"/> <source>Project Files (*.e4p)</source> <translation>Файлы проектов (*.e4p)</translation> </message> <message> - <location filename="Project/Project.py" line="3248"/> + <location filename="Project/Project.py" line="3249"/> <source>&Project</source> <translation>&Проект</translation> </message> <message> - <location filename="Project/Project.py" line="3363"/> + <location filename="Project/Project.py" line="3364"/> <source>Project</source> <translation>Проект</translation> </message> <message> - <location filename="Project/Project.py" line="3424"/> + <location filename="Project/Project.py" line="3425"/> <source>&Clear</source> <translation>&Очистить</translation> </message> @@ -26809,33 +26986,33 @@ <translation><p>Невозможно записать файл пользовательских настроек <b>{0}</b>.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2986"/> + <location filename="Project/Project.py" line="2987"/> <source>User project properties</source> <translation>Пользовательские настройки проекта</translation> </message> <message> - <location filename="Project/Project.py" line="2986"/> + <location filename="Project/Project.py" line="2987"/> <source>&User Properties...</source> <translation>&Пользовательские свойства...</translation> </message> <message> - <location filename="Project/Project.py" line="2989"/> + <location filename="Project/Project.py" line="2990"/> <source>Show the user specific project properties</source> <translation>Показать пользовательские свойства проекта</translation> </message> <message> - <location filename="Project/Project.py" line="2991"/> + <location filename="Project/Project.py" line="2992"/> <source><b>User Properties...</b><p>This shows a dialog to edit the user specific project properties.</p></source> <translation><b>Пользовательские свойства...</b> <p>Отображает диалог для редактирования пользовательских свойств проекта.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2590"/> + <location filename="Project/Project.py" line="2591"/> <source>Syntax errors detected</source> <translation>Найдены синтаксисические ошибки</translation> </message> <message numerus="yes"> - <location filename="Project/Project.py" line="2590"/> + <location filename="Project/Project.py" line="2591"/> <source>The project contains %n file(s) with syntax errors.</source> <translation> <numerusform>Проект содержит %n файл с синтаксическими ошибками.</numerusform> @@ -26844,47 +27021,47 @@ </translation> </message> <message> - <location filename="Project/Project.py" line="4015"/> + <location filename="Project/Project.py" line="4016"/> <source>Create Package List</source> <translation>Создать список пакетов</translation> </message> <message> - <location filename="Project/Project.py" line="3185"/> + <location filename="Project/Project.py" line="3186"/> <source>Create &Package List</source> <translation>&Создать список пакетов</translation> </message> <message> - <location filename="Project/Project.py" line="4178"/> + <location filename="Project/Project.py" line="4179"/> <source>Create Plugin Archive</source> <translation>Создать архив подключаемого модуля</translation> </message> <message> - <location filename="Project/Project.py" line="3199"/> + <location filename="Project/Project.py" line="3200"/> <source>Create Plugin &Archive</source> <translation>Создать &архив плагина</translation> </message> <message> - <location filename="Project/Project.py" line="3988"/> + <location filename="Project/Project.py" line="3989"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>Файл <b>PKGLIST</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="Project/Project.py" line="4015"/> + <location filename="Project/Project.py" line="4016"/> <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> <translation><p>Невозможно создать файл <b>PKGLIST</b>.</p><p>Причина: {0}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4032"/> + <location filename="Project/Project.py" line="4033"/> <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> <translation><p>Файл <b>PKGLIST</b> не существует. Отмена...</p></translation> </message> <message> - <location filename="Project/Project.py" line="4040"/> + <location filename="Project/Project.py" line="4041"/> <source>The project does not have a main script defined. Aborting...</source> <translation>Для текущего проекта не определён главный сценарий. Отмена...</translation> </message> <message> - <location filename="Project/Project.py" line="4052"/> + <location filename="Project/Project.py" line="4053"/> <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> <translation><p>Невозможно прочитать файл <b>PKGLIST</b>.</p><p>Причина: {0}</p></translation> </message> @@ -26894,7 +27071,7 @@ <translation><p>Каталог не содержит ни одного файла, принадлежащего к заданной категории.</p></translation> </message> <message> - <location filename="Project/Project.py" line="2282"/> + <location filename="Project/Project.py" line="2283"/> <source>Select Version Control System</source> <translation>Выберите систему контроля версий (VCS)</translation> </message> @@ -26914,22 +27091,22 @@ <translation><p>Тип проекта <b>{0}</b> уже существует.</p></translation> </message> <message> - <location filename="Project/Project.py" line="4086"/> + <location filename="Project/Project.py" line="4087"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation><p>Невозможно сохранить в архив файл <b>{0}</b>. Игнорируем его.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="3214"/> + <location filename="Project/Project.py" line="3215"/> <source>Create Plugin Archive (Snapshot)</source> <translation>Создать архив плагинов (снимок)</translation> </message> <message> - <location filename="Project/Project.py" line="3214"/> + <location filename="Project/Project.py" line="3215"/> <source>Create Plugin Archive (&Snapshot)</source> <translation>Создать архив плагинов (&снимок)</translation> </message> <message> - <location filename="Project/Project.py" line="4178"/> + <location filename="Project/Project.py" line="4179"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>Невозможно прочитать файл плагина <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> @@ -26949,32 +27126,32 @@ <translation>Введите образец имени файла для переводов (используйте '%language%' вместо кода языка):</translation> </message> <message> - <location filename="Project/Project.py" line="3663"/> + <location filename="Project/Project.py" line="3664"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Reverting override.</p><p>{1}</p></source> <translation><p>Выбранная VCS <b>{0}</b> не найдена.<br/>Отмена.</p><p>{1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="3672"/> + <location filename="Project/Project.py" line="3673"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Disabling version control.</p><p>{1}</p></source> <translation><p>Выбранная VCS <b>{0}</b> не найдена.<br/>Контроль версий не используется.</p><p>{1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="3013"/> + <location filename="Project/Project.py" line="3014"/> <source>Lexer Associations</source> <translation>Ассоциации для лексеров</translation> </message> <message> - <location filename="Project/Project.py" line="3013"/> + <location filename="Project/Project.py" line="3014"/> <source>Lexer Associations...</source> <translation>Ассоциации для лексеров...</translation> </message> <message> - <location filename="Project/Project.py" line="3016"/> + <location filename="Project/Project.py" line="3017"/> <source>Show the project lexer associations (overriding defaults)</source> <translation>Показать ассоциации для лексеров</translation> </message> <message> - <location filename="Project/Project.py" line="3018"/> + <location filename="Project/Project.py" line="3019"/> <source><b>Lexer Associations...</b><p>This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.</p></source> <translation><b>Ассоциации для лексеров...</b><p>Показать ассоциации лексеров для проекта. Лексеры используются для подсвечивания текста в редакторе.</p></translation> </message> @@ -26999,42 +27176,42 @@ <translation>Подключаемый модуль Eric</translation> </message> <message> - <location filename="Project/Project.py" line="3189"/> + <location filename="Project/Project.py" line="3190"/> <source>Create an initial PKGLIST file for an eric5 plugin.</source> <translation>Создать начальный файл PKGLIST для подключаемого модуля eric5.</translation> </message> <message> - <location filename="Project/Project.py" line="3191"/> + <location filename="Project/Project.py" line="3192"/> <source><b>Create Package List</b><p>This creates an initial list of files to include in an eric5 plugin archive. The list is created from the project file.</p></source> <translation><b>Создать список пакетов</b><p>Создаёт начальный список файлов для включения в архив подключаемого модуля eric5. Список создаётся из файла проекта.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3203"/> + <location filename="Project/Project.py" line="3204"/> <source>Create an eric5 plugin archive file.</source> <translation>Создать архив подключаемого модуля eric5.</translation> </message> <message> - <location filename="Project/Project.py" line="3205"/> + <location filename="Project/Project.py" line="3206"/> <source><b>Create Plugin Archive</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name.</p></source> <translation><b>Создать архив подключаемого модуля</b><p>Создаёт файл арива подключаемого модуля eric5, используя список файлов, данный в файле PKGLIST. Имя архива берётся из имени главного сценария.</p></translation> </message> <message> - <location filename="Project/Project.py" line="3218"/> + <location filename="Project/Project.py" line="3219"/> <source>Create an eric5 plugin archive file (snapshot release).</source> <translation>Создать файл архива плагинов eric5 (снимок выпуска).</translation> </message> <message> - <location filename="Project/Project.py" line="3220"/> + <location filename="Project/Project.py" line="3221"/> <source><b>Create Plugin Archive (Snapshot)</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name. The version entry of the main script is modified to reflect a snapshot release.</p></source> <translation><b>Создать файл архива плагинов (снимок выпуска)</b><p>Создаёт файл архива плагинов eric5, используя список файлов, указанный в файле PKGLIST. Имя архива строится из имени главного сценария. Версия главного сценария меняется, чтобы соответствовать версии выпуска снимка.</p></translation> </message> <message> - <location filename="Project/Project.py" line="4066"/> + <location filename="Project/Project.py" line="4067"/> <source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation><p>Невозможно создать подключаемый модуль eric5 <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="Project/Project.py" line="4098"/> + <location filename="Project/Project.py" line="4099"/> <source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation><p>Подключаемый модуль <b>{0}</b> был успешно создан.</p></translation> </message> @@ -27294,32 +27471,32 @@ <translation>Добавить каталог с формами...</translation> </message> <message> - <location filename="Project/ProjectFormsBrowser.py" line="627"/> + <location filename="Project/ProjectFormsBrowser.py" line="630"/> <source>Form Compilation</source> <translation>Компиляция форм</translation> </message> <message> - <location filename="Project/ProjectFormsBrowser.py" line="615"/> + <location filename="Project/ProjectFormsBrowser.py" line="618"/> <source>The compilation of the form file was successful.</source> <translation>Компиляция формы прошла успешно.</translation> </message> <message> - <location filename="Project/ProjectFormsBrowser.py" line="627"/> + <location filename="Project/ProjectFormsBrowser.py" line="630"/> <source>The compilation of the form file failed.</source> <translation>Компиляция формы не удалась.</translation> </message> <message> - <location filename="Project/ProjectFormsBrowser.py" line="699"/> + <location filename="Project/ProjectFormsBrowser.py" line="702"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Project/ProjectFormsBrowser.py" line="787"/> + <location filename="Project/ProjectFormsBrowser.py" line="790"/> <source>Compiling forms...</source> <translation>Компилирую формы...</translation> </message> <message> - <location filename="Project/ProjectFormsBrowser.py" line="787"/> + <location filename="Project/ProjectFormsBrowser.py" line="790"/> <source>Abort</source> <translation>Отмена</translation> </message> @@ -27359,12 +27536,12 @@ <translation>Скрыть все подкаталоги</translation> </message> <message> - <location filename="Project/ProjectFormsBrowser.py" line="523"/> + <location filename="Project/ProjectFormsBrowser.py" line="526"/> <source>New Form</source> <translation>Новая форма</translation> </message> <message> - <location filename="Project/ProjectFormsBrowser.py" line="479"/> + <location filename="Project/ProjectFormsBrowser.py" line="482"/> <source>Select a form type:</source> <translation>Выберите тип формы:</translation> </message> @@ -27384,17 +27561,17 @@ <translation>Компилировать формы</translation> </message> <message> - <location filename="Project/ProjectFormsBrowser.py" line="546"/> + <location filename="Project/ProjectFormsBrowser.py" line="549"/> <source>Delete forms</source> <translation>Удалить формы</translation> </message> <message> - <location filename="Project/ProjectFormsBrowser.py" line="546"/> + <location filename="Project/ProjectFormsBrowser.py" line="549"/> <source>Do you really want to delete these forms from the project?</source> <translation>Вы правда хотите удалить выбранные формы из проекта?</translation> </message> <message> - <location filename="Project/ProjectFormsBrowser.py" line="523"/> + <location filename="Project/ProjectFormsBrowser.py" line="526"/> <source><p>The new form file <b>{0}</b> could not be created.<br>Problem: {1}</p></source> <translation><p>Файл с формой <b>{0}</b> не может быть создан из-за следующей проблемы: {1}</p></translation> </message> @@ -27409,12 +27586,12 @@ <translation>Предпросмотр переводов</translation> </message> <message> - <location filename="Project/ProjectFormsBrowser.py" line="621"/> + <location filename="Project/ProjectFormsBrowser.py" line="624"/> <source><p>The compilation of the form file failed.</p><p>Reason: {0}</p></source> <translation><p>Компиляция формы не удалась по причине: {0}</p></translation> </message> <message> - <location filename="Project/ProjectFormsBrowser.py" line="699"/> + <location filename="Project/ProjectFormsBrowser.py" line="702"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>Невозможно запустить {0}.<br>Убедитесь, что он находится в пути поиска.</translation> </message> @@ -27434,17 +27611,17 @@ <translation>Диалог с кнопками (снизу в центре)</translation> </message> <message> - <location filename="Project/ProjectFormsBrowser.py" line="822"/> + <location filename="Project/ProjectFormsBrowser.py" line="825"/> <source>Determining changed forms...</source> <translation>Определяю изменённые формы...</translation> </message> <message> - <location filename="Project/ProjectFormsBrowser.py" line="849"/> + <location filename="Project/ProjectFormsBrowser.py" line="852"/> <source>Compiling changed forms...</source> <translation>Компилирую изменённые формы...</translation> </message> <message> - <location filename="Project/ProjectFormsBrowser.py" line="512"/> + <location filename="Project/ProjectFormsBrowser.py" line="515"/> <source>The file already exists! Overwrite it?</source> <translation>Файл уже существует! Перезаписать?</translation> </message> @@ -27469,7 +27646,7 @@ <translation>Открыть</translation> </message> <message> - <location filename="Project/ProjectFormsBrowser.py" line="493"/> + <location filename="Project/ProjectFormsBrowser.py" line="496"/> <source>Qt User-Interface Files (*.ui);;All Files (*)</source> <translation>Файлы описания интерфейса Qt (*.ui);;Все файлы (*)</translation> </message> @@ -27932,82 +28109,82 @@ <translation>Компилировать ресурсы</translation> </message> <message> - <location filename="Project/ProjectResourcesBrowser.py" line="428"/> + <location filename="Project/ProjectResourcesBrowser.py" line="431"/> <source>New Resource</source> <translation>Добавить ресурс</translation> </message> <message> - <location filename="Project/ProjectResourcesBrowser.py" line="388"/> + <location filename="Project/ProjectResourcesBrowser.py" line="391"/> <source>Qt Resource Files (*.qrc)</source> <translation>Файлы ресурсов Qt (*.qrc)</translation> </message> <message> - <location filename="Project/ProjectResourcesBrowser.py" line="428"/> + <location filename="Project/ProjectResourcesBrowser.py" line="431"/> <source><p>The new resource file <b>{0}</b> could not be created.<br>Problem: {1}</p></source> <translation><p>Файл с ресурсом <b>{0}</b> не может быть создан из-за следующей проблемы: {1}</p></translation> </message> <message> - <location filename="Project/ProjectResourcesBrowser.py" line="452"/> + <location filename="Project/ProjectResourcesBrowser.py" line="455"/> <source>Delete resources</source> <translation>Удалить ресурс</translation> </message> <message> - <location filename="Project/ProjectResourcesBrowser.py" line="452"/> + <location filename="Project/ProjectResourcesBrowser.py" line="455"/> <source>Do you really want to delete these resources from the project?</source> <translation>Вы правда хотите удалить эти ресурсы из проекта?</translation> </message> <message> - <location filename="Project/ProjectResourcesBrowser.py" line="533"/> + <location filename="Project/ProjectResourcesBrowser.py" line="536"/> <source>Resource Compilation</source> <translation>Компилиляция ресурса</translation> </message> <message> - <location filename="Project/ProjectResourcesBrowser.py" line="521"/> + <location filename="Project/ProjectResourcesBrowser.py" line="524"/> <source>The compilation of the resource file was successful.</source> <translation>Компиляция ресурса прошла успешно.</translation> </message> <message> - <location filename="Project/ProjectResourcesBrowser.py" line="527"/> + <location filename="Project/ProjectResourcesBrowser.py" line="530"/> <source><p>The compilation of the resource file failed.</p><p>Reason: {0}</p></source> <translation><p>Компиляция ресурса не удалась по причине: {0}</p></translation> </message> <message> - <location filename="Project/ProjectResourcesBrowser.py" line="533"/> + <location filename="Project/ProjectResourcesBrowser.py" line="536"/> <source>The compilation of the resource file failed.</source> <translation>Компиляция ресурса не удалась.</translation> </message> <message> - <location filename="Project/ProjectResourcesBrowser.py" line="606"/> + <location filename="Project/ProjectResourcesBrowser.py" line="609"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="Project/ProjectResourcesBrowser.py" line="606"/> + <location filename="Project/ProjectResourcesBrowser.py" line="609"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>Невозможно запустить {0}.<br>Убедитесь, что он находится в пути поиска.</translation> </message> <message> - <location filename="Project/ProjectResourcesBrowser.py" line="668"/> + <location filename="Project/ProjectResourcesBrowser.py" line="671"/> <source>Compiling resources...</source> <translation>Компилиляция ресурсов...</translation> </message> <message> - <location filename="Project/ProjectResourcesBrowser.py" line="668"/> + <location filename="Project/ProjectResourcesBrowser.py" line="671"/> <source>Abort</source> <translation>Отмена</translation> </message> <message> - <location filename="Project/ProjectResourcesBrowser.py" line="733"/> + <location filename="Project/ProjectResourcesBrowser.py" line="736"/> <source>Determining changed resources...</source> <translation>Определяю изменённые ресурсы...</translation> </message> <message> - <location filename="Project/ProjectResourcesBrowser.py" line="766"/> + <location filename="Project/ProjectResourcesBrowser.py" line="769"/> <source>Compiling changed resources...</source> <translation>Компилирую изменённые ресурсы...</translation> </message> <message> - <location filename="Project/ProjectResourcesBrowser.py" line="407"/> + <location filename="Project/ProjectResourcesBrowser.py" line="410"/> <source>The file already exists! Overwrite it?</source> <translation>Файл уже существует! Перезаписать?</translation> </message> @@ -30646,80 +30823,125 @@ <context> <name>Queues</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="196"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="246"/> <source>New Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="245"/> - <source>Update Current Patch</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="295"/> + <source>Update Current Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="345"/> <source>Pop Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="299"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="349"/> <source>Push Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="303"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="353"/> <source>Go to Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="481"/> <source>Select Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="314"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="364"/> <source>Select the target patch name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="431"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="481"/> <source>No patches to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="363"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="413"/> <source>Finish Applied Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="395"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="445"/> <source>Rename Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="417"/> - <source>Select the patch to be deleted:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="426"/> - <source>Delete Patch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="471"/> - <source>Fold Patches</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="467"/> + <source>Select the patch to be deleted:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="476"/> + <source>Delete Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="521"/> + <source>Fold Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="517"/> <source>No patches selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="471"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="521"/> <source>No patches available to be folded.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="545"/> + <source>List Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="545"/> + <source>No patches available to list guards for.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="580"/> + <source>Define Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="621"/> + <source>No patches available to define guards for.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="621"/> + <source>Drop All Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="600"/> + <source>Select the patch to drop guards for (leave empty for the current patch):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="655"/> + <source>Set Active Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="655"/> + <source>No guards available to select from.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="677"/> + <source>Deactivate Guards</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>QueuesProjectHelper</name> @@ -30889,187 +31111,187 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="295"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="296"/> <source>Push Next Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="200"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="201"/> <source>Push the next patch onto the stack</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="203"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="204"/> <source><b>Push Next Patch</b><p>This pushes the next patch onto the stack of applied patches.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="309"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="310"/> <source>Push All Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="214"/> <source>Push all patches onto the stack</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="216"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="217"/> <source><b>Push All Patches</b><p>This pushes all patches onto the stack of applied patches.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="324"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="325"/> <source>Push Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="226"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="227"/> <source>Push patches onto the stack</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="339"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="340"/> <source>Pop Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="240"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="241"/> <source>Pop the current patch off the stack</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="243"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="244"/> <source><b>Pop Current Patch</b><p>This pops the current patch off the stack of applied patches.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="353"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="354"/> <source>Pop All Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="253"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="254"/> <source>Pop all patches off the stack</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="256"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="257"/> <source><b>Pop All Patches</b><p>This pops all patches off the stack of applied patches.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="368"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="369"/> <source>Pop Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="266"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="267"/> <source>Pop patches off the stack</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="269"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="270"/> <source><b>Pop Patches</b><p>This pops patches off the stack of applied patches until a named patch is at the top of the stack.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="382"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="383"/> <source>Go to Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="280"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="281"/> <source>Push or pop patches until named patch is at top of stack</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="283"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="284"/> <source><b>Go to Patch</b><p>This pushes or pops patches until a named patch is at the top of the stack.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="298"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="299"/> <source>Push the next patch onto the stack on top of local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="302"/> <source><b>Push Next Patch</b><p>This pushes the next patch onto the stack of applied patches on top of local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="312"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="313"/> <source>Push all patches onto the stack on top of local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="315"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="316"/> <source><b>Push All Patches</b><p>This pushes all patches onto the stack of applied patches on top of local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="327"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="328"/> <source>Push patches onto the stack on top of local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="330"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="331"/> <source><b>Push Patches</b><p>This pushes patches onto the stack of applied patches until a named patch is at the top of the stack on top of local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="343"/> <source>Pop the current patch off the stack forgetting local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="345"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="346"/> <source><b>Pop Current Patch</b><p>This pops the current patch off the stack of applied patches forgetting local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="356"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="357"/> <source>Pop all patches off the stack forgetting local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="359"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="360"/> <source><b>Pop All Patches</b><p>This pops all patches off the stack of applied patches forgetting local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="371"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="372"/> <source>Pop patches off the stack forgetting local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="374"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="375"/> <source><b>Pop Patches</b><p>This pops patches off the stack of applied patches until a named patch is at the top of the stack forgetting local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="385"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="386"/> <source>Push or pop patches until named patch is at top of stack overwriting any local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="389"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="390"/> <source><b>Go to Patch</b><p>This pushes or pops patches until a named patch is at the top of the stack overwriting any local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="404"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="505"/> <source>Queues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="406"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="507"/> <source>Push/Pop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="417"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="518"/> <source>Push/Pop (force)</source> <translation type="unfinished"></translation> </message> @@ -31079,10 +31301,155 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="229"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="230"/> <source><b>Push Patches</b><p>This pushes patches onto the stack of applied patches until a named patch is at the top of the stack.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="403"/> + <source>Define Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="403"/> + <source>Define Guards...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="406"/> + <source>Define guards for the current or a named patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="409"/> + <source><b>Define Guards</b><p>This opens a dialog to define guards for the current or a named patch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="417"/> + <source>Drop All Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="417"/> + <source>Drop All Guards...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="420"/> + <source>Drop all guards of the current or a named patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="423"/> + <source><b>Drop All Guards</b><p>This drops all guards of the current or a named patch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="430"/> + <source>List Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="430"/> + <source>List Guards...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="433"/> + <source>List guards of the current or a named patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="436"/> + <source><b>List Guards</b><p>This lists the guards of the current or a named patch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="443"/> + <source>List All Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="443"/> + <source>List All Guards...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="446"/> + <source>List all guards of all patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="449"/> + <source><b>List All Guards</b><p>This lists all guards of all patches.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="456"/> + <source>Set Active Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="456"/> + <source>Set Active Guards...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="459"/> + <source>Set the list of active guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="462"/> + <source><b>Set Active Guards</b><p>This opens a dialog to set the active guards.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="469"/> + <source>Deactivate Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="469"/> + <source>Deactivate Guards...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="472"/> + <source>Deactivate all active guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="475"/> + <source><b>Deactivate Guards</b><p>This deactivates all active guards.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="483"/> + <source>Identify Active Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="483"/> + <source>Identify Active Guards...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="487"/> + <source>Show a list of active guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="490"/> + <source><b>Identify Active Guards</b><p>This opens a dialog showing a list of active guards.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="529"/> + <source>Guards</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ReplaceWidget</name>