--- a/i18n/eric5_ru.ts Sun May 09 17:05:33 2010 +0200 +++ b/i18n/eric5_ru.ts Sun May 09 18:13:43 2010 +0200 @@ -14704,12 +14704,12 @@ <translation type="unfinished">Задайте поле, по которому фильтровать</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="830"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="878"/> <source>Revision</source> <translation type="unfinished">Версия (ревизия)</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="827"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="875"/> <source>Author</source> <translation type="unfinished">Автор</translation> </message> @@ -14724,22 +14724,22 @@ <translation type="unfinished">Задайте регулярное выражения для фильтра</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="136"/> + <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="189"/> + <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="194"/> + <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="199"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="202"/> <source>Copy from</source> <translation type="unfinished">Копировать из</translation> </message> @@ -14749,27 +14749,27 @@ <translation type="obsolete">Копировать из версии</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="209"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="212"/> <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="212"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="215"/> <source>&Next</source> <translation type="unfinished">&Далее</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="219"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="222"/> <source>Enter the limit of entries to fetch</source> <translation type="unfinished">Задайте максимальное количество записей</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="238"/> - <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="241"/> + <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="244"/> <source>Stop on Copy/Move</source> <translation type="unfinished">Стоп при копировании/перемещении</translation> </message> @@ -14784,62 +14784,62 @@ <translation type="obsolete">&Сравнить с предыдущей</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="273"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="278"/> <source>Press to compare two revisions</source> - <translation type="obsolete">Нажмите, чтобы сравнить две версии</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="276"/> + <translation type="unfinished">Нажмите, чтобы сравнить две версии</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="281"/> <source>&Compare Revisions</source> - <translation type="obsolete">&Сравнить версии</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="296"/> + <translation type="unfinished">&Сравнить версии</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="309"/> <source>Errors</source> <translation type="unfinished">Ошибки</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="305"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="318"/> <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="321"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="334"/> <source>Input</source> <translation type="unfinished">Ввод</translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="343"/> - <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="346"/> - <source>&Send</source> - <translation type="unfinished">&Отправить</translation> - </message> - <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/> - <source>Alt+S</source> - <translation type="unfinished">Alt+S</translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="356"/> - <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="363"/> - <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="366"/> - <source>&Password Mode</source> - <translation type="unfinished">&Парольный режим</translation> + <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="359"/> + <source>&Send</source> + <translation type="unfinished">&Отправить</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="362"/> + <source>Alt+S</source> + <translation type="unfinished">Alt+S</translation> </message> <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/> + <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="376"/> + <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="379"/> + <source>&Password Mode</source> + <translation type="unfinished">&Парольный режим</translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="382"/> <source>Alt+P</source> <translation type="unfinished">Alt+P</translation> </message> @@ -14869,12 +14869,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="121"/> + <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="146"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="149"/> <source>Tags</source> <translation type="unfinished"></translation> </message> @@ -14894,27 +14894,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="116"/> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="119"/> <source>Graph</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="255"/> - <source>Press to generate a diff to the first parent revision</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="258"/> + <source>Press to generate a diff to the first parent revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="261"/> <source>Diff to Parent &1</source> <translation type="unfinished"></translation> </message> <message> - <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="265"/> - <source>Press to generate a diff to the second parent revision</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="268"/> + <source>Press to generate a diff to the second parent revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="271"/> <source>Diff to Parent &2</source> <translation type="unfinished"></translation> </message> @@ -24468,7 +24468,7 @@ <translation>Статус VCS</translation> </message> <message> - <location filename="Project/ProjectBrowserModel.py" line="601"/> + <location filename="Project/ProjectBrowserModel.py" line="682"/> <source>local</source> <translation>локальный</translation> </message>