--- a/src/eric7/i18n/eric7_ru.ts Tue Dec 19 09:31:02 2023 +0100 +++ b/src/eric7/i18n/eric7_ru.ts Tue Dec 19 11:04:03 2023 +0100 @@ -3737,7 +3737,7 @@ <translation>Очистить список хостов</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="510" /> + <location filename="../Cooperation/ChatWidget.py" line="529" /> <location filename="../Cooperation/ChatWidget.ui" line="0" /> <source>Clear</source> <translation>Очистить</translation> @@ -3768,156 +3768,156 @@ <translation>Отображение статуса сервера</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="314" /> - <location filename="../Cooperation/ChatWidget.py" line="82" /> + <location filename="../Cooperation/ChatWidget.py" line="324" /> + <location filename="../Cooperation/ChatWidget.py" line="85" /> <source>Start Server</source> <translation>Запустить сервер</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="149" /> + <location filename="../Cooperation/ChatWidget.py" line="153" /> <source>! Unknown command: {0} </source> <translation>! Неизвестная команда: {0} </translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="172" /> + <location filename="../Cooperation/ChatWidget.py" line="177" /> <source>* {0} has joined. </source> <translation>* {0} присоединился. </translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="189" /> + <location filename="../Cooperation/ChatWidget.py" line="194" /> <source>New User</source> <translation>Новый пользователь</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="190" /> + <location filename="../Cooperation/ChatWidget.py" line="195" /> <source>{0} has joined.</source> <translation>{0} присоединился.</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="213" /> + <location filename="../Cooperation/ChatWidget.py" line="219" /> <source>* {0} has left. </source> <translation>* {0} отсоединился. </translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="222" /> + <location filename="../Cooperation/ChatWidget.py" line="228" /> <source>User Left</source> <translation>Пользователь вышел</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="223" /> + <location filename="../Cooperation/ChatWidget.py" line="229" /> <source>{0} has left.</source> <translation>{0} отсоединился.</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="249" /> + <location filename="../Cooperation/ChatWidget.py" line="257" /> <source>Message from <{0}></source> <translation>Сообщение от <{0}></translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="322" /> + <location filename="../Cooperation/ChatWidget.py" line="332" /> <source>Stop Server</source> <translation>Остановить сервер</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="328" /> + <location filename="../Cooperation/ChatWidget.py" line="338" /> <source>! Server Error: {0} </source> <translation>! Ошибка сервера: {0} </translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="338" /> + <location filename="../Cooperation/ChatWidget.py" line="349" /> <source>Disconnect</source> <translation>Отсоединиться</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="342" /> + <location filename="../Cooperation/ChatWidget.py" line="353" /> <source>Connect</source> <translation>Соединиться</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="499" /> + <location filename="../Cooperation/ChatWidget.py" line="518" /> <source>Copy</source> <translation>Копировать</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="503" /> + <location filename="../Cooperation/ChatWidget.py" line="522" /> <source>Cut all</source> <translation>Вырезать всё</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="506" /> + <location filename="../Cooperation/ChatWidget.py" line="525" /> <source>Copy all</source> <translation>Копировать всё</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="514" /> + <location filename="../Cooperation/ChatWidget.py" line="533" /> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="570" /> - <location filename="../Cooperation/ChatWidget.py" line="555" /> + <location filename="../Cooperation/ChatWidget.py" line="591" /> + <location filename="../Cooperation/ChatWidget.py" line="576" /> <source>Save Chat</source> <translation>Сохранить содержание</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="557" /> + <location filename="../Cooperation/ChatWidget.py" line="578" /> <source>Text Files (*.txt);;All Files (*)</source> <translation>Файлы текстовые (*.txt);;Все файлы (*)</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="571" /> + <location filename="../Cooperation/ChatWidget.py" line="592" /> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="586" /> + <location filename="../Cooperation/ChatWidget.py" line="607" /> <source>Error saving Chat</source> <translation>Ошибка при сохранении содержания</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="587" /> + <location filename="../Cooperation/ChatWidget.py" line="608" /> <source><p>The chat contents could not be written to <b>{0}</b></p><p>Reason: {1}</p></source> <translation><p>Невозможно записать содержание в файл <b>{0}</b>:<br>Причина: {1}.</p></translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="626" /> + <location filename="../Cooperation/ChatWidget.py" line="647" /> <source>Kick User</source> <translation>Отключить пользователя</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="630" /> + <location filename="../Cooperation/ChatWidget.py" line="651" /> <source>Ban User</source> <translation>Запретить пользователя</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="634" /> + <location filename="../Cooperation/ChatWidget.py" line="655" /> <source>Ban and Kick User</source> <translation>Запретить и отключить пользователя</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="665" /> + <location filename="../Cooperation/ChatWidget.py" line="687" /> <source>* {0} has been kicked. </source> <translation>* {0} отключён. </translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="683" /> + <location filename="../Cooperation/ChatWidget.py" line="705" /> <source>* {0} has been banned. </source> <translation>* {0} запрещён. </translation> </message> <message> - <location filename="../Cooperation/ChatWidget.py" line="701" /> + <location filename="../Cooperation/ChatWidget.py" line="723" /> <source>* {0} has been banned and kicked. </source> <translation>* {0} запрещён и отключен. @@ -20031,28 +20031,38 @@ <translation>С учётом регистра</translation> </message> <message> - <location filename="../EricWidgets/EricTextEditSearchWidget.py" line="147" /> + <location filename="../EricWidgets/EricTextEditSearchWidget.py" line="143" /> + <source>Select to match case sensitive</source> + <translation type="unfinished">При поиске учитывать регистр</translation> + </message> + <message> + <location filename="../EricWidgets/EricTextEditSearchWidget.py" line="148" /> <source>Whole word</source> <translation>Целое слово</translation> </message> <message> - <location filename="../EricWidgets/EricTextEditSearchWidget.py" line="157" /> + <location filename="../EricWidgets/EricTextEditSearchWidget.py" line="149" /> + <source>Select to match whole words only</source> + <translation type="unfinished">Поиск по совпадению целого слова</translation> + </message> + <message> + <location filename="../EricWidgets/EricTextEditSearchWidget.py" line="159" /> <source>Press to find the previous occurrence</source> <translation>Перейти к предыдущему вхождению</translation> </message> <message> - <location filename="../EricWidgets/EricTextEditSearchWidget.py" line="163" /> + <location filename="../EricWidgets/EricTextEditSearchWidget.py" line="165" /> <source>Press to find the next occurrence</source> <translation>Перейти к следующему вхождению</translation> </message> <message> - <location filename="../EricWidgets/EricTextEditSearchWidget.py" line="482" /> - <location filename="../EricWidgets/EricTextEditSearchWidget.py" line="434" /> + <location filename="../EricWidgets/EricTextEditSearchWidget.py" line="484" /> + <location filename="../EricWidgets/EricTextEditSearchWidget.py" line="436" /> <source>'{0}' was not found.</source> <translation>'{0}' не найдено.</translation> </message> <message> - <location filename="../EricWidgets/EricTextEditSearchWidget.py" line="487" /> + <location filename="../EricWidgets/EricTextEditSearchWidget.py" line="489" /> <source>Match {0} of {1}</source> <translation>Соответствие {0} из {1}</translation> </message> @@ -71398,8 +71408,18 @@ </message> <message> <location filename="../QScintilla/SearchReplaceWidget.ui" line="0" /> - <source>Press to close the window</source> - <translation>Закрыть окно</translation> + <source>&Replace:</source> + <translation>&Заменить на:</translation> + </message> + <message> + <location filename="../QScintilla/SearchReplaceWidget.ui" line="0" /> + <source>Select to search in the current selection only</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../QScintilla/SearchReplaceWidget.ui" line="0" /> + <source>&Selection only</source> + <translation>&Только выделенный</translation> </message> <message> <location filename="../QScintilla/SearchReplaceWidget.ui" line="0" /> @@ -71413,6 +71433,16 @@ </message> <message> <location filename="../QScintilla/SearchReplaceWidget.ui" line="0" /> + <source>Select to match case sensitive</source> + <translation type="unfinished">При поиске учитывать регистр</translation> + </message> + <message> + <location filename="../QScintilla/SearchReplaceWidget.ui" line="0" /> + <source>&Match case</source> + <translation>&С учётом регистра</translation> + </message> + <message> + <location filename="../QScintilla/SearchReplaceWidget.ui" line="0" /> <source>Press to find the previous occurrence</source> <translation>Найти предыдущее вхождение</translation> </message> @@ -71428,36 +71458,6 @@ </message> <message> <location filename="../QScintilla/SearchReplaceWidget.ui" line="0" /> - <source>&Match case</source> - <translation>&С учётом регистра</translation> - </message> - <message> - <location filename="../QScintilla/SearchReplaceWidget.ui" line="0" /> - <source>Whole &word</source> - <translation>&Целое слово</translation> - </message> - <message> - <location filename="../QScintilla/SearchReplaceWidget.ui" line="0" /> - <source>Rege&xp</source> - <translation>Регулярное &выражение</translation> - </message> - <message> - <location filename="../QScintilla/SearchReplaceWidget.ui" line="0" /> - <source>Wrap &around</source> - <translation>Циклический &поиск</translation> - </message> - <message> - <location filename="../QScintilla/SearchReplaceWidget.ui" line="0" /> - <source>&Selection only</source> - <translation>&Только выделенный</translation> - </message> - <message> - <location filename="../QScintilla/SearchReplaceWidget.ui" line="0" /> - <source>&Replace:</source> - <translation>&Заменить на:</translation> - </message> - <message> - <location filename="../QScintilla/SearchReplaceWidget.ui" line="0" /> <source>Press to replace the selection</source> <translation>Заменить выделенный текст</translation> </message> @@ -71472,6 +71472,51 @@ <translation>Заменить все вхождения</translation> </message> <message> + <location filename="../QScintilla/SearchReplaceWidget.ui" line="0" /> + <source>Select if the searchtext is a regular expression</source> + <translation type="unfinished">Задавать поиск как регулярное выражение</translation> + </message> + <message> + <location filename="../QScintilla/SearchReplaceWidget.ui" line="0" /> + <source>Rege&xp</source> + <translation>Регулярное &выражение</translation> + </message> + <message> + <location filename="../QScintilla/SearchReplaceWidget.ui" line="0" /> + <source>Press to close the window</source> + <translation>Закрыть окно</translation> + </message> + <message> + <location filename="../QScintilla/SearchReplaceWidget.ui" line="0" /> + <source>Select to continue the search at the beginning or end</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../QScintilla/SearchReplaceWidget.ui" line="0" /> + <source>Wrap &around</source> + <translation>Циклический &поиск</translation> + </message> + <message> + <location filename="../QScintilla/SearchReplaceWidget.ui" line="0" /> + <source>Select to match whole words only</source> + <translation type="unfinished">Поиск по совпадению целого слова</translation> + </message> + <message> + <location filename="../QScintilla/SearchReplaceWidget.ui" line="0" /> + <source>Whole &word</source> + <translation>&Целое слово</translation> + </message> + <message> + <location filename="../QScintilla/SearchReplaceWidget.ui" line="0" /> + <source>Select if the search or replace text contains escape codes</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../QScintilla/SearchReplaceWidget.ui" line="0" /> + <source>Escape</source> + <translation type="unfinished">Escape</translation> + </message> + <message> <location filename="../QScintilla/SearchReplaceWidget.py" line="67" /> <source><b>Find and Replace</b> <p>This dialog is used to find some text and replace it with another text. @@ -71637,19 +71682,19 @@ <translation>Заменить все выделения ({0})</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="1164" /> - <location filename="../QScintilla/SearchReplaceWidget.py" line="713" /> - <location filename="../QScintilla/SearchReplaceWidget.py" line="675" /> + <location filename="../QScintilla/SearchReplaceWidget.py" line="1205" /> + <location filename="../QScintilla/SearchReplaceWidget.py" line="748" /> + <location filename="../QScintilla/SearchReplaceWidget.py" line="710" /> <source>'{0}' was not found.</source> <translation>'{0}' не найдено.</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="1317" /> + <location filename="../QScintilla/SearchReplaceWidget.py" line="1364" /> <source>Replaced {0} occurrences.</source> <translation>Заменено в {0} местах.</translation> </message> <message> - <location filename="../QScintilla/SearchReplaceWidget.py" line="1323" /> + <location filename="../QScintilla/SearchReplaceWidget.py" line="1370" /> <source>Nothing replaced because '{0}' was not found.</source> <translation>Ничего не заменено, потому что '{0}' не найдено.</translation> </message> @@ -71687,6 +71732,11 @@ <translation>Найти следующее вхождение</translation> </message> <message> + <location filename="../WebBrowser/SearchWidget.ui" line="0" /> + <source>Select to match case sensitive</source> + <translation type="unfinished">При поиске учитывать регистр</translation> + </message> + <message> <location filename="../UI/SearchWidget.ui" line="0" /> <location filename="../WebBrowser/SearchWidget.ui" line="0" /> <source>Match case</source> @@ -71742,16 +71792,31 @@ </message> <message> <location filename="../UI/SearchWidgetLine.ui" line="0" /> + <source>Select to match case sensitive</source> + <translation type="unfinished">При поиске учитывать регистр</translation> + </message> + <message> + <location filename="../UI/SearchWidgetLine.ui" line="0" /> <source>Match case</source> <translation>С учётом регистра</translation> </message> <message> <location filename="../UI/SearchWidgetLine.ui" line="0" /> + <source>Select to match whole words only</source> + <translation type="unfinished">Поиск по совпадению целого слова</translation> + </message> + <message> + <location filename="../UI/SearchWidgetLine.ui" line="0" /> <source>Whole word</source> <translation>Целое слово</translation> </message> <message> <location filename="../UI/SearchWidgetLine.ui" line="0" /> + <source>Select if the searchtext is a regular expression</source> + <translation type="unfinished">Задавать поиск как регулярное выражение</translation> + </message> + <message> + <location filename="../UI/SearchWidgetLine.ui" line="0" /> <source>Regexp</source> <translation>Regexp</translation> </message> @@ -85019,88 +85084,88 @@ <translation>{0} (недоступно)</translation> </message> <message> - <location filename="../Testing/TestingWidget.py" line="649" /> + <location filename="../Testing/TestingWidget.py" line="650" /> <source>Running</source> <translation>Выполнение</translation> </message> <message> - <location filename="../Testing/TestingWidget.py" line="719" /> + <location filename="../Testing/TestingWidget.py" line="720" /> <source>Python3 Files ({0});;All Files (*)</source> <translation>Файлы Python3 ({0});;Все файлы (*)</translation> </message> <message> - <location filename="../Testing/TestingWidget.py" line="724" /> + <location filename="../Testing/TestingWidget.py" line="725" /> <source>Python Files (*.py);;All Files (*)</source> <translation>Файлы Python (*.py);;Все файлы (*)</translation> </message> <message> - <location filename="../Testing/TestingWidget.py" line="887" /> + <location filename="../Testing/TestingWidget.py" line="888" /> <source><h3>Versions of Frameworks and their Plugins</h3></source> <translation><h3>Версии фреймворков и их плагинов</h3></translation> </message> <message> - <location filename="../Testing/TestingWidget.py" line="901" /> + <location filename="../Testing/TestingWidget.py" line="902" /> <source><tr><td>{0}</td><td>{1}</td></tr></source> <translation><tr><td>{0}</td><td>{1}</td></tr></translation> </message> <message> - <location filename="../Testing/TestingWidget.py" line="910" /> + <location filename="../Testing/TestingWidget.py" line="911" /> <source>No version information available.</source> <translation>Информация о версии недоступна.</translation> </message> <message> - <location filename="../Testing/TestingWidget.py" line="913" /> + <location filename="../Testing/TestingWidget.py" line="914" /> <source>Versions</source> <translation>Версии</translation> </message> <message> - <location filename="../Testing/TestingWidget.py" line="931" /> + <location filename="../Testing/TestingWidget.py" line="934" /> <source>Discovering Tests</source> <translation>Обнаружение тестов</translation> </message> <message> - <location filename="../Testing/TestingWidget.py" line="993" /> + <location filename="../Testing/TestingWidget.py" line="996" /> <source>Preparing Testsuite</source> <translation>Подготовка набора тестов</translation> </message> <message> - <location filename="../Testing/TestingWidget.py" line="1009" /> + <location filename="../Testing/TestingWidget.py" line="1012" /> <source>Running Tests</source> <translation>Запуск тестов</translation> </message> <message> - <location filename="../Testing/TestingWidget.py" line="1010" /> + <location filename="../Testing/TestingWidget.py" line="1013" /> <source>No test case has been selected. Shall all test cases be run?</source> <translation>Тестовый набор не выбран. Должны ли быть запущены все тестовые примеры?</translation> </message> <message> - <location filename="../Testing/TestingWidget.py" line="1073" /> + <location filename="../Testing/TestingWidget.py" line="1076" /> <source>pending</source> <translation>ожидает</translation> </message> <message> - <location filename="../Testing/TestingWidget.py" line="1104" /> + <location filename="../Testing/TestingWidget.py" line="1107" /> <source>Failure</source> <translation>Сбой</translation> </message> <message> - <location filename="../Testing/TestingWidget.py" line="1114" /> - <location filename="../Testing/TestingWidget.py" line="1107" /> + <location filename="../Testing/TestingWidget.py" line="1117" /> + <location filename="../Testing/TestingWidget.py" line="1110" /> <source>Collection Error</source> <translation>Ошибка сборки</translation> </message> <message> - <location filename="../Testing/TestingWidget.py" line="1115" /> + <location filename="../Testing/TestingWidget.py" line="1118" /> <source><p>There was an error while collecting tests.</p><p>{0}</p></source> <translation><p>При сборке тестов произошла ошибка.</p><p>{0}</p></translation> </message> <message> - <location filename="../Testing/TestingWidget.py" line="1137" /> + <location filename="../Testing/TestingWidget.py" line="1140" /> <source>running</source> <translation>выполнение</translation> </message> <message numerus="yes"> - <location filename="../Testing/TestingWidget.py" line="1189" /> + <location filename="../Testing/TestingWidget.py" line="1192" /> <source>Ran %n test(s) in {0}s</source> <translation> <numerusform>Выполнен %n тест за {0} сек</numerusform> @@ -85109,7 +85174,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Testing/TestingWidget.py" line="1201" /> + <location filename="../Testing/TestingWidget.py" line="1204" /> <source>Ran %n test(s)</source> <translation> <numerusform>Выполнен %n тест</numerusform> @@ -85118,17 +85183,17 @@ </translation> </message> <message> - <location filename="../Testing/TestingWidget.py" line="1223" /> + <location filename="../Testing/TestingWidget.py" line="1226" /> <source>not run</source> <translation>не выполнено</translation> </message> <message> - <location filename="../Testing/TestingWidget.py" line="1266" /> + <location filename="../Testing/TestingWidget.py" line="1269" /> <source>Test Run Output</source> <translation>Выходные данные прогона теста</translation> </message> <message numerus="yes"> - <location filename="../Testing/TestingWidget.py" line="1444" /> + <location filename="../Testing/TestingWidget.py" line="1447" /> <source>Discovered %n Test(s)</source> <translation> <numerusform>Обнаружен %n тест</numerusform> @@ -85137,12 +85202,12 @@ </translation> </message> <message> - <location filename="../Testing/TestingWidget.py" line="1457" /> + <location filename="../Testing/TestingWidget.py" line="1460" /> <source>Discovery Error</source> <translation>Ошибка обнаружения</translation> </message> <message> - <location filename="../Testing/TestingWidget.py" line="1458" /> + <location filename="../Testing/TestingWidget.py" line="1461" /> <source><p>There was an error while discovering tests in <b>{0}</b>.</p><p>{1}</p></source> <translation><p>Произошла ошибка при обнаружении тестов в <b>{0}</b>.</p><p>{1}</p></translation> </message>