--- a/i18n/eric5_ru.ts Sat Apr 17 16:54:38 2010 +0000 +++ b/i18n/eric5_ru.ts Sat Apr 17 17:48:18 2010 +0000 @@ -13770,105 +13770,265 @@ <context> <name>Hg</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="153"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="154"/> <source>The hg process finished with the exit code {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="157"/> <source>The hg process did not finish within 30s.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="158"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="159"/> <source>Could not start the hg executable.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="184"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="185"/> <source>Create project repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="184"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="185"/> <source>The project repository could not be created.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="220"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="221"/> <source>Creating Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="242"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="243"/> <source>Initial commit to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="283"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="284"/> <source>Cloning project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="376"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="382"/> <source>Commiting changes to Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="412"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="423"/> <source>Synchronizing with the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="460"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="471"/> <source>Adding files/directories to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="520"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="531"/> <source>Removing files/directories from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="578"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="589"/> <source>Renaming {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="671"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="768"/> <source>Merging</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="963"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1137"/> <source>Copying {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <source>Mercurial Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1017"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1230"/> <source>Select number of entries to show.</source> <translation type="unfinished">Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1078"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1301"/> <source>Pulling from a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1103"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1326"/> <source>Pushing to a remote Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1435"/> <source>Resolving files/directories</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="697"/> + <source>Taging in the Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="727"/> + <source>Reverting changes</source> + <translation type="unfinished">Отменяю изменения</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="968"/> + <source>Mercurial command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> + <source>Create Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1457"/> + <source>Enter branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1468"/> + <source>Creating branch in the Mercurial repository</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgAnnotateDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="14"/> + <source>Mercurial Annotate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="48"/> + <source>Revision</source> + <translation type="unfinished">Версия (ревизия)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="53"/> + <source>Changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="58"/> + <source>Author</source> + <translation type="unfinished">Автор</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="63"/> + <source>Date</source> + <translation type="unfinished">Дата</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="68"/> + <source>Line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="82"/> + <source>Errors</source> + <translation type="unfinished">Ошибки</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="104"/> + <source>Input</source> + <translation type="unfinished">Ввод</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="126"/> + <source>Press to send the input to the hg process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="129"/> + <source>&Send</source> + <translation type="unfinished">&Отправить</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="132"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="139"/> + <source>Enter data to be sent to the hg process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="146"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">Задать режим ввода пароля для поля ввода пароля</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="149"/> + <source>&Password Mode</source> + <translation type="unfinished">&Парольный режим</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.ui" line="152"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="110"/> + <source>Process Generation Error</source> + <translation type="unfinished">Ошибка процесса генерации</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="110"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgCommandDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="14"/> + <source>Mercurial Command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="23"/> + <source>Mercurial Command:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="36"/> + <source>Enter the Mercurial command to be executed with all necessary parameters</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="39"/> + <source><b>Mercurial Command</b> +<p>Enter the Mercurial command to be executed including all necessary +parameters. If a parameter of the commandline includes a space you have to +surround this parameter by single or double quotes. Do not include the name +of the Mercurial client executable (i.e. hg).</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="68"/> + <source>Project Directory:</source> + <translation type="unfinished">Каталог проекта:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="81"/> + <source>This shows the root directory of the current project.</source> + <translation type="unfinished">Корневой каталог текущего проекта.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.ui" line="84"/> + <source>project directory</source> + <translation type="unfinished">каталог проекта</translation> + </message> </context> <context> <name>HgCommitDialog</name> @@ -14183,17 +14343,17 @@ <translation type="unfinished">Задайте поле, по которому фильтровать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="554"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="748"/> <source>Revision</source> <translation type="unfinished">Версия (ревизия)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="551"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="745"/> <source>Author</source> <translation type="unfinished">Автор</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="53"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> <source>Message</source> <translation type="unfinished">Сообщение</translation> </message> @@ -14203,150 +14363,160 @@ <translation type="unfinished">Задайте регулярное выражения для фильтра</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="132"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="139"/> <source>Date</source> <translation type="unfinished">Дата</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="180"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="192"/> <source>Action</source> <translation type="unfinished">Действие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="185"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="197"/> <source>Path</source> <translation type="unfinished">Путь</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="190"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="202"/> <source>Copy from</source> <translation type="unfinished">Копировать из</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="207"/> <source>Copy from Rev</source> <translation type="unfinished">Копировать из версии</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="205"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="217"/> <source>Press to get the next bunch of log entries</source> <translation type="unfinished">Нажмите для получения следующей части сообщений журнала</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="208"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="220"/> <source>&Next</source> <translation type="unfinished">&Далее</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="227"/> <source>Enter the limit of entries to fetch</source> <translation type="unfinished">Задайте максимальное количество записей</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="234"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="246"/> <source>Select to stop listing log messages at a copy or move</source> <translation type="unfinished">Выберите для приостановки пролистывания сообщений журнала при копировании или перемещении</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="237"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="249"/> <source>Stop on Copy/Move</source> <translation type="unfinished">Стоп при копировании/перемещении</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="251"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="263"/> <source>Press to generate a diff to the previous revision</source> <translation type="unfinished">Создания сравнение с предыдущей версией</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="254"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="266"/> <source>&Diff to Previous</source> <translation type="unfinished">&Сравнить с предыдущей</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="261"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="273"/> <source>Press to compare two revisions</source> <translation type="unfinished">Нажмите, чтобы сравнить две версии</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="264"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="276"/> <source>&Compare Revisions</source> <translation type="unfinished">&Сравнить версии</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="292"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="304"/> <source>Errors</source> <translation type="unfinished">Ошибки</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="301"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="313"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="317"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="329"/> <source>Input</source> <translation type="unfinished">Ввод</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="339"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="351"/> <source>Press to send the input to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="342"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="354"/> <source>&Send</source> <translation type="unfinished">&Отправить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="345"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="357"/> <source>Alt+S</source> <translation type="unfinished">Alt+S</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="352"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="364"/> <source>Enter data to be sent to the hg process</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="371"/> <source>Select to switch the input field to password mode</source> <translation type="unfinished">Задать режим ввода пароля для поля ввода пароля</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="362"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="374"/> <source>&Password Mode</source> <translation type="unfinished">&Парольный режим</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="365"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="377"/> <source>Alt+P</source> <translation type="unfinished">Alt+P</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="70"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="90"/> <source>Added</source> <translation type="unfinished">Добавлено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="91"/> <source>Deleted</source> <translation type="unfinished">Удалено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="92"/> <source>Modified</source> <translation type="unfinished">Изменено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="413"/> <source>Process Generation Error</source> <translation type="unfinished">Ошибка процесса генерации</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="233"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="413"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="124"/> + <source>Branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="149"/> + <source>Tags</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -14552,24 +14722,39 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="111"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="137"/> <source>Select to not specify a specific revision</source> <translation type="unfinished"></translation> </message> <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="140"/> + <source>No revision selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="153"/> + <source>Select to force the merge operation</source> + <translation type="unfinished">Выполнить операцию слияния принудительно</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="156"/> + <source>Enforce merge</source> + <translation type="unfinished">Слить принудительно</translation> + </message> + <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="114"/> - <source>No revision selected</source> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="117"/> + <source>Branch:</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="127"/> - <source>Select to force the merge operation</source> - <translation type="unfinished">Выполнить операцию слияния принудительно</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="130"/> - <source>Enforce merge</source> - <translation type="unfinished">Слить принудительно</translation> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -14606,12 +14791,12 @@ <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="57"/> <source>Enter the url path of the module in the repository</source> - <translation type="unfinished">Задайте путь URL модуля в репозитории</translation> + <translation type="obsolete">Задайте путь URL модуля в репозитории</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="64"/> <source>Select the repository url via a directory selection dialog or the repository browser</source> - <translation type="unfinished">Задайте URL репозитория с помощью диалога выбора каталога или проводника репозитория</translation> + <translation type="obsolete">Задайте URL репозитория с помощью диалога выбора каталога или проводника репозитория</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="116"/> @@ -14656,6 +14841,16 @@ <source>Select Project Directory</source> <translation type="unfinished">Выберите каталог проекта</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="64"/> + <source>Select the repository url via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="57"/> + <source>Enter the url path of the repository</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgOptionsDialog</name> @@ -14699,547 +14894,1284 @@ <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="450"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474"/> <source>Version Control</source> <translation type="unfinished">Контроль версий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="461"/> - <source>Commit changes to repository...</source> - <translation type="unfinished">Зафиксировать изменения в репозитории...</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="466"/> - <source>Add to repository</source> - <translation type="unfinished">Добавить в репозиторий</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="469"/> - <source>Remove from repository (and disk)</source> - <translation type="unfinished">Удаление из репозитория (и с диска)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="398"/> - <source>Copy in repository</source> - <translation type="unfinished">Копировать в репозиторий</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="400"/> - <source>Move in repository</source> - <translation type="unfinished">Переместить в репозиторий</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="403"/> - <source>Show log</source> - <translation type="unfinished">Показать журнал</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="406"/> - <source>Show limited log</source> - <translation type="unfinished">Показать ограниченный журнал</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="409"/> - <source>Show log browser</source> - <translation type="unfinished">Показать проводник журналов</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="474"/> - <source>Show difference</source> - <translation type="unfinished">Показать различие</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="477"/> - <source>Show difference (extended)</source> - <translation type="unfinished">Показать различие (расширенно)</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="482"/> - <source>Resolve conflict</source> - <translation type="unfinished">Разрешить конфликт</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="485"/> + <source>Commit changes to repository...</source> + <translation type="unfinished">Зафиксировать изменения в репозитории...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="490"/> + <source>Add to repository</source> + <translation type="unfinished">Добавить в репозиторий</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="493"/> + <source>Remove from repository (and disk)</source> + <translation type="unfinished">Удаление из репозитория (и с диска)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="415"/> + <source>Copy in repository</source> + <translation type="unfinished">Копировать в репозиторий</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="417"/> + <source>Move in repository</source> + <translation type="unfinished">Переместить в репозиторий</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="420"/> + <source>Show log</source> + <translation type="unfinished">Показать журнал</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="423"/> + <source>Show limited log</source> + <translation type="unfinished">Показать ограниченный журнал</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="426"/> + <source>Show log browser</source> + <translation type="unfinished">Показать проводник журналов</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="502"/> + <source>Show difference</source> + <translation type="unfinished">Показать различие</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="505"/> + <source>Show difference (extended)</source> + <translation type="unfinished">Показать различие (расширенно)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="513"/> + <source>Resolve conflict</source> + <translation type="unfinished">Разрешить конфликт</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="516"/> <source>Select all local file entries</source> <translation type="unfinished">Выделить все локальные файлы</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="487"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="518"/> <source>Select all versioned file entries</source> <translation type="unfinished">Выделить все файлы с версиями (VCS)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="489"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="520"/> <source>Select all local directory entries</source> <translation type="unfinished">Выделить все локальные каталоги</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="491"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="522"/> <source>Select all versioned directory entries</source> <translation type="unfinished">Выделить все каталоги с версиями (VCS)</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <source>Show status</source> + <translation type="unfinished">Показать статус</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="252"/> + <source>Show annotated file</source> + <translation type="unfinished">Показать файл, снабжённый комментариями</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> + <source>Revert changes</source> + <translation type="unfinished">Отмена изменений</translation> + </message> </context> <context> <name>HgProjectHelper</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="49"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="50"/> <source>New from repository</source> <translation type="unfinished">Новый из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="49"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="50"/> <source>&New from repository...</source> <translation type="unfinished">&Новый из репозитория...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="52"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="53"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="55"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="56"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="63"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="64"/> <source>Show incoming log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="67"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="68"/> <source>Show the log of incoming changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="70"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="71"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="77"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="78"/> <source>Pull changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="81"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="82"/> <source>Pull changes from a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="84"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="85"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="93"/> <source>Update from repository</source> <translation type="unfinished">Загрузить из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="92"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="93"/> <source>&Update from repository</source> <translation type="unfinished">&Загрузить из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="96"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="97"/> <source>Update the local project from the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="99"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="100"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="107"/> <source>Commit changes to repository</source> <translation type="unfinished">Сохранение изменения в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="106"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="107"/> <source>&Commit changes to repository...</source> <translation type="unfinished">&Сохранение изменения в репозиторий...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="110"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="111"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="113"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="114"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="121"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="122"/> <source>Show outgoing log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="125"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126"/> <source>Show the log of outgoing changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="128"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="129"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="135"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="136"/> <source>Push changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="140"/> <source>Push changes to a remote repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="142"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="143"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="151"/> <source>Export from repository</source> <translation type="unfinished">Экспорт из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="150"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="151"/> <source>&Export from repository...</source> <translation type="unfinished">&Экспорт из репозитория...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="154"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> <source>Export a project from the repository</source> <translation type="unfinished">Экспортировать проект из репозитория</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="157"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation type="unfinished"><b>Экспорт из репозитория</b><p>Экспортировать проект из репозитория.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="164"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165"/> <source>Add to repository</source> <translation type="unfinished">Добавить в репозиторий</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="164"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="165"/> <source>&Add to repository...</source> <translation type="unfinished">&Добавить в репозиторий...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="167"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> <source>Add the local project to the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="170"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> <source><b>Add to repository</b><p>This adds (imports) the local project to the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="177"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178"/> <source>Remove from repository (and disk)</source> <translation type="unfinished">Удаление из репозитория (и с диска)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="177"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="178"/> <source>&Remove from repository (and disk)</source> <translation type="unfinished">&Удалить из репозитория (и с диска)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="181"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="182"/> <source>Remove the local project from the repository (and disk)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="185"/> <source><b>Remove from repository</b><p>This removes the local project from the repository (and disk).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="193"/> <source>Show log</source> <translation type="unfinished">Показать журнал</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="192"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="193"/> <source>Show &log</source> <translation type="unfinished">Показать &журнал</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="196"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="197"/> <source>Show the log of the local project</source> <translation type="unfinished">Показать журнал изменений локального проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation type="unfinished"><b>Показать журнал</b><p>Показать журнал изменений локального проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="207"/> <source>Show limited log</source> <translation type="unfinished">Показать ограниченный журнал</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="210"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="211"/> <source>Show a limited log of the local project</source> <translation type="unfinished">Показать ограниченный журнал изменений локального проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="213"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="214"/> <source><b>Show limited log</b><p>This shows the log of the local project limited to a selectable number of entries.</p></source> <translation type="unfinished"><b>Показать ограниченный журнал</b><p>Отображает журнал с заданным количеством элементов.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="221"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Show log browser</source> <translation type="unfinished">Показать проводник журналов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="225"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="226"/> <source>Show a dialog to browse the log of the local project</source> <translation type="unfinished">Показать диалог для навигации по файлу журнала для локального проекта</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="229"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation type="unfinished"><b>Показать проводник журнала</b><p>Показывает диалог для навигации по файлу журнала локального проекта. Изначально показывается ограниченное количество записей. Дальнейшие записи могут быть получены позже.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="238"/> <source>Show difference</source> <translation type="unfinished">Показать различие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="237"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="238"/> <source>Show &difference</source> <translation type="unfinished">Показать &различие</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> <source>Show the difference of the local project to the repository</source> <translation type="unfinished">Показать изменения между репозиторием и локальной копией</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="244"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="245"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation type="unfinished"><b>Показать различие</b> <p>Показать различие между локальным проектом и репозиторием.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="251"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="252"/> <source>Show difference (extended)</source> <translation type="unfinished">Показать различие (расширенно)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="255"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source>Show the difference of revisions of the project to the repository</source> <translation type="unfinished">Показать разницу версий между репозиторием и локальной копией</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="258"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="259"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation type="unfinished"><b>Показать разницу (насширенно)</b><p>Отображает различие выбираемых ревизий проекта.</p></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="265"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show heads</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="283"/> <source>Show the heads of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="286"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="278"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="293"/> <source>Show parents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="281"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show the parents of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="284"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="299"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="291"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="306"/> <source>Show tip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="294"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="309"/> <source>Show the tip of the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="297"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> <source>Merge</source> <translation type="unfinished">Слить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="333"/> <source>Mer&ge changes...</source> <translation type="unfinished">С&лить изменения...</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="308"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> <source>Merge changes of a revision into the local project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="340"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Resolve conflicts</source> <translation type="unfinished">Разрешение конфликтов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="318"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Resolve con&flicts</source> <translation type="unfinished">Разрешение кон&фликтов</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="321"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source>Resolve all conflicts of the local project</source> <translation type="unfinished">Разрешить все конфликты, возникшие в локальном проекте</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="324"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="353"/> <source><b>Resolve conflicts</b><p>This resolves all conflicts of the local project.</p></source> <translation type="unfinished"><b>Разрешение конфликтов</b><p>Разрешает конфликты, возникшие при обновлении локальной копии с репозитория.</p></translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> + <source>Show status</source> + <translation type="unfinished">Показать статус</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="266"/> + <source>Show &status</source> + <translation type="unfinished">Показать &статус</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="270"/> + <source>Show the status of the local project</source> + <translation type="unfinished">Показать статус локального проекта</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="273"/> + <source><b>Show status</b><p>This shows the status of the local project.</p></source> + <translation type="unfinished"><b>Показать статус</b><p>Показать статус локального проекта.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> + <source>Revert changes</source> + <translation type="unfinished">Отмена изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="319"/> + <source>Re&vert changes</source> + <translation type="unfinished">От&мена изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="323"/> + <source>Revert all changes made to the local project</source> + <translation type="unfinished">Отменить все изменения в локальном проекте</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="326"/> + <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> + <translation type="unfinished"><b>Отмена изменений</b><p>Все изменения в локальном проекте будут отменены.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> + <source>Tag in repository</source> + <translation type="unfinished">Создать тег в репозитории</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="360"/> + <source>&Tag in repository...</source> + <translation type="unfinished">&Создать тег в репозитории...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> + <source>Tag the local project in the repository</source> + <translation type="unfinished">Создать в репозитории тег для проекта</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="367"/> + <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> + <translation type="unfinished"><b>Создать тег</b><p>Создаёт тег для локального проекта в репозитории.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> + <source>List tags</source> + <translation type="unfinished">Список тегов</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="374"/> + <source>List tags...</source> + <translation type="unfinished">Список тегов...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="377"/> + <source>List tags of the project</source> + <translation type="unfinished">Список тегов текущего проекта</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="380"/> + <source><b>List tags</b><p>This lists the tags of the project.</p></source> + <translation type="unfinished"><b>Список тегов</b><p>Отображает список тегов текущего проекта.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="387"/> + <source>List branches</source> + <translation type="unfinished">Список ветвей</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="387"/> + <source>List branches...</source> + <translation type="unfinished">Список ветвей...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> + <source>List branches of the project</source> + <translation type="unfinished">Список ветвей текущего проекта</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> + <source><b>List branches</b><p>This lists the branches of the project.</p></source> + <translation type="unfinished"><b>Список ветвей</b> +<p>Отображает список ветвей текущего проекта.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> + <source>Create branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> + <source>Create &branch...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="404"/> + <source>Create a new branch for the local project in the repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="407"/> + <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="415"/> + <source>Close branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="418"/> + <source>Close the current branch of the local project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="421"/> + <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="428"/> + <source>Switch</source> + <translation type="unfinished">Переключиться</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="428"/> + <source>S&witch...</source> + <translation type="unfinished">Пе&реключиться...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="432"/> + <source>Switch the working directory to another revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="435"/> + <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <source>Cleanup</source> + <translation type="unfinished">Очистка</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="442"/> + <source>Cleanu&p</source> + <translation type="unfinished">О&чистка</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="445"/> + <source>Cleanup the local project</source> + <translation type="unfinished">Очистить локальный проект</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="448"/> + <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> + <translation type="unfinished"><b>Очистка</b><p>Очистить локальный проект.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="455"/> + <source>Execute command</source> + <translation type="unfinished">Выполнить команду</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="455"/> + <source>E&xecute command...</source> + <translation type="unfinished">В&ыполнить команду...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> + <source>Execute an arbitrary Mercurial command</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> + <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <source>Command options</source> + <translation type="unfinished">Опции командной строки</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <source>Command &options...</source> + <translation type="unfinished">&Опции командной строки...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="471"/> + <source>Show the Mercurial command options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="472"/> + <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> + <source>Configure</source> + <translation type="unfinished">Настроить</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> + <source>Configure...</source> + <translation type="unfinished">Настроить...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> + <source>Show the configuration dialog with the Mercurial page selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="485"/> + <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRevisionSelectionDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="14"/> - <source>Mercurial Diff</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="23"/> <source>Revision &1</source> - <translation type="unfinished">Ревизия &1</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="153"/> + <translation type="obsolete">Ревизия &1</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="29"/> <source>Select to specify a revision by number</source> <translation type="unfinished">Задать ревизию порядковым номером</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="156"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="32"/> <source>Number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="166"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="42"/> <source>Enter a revision number</source> <translation type="unfinished">Задайте номер ревизии</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="195"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="71"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="198"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="74"/> <source>Id:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="208"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="84"/> <source>Enter a changeset id</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="215"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="91"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="218"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="94"/> <source>Tag:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="228"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="110"/> <source>Enter a tag name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="235"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="149"/> <source>Select tip revision of repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="238"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="152"/> <source>TIP</source> <translation type="unfinished"></translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="248"/> <source>Select working revision</source> - <translation type="unfinished">Рабочая ревизия</translation> + <translation type="obsolete">Рабочая ревизия</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="251"/> <source>WORKING</source> - <translation type="unfinished">WORKING</translation> + <translation type="obsolete">WORKING</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="258"/> <source>Select revision before last commit</source> - <translation type="unfinished">Выбрать ревизию перед последней фиксацией</translation> + <translation type="obsolete">Выбрать ревизию перед последней фиксацией</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="261"/> <source>PREV</source> - <translation type="unfinished">PREV</translation> + <translation type="obsolete">PREV</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="147"/> <source>Revision &2</source> + <translation type="obsolete">Ревизия &2</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="14"/> + <source>Mercurial Revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="23"/> + <source>Revision</source> + <translation type="unfinished">Версия (ревизия)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="120"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="123"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="139"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgRevisionsSelectionDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="14"/> + <source>Mercurial Diff</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="23"/> + <source>Revision &1</source> + <translation type="unfinished">Ревизия &1</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="175"/> + <source>Select to specify a revision by number</source> + <translation type="unfinished">Задать ревизию порядковым номером</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="178"/> + <source>Number</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="188"/> + <source>Enter a revision number</source> + <translation type="unfinished">Задайте номер ревизии</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="217"/> + <source>Select to specify a revision by changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="220"/> + <source>Id:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="230"/> + <source>Enter a changeset id</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="237"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="240"/> + <source>Tag:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="250"/> + <source>Enter a tag name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="260"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="263"/> + <source>Branch:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="273"/> + <source>Enter a branch name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="283"/> + <source>Select tip revision of repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="286"/> + <source>TIP</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="296"/> + <source>Select revision before last commit</source> + <translation type="unfinished">Выбрать ревизию перед последней фиксацией</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="299"/> + <source>PREV</source> + <translation type="unfinished">PREV</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="169"/> + <source>Revision &2</source> <translation type="unfinished">Ревизия &2</translation> </message> </context> <context> + <name>HgStatusDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="180"/> + <source>Mercurial Status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="17"/> + <source><b>Mercurial Status</b> +<p>This dialog shows the status of the selected file or project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="46"/> + <source>Status</source> + <translation type="unfinished">Статус</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="51"/> + <source>Path</source> + <translation type="unfinished">Путь</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="65"/> + <source>Errors</source> + <translation type="unfinished">Ошибки</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/> + <source>Input</source> + <translation type="unfinished">Ввод</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="109"/> + <source>Press to send the input to the hg process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="112"/> + <source>&Send</source> + <translation type="unfinished">&Отправить</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="115"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="122"/> + <source>Enter data to be sent to the hg process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="129"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">Задать режим ввода пароля для поля ввода пароля</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="132"/> + <source>&Password Mode</source> + <translation type="unfinished">&Парольный режим</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="135"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="41"/> + <source>Refresh</source> + <translation type="unfinished">Обновить</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="42"/> + <source>Press to refresh the status display</source> + <translation type="unfinished">Нажмите, чтобы обновить отображение статуса</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="56"/> + <source>Commit changes to repository...</source> + <translation type="unfinished">Зафиксировать изменения в репозитории...</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="59"/> + <source>Add to repository</source> + <translation type="unfinished">Добавить в репозиторий</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="61"/> + <source>Revert changes</source> + <translation type="unfinished">Отмена изменений</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="64"/> + <source>Adjust column sizes</source> + <translation type="unfinished">Подстроить размеры колонок</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="85"/> + <source>added</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="88"/> + <source>modified</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="89"/> + <source>removed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="90"/> + <source>not tracked</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="86"/> + <source>normal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="87"/> + <source>ignored</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="91"/> + <source>missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="187"/> + <source>Process Generation Error</source> + <translation type="unfinished">Ошибка процесса генерации</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="187"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="368"/> + <source>Commit</source> + <translation type="unfinished">Зафиксировать</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <source>There are no uncommitted changes available/selected.</source> + <translation type="unfinished">Нет доступных/выбранных неотправленных изменений.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="394"/> + <source>Add</source> + <translation type="unfinished">Добавить</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="394"/> + <source>There are no unversioned entries available/selected.</source> + <translation type="unfinished">Нет/не выбраны неверсионные элементы.</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="414"/> + <source>Revert</source> + <translation type="unfinished">Откатить</translation> + </message> +</context> +<context> <name>HgStatusMonitorThread</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="103"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="104"/> <source>Mercurial status checked successfully</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="114"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="115"/> <source>Could not start the Mercurial process.</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>HgTagBranchListDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="14"/> + <source>Mercurial Tag List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="17"/> + <source><b>Mercurial Tag/Branch List</b> +<p>This dialog shows a list of the projects tags or branches.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="36"/> + <source><b>Tag/Branches List</b> +<p>This shows a list of the projects tags or branches.</p></source> + <translation type="unfinished"><b>Список тегов/ветвей</b> +<p>Отображает список тегов или ветвей проекта.</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="53"/> + <source>Revision</source> + <translation type="unfinished">Версия (ревизия)</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="58"/> + <source>Changeset</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="63"/> + <source>Local</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="68"/> + <source>Name</source> + <translation type="unfinished">Имя</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="82"/> + <source>Errors</source> + <translation type="unfinished">Ошибки</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="104"/> + <source>Input</source> + <translation type="unfinished">Ввод</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="126"/> + <source>Press to send the input to the hg process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="129"/> + <source>&Send</source> + <translation type="unfinished">&Отправить</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="132"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="139"/> + <source>Enter data to be sent to the hg process</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="146"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished">Задать режим ввода пароля для поля ввода пароля</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="149"/> + <source>&Password Mode</source> + <translation type="unfinished">&Парольный режим</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.ui" line="152"/> + <source>Alt+P</source> + <translation type="unfinished">Alt+P</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="81"/> + <source>Mercurial Branches List</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="82"/> + <source>Status</source> + <translation type="unfinished">Статус</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <source>Process Generation Error</source> + <translation type="unfinished">Ошибка процесса генерации</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="112"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="212"/> + <source>active</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="217"/> + <source>yes</source> + <translation type="unfinished">да</translation> + </message> +</context> +<context> + <name>HgTagDialog</name> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="14"/> + <source>Subversion Tag</source> + <translation type="obsolete">Тег Subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="39"/> + <source>Enter the name of the tag</source> + <translation type="unfinished">Задайте имя тега</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="42"/> + <source><b>Tag Name</b> +<p>Enter the name of the tag to be created, moved or deleted.</p></source> + <translation type="unfinished"><b>Имя тега</b> +<p>Задайте имя тега для создания, перемещеия или удаления</p></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="59"/> + <source>Name:</source> + <translation type="unfinished">Имя:</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="66"/> + <source>Tag Action</source> + <translation type="unfinished">Действие тега</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="72"/> + <source>Select to create a regular tag</source> + <translation type="unfinished">Выберите для создания обычного тега</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="75"/> + <source><b>Create Regular Tag</b> +<p>Select this entry in order to create a regular tag.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="79"/> + <source>Create Regular Tag</source> + <translation type="unfinished">Создать обычный тег</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="89"/> + <source>Select to create a local tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="92"/> + <source><b>Create Local Tag</b> +<p>Select this entry in order to create a local tag.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="96"/> + <source>Create Local Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="103"/> + <source>Select to delete a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="106"/> + <source><b>Delete Tag</b> +<p>Select this entry in order to delete the selected tag.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="110"/> + <source>Delete Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="14"/> + <source>Mercurial Tag</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HistoryDialog</name> <message> <location filename="Helpviewer/History/HistoryDialog.ui" line="14"/> @@ -18446,15 +19378,30 @@ <translation type="unfinished">Задайте количество комментариев к фиксациям, которое необходимо помнить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="124"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/> <source>Edit the mercurial config file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="127"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="146"/> <source>Edit config file</source> <translation type="unfinished">Править файл конфигурации</translation> </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="124"/> + <source>Incoming / Outgoing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="130"/> + <source>Select to show the incoming and outgoing log in a log browser dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="133"/> + <source>Use Log Browser for incoming / outgoing log</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MessageBoxWizard</name> @@ -28704,67 +29651,67 @@ <context> <name>SvnBlameDialog</name> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.ui" line="13"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.ui" line="14"/> <source>Subversion Blame</source> <translation>Обвинить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.ui" line="41"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.ui" line="48"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.ui" line="46"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.ui" line="53"/> <source>Author</source> <translation>Автор</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.ui" line="51"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.ui" line="58"/> <source>Line</source> <translation>Строка</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.ui" line="65"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.ui" line="72"/> <source>Errors</source> <translation>Ошибки</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.ui" line="87"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.ui" line="94"/> <source>Input</source> <translation>Ввод</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.ui" line="109"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.ui" line="116"/> <source>Press to send the input to the subversion process</source> <translation>Отправить данные процессу subversion</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.ui" line="112"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.ui" line="119"/> <source>&Send</source> <translation>&Отправить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.ui" line="115"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.ui" line="122"/> - <source>Enter data to be sent to the subversion process</source> - <translation>Задайте данные, которые будут посланы процессу subversion</translation> + <source>Alt+S</source> + <translation>Alt+S</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.ui" line="129"/> + <source>Enter data to be sent to the subversion process</source> + <translation>Задайте данные, которые будут посланы процессу subversion</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.ui" line="136"/> <source>Select to switch the input field to password mode</source> <translation>Задать режим ввода пароля для поля ввода пароля</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.ui" line="132"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.ui" line="139"/> <source>&Password Mode</source> <translation>&Парольный режим</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.ui" line="135"/> + <location filename="Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.ui" line="142"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> @@ -31319,17 +32266,17 @@ <translation>Зафиксировать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="437"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="438"/> <source>There are no uncommitted changes available/selected.</source> <translation>Нет доступных/выбранных неотправленных изменений.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="453"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="458"/> <source>Lock</source> <translation>Захватить</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="468"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="473"/> <source>Unlock</source> <translation>Освободить</translation> </message> @@ -31374,22 +32321,22 @@ <translation>заменено</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="453"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="458"/> <source>There are no unlocked files available/selected.</source> <translation>Нет доступных/выбранных незахваченных файлов.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="498"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="503"/> <source>There are no locked files available/selected.</source> <translation>Нет доступных/выбранных захваченных файлов.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="483"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="488"/> <source>Break Lock</source> <translation>Нарушить захват</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="498"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="503"/> <source>Steal Lock</source> <translation>Украсть захват</translation> </message> @@ -31541,7 +32488,7 @@ <translation>Нет/не выбраны неверсионные элементы.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="437"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="438"/> <source>Revert</source> <translation>Откатить</translation> </message> @@ -31561,17 +32508,17 @@ <translation>Добавить к списку изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="536"/> <source>Remove from Changelist</source> <translation>Удалить из списка изменений</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="513"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="518"/> <source>There are no files available/selected not belonging to a changelist.</source> <translation>Среди выбранных нет файлов не включенных в список изменений.</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="531"/> + <location filename="Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py" line="536"/> <source>There are no files available/selected belonging to a changelist.</source> <translation>Среди выбранных нет файлов включенных в список изменений.</translation> </message> @@ -37187,7 +38134,7 @@ <context> <name>Utilities</name> <message> - <location filename="Utilities/__init__.py" line="839"/> + <location filename="Utilities/__init__.py" line="844"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>В строках вы можете использовать следующие %-коды:: <table> @@ -41150,24 +42097,17 @@ <context> <name>mercurial</name> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="862"/> - <source><p><table> -<tr><td><b>Parent #{0}</b></td><td></td></tr> -<tr><td><b>Changeset</b></td><td>{1}</td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1165"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1388"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1169"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1392"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1176"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1399"/> <source><tr><td><b>Last author</b></td><td>{0}</td></tr> <tr><td><b>Committed date</b></td><td>{1}</td></tr> <tr><td><b>Committed time</b></td><td>{2}</td></tr> @@ -41175,28 +42115,43 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="882"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1382"/> + <source><tr><td><b>Tip</b></td><td></td></tr> +</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1384"/> + <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1396"/> + <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1021"/> + <source><tr><td><b>Parent #{0}</b></td><td></td></tr> +<tr><td><b>Changeset</b></td><td>{1}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1033"/> + <source><tr><td><b>Last author</b></td><td>{0}</td></tr> +<tr><td><b>Committed date</b></td><td>{1}</td></tr> +<tr><td><b>Committed time</b></td><td>{2}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1054"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> +<tr></tr> +<tr><td><b>URL</b></td><td>{1}</td></tr> </table></p> -{1}</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1159"/> - <source><tr><td><b>Tip</b></td><td></td></tr> -</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1161"/> - <source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/hg.py" line="1173"/> - <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> +{2}</source> <translation type="unfinished"></translation> </message> </context>