--- a/i18n/eric6_ru.ts Sun Nov 22 12:03:31 2015 +0100 +++ b/i18n/eric6_ru.ts Sun Nov 22 18:41:02 2015 +0100 @@ -3115,37 +3115,37 @@ <translation>Сообщение</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="68"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/> <source>PEP-257</source> <translation>PEP-257</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="69"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="74"/> <source>Eric</source> <translation>Eric</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="73"/> - <source>Statistics...</source> - <translation>Статистика...</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="75"/> - <source>Press to show some statistics for the last run</source> - <translation>Показать результаты последней проверки</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="78"/> - <source>Show</source> - <translation>Показать</translation> + <source>Statistics...</source> + <translation>Статистика...</translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="80"/> + <source>Press to show some statistics for the last run</source> + <translation>Показать результаты последней проверки</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="83"/> + <source>Show</source> + <translation>Показать</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="85"/> <source>Press to show all files containing an issue</source> <translation>Показать все файлы содержащие ошибки</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="552"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="557"/> <source>Error: {0}</source> <translation>Ошибка: {0}</translation> </message> @@ -3155,7 +3155,7 @@ <translation>Исправлено: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="692"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="697"/> <source>No issues found.</source> <translation>Проблем со стилем не найдено.</translation> </message> @@ -3180,12 +3180,12 @@ <translation>Показать проигнорированные</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="645"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="650"/> <source>{0} (ignored)</source> <translation>{0} (проигнорировано)</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="537"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="542"/> <source>Preparing files...</source> <translation type="unfinished"></translation> </message> @@ -3200,12 +3200,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="134"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="139"/> <source>Errors</source> <translation type="unfinished">Ошибки</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="579"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="584"/> <source>Transferring data...</source> <translation type="unfinished"></translation> </message> @@ -4874,14 +4874,14 @@ <translation>Компилятор интерфейсов (IDL Compiler)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="57"/> + <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="33"/> <source>Press to select the IDL compiler via a file selection dialog.</source> <translation>Нажмите, чтобы выбрать компилятор интерфейсов с помощью файлового диалога.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="43"/> <source>Enter the path to the IDL compiler.</source> - <translation>Задайте путь для компилятора интерфейсов.</translation> + <translation type="unfinished">Задайте путь для компилятора интерфейсов.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="50"/> @@ -4891,7 +4891,7 @@ <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="55"/> <source>Select IDL compiler</source> - <translation>Выбрать компилятор интерфейсов (IDL Compiler)</translation> + <translation type="obsolete">Выбрать компилятор интерфейсов (IDL Compiler)</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="17"/> @@ -8003,6 +8003,34 @@ </message> </context> <context> + <name>E5PathPicker</name> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="70"/> + <source>Enter Path Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="275"/> + <source>Choose a file to open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="277"/> + <source>Choose files to open</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="279"/> + <source>Choose a file to save</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../E5Gui/E5PathPicker.py" line="281"/> + <source>Choose a directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>E5RequestModel</name> <message> <location filename="../E5Network/E5NetworkMonitor.py" line="225"/> @@ -21224,42 +21252,42 @@ <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="90"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="137"/> + <source>Did not receive the 'hello' message.</source> + <translation>Сообщение 'hello' не получено.</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="139"/> - <source>Did not receive the 'hello' message.</source> - <translation>Сообщение 'hello' не получено.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="141"/> <source>Received data on unexpected channel.</source> <translation>Получены данные по неожиданному каналу.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="144"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation>Неправильное 'hello' сообщение, ожидалось 'capabilities: ', а получено '{0}'.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="149"/> <source>'capabilities' message did not contain any capability.</source> <translation>Сообщение 'capabilities' пусто.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="159"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="157"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation>Неправильное 'hello' сообщение, ожидалось 'encoding: ', а получено '{0}'.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="164"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="162"/> <source>'encoding' message did not contain any encoding.</source> <translation>Сообщение 'encoding' пусто.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="351"/> <source>For message see output dialog.</source> <translation>Сообщение можно увидеть в окне вывода.</translation> </message> @@ -60705,59 +60733,59 @@ <context> <name>VariablesViewer</name> <message> - <location filename="../Debugger/VariablesViewer.py" line="321"/> + <location filename="../Debugger/VariablesViewer.py" line="279"/> <source>Global Variables</source> <translation>Глобальные переменные</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="322"/> + <location filename="../Debugger/VariablesViewer.py" line="280"/> <source>Globals</source> <translation>Глобальные переменные</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="326"/> + <location filename="../Debugger/VariablesViewer.py" line="284"/> <source><b>The Global Variables Viewer Window</b><p>This window displays the global variables of the debugged program.</p></source> <translation><b>Окно показа глобальных переменных</b> <p>Это окно отображает глобальные переменные отлаживаемой программы.</p></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="332"/> + <location filename="../Debugger/VariablesViewer.py" line="290"/> <source>Local Variables</source> <translation>Локальные переменные</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> + <location filename="../Debugger/VariablesViewer.py" line="291"/> <source>Locals</source> <translation>Локальные переменные</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="337"/> + <location filename="../Debugger/VariablesViewer.py" line="295"/> <source><b>The Local Variables Viewer Window</b><p>This window displays the local variables of the debugged program.</p></source> <translation><b>Окно показа локальных переменных</b> <p>Это окно отображает локальные переменные отлаживаемой программы.</p></translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> + <location filename="../Debugger/VariablesViewer.py" line="291"/> <source>Value</source> <translation>Значение</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="333"/> + <location filename="../Debugger/VariablesViewer.py" line="291"/> <source>Type</source> <translation>Тип</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="580"/> + <location filename="../Debugger/VariablesViewer.py" line="539"/> <source>{0} items</source> <translation>{0} элементов</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="367"/> + <location filename="../Debugger/VariablesViewer.py" line="326"/> <source>Show Details...</source> <translation>Показать подробности...</translation> </message> <message> - <location filename="../Debugger/VariablesViewer.py" line="372"/> + <location filename="../Debugger/VariablesViewer.py" line="331"/> <source>Configure...</source> <translation>Настроить...</translation> </message>