Mercurial Repositories > eric / changeset
changeset
Merged with the 'without_py2_and_pyqt4' branch to make it the default.
Sat, 07 Sep 2019 16:10:29 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sat, 07 Sep 2019 16:10:29 +0200
- changeset 7220
- 5cf645f6daab
- parent 7218
- eaf2cf171f3a (diff)
- parent 7211
- 1c97f3142fa8 (current diff)
- child 7221
- 0485ccdf7877
Merged with the 'without_py2_and_pyqt4' branch to make it the default.
--- a/docs/changelog Thu Sep 05 18:47:56 2019 +0200 +++ b/docs/changelog Sat Sep 07 16:10:29 2019 +0200 @@ -10,8 +10,9 @@ Version 19.9: - bug fixes -- added widgets to support development for embedded controllers with - MicroPython (ESP8266/ESP32, CircuitPython and BBC micro:bit) +- MicroPython + -- added widgets to support development for embedded micro controllers with + MicroPython (ESP8266/ESP32, CircuitPython and BBC micro:bit) - Main Window -- added an action to the Windows menu to activate the current editor - Mercurial Interface @@ -19,8 +20,8 @@ - Web Browser (NG) -- added support for the QWebEnginePage.Notifications as Qt 5.13.0 - API Files - -- added API files for BBC micro:bit MicroPython and updated the PyQt5 API - files + -- added API files for MicroPython, CircuitPython and BBC micro:bit + MicroPython and updated the PyQt5 API files - API Generator -- added the -i switch to ignore the existence of builtin modules when creating API files
--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html Thu Sep 05 18:47:56 2019 +0200 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgStatusDialog.html Sat Sep 07 16:10:29 2019 +0200 @@ -539,4 +539,4 @@ </dl> <div align="right"><a href="#top">Up</a></div> <hr /> -</body></html> \ No newline at end of file +</body></html>
--- a/eric6/i18n/eric6_es.ts Thu Sep 05 18:47:56 2019 +0200 +++ b/eric6/i18n/eric6_es.ts Sat Sep 07 16:10:29 2019 +0200 @@ -17156,7 +17156,7 @@ <message> <location filename="../MicroPython/EspDevices.py" line="140"/> <source>Reset Device</source> - <translation type="unfinished"></translation> + <translation>Resetear Dispositivo</translation> </message> </context> <context> @@ -26810,7 +26810,7 @@ <context> <name>HelpDocsInstaller</name> <message> - <location filename="../WebBrowser/QtHelp/HelpDocsInstaller.py" line="232"/> + <location filename="../WebBrowser/QtHelp/HelpDocsInstaller.py" line="236"/> <source><p>The file <b>{0}</b> could not be registered. <br/>Reason: {1}</p></source> <translation><p>El archivo <b>{0}</b> no ha podido ser registrado.<br />Causa: {1}</p></translation> </message> @@ -34304,12 +34304,12 @@ <translation>Cambiar Fase</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2247"/> <source>Copy Changesets</source> <translation>Copiar Changesets</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2588"/> <source>The project should be reread. Do this now?</source> <translation>El proyecto debería ser cargado de nuevo. ¿Desea hacerlo ahora?</translation> </message> @@ -34334,7 +34334,7 @@ <translation>Aplicar Tag a la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2319"/> <source>Switch</source> <translation>Hacer switch</translation> </message> @@ -34399,12 +34399,12 @@ <translation><tr><td><b>Marcadores</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2730"/> <source>Find Commit</source> <translation>Buscar Commit</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2730"/> <source>'{0}' was not found.</source> <translation>'{0}' no se ha encontrado.</translation> </message> @@ -34429,7 +34429,7 @@ <translation>Secreto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2450"/> <source>Pull Changes</source> <translation>Hacer Pull de Cambios</translation> </message> @@ -34459,12 +34459,12 @@ <translation>Hacer push de todos los cambios a un repositorio remoto</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2415"/> <source>Fetch Changes</source> <translation>Fetch (recuperación) de cambios</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2483"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2496"/> <source>Strip Changesets</source> <translation>Hacer strip de Changesets</translation> </message> @@ -34499,27 +34499,27 @@ <translation>Mover marcador a la revisión seleccionada</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341"/> <source>Define Bookmark</source> <translation>Definir Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341"/> <source>Enter bookmark name for changeset "{0}":</source> <translation>Introducir nombre de marcador para el changeset "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2364"/> <source>Move Bookmark</source> <translation>Mover Marcador</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2364"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation>Seleccionar el marcador a mover al changeset "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation>Seleccionar marcador al que cambiar (dejar vacío para usar revisión):</translation> </message> @@ -34581,7 +34581,7 @@ <p>Esto crea un archivo de changegroup que contiene las revisiones seleccionadas. Si no se han seleccionado revisiones, se incluirán todos los changesets. Si se ha seleccionado una revisión, se tomará como revisión base. En cualquier otro lugar, la revisión más baja se usará como revisión base y todas las otras revisiones se incluirán en el archivo. Si el diálogo muestra changesets salientes, todos los changesets seleccionados se incluirán en el archivo.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2588"/> <source>Apply Changegroup</source> <translation>Aplicar Changegroup</translation> </message> @@ -34621,62 +34621,62 @@ <translation>Quitar Selección de Todas las Entradas</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1571"/> <source>Side-by-Side Diff to Parent {0}</source> <translation>Mostrar Diff lado a lado con el Parent {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1569"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1582"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation><a href="sbsdiff:{0}_{1}">Comparar lado a lado</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1708"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1721"/> <source>Pull Selected Changes</source> <translation>Hacer Pull de Cambios Seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1722"/> <source>Fetch Selected Changes</source> <translation>Hacer Fetch de Cambios Seleccionados</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774"/> <source>Differences</source> <translation>Diferencias</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2784"/> <source>Differences to Parent {0}</source> <translation>Diferencias con el Parent {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2787"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2800"/> <source>Diff to Parent {0}{1}</source> <translation>Diff con el Parent {0}{1}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2825"/> <source>There is no difference.</source> <translation>No hay ninguna diferencia.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2968"/> <source>Save Diff</source> <translation>Guardar Diff</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2922"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2935"/> <source>Patch Files (*.diff)</source> <translation>Archivos de Parche (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2952"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>El archivo de parche <b>{0}</b> ya existe. ¿Desea sobreescribirlo?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2968"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>El archivo de parche <b>{0}</b> no puede ser guardado.<br />Causa: {1}</p></translation> </message> @@ -34686,7 +34686,7 @@ <translation><a href="save:me">Guardar</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2773"/> <source>Generating differences ...</source> <translation>Generando diferencias ...</translation> </message> @@ -36614,11 +36614,6 @@ <translation>Commit Merge</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> - <source>Commit a merge.</source> - <translation type="obsolete">Hace commit de un merge</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="429"/> <source><b>Commit a merge</b><p>This commits a merge working directory</p></source> <translation><b>Hacer commit de un merge</b><p>Ejecuta un commit de un directorio de trabajo en merge</p></translation> @@ -36641,7 +36636,7 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="426"/> <source>Commit all the merged changes.</source> - <translation type="unfinished"></translation> + <translation>Hacer commit de los cambios con merge.</translation> </message> </context> <context> @@ -38324,27 +38319,27 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="196"/> <source>Commit Merge</source> - <translation type="unfinished">Commit Merge</translation> + <translation>Commit Merge</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="198"/> <source>Commit all the merged changes.</source> - <translation type="unfinished"></translation> + <translation>Hacer commit de todos los cambios con merge.</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="200"/> <source>Abort Merge</source> - <translation type="unfinished">Abortar Merge</translation> + <translation>Abortar Merge</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="202"/> <source>Abort an uncommitted merge and lose all changes</source> - <translation type="unfinished">Abortar un merge sin commit y perder todos los cambios</translation> + <translation>Abortar un merge sin commit y perder todos los cambios</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="934"/> <source>Merge</source> - <translation type="unfinished">Hacer merge</translation> + <translation>Hacer merge</translation> </message> </context> <context> @@ -47279,21 +47274,6 @@ <translation>El nombre proporcionado '{0}' no es un directorio o no existe.</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="203"/> - <source>Synchronizing <b>{0}</b>.</source> - <translation type="obsolete">Sincronizando <b>{0}</b>.</translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="207"/> - <source>Done synchronizing <b>{0}</b>.</source> - <translation type="obsolete">Fin de sincronización de <b>{0}</b>.</translation> - </message> - <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="315"/> - <source>Adding <b>{0}</b>...</source> - <translation type="obsolete">Añadiendo <b>{0}</b>...</translation> - </message> - <message> <location filename="../MicroPython/MicroPythonFileManager.py" line="382"/> <source>Source <b>{0}</b> is a directory and destination <b>{1}</b> is a file. Ignoring it.</source> <translation>El origen <b>{0}</b> es un directorio y el destino <b>{1}</b> es un archivo. Ignorado.</translation> @@ -47309,34 +47289,29 @@ <translation>Actualizando <b>{0}</b>...</translation> </message> <message> - <location filename="../MicroPython/MicroPythonFileManager.py" line="335"/> - <source>Removing <b>{0}</b>...</source> - <translation type="obsolete">Eliminando <b>{0}</b>...</translation> - </message> - <message> <location filename="../MicroPython/MicroPythonFileManager.py" line="207"/> <source>{1}Synchronizing <b>{0}</b>.</source> - <translation type="unfinished"></translation> + <translation>{1}Sincronizando <b>{0}</b>.</translation> </message> <message> <location filename="../MicroPython/MicroPythonFileManager.py" line="212"/> <source>{1}Done synchronizing <b>{0}</b>.</source> - <translation type="unfinished"></translation> + <translation>{1}Sincronización terminada <b>{0}</b>.</translation> </message> <message> <location filename="../MicroPython/MicroPythonFileManager.py" line="327"/> <source>{1}Adding <b>{0}</b>...</source> - <translation type="unfinished"></translation> + <translation>{1}Añadiendo <b>{0}</b>...</translation> </message> <message> <location filename="../MicroPython/MicroPythonFileManager.py" line="352"/> <source>{1}Removing <b>{0}</b>...</source> - <translation type="unfinished"></translation> + <translation>{1}Eliminando <b>{0}</b>...</translation> </message> <message> <location filename="../MicroPython/MicroPythonFileManager.py" line="398"/> <source>{1}Updating <b>{0}</b>...</source> - <translation type="unfinished"></translation> + <translation>{1}Actualizando <b>{0}</b>...</translation> </message> </context> <context>
--- a/eric6/i18n/eric6_ru.ts Thu Sep 05 18:47:56 2019 +0200 +++ b/eric6/i18n/eric6_ru.ts Sat Sep 07 16:10:29 2019 +0200 @@ -17912,7 +17912,7 @@ <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="56"/> <source>Select to create an 'Open File' dialog</source> - <translation>Создать диалог открытия файла 'Open File'</translation> + <translation>Разрешить создание диалога открытия файла 'Open File'</translation> </message> <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="59"/> @@ -17922,7 +17922,7 @@ <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="69"/> <source>Select to create an 'Open Files' dialog</source> - <translation>Создать диалог открытия файлов 'Open Files'</translation> + <translation>Разрешить создание диалога открытия файлов 'Open Files'</translation> </message> <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="72"/> @@ -17932,7 +17932,7 @@ <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="79"/> <source>Select to create a 'Save File' dialog</source> - <translation>Создать диалог сохранения файла 'Save File'</translation> + <translation>Разрешить создание диалога сохранения файла 'Save File'</translation> </message> <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="82"/> @@ -17942,7 +17942,7 @@ <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="89"/> <source>Select to create a 'Select Directory' dialog</source> - <translation>Создать диалог выбора директории 'Select Directory'</translation> + <translation>Разрешить создание диалога выбора директории 'Select Directory'</translation> </message> <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="92"/> @@ -17952,7 +17952,7 @@ <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="99"/> <source>Select to create an 'Open File' dialog capturing the selected filter</source> - <translation>Создать диалог открытия файла 'Open File' с учетом выбранного шаблона</translation> + <translation>Разрешить создание диалога открытия файла 'Open File' с учетом выбранного шаблона</translation> </message> <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="102"/> @@ -17962,7 +17962,7 @@ <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="112"/> <source>Select to create an 'Open Files' dialog capturing the selected filter</source> - <translation>Создать диалог открытия файлов 'Open Files' с учетом выбранного шаблона</translation> + <translation>Разрешить создание диалога открытия файлов 'Open Files' с учетом выбранного шаблона</translation> </message> <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="115"/> @@ -17972,7 +17972,7 @@ <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="122"/> <source>Select to create a 'Save File' dialog capturing the selected filter</source> - <translation>Создать диалог сохранения файла 'Save File' с учетом выбранного шаблона</translation> + <translation>Разрешить создание диалога сохранения файла 'Save File' с учетом выбранного шаблона</translation> </message> <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="125"/> @@ -17987,7 +17987,7 @@ <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="185"/> <source>Resolve Symlinks</source> - <translation>Разрешенные символические ссылки</translation> + <translation>Разрешать символические ссылки</translation> </message> <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="251"/> @@ -18007,7 +18007,7 @@ <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="288"/> <source>Enter the filter specifications separated by ';;'</source> - <translation>Задайте описания шаблонов, разделённые '<b>;;</b>'</translation> + <translation>Задайте описания шаблонов, разделённые ';'</translation> </message> <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="264"/> @@ -18017,17 +18017,17 @@ <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="281"/> <source>Filters</source> - <translation>Шаблоны файлов</translation> + <translation>Шаблоны</translation> </message> <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="332"/> <source>Select to show an overwrite confirmation dialog</source> - <translation>Разрешить отображение диалог подтверждениея на перезапись</translation> + <translation>Разрешить отображение диалога подтверждения перезаписи</translation> </message> <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="335"/> <source>Show overwrite confirmation</source> - <translation>Запрашивать подтверждение на перезапись</translation> + <translation>Запрашивать подтверждение перезаписи</translation> </message> <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="257"/> @@ -18067,7 +18067,7 @@ <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="25"/> <source>PyQt Variant:</source> - <translation>Версия PyQt:</translation> + <translation>Вариант PyQt:</translation> </message> <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="173"/> @@ -18077,12 +18077,12 @@ <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="195"/> <source>Parent</source> - <translation>Предок</translation> + <translation>Родительские компоненты</translation> </message> <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="201"/> <source>Select "self" as parent</source> - <translation>Выбрать "self" в качестве предка</translation> + <translation>Выбрать "self" в качестве родительских компонентов</translation> </message> <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="204"/> @@ -18092,7 +18092,7 @@ <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="214"/> <source>Select "None" as parent</source> - <translation>Выбрать "None" в качестве предка</translation> + <translation>Выбрать "None" в качестве родительских компонентов</translation> </message> <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="217"/> @@ -18102,7 +18102,7 @@ <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="226"/> <source>Select to enter a parent expression</source> - <translation>Разрешить задание выражения для предка</translation> + <translation>Разрешить задание родительских компонентов</translation> </message> <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="229"/> @@ -18112,7 +18112,7 @@ <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="239"/> <source>Enter the parent expression</source> - <translation>Введите выражение для предка</translation> + <translation>Введите родительские компоненты</translation> </message> <message> <location filename="../Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.ui" line="305"/> @@ -26855,7 +26855,7 @@ <context> <name>HelpDocsInstaller</name> <message> - <location filename="../WebBrowser/QtHelp/HelpDocsInstaller.py" line="232"/> + <location filename="../WebBrowser/QtHelp/HelpDocsInstaller.py" line="236"/> <source><p>The file <b>{0}</b> could not be registered. <br/>Reason: {1}</p></source> <translation><p>Невозможно зарегистрировать файл <b>{0}</b>.<br>Причина: {1}</p></translation> </message> @@ -34360,12 +34360,12 @@ <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2234"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2247"/> <source>Copy Changesets</source> <translation>Копировать набор изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2588"/> <source>The project should be reread. Do this now?</source> <translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation> </message> @@ -34390,7 +34390,7 @@ <translation>Тег выбранной ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2319"/> <source>Switch</source> <translation>Переключиться</translation> </message> @@ -34455,12 +34455,12 @@ <translation><tr><td><b>Закладки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2730"/> <source>Find Commit</source> <translation>Поиск фиксации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2730"/> <source>'{0}' was not found.</source> <translation>'{0}' не найдено.</translation> </message> @@ -34485,7 +34485,7 @@ <translation>Secret</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2450"/> <source>Pull Changes</source> <translation>Затянуть изменения</translation> </message> @@ -34515,12 +34515,12 @@ <translation>Протолкнуть все изменения в удаленный репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2415"/> <source>Fetch Changes</source> <translation>Получить изменения (fetch)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2483"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2496"/> <source>Strip Changesets</source> <translation>Срезать наборы изменений (strip)</translation> </message> @@ -34555,27 +34555,27 @@ <translation>Переместить закладку в выбранную ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341"/> <source>Define Bookmark</source> <translation>Определить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2328"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2341"/> <source>Enter bookmark name for changeset "{0}":</source> <translation>Введите имя закладки для набора изменений "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2364"/> <source>Move Bookmark</source> <translation>Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2364"/> <source>Select the bookmark to be moved to changeset "{0}":</source> <translation>Выберите закладку для перемещения в набор изменений "{0}":</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2305"/> <source>Select bookmark to switch to (leave empty to use revision):</source> <translation>Выберите закладку для переключения (оставьте поле пустым для использования ревизии):</translation> </message> @@ -34637,7 +34637,7 @@ <p>Создание файла группы изменений, содержащего выбранные ревизии. Если не выбрано ни одного изменения, все наборы изменений будут поставляться пакетом. Если выбрана одна ревизия, то она будет интерпретирована как базовая ревизия. В противном случае самая младшая ревизия будет использована как базовая ревизия а все остальные изменения будут поставляться пакетом. Если диалог отображает исходящие наборы изменений, все помеченные наборы изменений будут поставляться пакетом.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2575"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2588"/> <source>Apply Changegroup</source> <translation>Применить группу изменений</translation> </message> @@ -34677,62 +34677,62 @@ <translation>Снять выделение всех записей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1571"/> <source>Side-by-Side Diff to Parent {0}</source> <translation>Построчные различия с предком {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1569"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1582"/> <source><a href="sbsdiff:{0}_{1}">Side-by-Side Compare</a></source> <translation><a href="sbsdiff:{0}_{1}">Построчное сравнение</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1708"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1721"/> <source>Pull Selected Changes</source> <translation>Затянуть помеченные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1709"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1722"/> <source>Fetch Selected Changes</source> <translation>Получить помеченные изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2774"/> <source>Differences</source> <translation>Различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2771"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2784"/> <source>Differences to Parent {0}</source> <translation>Различия с предком {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2787"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2800"/> <source>Diff to Parent {0}{1}</source> <translation>Различия с предком {0}{1}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2825"/> <source>There is no difference.</source> <translation>Различий нет.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2968"/> <source>Save Diff</source> <translation>Сохранить различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2922"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2935"/> <source>Patch Files (*.diff)</source> <translation>Файлы патчей (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2952"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл патча <b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2955"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2968"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Невозможно сохранить файл патча <b>{0}</b>.<br>Причина: {1}</p></translation> </message> @@ -34742,7 +34742,7 @@ <translation><a href="save:me">Сохранить</a></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2760"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2773"/> <source>Generating differences ...</source> <translation>Генерация различий...</translation> </message>
--- a/setup.py Thu Sep 05 18:47:56 2019 +0200 +++ b/setup.py Sat Sep 07 16:10:29 2019 +0200 @@ -315,8 +315,8 @@ "": getPackageData( "eric6", [".png", ".svg", ".svgz", ".xpm", ".ico", ".gif", ".icns", ".txt", - ".style", ".tmpl", ".html", ".qch", ".css", ".qss", ".e4h", - ".e6h", ".api", ".bas" ".dat"] + ".tmpl", ".html", ".qch", ".css", ".qss", ".e4h", ".e6h", ".api", + ".bas" ".dat"] ) + ["i18n/eric6_de.qm", "i18n/eric6_en.qm", "i18n/eric6_es.qm", "i18n/eric6_ru.qm", ]
