--- a/i18n/eric6_ru.ts Fri Sep 28 20:07:25 2018 +0200 +++ b/i18n/eric6_ru.ts Sat Sep 29 19:32:33 2018 +0200 @@ -15025,117 +15025,117 @@ <context> <name>EricSchemeReply</name> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="157"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="164"/> <source>Content blocked by AdBlock Plus</source> <translation>Содержание заблокировано AdBlock Plus</translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="158"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="165"/> <source>Blocked by rule: <i>{0} ({1})</i></source> <translation>Заблокирован согласно правилу: <i>{0} ({1})</i></translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="181"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="188"/> <source>Welcome to eric6 Web Browser!</source> <translation>Добро пожаловать в Eric6 Web браузер!</translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="183"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="190"/> <source>About eric6</source> <translation>Об Eric6</translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="184"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="191"/> <source>eric6 Web Browser</source> <translation>Eric6 Web браузер</translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="185"/> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="192"/> <source>Search!</source> <translation>Искать!</translation> </message> <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="215"/> - <source>Speed Dial</source> - <translation>Быстрые вкладки</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="216"/> - <source>URL</source> - <translation>URL</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="217"/> - <source>Title</source> - <translation>Заголовок</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="218"/> - <source>Apply</source> - <translation>Применить</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="219"/> - <source>Close</source> - <translation>Закрыть</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="220"/> - <source>New Page</source> - <translation>Новая страница</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="221"/> - <source>Edit</source> - <translation>Редактировать</translation> - </message> - <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="222"/> - <source>Remove</source> - <translation>Удалить</translation> + <source>Speed Dial</source> + <translation>Быстрые вкладки</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="223"/> - <source>Reload</source> - <translation>Перезагрузить</translation> + <source>URL</source> + <translation>URL</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="224"/> - <source>Are you sure to remove this speed dial?</source> - <translation>Вы уверены в удалении этой быстрой вкладки?</translation> + <source>Title</source> + <translation>Заголовок</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="225"/> + <source>Apply</source> + <translation>Применить</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="226"/> + <source>Close</source> + <translation>Закрыть</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="227"/> - <source>Are you sure you want to reload all speed dials?</source> - <translation>Вы уверены, что хотите перегрузить все быстрые вкладки?</translation> + <source>New Page</source> + <translation>Новая страница</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="228"/> + <source>Edit</source> + <translation>Редактировать</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="229"/> + <source>Remove</source> + <translation>Удалить</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="230"/> - <source>Load title from page</source> - <translation>Загружать заголовок со страницы</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="232"/> - <source>Speed Dial Settings</source> - <translation>Настройки быстрых вкладок</translation> + <source>Reload</source> + <translation>Перезагрузить</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="231"/> + <source>Are you sure to remove this speed dial?</source> + <translation>Вы уверены в удалении этой быстрой вкладки?</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="234"/> - <source>Add New Page</source> - <translation>Добавить новую страницу</translation> - </message> - <message> - <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="235"/> - <source>Maximum pages in a row:</source> - <translation>Максимальное число страниц в ряду:</translation> + <source>Are you sure you want to reload all speed dials?</source> + <translation>Вы уверены, что хотите перегрузить все быстрые вкладки?</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="237"/> - <source>Change size of pages:</source> - <translation>Изменить размер страниц:</translation> + <source>Load title from page</source> + <translation>Загружать заголовок со страницы</translation> </message> <message> <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="239"/> + <source>Speed Dial Settings</source> + <translation>Настройки быстрых вкладок</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="241"/> + <source>Add New Page</source> + <translation>Добавить новую страницу</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="242"/> + <source>Maximum pages in a row:</source> + <translation>Максимальное число страниц в ряду:</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="244"/> + <source>Change size of pages:</source> + <translation>Изменить размер страниц:</translation> + </message> + <message> + <location filename="../WebBrowser/Network/EricSchemeHandler.py" line="246"/> <source>SpeedDial requires enabled JavaScript.</source> <translation>Для работы SpeedDial требуется разрешение JavaScript.</translation> </message> @@ -17670,172 +17670,172 @@ <context> <name>Git</name> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="209"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="210"/> <source>The git process finished with the exit code {0}</source> <translation>Процесс Git завершился с кодом выхода {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1557"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1558"/> <source>The git process did not finish within 30s.</source> <translation>Процесс Git не завершился в течении 30 сек.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="217"/> <source>Could not start the git executable.</source> <translation>Невозможно запустить Git.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="245"/> <source>Create project repository</source> <translation>Создать репозиторий проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="244"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="245"/> <source>The project repository could not be created.</source> <translation>Невозможно создать репозиторий проекта.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="273"/> <source>Creating Git repository</source> <translation>Создание Git репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="287"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="288"/> <source>Adding files to Git repository</source> <translation>Добавление файлов в репозиторий Git проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="299"/> <source>Initial commit to Git repository</source> <translation>Первичная фиксация в Git репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="328"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="329"/> <source>Cloning project from a Git repository</source> <translation>Клонирование проекта из Git репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="417"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="418"/> <source>Commit Changes</source> <translation>Фиксация изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="417"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="418"/> <source>The commit affects files, that have unsaved changes. Shall the commit be continued?</source> <translation>Фиксация влияет на файлы с несохраненными изменениями. Продолжать ли фиксацию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="476"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="477"/> <source>Committing changes to Git repository</source> <translation>Фиксация изменений в Git репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="530"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="531"/> <source>Synchronizing with the Git repository</source> <translation>Синхронизация с Git репозиторием</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="577"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="578"/> <source>Adding files/directories to the Git repository</source> <translation>Добавление файлов/директорий в Git репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="651"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="652"/> <source>Removing files/directories from the Git repository</source> <translation>Удаление файлов/директорий из Git репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="708"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="709"/> <source>Renaming {0}</source> <translation>Переименование {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="831"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="832"/> <source>Unstage files/directories</source> <translation>Отменить индексирование файлов/директорий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="883"/> <source>Revert changes</source> <translation>Вернуть изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="873"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="874"/> <source>Do you really want to revert all changes to these files or directories?</source> <translation>Вы действительно хотите вернуть все изменения в этих файлах и директориях?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="882"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="883"/> <source>Do you really want to revert all changes of the project?</source> <translation>Вы действительно хотите вернуть все изменения в проекте?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="888"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="889"/> <source>Reverting changes</source> <translation>Возврат изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="940"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="941"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="965"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="966"/> <source>Master branch head</source> <translation>Вершина ветви Master</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1198"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1199"/> <source>Git Command</source> <translation>Команда git</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1285"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1286"/> <source><tr><td><b>Commit</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Коммит</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1289"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1290"/> <source><tr><td><b>Parents</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1293"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1294"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Теги</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1297"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1298"/> <source><tr><td><b>Branches</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Ветви</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1300"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1301"/> <source><tr><td><b>Author</b></td><td>{0} &lt;{1}&gt;</td></tr></source> <translation><tr><td><b>Автор</b></td><td>{0} &lt;{1}&gt;</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1303"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1304"/> <source><tr><td><b>Date</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Дата</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1306"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1307"/> <source><tr><td><b>Committer</b></td><td>{0} &lt;{1}&gt;</td></tr></source> <translation><tr><td><b>Коммиттер</b></td><td>{0} &lt;{1}&gt;</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1309"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1310"/> <source><tr><td><b>Committed Date</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Дата подачи</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1312"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1313"/> <source><tr><td><b>Subject</b></td><td>{0}</td></tr></source> <translation><tr><td><b>Сообщение</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1320"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1321"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Git V.</b></td><td>{0}</td></tr> @@ -17850,442 +17850,442 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1383"/> <source>Create {0} file</source> <translation>Создать {0} файл</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1382"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1383"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже существует. Переписать его?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1441"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1442"/> <source>Git Copy</source> <translation>Git: Копирование</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1426"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1427"/> <source><p>Copying the directory <b>{0}</b> failed.</p><p>Reason: {1}</p></source> <translation><p>Сбой копирования директории <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1441"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1442"/> <source><p>Copying the file <b>{0}</b> failed.</p><p>Reason: {1}</p></source> <translation><p>Сбой копирования файла <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2626"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2627"/> <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/vcsGit/git.py" line="1628"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1629"/> <source>Git Side-by-Side Difference</source> <translation>Git: Построчный просмотр различий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1628"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1629"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл: <b>{0}</b></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1677"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1678"/> <source>Fetching from a remote Git repository</source> <translation>Получение изменений из удаленного Git репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1715"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1716"/> <source>Pulling from a remote Git repository</source> <translation>Затягивание изменений из удаленного Git репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1756"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1757"/> <source>Pushing to a remote Git repository</source> <translation>Проталкивание изменений в удаленный Git репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1784"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1785"/> <source>Committing failed merge</source> <translation>Фиксация неудачного слияния</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1811"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1812"/> <source>Aborting uncommitted/failed merge</source> <translation>Отмена незафиксированного/неудачного слияния</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1961"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1962"/> <source>Tagging in the Git repository</source> <translation>Работа с тегами в Git репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2192"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2193"/> <source>Branching in the Git repository</source> <translation>Работа с ветвями в Git репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2232"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2233"/> <source>Delete Remote Branch</source> <translation>Удалить удаленную ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2253"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2254"/> <source>Current Branch</source> <translation>Текущая ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2253"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2254"/> <source><p>The current branch is <b>{0}</b>.</p></source> <translation><p>Текущая ветвь <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2317"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2318"/> <source>Create Bundle</source> <translation>Создать комплект</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2282"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2283"/> <source>Git Bundle Files (*.bundle)</source> <translation>Файлы Git пакетов (*.bundle)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2299"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2300"/> <source><p>The Git bundle file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл Git комплекта<b>{0}</b> уже существует. Перезаписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2347"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2348"/> <source>Verify Bundle</source> <translation>Проверить комплект</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2477"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2478"/> <source>Git Bundle Files (*.bundle);;All Files (*)</source> <translation>Файлы Git комплектов (*.bundle);;Все файлы (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2377"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2378"/> <source>List Bundle Heads</source> <translation>Список головных ревизий в комплекте</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2477"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2478"/> <source>Apply Bundle</source> <translation>Применить комплект</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2500"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2501"/> <source>Applying a bundle file (fetch)</source> <translation>Применение комплекта (fetch)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2527"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2528"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Bisect Недействительная подкоманда ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2730"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2731"/> <source>Git Bisect ({0})</source> <translation>Git Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2626"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2627"/> <source>Process Generation Error</source> <translation>Ошибка при запуске процесса</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2670"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2671"/> <source>Create Bisect Replay File</source> <translation>Создать файл повтора Bisect</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2636"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2637"/> <source>Git Bisect Replay Files (*.replay)</source> <translation>Файлы повтора Git Bisect (*.replay)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2653"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2654"/> <source><p>The Git bisect replay file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл повтора Git Bisect<b>{0}</b> уже существует. Перезаписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2670"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2671"/> <source><p>The file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source> <translation><p>Невозможно записать файл <b>{0}</b></p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2691"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2692"/> <source>Edit Bisect Replay File</source> <translation>Редактировать файл повтора bisect-поиска</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2718"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2719"/> <source>Git Bisect Replay Files (*.replay);;All Files (*)</source> <translation>Файлы повтора Git Bisect(*.replay);;Все файлы (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2718"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2719"/> <source>Bisect Replay</source> <translation>Повтор Bisect-поиска</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3070"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3071"/> <source>Show Remote Info</source> <translation>Показать инфо об удаленном источнике</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2950"/> <source>Rename Remote Repository</source> <translation>Переименовать удаленный репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2949"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="2950"/> <source>Enter new name for remote repository:</source> <translation>Введите новое имя для удаленного репозитория:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3094"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3095"/> <source>Show Shortlog</source> <translation>Отображение журнала изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3152"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3153"/> <source>Cherry-pick</source> <translation>Выборка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3182"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3183"/> <source>Copy Changesets (Continue)</source> <translation>Копировать набор изменений (Continue)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3207"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3208"/> <source>Copy Changesets (Quit)</source> <translation>Копировать набор изменений (Quit)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3233"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3234"/> <source>Copy Changesets (Cancel)</source> <translation>Копировать набор изменений (Cancel)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3313"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3314"/> <source>Saving stash</source> <translation>Сохранение в стеке незавершенных изменений ("заначка")</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3513"/> <source>Show Stash</source> <translation>Показать "заначку"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3512"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3513"/> <source>Select a stash (empty for latest stash):</source> <translation>Выберите "заначку" (оставьте пустым чтобы использовать последнюю):</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3424"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3425"/> <source>Restore Stash</source> <translation>Восстановить из "заначки"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3438"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3439"/> <source>Restoring stash</source> <translation>Восстановление из стека незавершенных изменений ("заначки")</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3472"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3473"/> <source>Create Branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3462"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3463"/> <source>Enter a branch name to restore a stash to:</source> <translation>Введите имя ветви для восстановления из "заначки":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3487"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3488"/> <source>Creating branch</source> <translation>Создание ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3522"/> <source>Delete Stash</source> <translation>Удалить "заначку"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3521"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3522"/> <source>Do you really want to delete the stash <b>{0}</b>?</source> <translation>Вы действительно хотите удалить "заначку" <b>{0}</b>?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3532"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3533"/> <source>Deleting stash</source> <translation>Удаление "заначки"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3553"/> <source>Delete All Stashes</source> <translation>Удалить все "заначки"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3552"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3553"/> <source>Do you really want to delete all stashes?</source> <translation>Вы действительно хотите удалить все "заначки"?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3560"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3561"/> <source>Deleting all stashes</source> <translation>Удаление всех "заначек"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3632"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3633"/> <source>Showing the combined configuration settings</source> <translation>Отображение обобщенных параметров конфигурации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3658"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3659"/> <source>Verifying the integrity of the Git repository</source> <translation>Проверка целостности Git репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3683"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3684"/> <source>Performing Repository Housekeeping</source> <translation>Проведение уборки репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3727"/> - <source><tr><td><b>Statistics</b></td></tr></source> - <translation><tr><td><b>Статистика</b></td></tr></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3728"/> + <source><tr><td><b>Statistics</b></td></tr></source> + <translation><tr><td><b>Статистика</b></td></tr></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3729"/> <source><tr><td>Number of loose objects: </td><td>{0}</td></tr></source> <translation><tr><td>Количество "рыхлых" объектов: </td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3732"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3733"/> <source><tr><td>Disk space used by loose objects: </td><td>{0} KiB</td></tr></source> <translation><tr><td>Дисковое пространство, занятое "рыхлыми" объектами: </td><td>{0} KiB</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3736"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3737"/> <source><tr><td>Number of packed objects: </td><td>{0}</td></tr></source> <translation><tr><td>Количество упакованных объектов: </td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3740"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3741"/> <source><tr><td>Number of packs: </td><td>{0}</td></tr></source> <translation><tr><td>Количество упаковок: </td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3744"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3745"/> <source><tr><td>Disk space used by packed objects: </td><td>{0} KiB</td></tr></source> <translation><tr><td>Дисковое пространство, занятое упакованными объектами: </td><td>{0} KiB</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3748"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3749"/> <source><tr><td>Packed objects waiting for pruning: </td><td>{0}</td></tr></source> <translation><tr><td>Упакованные объекты, ожидающие удаления: </td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3752"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3753"/> <source><tr><td>Garbage files: </td><td>{0}</td></tr></source> <translation><tr><td>Мусорные файлы: </td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3756"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3757"/> <source><tr><td>Disk space used by garbage files: </td><td>{0} KiB</td></tr></source> <translation><tr><td>Дисковое пространство, занятое мусорными файлами: </td><td>{0} KiB</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3762"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3763"/> <source><p><b>No statistics available.</b></p></source> <translation><p><b>Нет статистики.</b></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3828"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3829"/> <source>Creating Archive</source> <translation>Создание архива</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="499"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="500"/> <source>Switch</source> <translation>Переключиться</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="499"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="500"/> <source><p>Do you really want to switch to <b>{0}</b>?</p></source> <translation><p>Вы действительно хотите переключиться на <b>{0}</b>?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1844"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1845"/> <source>Applying patch</source> <translation>Применение патча</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1876"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1877"/> <source>Check patch files</source> <translation>Проверить файлы патчей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1879"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="1880"/> <source>Apply patch files</source> <translation>Применить файлы патчей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3871"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3872"/> <source>Add Submodule</source> <translation>Добавить подмодуль</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3942"/> <source>List Submodules</source> <translation>Список подмодулей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3941"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3942"/> <source>No submodules defined for the project.</source> <translation>Подмодули для проекта не определены.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3956"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3957"/> <source>All</source> <translation>Все</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3960"/> <source>Submodule Path</source> <translation>Путь подмодуля</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3959"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="3960"/> <source>Select a submodule path:</source> <translation>Выберите путь к подмодулю:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4012"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4013"/> <source>Initialize Submodules</source> <translation>Инициализация подмодулей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4049"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4050"/> <source>Unregister Submodules</source> <translation>Отменить регистрацию подмодулей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4129"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4130"/> <source>Update Submodules</source> <translation>Обновить подмодули</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4163"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4164"/> <source>Synchronize Submodules</source> <translation>Синхронизировать подмодули</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4221"/> + <location filename="../Plugins/VcsPlugins/vcsGit/git.py" line="4222"/> <source>Submodules Summary</source> <translation>Сводка о подмодулях</translation> </message> @@ -40702,122 +40702,122 @@ <translation>Введите сообщение. Для его отправки нажмите Return или Enter</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="369"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="416"/> <source>Send Message</source> <translation>Отправить сообщение</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="369"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="416"/> <source>Messages starting with a '/' are not allowed in private chats.</source> <translation>В приватных разговорах сообщения, начинающиеся с '/', не разрешаются.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="405"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="528"/> <source>Leave IRC channel</source> <translation>Уйти с канала</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="405"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="528"/> <source>Do you really want to leave the IRC channel <b>{0}</b>?</source> <translation>Вы действительно хотите уйти с канала <b>{0}</b>?</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="546"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="681"/> <source>Channel Message</source> <translation>Сообщение в канале</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="551"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="686"/> <source>Nick mentioned</source> <translation>Упомянутый ник</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="576"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="711"/> <source>{0} has joined the channel {1} ({2}).</source> <translation>{0} присоединился к каналу {1} ({2}).</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="582"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="717"/> <source>You have joined the channel {0} ({1}).</source> <translation>Вы присоединились к каналу {0} ({1}).</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="589"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="724"/> <source>Join Channel</source> <translation>Подключиться к каналу</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="608"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="743"/> <source>{0} has left {1}.</source> <translation>{0} отсоединился {1}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="616"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="751"/> <source>{0} has left {1}: {2}.</source> <translation>{0} отсоединился {1}: {2}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="622"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="757"/> <source>Leave Channel</source> <translation>Уйти с канала</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="641"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="776"/> <source>{0} has quit {1}.</source> <translation>{0} отсоединился {1}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="646"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="781"/> <source>{0} has quit {1}: {2}.</source> <translation>{0} отсоединился {1}: {2}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="652"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="787"/> <source>Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="670"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="805"/> <source>You are now known as {0}.</source> <translation>Вы теперь {0}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="676"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="811"/> <source>User {0} is now known as {1}.</source> <translation>Пользователь {0} сменил псевдоним на {1}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="714"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="849"/> <source>Away</source> <translation>Отсутствует</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="714"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="849"/> <source>{0} is away: {1}</source> <translation>{0} вдали: {1}</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="731"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="866"/> <source>The channel topic is: "{0}".</source> <translation>Тема канала: "{0}".</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="747"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="882"/> <source>The topic was set by {0} on {1}.</source> <translation>Тему отрыл {0} {1}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="764"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="899"/> <source>Channel URL: {0}</source> <translation>URL канала: {0}</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="789"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="924"/> <source>password protected ({0})</source> <translation>защищён паролем ({0})</translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="793"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="928"/> <source>limited to %n user(s)</source> <translation> <numerusform>ограничивается %n пользователем</numerusform> @@ -40826,77 +40826,77 @@ </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="800"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="935"/> <source>Channel modes: {0}.</source> <translation>Режимы канала: {0}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="816"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="951"/> <source>This channel was created on {0}.</source> <translation>Этот канал был открыт {0}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="851"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="986"/> <source>{0} sets the channel mode to 'anonymous'.</source> <translation>{0} устанавливает 'анонимный' режим для канала.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="855"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="990"/> <source>{0} removes the 'anonymous' mode from the channel.</source> <translation>{0} отменяет 'анонимный' режим для канала.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="860"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="995"/> <source>{0} sets a ban on {1}.</source> <translation>{0} устанавливает запрет на {1}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="864"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="999"/> <source>{0} removes the ban on {1}.</source> <translation>{0} снимает запрет на {1}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="869"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1004"/> <source>{0} sets the channel mode to 'no colors allowed'.</source> <translation>{0} устанавливает 'цвета запрещены' режим для канала.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="873"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1008"/> <source>{0} sets the channel mode to 'allow color codes'.</source> <translation>{0} устанавливает 'цвета разрешены' режим для канала.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="878"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1013"/> <source>{0} sets a ban exception on {1}.</source> <translation>{0} устанавливает ислючение на запрет на {1}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="882"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1017"/> <source>{0} removes the ban exception on {1}.</source> <translation>{0} отменяет ислючение на запрет на {1}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="887"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1022"/> <source>{0} sets the channel mode to 'invite only'.</source> <translation>{0} устанавливает 'только по приглашению' режим для канала.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="891"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1026"/> <source>{0} removes the 'invite only' mode from the channel.</source> <translation>{0} отменяет 'только по приглашению' режим для канала.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="896"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1031"/> <source>{0} sets the channel key to '{1}'.</source> <translation>{0} устанавливает ключ '{1}' для канала.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="900"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1035"/> <source>{0} removes the channel key.</source> <translation>{0} удаляет ключ для канала.</translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="904"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1039"/> <source>{0} sets the channel limit to %n nick(s).</source> <translation> <numerusform>{0} устанавливает ограничение канала в %n ник.</numerusform> @@ -40905,242 +40905,242 @@ </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="908"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1043"/> <source>{0} removes the channel limit.</source> <translation>{0} снимает ограничение на число пользователей канала.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="912"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1047"/> <source>{0} sets the channel mode to 'moderated'.</source> <translation>{0} устанавливает 'контролируемый' режим для канала.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="916"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1051"/> <source>{0} sets the channel mode to 'unmoderated'.</source> <translation>{0} устанавливает 'неконтролируемый' режим для канала.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="921"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1056"/> <source>{0} sets the channel mode to 'no messages from outside'.</source> <translation>{0} устанавливает 'внешние сообщения запрещены' режим для канала.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="925"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1060"/> <source>{0} sets the channel mode to 'allow messages from outside'.</source> <translation>{0} устанавливает режим 'внешние сообщения разрешены' для канала.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="930"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1065"/> <source>{0} sets the channel mode to 'private'.</source> <translation>{0} устанавливает 'приватный' режим для канала.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="934"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1069"/> <source>{0} sets the channel mode to 'public'.</source> <translation>{0} устанавливает 'общий' режим для канала.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="939"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1074"/> <source>{0} sets the channel mode to 'quiet'.</source> <translation>{0} устанавливает 'тихий' режим для канала.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="943"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1078"/> <source>{0} removes the 'quiet' mode from the channel.</source> <translation>{0} отменяет 'тихий' режим для канала.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="950"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1085"/> <source>{0} sets the channel mode to 'secret'.</source> <translation>{0} устанавливает 'секретный' режим для канала.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="954"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1089"/> <source>{0} sets the channel mode to 'visible'.</source> <translation>{0} устанавливает 'открытый' режим для канала.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="959"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1094"/> <source>{0} switches on 'topic protection'.</source> <translation>{0} включает 'тема защищена'.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="962"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1097"/> <source>{0} switches off 'topic protection'.</source> <translation>{0} выключает 'тема защищена'.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="967"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1102"/> <source>{0} sets invitation mask {1}.</source> <translation>{0} устанавливает шаблон для приглашений {1}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="971"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1106"/> <source>{0} removes the invitation mask {1}.</source> <translation>{0} отменяет шаблон для приглашений {1}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="975"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1110"/> <source>Mode</source> <translation>Режим</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="993"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1128"/> <source>{0} sets mode for {1}: {2}.</source> <translation>{0} устанавливает режим для {1}: {2}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1020"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1155"/> <source>Help</source> <translation>Справка</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1154"/> - <source>--- New From Here ---</source> - <translation>--- Здесь новые сообщения ---</translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1237"/> - <source>Save Messages</source> - <translation>Сохранить сообщения</translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1220"/> - <source>HTML Files (*.{0});;Text Files (*.txt);;All Files (*)</source> - <translation>Файлы HTML (*.{0});;Текстовые файлы (*.txt);;Все файлы (*)</translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1237"/> - <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> - <translation><p>Файл <b>{0}</b> уже существует. Переписать?</p></translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1256"/> - <source>Error saving Messages</source> - <translation>Ошибка при сохранении сообщений</translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1256"/> - <source><p>The messages 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="../Network/IRC/IrcChannelWidget.py" line="1270"/> - <source>Copy</source> - <translation>Копировать</translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1275"/> - <source>Cut all</source> - <translation>Вырезать всё</translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1279"/> - <source>Copy all</source> - <translation>Копировать всё</translation> - </message> - <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1284"/> - <source>Clear</source> - <translation>Очистить</translation> - </message> - <message> <location filename="../Network/IRC/IrcChannelWidget.py" line="1289"/> + <source>--- New From Here ---</source> + <translation>--- Здесь новые сообщения ---</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1372"/> + <source>Save Messages</source> + <translation>Сохранить сообщения</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1355"/> + <source>HTML Files (*.{0});;Text Files (*.txt);;All Files (*)</source> + <translation>Файлы HTML (*.{0});;Текстовые файлы (*.txt);;Все файлы (*)</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1372"/> + <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> + <translation><p>Файл <b>{0}</b> уже существует. Переписать?</p></translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1391"/> + <source>Error saving Messages</source> + <translation>Ошибка при сохранении сообщений</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1391"/> + <source><p>The messages 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="../Network/IRC/IrcChannelWidget.py" line="1405"/> + <source>Copy</source> + <translation>Копировать</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1410"/> + <source>Cut all</source> + <translation>Вырезать всё</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1414"/> + <source>Copy all</source> + <translation>Копировать всё</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1419"/> + <source>Clear</source> + <translation>Очистить</translation> + </message> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1424"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1293"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1428"/> <source>Mark Current Position</source> <translation>Пометить текущую позицию</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1295"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1430"/> <source>Remove Position Marker</source> <translation>Удалить маркер позиции</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1345"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1480"/> <source>Who Is</source> <translation>Кто это</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1348"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1483"/> <source>Private Chat</source> <translation>Приватный чат</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1463"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1598"/> <source>Who</source> <translation>Кто</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1437"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1572"/> <source>End of WHO list for {0}.</source> <translation>Конец списка для {0}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1460"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1595"/> <source> (Away)</source> <translation> (отсутствует)</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1463"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1598"/> <source>{0} is {1}@{2} ({3}){4}</source> <translation>{0} это {1}@{2} ({3}){4}</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1801"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1936"/> <source>Whois</source> <translation>Whois</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1485"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1620"/> <source>{0} is {1}@{2} ({3}).</source> <translation>{0} это {1}@{2} ({3}).</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1531"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1666"/> <source>{0} is a user on channels: {1}</source> <translation>{0} это пользователь в каналах: {1}</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1536"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1671"/> <source>{0} has voice on channels: {1}</source> <translation>{0} обладает голосом в каналах: {1}</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1541"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1676"/> <source>{0} is a halfop on channels: {1}</source> <translation>{0} это помощник оператора в каналах: {1}</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1546"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1681"/> <source>{0} is an operator on channels: {1}</source> <translation>{0} это оператор в каналах: {1}</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1551"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1686"/> <source>{0} is owner of channels: {1}</source> <translation>{0} это владелец каналов: {1}</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1556"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1691"/> <source>{0} is admin on channels: {1}</source> <translation>{0} это администратор в каналах: {1}</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1575"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1710"/> <source>{0} is online via {1} ({2}).</source> <translation>{0} в режиме онлайн через {1} ({2}).</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1594"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1729"/> <source>{0} is an IRC Operator.</source> <translation>{0} это IRC оператор.</translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1627"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1762"/> <source>%n day(s)</source> <translation> <numerusform>%n день</numerusform> @@ -41149,7 +41149,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1641"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1776"/> <source>%n hour(s)</source> <translation> <numerusform>%n час</numerusform> @@ -41158,7 +41158,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1653"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1788"/> <source>%n minute(s)</source> <translation> <numerusform>%n минуту</numerusform> @@ -41167,7 +41167,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1654"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1789"/> <source>%n second(s)</source> <translation> <numerusform>%n секунду</numerusform> @@ -41176,25 +41176,25 @@ </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1631"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1766"/> <source>{0} has been idle for {1}, {2}, {3}, and {4}.</source> <comment>{0} = name of person, {1} = (x days), {2} = (x hours), {3} = (x minutes), {4} = (x seconds)</comment> <translation>{0} не появлялся {1}, {2}, {3}, и {4}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1644"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1779"/> <source>{0} has been idle for {1}, {2}, and {3}.</source> <comment>{0} = name of person, {1} = (x hours), {2} = (x minutes), {3} = (x seconds)</comment> <translation>{0} не появлялся {1}, {2}, и {3}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1655"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1790"/> <source>{0} has been idle for {1} and {2}.</source> <comment>{0} = name of person, {1} = (x minutes), {3} = (x seconds)</comment> <translation>{0} не появлялся {1} и {2}.</translation> </message> <message numerus="yes"> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1663"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1798"/> <source>{0} has been idle for %n second(s).</source> <translation> <numerusform>{0} бездействует %n секунду.</numerusform> @@ -41203,67 +41203,67 @@ </translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1670"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1805"/> <source>{0} has been online since {1}.</source> <translation>{0} присутствует с {1}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1691"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1826"/> <source>End of WHOIS list for {0}.</source> <translation>Конец WHOIS списка для {0}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1709"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1844"/> <source>{0} is an identified user.</source> <translation>{0} является реальным пользователем.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1727"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1862"/> <source>{0} is available for help.</source> <translation>{0} готов помочь.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1745"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1880"/> <source>{0} is logged in as {1}.</source> <translation>{0} вошёл как {1}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1764"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1899"/> <source>{0} is actually using the host {1} (IP: {2}).</source> <translation>{0} использует компьютер {1} (IP: {2}).</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1782"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1917"/> <source>{0} is using a secure connection.</source> <translation>{0} использует безопасное соединение.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1801"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1936"/> <source>{0} is connecting from {1} (IP: {2}).</source> <translation>{0} подсоединился с {1} (IP: {2}).</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1068"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1203"/> <source>CTCP</source> <translation>CTCP (Клиент-клиент протокол)</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1046"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1181"/> <source>Received Version request from {0}.</source> <translation>Получен запрос версии от {0}.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1052"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1187"/> <source>Received CTCP-PING request from {0}, sending answer.</source> <translation>CTCP-PING запрос от {0}, отправление ответа.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1060"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1195"/> <source>Received CTCP-CLIENTINFO request from {0}, sending answer.</source> <translation>CTCP-CLIENTINFO запрос от {0}, отправление ответа.</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1068"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1203"/> <source>Received unknown CTCP-{0} request from {1}.</source> <translation>Неизвестный CTCP-{0} запрос от {1}.</translation> </message> @@ -41273,17 +41273,17 @@ <translation>Сменить тему</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1351"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1486"/> <source>Refresh</source> <translation>Освежить</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1822"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1957"/> <source>Edit Channel Topic</source> <translation>Изменить тему канала</translation> </message> <message> - <location filename="../Network/IRC/IrcChannelWidget.py" line="1822"/> + <location filename="../Network/IRC/IrcChannelWidget.py" line="1957"/> <source>Enter the topic for this channel:</source> <translation>Введите тему для канала:</translation> </message> @@ -41758,7 +41758,7 @@ <translation>Выберите сеть для подключения</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="333"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="350"/> <source>Press to connect to the selected network</source> <translation>Подключиться к выбранной сети</translation> </message> @@ -41788,57 +41788,57 @@ <translation>Подсоединиться к каналу</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="421"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="438"/> <source>Save Messages</source> <translation>Сохранить сообщения</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="404"/> - <source>HTML Files (*.{0});;Text Files (*.txt);;All Files (*)</source> - <translation>Файлы HTML (*.{0});;Текстовые файлы (*.txt);;Все файлы (*)</translation> - </message> - <message> <location filename="../Network/IRC/IrcNetworkWidget.py" line="421"/> + <source>HTML Files (*.{0});;Text Files (*.txt);;All Files (*)</source> + <translation>Файлы HTML (*.{0});;Текстовые файлы (*.txt);;Все файлы (*)</translation> + </message> + <message> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="438"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="440"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="457"/> <source>Error saving Messages</source> <translation>Ошибка при сохранении сообщений</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="440"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="457"/> <source><p>The messages 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="../Network/IRC/IrcNetworkWidget.py" line="454"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="471"/> <source>Copy</source> <translation>Копировать</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="459"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="476"/> <source>Cut all</source> <translation>Вырезать всё</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="463"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="480"/> <source>Copy all</source> <translation>Копировать всё</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="468"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="485"/> <source>Clear</source> <translation>Очистить</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="473"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="490"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../Network/IRC/IrcNetworkWidget.py" line="328"/> + <location filename="../Network/IRC/IrcNetworkWidget.py" line="345"/> <source>Press to disconnect from the network</source> <translation>Отсоединиться от сети</translation> </message> @@ -42195,6 +42195,14 @@ </message> </context> <context> + <name>IrcUserItem</name> + <message> + <location filename="../Network/IRC/IrcChannelWidget.py" line="121"/> + <source>{0} (ignored)</source> + <translation type="unfinished">{0} (проигнорировано)</translation> + </message> +</context> +<context> <name>IrcUtilities</name> <message> <location filename="../Network/IRC/IrcUtilities.py" line="157"/> @@ -42275,258 +42283,258 @@ <context> <name>IrcWidget</name> <message> - <location filename="../Network/IRC/IrcWidget.py" line="68"/> + <location filename="../Network/IRC/IrcWidget.py" line="69"/> <source>Press to leave the current channel</source> <translation>Отключиться от текущего канала</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="242"/> + <location filename="../Network/IRC/IrcWidget.py" line="243"/> <source>Disconnect from Server</source> <translation>Отключение от сервера</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="242"/> + <location filename="../Network/IRC/IrcWidget.py" line="243"/> <source><p>Do you really want to disconnect from <b>{0}</b>?</p><p>All channels will be closed.</p></source> <translation><p>Вы действительно хотите отключиться от <b>{0}</b>?</p><p>Все каналы будут закрыты.</p></translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="195"/> + <location filename="../Network/IRC/IrcWidget.py" line="196"/> <source>SSL Connection</source> <translation>SSL соединение</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="195"/> + <location filename="../Network/IRC/IrcWidget.py" line="196"/> <source>An encrypted connection to the IRC network was requested but SSL is not available. Please change the server configuration.</source> <translation>Было запрошено шифрованное соединение к IRC сети, но SSL не доступен. Пожалуйста измените настройки сервера.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="510"/> + <location filename="../Network/IRC/IrcWidget.py" line="563"/> <source>Info</source> <translation>Информация</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="221"/> + <location filename="../Network/IRC/IrcWidget.py" line="222"/> <source>Looking for server {0} (port {1}) using an SSL encrypted connection...</source> <translation>Поиск сервера {0} (порт {1}) используя шифрованное SSL соединение...</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="230"/> + <location filename="../Network/IRC/IrcWidget.py" line="231"/> <source>Looking for server {0} (port {1})...</source> <translation>Поиск сервера {0} (порт {1})...</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="251"/> + <location filename="../Network/IRC/IrcWidget.py" line="252"/> <source>Disconnecting from server {0}...</source> <translation>Отключение от сервера {0}...</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="466"/> + <location filename="../Network/IRC/IrcWidget.py" line="519"/> <source>Server found,connecting...</source> <translation>Сервер найден, подключение...</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="475"/> + <location filename="../Network/IRC/IrcWidget.py" line="528"/> <source>Connected,logging in...</source> <translation>Подключение выполнено, вход...</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="510"/> + <location filename="../Network/IRC/IrcWidget.py" line="563"/> <source>Server disconnected.</source> <translation>Сервер отсоединился.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="557"/> + <location filename="../Network/IRC/IrcWidget.py" line="610"/> <source>Message Error</source> <translation>Ошибка сообщения</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="557"/> + <location filename="../Network/IRC/IrcWidget.py" line="610"/> <source>Unknown message received from server:<br/>{0}</source> <translation>Неизвестное сообщение от сервера:<br/>{0}</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="583"/> + <location filename="../Network/IRC/IrcWidget.py" line="678"/> <source>Notice</source> <translation>Уведомление</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="601"/> - <source>Mode</source> - <translation>Режим</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="608"/> - <source>You have left channel {0}.</source> - <translation>Вы отключились от канала {0}.</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="619"/> - <source>You are now known as {0}.</source> - <translation>Вы теперь {0}.</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="624"/> - <source>User {0} is now known as {1}.</source> - <translation>Пользователь {0} сменил псевдоним на {1}.</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="629"/> - <source>Server Error</source> - <translation>Ошибка сервера</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="665"/> - <source>Error</source> - <translation>Ошибка</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="680"/> - <source>Welcome</source> - <translation>Добро пожаловать</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="682"/> - <source>Support</source> - <translation>Поддержка</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="684"/> - <source>User</source> - <translation>Пользователь</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="686"/> - <source>MOTD</source> - <translation>MOTD</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="688"/> - <source>Away</source> - <translation>Отсутствует</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="690"/> - <source>Info ({0})</source> - <translation>Инфо ({0})</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="694"/> - <source>Message of the day</source> - <translation>Сообщение дня</translation> - </message> - <message> <location filename="../Network/IRC/IrcWidget.py" line="696"/> - <source>End of message of the day</source> - <translation>Конец сообщения дня</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="699"/> - <source>Server {0} (Version {1}), User-Modes: {2}, Channel-Modes: {3}</source> - <translation>Сервер {0} (Версия {1}), Пользовательские режимы: {2}, Режимы каналов: {3}</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="705"/> - <source>Current users on {0}: {1}, max. {2}</source> - <translation>Текущее число пользователей на {0}: {1}, максимум: {2}</translation> - </message> - <message> - <location filename="../Network/IRC/IrcWidget.py" line="710"/> - <source>Current users on the network: {0}, max. {1}</source> - <translation>Текущее число пользователей в сети {0}, максимум: {1}</translation> + <source>Mode</source> + <translation>Режим</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="703"/> + <source>You have left channel {0}.</source> + <translation>Вы отключились от канала {0}.</translation> </message> <message> <location filename="../Network/IRC/IrcWidget.py" line="714"/> + <source>You are now known as {0}.</source> + <translation>Вы теперь {0}.</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="719"/> + <source>User {0} is now known as {1}.</source> + <translation>Пользователь {0} сменил псевдоним на {1}.</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="729"/> + <source>Server Error</source> + <translation>Ошибка сервера</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="765"/> + <source>Error</source> + <translation>Ошибка</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="780"/> + <source>Welcome</source> + <translation>Добро пожаловать</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="782"/> + <source>Support</source> + <translation>Поддержка</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="784"/> + <source>User</source> + <translation>Пользователь</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="786"/> + <source>MOTD</source> + <translation>MOTD</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="788"/> + <source>Away</source> + <translation>Отсутствует</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="790"/> + <source>Info ({0})</source> + <translation>Инфо ({0})</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="794"/> + <source>Message of the day</source> + <translation>Сообщение дня</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="796"/> + <source>End of message of the day</source> + <translation>Конец сообщения дня</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="799"/> + <source>Server {0} (Version {1}), User-Modes: {2}, Channel-Modes: {3}</source> + <translation>Сервер {0} (Версия {1}), Пользовательские режимы: {2}, Режимы каналов: {3}</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="805"/> + <source>Current users on {0}: {1}, max. {2}</source> + <translation>Текущее число пользователей на {0}: {1}, максимум: {2}</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="810"/> + <source>Current users on the network: {0}, max. {1}</source> + <translation>Текущее число пользователей в сети {0}, максимум: {1}</translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="814"/> <source>You are no longer marked as being away.</source> <translation>Вы больше не отмечены как отсутствующий.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="716"/> + <location filename="../Network/IRC/IrcWidget.py" line="816"/> <source>You have been marked as being away.</source> <translation>Вы отмечены как отсутствующий.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="835"/> + <location filename="../Network/IRC/IrcWidget.py" line="935"/> <source>SSL Error</source> <translation>Ошибка SSL</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="777"/> + <location filename="../Network/IRC/IrcWidget.py" line="877"/> <source>Connection to server {0} (port {1}) lost while waiting for user response to an SSL error.</source> <translation>Соединение с сервером {0} (порт {1}) потеряно.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="808"/> + <location filename="../Network/IRC/IrcWidget.py" line="908"/> <source>Socket Error</source> <translation>Ошибка соединения</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="785"/> + <location filename="../Network/IRC/IrcWidget.py" line="885"/> <source>The host was not found. Please check the host name and port settings.</source> <translation>Сервер не найден. Пожалуйста проверьте имя сервера и порт.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="791"/> + <location filename="../Network/IRC/IrcWidget.py" line="891"/> <source>The connection was refused by the peer. Please check the host name and port settings.</source> <translation>Сервер отказал в подключении. Пожалуйста проверьте имя сервера и порт.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="802"/> + <location filename="../Network/IRC/IrcWidget.py" line="902"/> <source>The following network error occurred:<br/>{0}</source> <translation>Сетевая ошибка:<br/>{0}</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="934"/> + <location filename="../Network/IRC/IrcWidget.py" line="1034"/> <source>{0} ({1})</source> <comment>channel name, users count</comment> <translation>{0} ({1})</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="969"/> + <location filename="../Network/IRC/IrcWidget.py" line="1069"/> <source>Critical</source> <translation>Критическая</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="949"/> + <location filename="../Network/IRC/IrcWidget.py" line="1049"/> <source>No nickname acceptable to the server configured for <b>{0}</b>. Disconnecting...</source> <translation>Нет приемлимых псевдонимов на сервере, сконфигурированном для <b>{0}</b>. Отключение...</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="969"/> + <location filename="../Network/IRC/IrcWidget.py" line="1069"/> <source>The given nickname is already in use.</source> <translation>Данный псевдоним уже используется.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="919"/> + <location filename="../Network/IRC/IrcWidget.py" line="1019"/> <source>CTCP</source> <translation>CTCP (Клиент-клиент протокол)</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="896"/> + <location filename="../Network/IRC/IrcWidget.py" line="996"/> <source>Received Version request from {0}.</source> <translation>Получен запрос версии от {0}.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="902"/> + <location filename="../Network/IRC/IrcWidget.py" line="1002"/> <source>Received CTCP-PING request from {0}, sending answer.</source> <translation>CTCP-PING запрос от {0}, отправление ответа.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="910"/> + <location filename="../Network/IRC/IrcWidget.py" line="1010"/> <source>Received CTCP-CLIENTINFO request from {0}, sending answer.</source> <translation>CTCP-CLIENTINFO запрос от {0}, отправление ответа.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="919"/> + <location filename="../Network/IRC/IrcWidget.py" line="1019"/> <source>Received unknown CTCP-{0} request from {1}.</source> <translation>Неизвестный CTCP-{0} запрос от {1}.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="594"/> + <location filename="../Network/IRC/IrcWidget.py" line="689"/> <source>You have set your personal modes to <b>[{0}]</b>.</source> <translation>Ваши личные режимы установлены: <b>[{0}]</b>.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="598"/> + <location filename="../Network/IRC/IrcWidget.py" line="693"/> <source>{0} has changed your personal modes to <b>[{1}]</b>.</source> <translation>{0} изменил ваши личные режимы на: <b>[{1}]</b>.</translation> </message> @@ -42541,35 +42549,50 @@ <translation>Сеть</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="797"/> + <location filename="../Network/IRC/IrcWidget.py" line="897"/> <source>The SSL handshake failed.</source> <translation>Неудачное SSL соединение.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="808"/> + <location filename="../Network/IRC/IrcWidget.py" line="908"/> <source>A network error occurred.</source> <translation>Сетевая ошибка.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="821"/> + <location filename="../Network/IRC/IrcWidget.py" line="921"/> <source>Could not connect to {0} (port {1}) using an SSL encrypted connection. Either the server does not support SSL (did you use the correct port?) or you rejected the certificate.</source> <translation>Ошибка подключения к {0} (порт {1}) с использованием SSL. Либо сервер не поддерживает SSL (Вы выбрали правильный порт?), либо неправильный сертификат.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="835"/> + <location filename="../Network/IRC/IrcWidget.py" line="935"/> <source>The SSL certificate for the server {0} (port {1}) failed the authenticity check. SSL errors were accepted by you.</source> <translation>SSL сертификат сервера {0} (порт {1}) не прошел проверку на подлинность. Возможно Вы приняли ошибки SSL.</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="256"/> + <location filename="../Network/IRC/IrcWidget.py" line="257"/> <source>Disconnecting from network {0}...</source> <translation>Отключение от сети {0}...</translation> </message> <message> - <location filename="../Network/IRC/IrcWidget.py" line="261"/> + <location filename="../Network/IRC/IrcWidget.py" line="262"/> <source>Disconnecting from server.</source> <translation>Отключение от сервера.</translation> </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="645"/> + <source>Received CTCP-PING response from {0} with latency of {1} ms.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="651"/> + <source>Received unknown CTCP-{0} response from {1}.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Network/IRC/IrcWidget.py" line="725"/> + <source>Received PONG from {0}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>JavaScriptEricObject</name> @@ -59303,7 +59326,7 @@ <context> <name>QtHelpSchemeReply</name> <message> - <location filename="../WebBrowser/Network/QtHelpSchemeHandler.py" line="147"/> + <location filename="../WebBrowser/Network/QtHelpSchemeHandler.py" line="163"/> <source><html><head><title>Error 404...</title></head><body><div align="center"><br><br><h1>The page could not be found</h1><br><h3>'{0}'</h3></div></body></html></source> <translation><html><head><title>Error 404...</title></head><body><div align="center"><br><br><h1>Страница не может быть найдена</h1><br><h3>'{0}'</h3></div></body></html></translation> </message>